Revert "Revert^2: Use action bar style from ContactsCommon"
I am going to move this to master-contacts
This reverts commit ede793ef6a2f155ce55ad6a64c1299beae5500e4.
Change-Id: I4c31e825adf14605153efa8ceb08363bdf7ac94e
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
new file mode 100644
index 0000000..2fc5c2b
--- /dev/null
+++ b/res/drawable/action_bar_tab.xml
@@ -0,0 +1,22 @@
+<?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:drawable="@drawable/tab_selected_pressed" android:state_pressed="true"/>
+ <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true"/>
+ <item android:drawable="@drawable/tab_selected" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml
new file mode 100644
index 0000000..36a4175
--- /dev/null
+++ b/res/drawable/tab_selected.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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" >
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/action_bar_background" />
+ </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
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_selected_focused.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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" >
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/action_bar_background_highlight" />
+ </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
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_selected_pressed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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" >
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/action_bar_background_highlight" />
+ </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
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_unselected_focused.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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" >
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/action_bar_background_highlight" />
+ </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
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_unselected_pressed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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" >
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/action_bar_background_highlight" />
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fc5674b..e3fab85 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,6 +36,4 @@
<!-- Color of the text for buttons in the action bar -->
<color name="action_bar_button_text_color">#FFFFFF</color>
- <!-- Color of the selected tab underline (overriding value in ContactsCommon) -->
- <color name="tab_selected_color">#ffeeff41</color>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c59480..971bfc2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -273,11 +273,13 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> found</item>
</plurals>
- <!-- The title of "all contacts" tab. [CHAR LIMIT=14] -->
- <string name="all_contacts_tab_label">All contacts</string>
+ <!-- The content description for the "all contacts" tab.
- <!-- The title of "favorites" tab. [CHAR LIMIT=14] -->
- <string name="favorites_tab_label">Favorites</string>
+ Note: AccessibilityServices use this attribute to announce what the view represents.
+ This is especially valuable for views without textual representation like ImageView.
+
+ [CHAR LIMIT=NONE] -->
+ <string name="contactsAllLabel">All contacts</string>
<!-- Action string for calling back a number in the call log -->
<string name="callBack">Call back</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 771e92f..3129189 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,19 +53,16 @@
<item name="android:listViewStyle">@style/ListViewStyle</item>
</style>
- <style name="PeopleTheme" parent="@android:style/Theme.Quantum.Light">
+ <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
- <!-- Style for the tabs -->
- <item name="android:actionBarTabStyle">@style/ContactsActionBarTabStyle</item>
- <!-- Style for the tab bar (for the divider between tabs) -->
- <item name="android:actionBarTabBarStyle">@style/ContactsActionBarTabBarStyle</item>
- <!-- Style for the tab bar text (for text on tabs) -->
- <item name="android:actionBarTabTextStyle">@style/ContactsActionBarTabTextStyle</item>
- <!-- Style for the overflow button in the actionbar. -->
- <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
+ <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item>
+ <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item>
+ <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
+ <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
+ <item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
+ <item name="android:actionDropDownStyle">@style/ContactsActionBarDropDownStyle</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
- <item name="android:icon">@android:color/transparent</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:windowBackground">@color/background_primary</item>
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
@@ -102,45 +99,11 @@
<item name="android:src">@drawable/ic_overflow_menu</item>
</style>
- <style name="ContactsActionBarStyle" parent="@android:style/Widget.Quantum.Light.ActionBar">
- <item name="android:background">@color/actionbar_background_color</item>
- <item name="android:titleTextStyle">@style/ContactsActionBarTitleText</item>
- <item name="android:backgroundStacked">@color/actionbar_background_color</item>
- <!-- Empty icon -->
- <item name="android:icon">@android:color/transparent</item>
- </style>
-
- <!-- Styling for tabs. -->
- <style name="ContactsActionBarTabStyle" parent="@android:style/Widget.Quantum.Light.ActionBar.TabView">
+ <style name="ContactsActionBarStyle" parent="@android:Widget.Holo.Light.ActionBar">
<item name="android:background">@drawable/action_bar_tab</item>
- <item name="android:showDividers">none</item>
- </style>
-
- <!-- Text in the action bar at the top of the screen -->
- <style name="ContactsActionBarTitleText"
- parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title">
- <item name="android:textColor">@color/actionbar_text_color</item>
- </style>
-
- <!-- Styling for the tab bar; handles styling of the divider line. -->
- <style name="ContactsActionBarTabBarStyle"
- parent="@android:style/Widget.Quantum.ActionBar.TabBar">
- <item name="android:showDividers">none</item>
- </style>
-
- <!-- Text style for tabs. -->
- <style name="ContactsActionBarTabTextStyle"
- parent="android:style/Widget.Quantum.Light.ActionBar.TabText">
- <item name="android:textColor">@color/tab_text_color</item>
- <item name="android:textSize">@dimen/tab_text_size</item>
- <item name="android:fontFamily">@string/tab_font_family</item>
- <item name="android:textStyle">bold</item>
- </style>
-
- <!-- Action bar overflow menu icon. -->
- <style name="ContactsActionBarOverflowQP"
- parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow">
- <item name="android:src">@drawable/ic_menu_overflow_lt</item>
+ <item name="android:backgroundSplit">@drawable/action_bar_tab</item>
+ <item name="android:backgroundStacked">@drawable/action_bar_tab</item>
+ <item name="android:displayOptions"></item>
</style>
<style name="ContactsActionBarDropDownStyle" parent="@android:style/Widget.Holo.Light.Spinner">