Theme

calculatorpp/AndroidManifest.xml

@@ -20,7 +20,8 @@
 
         </activity>
 
-        <activity android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/>
+        <!-- settings must use action bar icon-->
+        <activity android:label="@string/c_app_settings" android:icon="@drawable/icon_action_bar" android:name=".CalculatorPreferencesActivity"/>
 
         <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
 
@@ -35,7 +36,9 @@
         <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
 
         <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-        <activity android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
+
+        <!-- settings must use action bar icon-->
+        <activity android:label="@string/c_settings" android:icon="@drawable/icon_action_bar" android:name=".plot.CalculatorPlotPreferenceActivity"/>
 
         <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
 
@@ -49,7 +52,7 @@
         </receiver>
 
         <activity android:name="org.acra.CrashReportDialog"
-                  android:theme="@android:style/Theme.Dialog"
+                  android:theme="@style/Theme.Sherlock.Dialog"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
                   android:finishOnTaskLaunch="true" />

calculatorpp/res/drawable/default_abs__btn_cab_done_holo_dark.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/default_abs__btn_cab_done_pressed_holo_dark" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/default_abs__btn_cab_done_focused_holo_dark" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/default_abs__btn_cab_done_default_holo_dark" />
+</selector>

calculatorpp/res/drawable/default_abs__item_background_holo_dark.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/abs__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/abs__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="true"                                                             android:drawable="@drawable/default_abs__list_focused_holo" />
+    <item                                                                                          android:drawable="@android:color/transparent" />
+</selector>

calculatorpp/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/default_abs__list_pressed_holo_dark"  />
+    <item android:drawable="@drawable/default_abs__list_longpressed_holo"  />
+</transition>

calculatorpp/res/drawable/default_abs__list_selector_holo_dark.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+
+    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/abs__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/abs__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/default_abs__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="true"                                                             android:drawable="@drawable/default_abs__list_focused_holo" />
+</selector>

calculatorpp/res/drawable/default_abs__spinner_ab_holo_dark.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:drawable="@drawable/abs__spinner_ab_disabled_holo_dark" />
+    <item android:state_pressed="true"
+          android:drawable="@drawable/default_abs__spinner_ab_pressed_holo_dark" />
+    <item android:state_pressed="false" android:state_focused="true"
+          android:drawable="@drawable/default_abs__spinner_ab_focused_holo_dark" />
+    <item android:drawable="@drawable/abs__spinner_ab_default_holo_dark" />
+</selector>

calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml

@@ -17,18 +17,18 @@
 <selector xmlns:a="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
     <item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
-    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="false" a:drawable="@drawable/abs__tab_selected_holo" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="false" a:drawable="@drawable/default_abs__tab_selected_holo" />
 
     <!-- Focused states -->
-    <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@drawable/abs__list_focused_holo" />
-    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="false" a:drawable="@drawable/abs__tab_selected_focused_holo" />
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@drawable/default_abs__list_focused_holo" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="false" a:drawable="@drawable/default_abs__tab_selected_focused_holo" />
 
     <!-- Pressed -->
     <!--    Non focused states -->
-    <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/abs__list_pressed_holo_dark" />
-    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="true" a:drawable="@drawable/abs__tab_selected_pressed_holo" />
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/default_abs__list_pressed_holo_dark" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="true" a:drawable="@drawable/default_abs__tab_selected_pressed_holo" />
 
     <!--    Focused states -->
-    <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/abs__tab_unselected_pressed_holo" />
-    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="true" a:drawable="@drawable/abs__tab_selected_pressed_holo" />
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/default_abs__tab_unselected_pressed_holo" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="true" a:drawable="@drawable/default_abs__tab_selected_pressed_holo" />
 </selector>

calculatorpp/res/drawable/metro_green_list_item.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:state_pressed="true"
+          android:drawable="@color/metro_green_color"/>
+
+    <!-- focused -->
+    <item android:state_focused="true"
+          android:drawable="@color/metro_green_color"/>
+
+    <!-- default -->
+    <item android:drawable="@android:color/transparent"/>
+</selector>

calculatorpp/res/drawable/metro_purple_list_item.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:state_pressed="true"
+          android:drawable="@color/metro_purple_color"/>
+
+    <!-- focused -->
+    <item android:state_focused="true"
+          android:drawable="@color/metro_purple_color"/>
+
+    <!-- default -->
+    <item android:drawable="@android:color/transparent"/>
+</selector>

calculatorpp/res/values/theme_default.xml

@@ -82,12 +82,29 @@
 
     <style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
         <item name="background">@drawable/default_abs__ab_transparent_dark_holo</item>
