From: Thad Hughes <thadh@google.com>
Date: Mon, 10 Feb 2014 18:20:49 +0000 (-0800)
Subject: Fixed background of actionbar color in dark theme for 2.3.x Android
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=fcf45ee3f02c9902219f52bcd08fefcb839fafe4

Fixed background of actionbar color in dark theme for 2.3.x Android
versions.
---

diff --git a/Dictionary_signed.apk b/Dictionary_signed.apk
index 58cd7d3..fd7ad59 100644
Binary files a/Dictionary_signed.apk and b/Dictionary_signed.apk differ
diff --git a/images/play_store/nexus_10/dictionary_manager.png b/images/play_store/nexus_10/dictionary_manager.png
new file mode 100644
index 0000000..03af536
Binary files /dev/null and b/images/play_store/nexus_10/dictionary_manager.png differ
diff --git a/images/play_store/nexus_10/essere.png b/images/play_store/nexus_10/essere.png
new file mode 100644
index 0000000..11a68df
Binary files /dev/null and b/images/play_store/nexus_10/essere.png differ
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d2ae2c6..bce60d9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,11 +1,11 @@
 <resources>
-    
+
     <style name="MyActionButtonStyle" parent="Widget.Sherlock.ActionButton">
         <item name="android:minWidth">28dip</item>
-        <!-- 
+        <!--
         <item name="android:paddingLeft">0dip</item>
         <item name="android:paddingRight">0dip</item>
-         -->
+        -->
     </style>
 
     <!--
@@ -13,6 +13,7 @@
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
     <style name="AppBaseThemeLight" parent="Theme.Sherlock.Light">
+
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -25,10 +26,10 @@
         <!--
       <item name="searchViewSearchIcon">@android:color/transparent</item>
       <item name="searchViewCloseIcon">@android:color/transparent</item>
-      -->
-      <item name="actionButtonStyle">@style/MyActionButtonStyle</item>
+        -->
+        <item name="actionButtonStyle">@style/MyActionButtonStyle</item>
     </style>
-    
+
     <style name="AppBaseThemeDark" parent="Theme.Sherlock">
         <!--
             Theme customizations available in newer API levels can go in
@@ -39,10 +40,10 @@
             Make search icon magnifying glass disappear:
             http://stackoverflow.com/questions/13604506/show-actionbarsherlock-searchview-always-expanded
         -->
-      <!--
+        <!--
       <item name="searchViewSearchIcon">@android:color/transparent</item>
       <item name="searchViewCloseIcon">@android:color/transparent</item>
-      -->
+        -->
         <item name="actionButtonStyle">@style/MyActionButtonStyle</item>
     </style>
 
@@ -51,6 +52,7 @@
     <style name="Theme.Default" parent="AppBaseThemeDark"></style>
 
     <style name="Theme.Default.TokenRow.Fg" parent="Theme.Default">
+
         <!-- <item name="android:textColor">#FFFFFF</item> -->
         <item name="android:textColorLink">#00AAFF</item>
     </style>
@@ -62,11 +64,13 @@
 
     <!-- ****************************************************************** -->
 
+
     <!-- Light theme -->
 
     <style name="Theme.Light" parent="AppBaseThemeLight"></style>
 
     <style name="Theme.Light.TokenRow.Fg" parent="Theme.Light">
+
         <!-- <item name="android:textColor">#000000</item> -->
         <item name="android:textColorLink">#0000FF</item>
     </style>
@@ -75,9 +79,8 @@
     <color name="theme_light_token_row_main_bg">#EEEEEE</color>
     <color name="theme_light_token_row_other_bg">#EEEEEE</color>
     <color name="theme_light_normal_row_bg">#FFFFFF</color>
-
     <color name="gray">#777777</color>
-    
+
     <style name="BorderlessButton">
         <item name="android:background">@null</item>
         <item name="android:paddingLeft">4dip</item>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 999a4f0..11606bc 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -197,6 +197,11 @@ public class DictionaryActivity extends SherlockListActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // This needs to be before super.onCreate, otherwise ActionbarSherlock
+        // doesn't makes the background of the actionbar white when you're
+        // in the dark theme.
+        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+
         Log.d(LOG, "onCreate:" + this);
         super.onCreate(savedInstanceState);
 
@@ -205,7 +210,6 @@ public class DictionaryActivity extends SherlockListActivity {
         // Don't auto-launch if this fails.
         prefs.edit().remove(C.DICT_FILE).commit();
 
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
 
         application = (DictionaryApplication) getApplication();
         theme = application.getSelectedTheme();
@@ -439,7 +443,7 @@ public class DictionaryActivity extends SherlockListActivity {
         searchView.requestFocus();
 
         // http://stackoverflow.com/questions/2833057/background-listview-becomes-black-when-scrolling
-        getListView().setCacheColorHint(0);
+//        getListView().setCacheColorHint(0);
     }
 
     private void onCreateSetupActionBarAndSearchView() {
@@ -475,7 +479,7 @@ public class DictionaryActivity extends SherlockListActivity {
         });
         customSearchView.addView(languageButton);
 
-        searchView = new SearchView(customSearchView.getContext());
+        searchView = new SearchView(getSupportActionBar().getThemedContext());
         searchView.setIconifiedByDefault(false);
         // searchView.setIconified(false); // puts the magnifying glass in the
         // wrong place.