Merge "Stylizing action bar tabs to QP green-ish theme."

10 files changed, 43 insertions, 182 deletions

diff --git a/res/drawable/tab_unselected.xml b/res/color/tab_text_color.xml
index 3eee4876e..629341e03 100644
--- a/res/drawable/tab_unselected.xml
+++ b/res/color/tab_text_color.xml
@@ -14,20 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_color"/>
-        </shape>
-    </item>
-    <!-- Tab background -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_color"
-                android:endColor="@color/tab_background_gradient_end_color"
-                android:angle="270" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#fff" android:state_selected="true"/>
+    <item android:color="#a3e7f0" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
index 3f31dbae1..fe961f72e 100644
--- a/res/drawable/action_bar_tab.xml
+++ b/res/drawable/action_bar_tab.xml
@@ -16,10 +16,22 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tab_selected_pressed" android:state_pressed="true" android:state_selected="true"/>
-    <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_selected="true"/>
-    <item android:drawable="@drawable/tab_selected" android:state_selected="true"/>
-    <item android:drawable="@drawable/tab_unselected_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true"/>
-    <item android:drawable="@drawable/tab_unselected" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_selected"
+            android:state_focused="false"
+            android:state_pressed="false"
+            android:state_selected="true" />
+    <item android:drawable="@drawable/tab_selected_focused"
+            android:state_focused="true"
+            android:state_pressed="false"
+            android:state_selected="true" />
+    <item android:drawable="@drawable/tab_unselected_focused"
+            android:state_focused="true"
+            android:state_pressed="false"
+            android:state_selected="false" />
+    <item android:drawable="@color/tab_pressed_color"
+            android:state_pressed="true" />
+    <item android:drawable="@drawable/tab_selected"
+            android:state_selected="true" />
+    <item android:drawable="@color/tab_default_color"
+            android:state_selected="false" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml
index 821f0473f..78f1eda67 100644
--- a/res/drawable/tab_selected.xml
+++ b/res/drawable/tab_selected.xml
@@ -15,25 +15,9 @@
      limitations under the License.
 -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_selected_color"/>
-        </shape>
-    </item>
-    <!-- Tab selection indicator -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <solid android:color="@color/tab_selected_color" />
-        </shape>
-    </item>
+    <!-- Tab selected underline -->
+    <item android:drawable="@color/tab_selected_color" />
     <!-- Tab background -->
-    <item android:bottom="@dimen/tab_selection_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_color"
-                android:endColor="@color/tab_background_gradient_end_color"
-                android:angle="270" />
-        </shape>
-    </item>
+    <item android:drawable="@color/tab_default_color"
+            android:bottom="@dimen/tab_selected_underline_height" />
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml
index 7c0d35f83..591045d34 100644
--- a/res/drawable/tab_selected_focused.xml
+++ b/res/drawable/tab_selected_focused.xml
@@ -15,27 +15,11 @@
      limitations under the License.
 -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_selected_color"/>
-        </shape>
-    </item>
-    <!-- Tab selection indicator -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <solid android:color="@color/tab_selected_color" />
-        </shape>
-    </item>
+    <!-- Tab selected underline -->
+    <item android:drawable="@color/tab_selected_color" />
     <!-- Tab background -->
-    <item android:bottom="@dimen/tab_selection_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_color"
-                android:endColor="@color/tab_background_gradient_end_color"
-                android:angle="270" />
-        </shape>
-    </item>
+    <item android:drawable="@color/tab_default_color"
+            android:bottom="@dimen/tab_selected_underline_height" />
     <item>
         <shape android:shape="rectangle" >
             <stroke
diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml
deleted file mode 100644
index 32efb69c4..000000000
--- a/res/drawable/tab_selected_pressed.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_selected_color"/>
-        </shape>
-    </item>
-    <!-- Tab selection indicator -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <solid android:color="@color/tab_selected_color" />
-        </shape>
-    </item>
-    <!-- Tab background (in pressed state) -->
-    <item android:bottom="@dimen/tab_selection_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_pressed_color"
-                android:endColor="@color/tab_background_gradient_end_pressed_color"
-                android:angle="270" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml
index c85473959..c32e2c534 100644
--- a/res/drawable/tab_unselected_focused.xml
+++ b/res/drawable/tab_unselected_focused.xml
@@ -15,21 +15,8 @@
      limitations under the License.
 -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_color"/>
-        </shape>
-    </item>
     <!-- Tab background -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_color"
-                android:endColor="@color/tab_background_gradient_end_color"
-                android:angle="270" />
-        </shape>
-    </item>
+    <item android:drawable="@color/tab_default_color" />
     <item>
         <shape android:shape="rectangle" >
             <stroke
diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml
deleted file mode 100644
index 5d2af321a..000000000
--- a/res/drawable/tab_unselected_pressed.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- Tab underline -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_underline_color"/>
-        </shape>
-    </item>
-    <!-- Tab background (in pressed state) -->
-    <item android:bottom="@dimen/tab_underline_height">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:startColor="@color/tab_background_gradient_start_pressed_color"
-                android:endColor="@color/tab_background_gradient_end_pressed_color"
-                android:angle="270" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c842e22b2..cbd116db6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,9 +57,9 @@
     <!-- Background color of dialer list items (contacts, call log entries) -->
     <color name="background_dialer_list_items">#ebebeb</color>
 
-    <!-- Background color of action bars.  Ensure this stays in sync with packages/Telephony
+    <!-- Background color of action bars. Ensure this stays in sync with packages/Telephony
          actionbar_background_color. -->
-    <color name="actionbar_background_color">#00AFCC</color>
+    <color name="actionbar_background_color">#00afcc</color>
 
     <!-- Color of the 1dp divider that separates favorites -->
     <color name="favorite_contacts_separator_color">#d0d0d0</color>
@@ -101,29 +101,14 @@
     <!-- Text color for the "All Contacts" button above the favorite callers -->
     <color name="all_contacts_button_text_color">#ffffff</color>
 
-    <!-- Background gradient start color for tabs in an unpressed state. -->
-    <color name="tab_background_gradient_start_color">#d3d3d3</color>
+    <!-- Background color for tabs in an unpressed state. -->
+    <color name="tab_default_color">#00afcc</color>
 
-    <!-- Background gradient end color for tabs in an unpressed state. -->
-    <color name="tab_background_gradient_end_color">#ebebeb</color>
-
-    <!-- Background gradient start color for tabs in a pressed state. -->
-    <color name="tab_background_gradient_start_pressed_color">#c4c4c4</color>
-
-    <!-- Background gradient end color for tabs in a pressed state. -->
-    <color name="tab_background_gradient_end_pressed_color">#dedede</color>
-
-    <!-- Color of the underline for a tab which is selected. -->
-    <color name="tab_underline_selected_color">#3265c1</color>
-
-    <!-- Color of the underline for a tab which is not selected. -->
-    <color name="tab_underline_color">#c8c8c8</color>
+    <!-- Background color for tabs in a pressed state. -->
+    <color name="tab_pressed_color">#008698</color>
 
     <!-- Color of the selection indicator for a tab which is selected. -->
-    <color name="tab_selected_color">#3b77e7</color>
-
-    <!-- Color of tab text. -->
-    <color name="tab_text_color">#505050</color>
+    <color name="tab_selected_color">#008698</color>
 
     <!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
     <color name="contacts_grid_bottom_border_color">#16000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9490d8da5..c8dfecc78 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,12 +122,8 @@
     <!-- Size of the icon (voice search, close search) in the search box. -->
     <dimen name="search_box_icon_size">37dp</dimen>
 
-    <!-- Height of the underline of a tab. -->
-    <dimen name="tab_underline_height">2dp</dimen>
     <!-- Height of the selection indicator of a tab. -->
-    <dimen name="tab_selection_height">7.7dp</dimen>
-    <!-- Padding above and below the divider line of a tab. -->
-    <dimen name="tab_divider_padding">12dp</dimen>
+    <dimen name="tab_selected_underline_height">3dp</dimen>
     <!-- Size of text in tabs. -->
-    <dimen name="tab_text_size">12sp</dimen>
+    <dimen name="tab_text_size">13sp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3d3a43190..c0f296d84 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -168,14 +168,11 @@
     <!-- Styling for the tab bar; handles styling of the divider line. -->
     <style name="DialtactsActionBarTabBarStyle"
            parent="@android:style/Widget.Quantum.ActionBar.TabBar">
-        <item name="android:divider">@drawable/divider</item>
-        <item name="android:showDividers">middle</item>
-        <item name="android:dividerPadding">@dimen/tab_divider_padding</item>
-        <item name="android:background">@drawable/action_bar_tab</item>
+        <item name="android:showDividers">none</item>
     </style>
 
     <!-- Styling for tabs. -->
-    <style name="DialtactsActionBarTabStyle" parent="@android:style/Widget.Holo.ActionBar.TabView">
+    <style name="DialtactsActionBarTabStyle" parent="@android:style/Widget.Quantum.ActionBar.TabView">
         <item name="android:background">@drawable/action_bar_tab</item>
         <item name="android:showDividers">none</item>
     </style>