summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-02-24 11:57:57 -0800
committerTyler Gunn <tgunn@google.com>2014-02-24 20:00:28 +0000
commita8ff9750831fcc276354ed80fad3b54316489383 (patch)
tree52efcc429a399f08db90468b7faea2a2a191329f /res/drawable
parenta875dec3a4911bb23e34af6d25e7cacc7395e239 (diff)
downloadandroid_packages_apps_Dialer-a8ff9750831fcc276354ed80fad3b54316489383.tar.gz
android_packages_apps_Dialer-a8ff9750831fcc276354ed80fad3b54316489383.tar.bz2
android_packages_apps_Dialer-a8ff9750831fcc276354ed80fad3b54316489383.zip
UX Changes: Dialer actionbar, tabs and searchbox.
See CL 423036 for the searchbox text changes. Bug: 13167901 Change-Id: I6806cb27c19f7f0ca55394d70134f0c30c93446b
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/action_bar_tab.xml3
-rw-r--r--res/drawable/background_favorites_menu.xml2
-rw-r--r--res/drawable/call_history_actionbar_background.xml4
-rw-r--r--res/drawable/tab_selected.xml20
-rw-r--r--res/drawable/tab_selected_focused.xml27
-rw-r--r--res/drawable/tab_selected_pressed.xml21
-rw-r--r--res/drawable/tab_unselected.xml33
-rw-r--r--res/drawable/tab_unselected_focused.xml23
-rw-r--r--res/drawable/tab_unselected_pressed.xml15
9 files changed, 102 insertions, 46 deletions
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
index 35df0538f..3f31dbae1 100644
--- a/res/drawable/action_bar_tab.xml
+++ b/res/drawable/action_bar_tab.xml
@@ -16,11 +16,10 @@
-->
<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"/>
</selector> \ No newline at end of file
diff --git a/res/drawable/background_favorites_menu.xml b/res/drawable/background_favorites_menu.xml
index fc2669b10..60933fd5e 100644
--- a/res/drawable/background_favorites_menu.xml
+++ b/res/drawable/background_favorites_menu.xml
@@ -18,7 +18,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape android:shape="rectangle" >
- <solid android:color="@color/background_dialer_list_items" />
+ <solid android:color="@color/favorites_menu_background_color" />
</shape>
</item>
<item android:state_pressed="true">
diff --git a/res/drawable/call_history_actionbar_background.xml b/res/drawable/call_history_actionbar_background.xml
index f781f27b0..eabceac2b 100644
--- a/res/drawable/call_history_actionbar_background.xml
+++ b/res/drawable/call_history_actionbar_background.xml
@@ -16,10 +16,10 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle">
- <solid android:color="#c6c6c6" />
+ <solid android:color="@color/actionbar_underline" />
</shape>
</item>
- <item android:bottom="1dip">
+ <item android:bottom="2dp">
<shape android:shape="rectangle">
<solid android:color="@color/actionbar_background_color" />
</shape>
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml
index 25d76fc27..821f0473f 100644
--- a/res/drawable/tab_selected.xml
+++ b/res/drawable/tab_selected.xml
@@ -14,18 +14,26 @@
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="#7d7d7d" />
+ <solid android:color="@color/tab_selected_color" />
</shape>
</item>
- <item android:bottom="6dp">
+ <!-- Tab background -->
+ <item android:bottom="@dimen/tab_selection_height">
<shape android:shape="rectangle" >
- <solid android:color="@color/actionbar_background_color" />
+ <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
diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml
index 8efd7b30e..7c0d35f83 100644
--- a/res/drawable/tab_selected_focused.xml
+++ b/res/drawable/tab_selected_focused.xml
@@ -14,32 +14,33 @@
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="#7d7d7d" />
+ <shape android:shape="rectangle">
+ <solid android:color="@color/tab_underline_selected_color"/>
</shape>
</item>
- <item android:bottom="6dp">
+ <!-- Tab selection indicator -->
+ <item android:bottom="@dimen/tab_underline_height">
<shape android:shape="rectangle" >
- <solid android:color="@color/actionbar_background_color" />
+ <solid android:color="@color/tab_selected_color" />
</shape>
</item>
- <item>
+ <!-- Tab background -->
+ <item android:bottom="@dimen/tab_selection_height">
<shape android:shape="rectangle" >
- <solid android:color="#27ffffff" />
+ <gradient
+ android:startColor="@color/tab_background_gradient_start_color"
+ android:endColor="@color/tab_background_gradient_end_color"
+ android:angle="270" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
- <solid android:color="#00000000" />
-
<stroke
- android:width="2dp"
- android:color="#27ffffff" />
+ android:width="4dp"
+ android:color="#44ff0000" />
</shape>
</item>
-
</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml
index a38344e04..32efb69c4 100644
--- a/res/drawable/tab_selected_pressed.xml
+++ b/res/drawable/tab_selected_pressed.xml
@@ -14,23 +14,26 @@
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="#7d7d7d" />
+ <shape android:shape="rectangle">
+ <solid android:color="@color/tab_underline_selected_color"/>
</shape>
</item>
- <item android:bottom="6dp">
+ <!-- Tab selection indicator -->
+ <item android:bottom="@dimen/tab_underline_height">
<shape android:shape="rectangle" >
- <solid android:color="@color/actionbar_background_color" />
+ <solid android:color="@color/tab_selected_color" />
</shape>
</item>
- <item>
+ <!-- Tab background (in pressed state) -->
+ <item android:bottom="@dimen/tab_selection_height">
<shape android:shape="rectangle" >
- <solid android:color="#4dffffff" />
+ <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.xml b/res/drawable/tab_unselected.xml
new file mode 100644
index 000000000..3eee4876e
--- /dev/null
+++ b/res/drawable/tab_unselected.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 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 -->
+ <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
diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml
index 2aceb63ef..c85473959 100644
--- a/res/drawable/tab_unselected_focused.xml
+++ b/res/drawable/tab_unselected_focused.xml
@@ -14,22 +14,27 @@
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" >
-
+<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" >
- <solid android:color="#27ffffff" />
+ <gradient
+ android:startColor="@color/tab_background_gradient_start_color"
+ android:endColor="@color/tab_background_gradient_end_color"
+ android:angle="270" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
- <solid android:color="#00000000" />
-
<stroke
- android:width="2dp"
- android:color="#27ffffff" />
+ android:width="4dp"
+ android:color="#44ff0000" />
</shape>
</item>
-
</layer-list> \ No newline at end of file
diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml
index 2362b6581..5d2af321a 100644
--- a/res/drawable/tab_unselected_pressed.xml
+++ b/res/drawable/tab_unselected_pressed.xml
@@ -14,13 +14,20 @@
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" >
- <solid android:color="#4dffffff" />
+ <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