diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-01 12:31:52 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-05-01 12:35:12 -0700 |
commit | 87ed384a49f91c9af8866c60f33f89ef8bc1b4ea (patch) | |
tree | 9bf6a4e3b26c6a94b6e412374d543a87d593be66 /res | |
parent | 10b8c46fe070a93f98db69c60e0f1b28c02b5964 (diff) |
Remove tab colors and drawables to ContactsCommon.
These are being moved there to make it easier for InCallUi to
reference and reuse.
Bug: 14108639
Change-Id: Id4ad1bee95e3f18ee436db527e8fde6e90e5c013
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/tab_selected.xml | 23 | ||||
-rw-r--r-- | res/drawable/tab_selected_focused.xml | 30 | ||||
-rw-r--r-- | res/drawable/tab_unselected_focused.xml | 27 | ||||
-rw-r--r-- | res/values/colors.xml | 9 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
5 files changed, 0 insertions, 91 deletions
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml deleted file mode 100644 index 78f1eda67..000000000 --- a/res/drawable/tab_selected.xml +++ /dev/null @@ -1,23 +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 selected underline --> - <item android:drawable="@color/tab_selected_color" /> - <!-- Tab background --> - <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 deleted file mode 100644 index 591045d34..000000000 --- a/res/drawable/tab_selected_focused.xml +++ /dev/null @@ -1,30 +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 selected underline --> - <item android:drawable="@color/tab_selected_color" /> - <!-- Tab background --> - <item android:drawable="@color/tab_default_color" - android:bottom="@dimen/tab_selected_underline_height" /> - <item> - <shape android:shape="rectangle" > - <stroke - android:width="4dp" - android:color="#44ff0000" /> - </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 deleted file mode 100644 index c32e2c534..000000000 --- a/res/drawable/tab_unselected_focused.xml +++ /dev/null @@ -1,27 +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 background --> - <item android:drawable="@color/tab_default_color" /> - <item> - <shape android:shape="rectangle" > - <stroke - android:width="4dp" - android:color="#44ff0000" /> - </shape> - </item> -</layer-list>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 4dab28596..5a6227332 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -101,15 +101,6 @@ <!-- Text color for the "All Contacts" button above the favorite callers --> <color name="all_contacts_button_text_color">#ffffff</color> - <!-- Background color for tabs in an unpressed state. --> - <color name="tab_default_color">#00afcc</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">#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 66b36a773..83ff4ae44 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -131,8 +131,6 @@ <!-- Size of the icon (voice search, close search) in the search box. --> <dimen name="search_box_icon_size">37dp</dimen> - <!-- Height of the selection indicator of a tab. --> - <dimen name="tab_selected_underline_height">3dp</dimen> <!-- Size of text in tabs. --> <dimen name="tab_text_size">13sp</dimen> </resources> |