summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-05-16 20:52:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-16 20:52:14 +0000
commit6c02922d6b3c4a2872d25f8377309339df8001f6 (patch)
tree1b478e2e030cff3e41d292016729b2af94ee3a57
parent92f82623d97e17ecb3a22f8a921bf4657534168b (diff)
parent3513176d4797a756465bd8dffbc4f4f44322a54d (diff)
Merge "Delete dialer resources moved into common"
-rw-r--r--res/drawable-hdpi/ic_menu_overflow_dk.pngbin645 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_menu_overflow_lt.pngbin947 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow_dk.pngbin616 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow_lt.pngbin692 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow_dk.pngbin801 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow_lt.pngbin1388 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_overflow_dk.pngbin1178 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_overflow_lt.pngbin4576 -> 0 bytes
-rw-r--r--res/drawable/action_bar_tab.xml38
-rw-r--r--res/values/colors.xml5
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/strings.xml4
12 files changed, 0 insertions, 48 deletions
diff --git a/res/drawable-hdpi/ic_menu_overflow_dk.png b/res/drawable-hdpi/ic_menu_overflow_dk.png
deleted file mode 100644
index e9b0523de..000000000
--- a/res/drawable-hdpi/ic_menu_overflow_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow_lt.png b/res/drawable-hdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 57db353f7..000000000
--- a/res/drawable-hdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_dk.png b/res/drawable-mdpi/ic_menu_overflow_dk.png
deleted file mode 100644
index 67f281d56..000000000
--- a/res/drawable-mdpi/ic_menu_overflow_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_lt.png b/res/drawable-mdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index c69937428..000000000
--- a/res/drawable-mdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_dk.png b/res/drawable-xhdpi/ic_menu_overflow_dk.png
deleted file mode 100644
index ec50c22c0..000000000
--- a/res/drawable-xhdpi/ic_menu_overflow_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_lt.png b/res/drawable-xhdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index e538b9894..000000000
--- a/res/drawable-xhdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow_dk.png b/res/drawable-xxhdpi/ic_menu_overflow_dk.png
deleted file mode 100644
index 004f26b38..000000000
--- a/res/drawable-xxhdpi/ic_menu_overflow_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow_lt.png b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 7f3f73386..000000000
--- a/res/drawable-xxhdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
deleted file mode 100644
index 8a3ea7a7e..000000000
--- a/res/drawable/action_bar_tab.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/tab_pressed_color">
- <item>
- <selector>
- <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="@drawable/tab_selected"
- android:state_selected="true" />
- <item android:drawable="@color/tab_default_color" />
- </selector>
- </item>
-</touch-feedback> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4874e1f68..28b78963c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -105,11 +105,6 @@
<!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
<color name="contacts_grid_bottom_border_color">#16000000</color>
- <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
- phone_settings_actionbar_text_color-->
- <color name="actionbar_text_color">#ffffff</color>
- <color name="actionbar_unselected_text_color">#a6ffffff</color>
-
<!-- Color of actions in expanded call log entries. This text color represents actions such
as call back, play voicemail, etc. -->
<color name="call_log_action_text">#1dc7db</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ae653303c..93b98ef94 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -113,7 +113,6 @@
<!-- Size of text in tabs. -->
<dimen name="tab_height">43dp</dimen>
- <dimen name="tab_text_size">14sp</dimen>
<!-- Padding to the left and right of call log action buttons. -->
<dimen name="call_log_action_horizontal_padding">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04c951b98..0f66131dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -657,10 +657,6 @@
Do not translate. -->
<string name="search_font_family">sans-serif</string>
- <!-- The font-family to use for tab text.
- Do not translate. -->
- <string name="tab_font_family">sans-serif</string>
-
<!-- Button text for the "call back" button displayed underneath an entry in the call log.
Tapping causes a call to be placed to the caller represented by the call log entry.
[CHAR LIMIT=30] -->