From 5bc166d3daa678fc7653f33c3e7ae048058bbb2f Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 13 Jun 2014 00:15:25 +0800
Subject: [PATCH] =?UTF-8?q?Translucent=20=E7=A7=BB=E8=87=B3=20themes.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidManifest.xml                 |  2 +-
 res/values/styles.xml               | 14 --------------
 res/values/themes.xml               |  5 +++++
 src/com/hippo/ehviewer/util/Ui.java | 10 ----------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b271fa131..be64231fa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme.Normal" >
         
         <activity
             android:name=".StartActivity"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 736820956..bed75485b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -180,18 +180,4 @@
         <item name="android:stepSize">0.5</item>
         <item name="android:isIndicator">true</item>
     </style>
-    
-    <style name="AlertDialogStyle">
-        <!--item name="android:fullDark">@android:drawable/popup_full_dark</item-->
-        <!--item name="android:topDark">@android:drawable/popup_top_dark</item-->
-        <!--item name="android:centerDark">@android:drawable/popup_center_dark</item-->
-        <!--item name="android:bottomDark">@android:drawable/popup_bottom_dark</item-->
-        <!--item name="android:fullBright">@android:drawable/popup_full_bright</item-->
-        <!--item name="android:topBright">@android:drawable/popup_top_bright</item-->
-        <!-- item name="android:centerBright">@android:drawable/popup_center_bright</item-->
-        <!--  item name="android:bottomBright">@android:drawable/popup_bottom_bright</item -->
-        <!-- item name="android:bottomMedium">@android:drawable/popup_bottom_medium</item-->
-        <!--item name="android:centerMedium">@android:drawable/popup_center_medium</item-->
-        <!--item name="android:layout">@android:layout/alert_dialog_holo</item-->
-    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b6df517ca..7a47feddc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,6 +23,7 @@
         <item name="@android:actionBarTabStyle">@style/ActionBarTabStyle</item>
         <item name="@android:actionOverflowButtonStyle">@style/OverFlow</item>
         <item name="@android:homeAsUpIndicator">@drawable/ic_ab_back</item>
+        <item name="@android:windowActionBarOverlay">true</item>
         
         <!-- Button -->
         <item name="@android:buttonStyle">@style/Button.Blue</item>
@@ -47,6 +48,10 @@
         <!-- item name="@android:alertDialogStyle">@style/AlertDialogStyle</item -->
     </style>
     
+    <style name="AppTheme.Normal">
+        <!-- nop -->
+    </style>
+    
     <style name="AppTheme.Main">
         <item name="@android:homeAsUpIndicator">@drawable/ic_navigation_drawer</item>
     </style>
diff --git a/src/com/hippo/ehviewer/util/Ui.java b/src/com/hippo/ehviewer/util/Ui.java
index fdbab7eb9..e0286e585 100644
--- a/src/com/hippo/ehviewer/util/Ui.java
+++ b/src/com/hippo/ehviewer/util/Ui.java
@@ -283,23 +283,13 @@ public class Ui {
         return translucent(activity, new ColorDrawable(color));
     }
     
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     public static SystemBarConfig translucent(
             Activity activity, Drawable drawable) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window win = activity.getWindow();
-            WindowManager.LayoutParams winParams = win.getAttributes();
-            winParams.flags |= WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
-            win.setAttributes(winParams);
-        }
-        
         SystemBarTintManager tintManager = new SystemBarTintManager(activity);
         tintManager.setStatusBarTintEnabled(true);
         tintManager.setStatusBarTintDrawable(drawable);
         tintManager.setNavigationBarTintEnabled(true);
         tintManager.setNavigationBarAlpha(0.0f);
-        
         return tintManager.getConfig();
     }
 }