+        <item name="android:background">@drawable/default_abs__ab_transparent_dark_holo</item>
     </style>
 
     <style name="default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
+        <item name="background">@drawable/default_abs__tab_indicator_ab_holo</item>
         <item name="android:background">@drawable/default_abs__tab_indicator_ab_holo</item>
     </style>
 
+    <style name="default_actionbar_close_button_style" parent="@style/Widget.Sherlock.ActionButton.CloseMode">
+        <item name="android:background">@drawable/default_abs__btn_cab_done_holo_dark</item>
+        <item name="background">@drawable/default_abs__btn_cab_done_holo_dark</item>
+    </style>
+
+    <style name="default_actionbar_dropdown_style" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+        <item name="android:background">@drawable/default_abs__spinner_ab_holo_dark</item>
+        <item name="background">@drawable/default_abs__spinner_ab_holo_dark</item>
+    </style>
+
+    <style name="default_actionbar_dropdown_listview_style" parent="@style/Widget.Sherlock.ListView.DropDown">
+        <item name="android:listSelector">@drawable/default_abs__list_selector_holo_dark</item>
+        <!--<item name="listSelector">@drawable/default_abs__list_selector_holo_dark</item>-->
+    </style>
+
     <style name="default_theme" parent="Theme.Sherlock">
         <item name="digitButtonStyle">@style/default_digit_button_style</item>
         <item name="controlButtonStyle">@style/default_control_button_style</item>
@@ -111,5 +128,15 @@
         <item name="android:actionBarTabStyle">@style/default_actionbar_tab_style</item>
         <item name="actionBarStyle">@style/default_actionbar_style</item>
         <item name="android:actionBarStyle">@style/default_actionbar_style</item>
+        <item name="actionModeCloseButtonStyle">@style/default_actionbar_close_button_style</item>
+        <item name="android:actionModeCloseButtonStyle">@style/default_actionbar_close_button_style</item>
+        <item name="actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
+        <item name="android:actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
+        <item name="actionDropDownStyle">@style/default_actionbar_dropdown_style</item>
+        <item name="android:actionDropDownStyle">@style/default_actionbar_dropdown_style</item>
+        <item name="dropDownListViewStyle">@style/default_actionbar_dropdown_listview_style</item>
+        <item name="android:dropDownListViewStyle">@style/default_actionbar_dropdown_listview_style</item>
+
+
     </style>
 </resources>

calculatorpp/res/values/theme_metro_blue.xml

@@ -22,9 +22,11 @@
 
     <style name="metro_blue_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
         <item name="background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
+        <item name="android:background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
     </style>
 
     <style name="metro_blue_actionbar_tab_style" parent="default_actionbar_tab_style">
+        <item name="background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
         <item name="android:background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
     </style>
 
@@ -37,10 +39,10 @@
         <item name="fragmentListViewItemStyle">@style/metro_blue_fragment_list_view_item_style</item>
 
         <!--action bar-->
-        <item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
+<!--        <item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
         <item name="android:actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
         <item name="actionBarStyle">@style/metro_blue_actionbar_style</item>
-        <item name="android:actionBarStyle">@style/metro_blue_actionbar_style</item>
+        <item name="android:actionBarStyle">@style/metro_blue_actionbar_style</item>-->
     </style>
 
 </resources>

calculatorpp/res/values/theme_metro_green.xml

@@ -16,11 +16,18 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="metro_green_theme" parent="default_theme">
+    <style name="metro_green_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
+        <item name="android:background">@drawable/metro_green_list_item</item>
+    </style>
+
+    <style name="metro_green_theme" parent="default_theme">
 		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
 		<item name="controlButtonStyle">@style/metro_control_button_style</item>
 		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
 		<item name="operationButtonStyle">@style/metro_green_operation_button_style</item>
-	</style>
+
+        <item name="fragmentListViewItemStyle">@style/metro_green_fragment_list_view_item_style</item>
+
+    </style>
 
 </resources>

calculatorpp/res/values/theme_metro_purple.xml

@@ -16,11 +16,18 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
+    <style name="metro_purple_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
+        <item name="android:background">@drawable/metro_purple_list_item</item>
+    </style>
+
 	<style name="metro_purple_theme" parent="default_theme">
 		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
 		<item name="controlButtonStyle">@style/metro_control_button_style</item>
 		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
 		<item name="operationButtonStyle">@style/metro_purple_operation_button_style</item>
-	</style>
+
+        <item name="fragmentListViewItemStyle">@style/metro_purple_fragment_list_view_item_style</item>
+
+    </style>
 
 </resources>