From a32a591d243a1e5ec9898a643a7be63800fab65a Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 5 May 2014 14:20:39 -0700
Subject: Move Dialpad-related resources to ContactsCommon

Change-Id: Ide81e00c798f3c2b9a4b4bc46a8ca8ac2971d2ca
---
 res/drawable-hdpi/ic_dial_action_delete.png   | Bin 942 -> 0 bytes
 res/drawable-hdpi/ic_dial_action_vm.png       | Bin 727 -> 0 bytes
 res/drawable-mdpi/ic_dial_action_delete.png   | Bin 694 -> 0 bytes
 res/drawable-mdpi/ic_dial_action_vm.png       | Bin 522 -> 0 bytes
 res/drawable-xhdpi/ic_dial_action_delete.png  | Bin 1214 -> 0 bytes
 res/drawable-xhdpi/ic_dial_action_vm.png      | Bin 929 -> 0 bytes
 res/drawable-xxhdpi/ic_dial_action_delete.png | Bin 1907 -> 0 bytes
 res/drawable-xxhdpi/ic_dial_action_vm.png     | Bin 1576 -> 0 bytes
 res/drawable/dialpad_key_colors.xml           |  22 ----
 res/layout/dialpad.xml                        | 139 --------------------------
 res/layout/dialpad_key.xml                    |  35 -------
 res/layout/dialpad_view.xml                   |  89 -----------------
 res/values/colors.xml                         |  17 ----
 res/values/dimens.xml                         |  18 ----
 res/values/strings.xml                        |  16 ---
 res/values/styles.xml                         |  46 ---------
 16 files changed, 382 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_dial_action_delete.png
 delete mode 100644 res/drawable-hdpi/ic_dial_action_vm.png
 delete mode 100644 res/drawable-mdpi/ic_dial_action_delete.png
 delete mode 100644 res/drawable-mdpi/ic_dial_action_vm.png
 delete mode 100644 res/drawable-xhdpi/ic_dial_action_delete.png
 delete mode 100644 res/drawable-xhdpi/ic_dial_action_vm.png
 delete mode 100644 res/drawable-xxhdpi/ic_dial_action_delete.png
 delete mode 100644 res/drawable-xxhdpi/ic_dial_action_vm.png
 delete mode 100644 res/drawable/dialpad_key_colors.xml
 delete mode 100644 res/layout/dialpad.xml
 delete mode 100644 res/layout/dialpad_key.xml
 delete mode 100644 res/layout/dialpad_view.xml

diff --git a/res/drawable-hdpi/ic_dial_action_delete.png b/res/drawable-hdpi/ic_dial_action_delete.png
deleted file mode 100644
index ebf692a4f..000000000
Binary files a/res/drawable-hdpi/ic_dial_action_delete.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dial_action_vm.png b/res/drawable-hdpi/ic_dial_action_vm.png
deleted file mode 100644
index f4243043a..000000000
Binary files a/res/drawable-hdpi/ic_dial_action_vm.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dial_action_delete.png b/res/drawable-mdpi/ic_dial_action_delete.png
deleted file mode 100644
index e1394c5d6..000000000
Binary files a/res/drawable-mdpi/ic_dial_action_delete.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dial_action_vm.png b/res/drawable-mdpi/ic_dial_action_vm.png
deleted file mode 100644
index fbcf378cf..000000000
Binary files a/res/drawable-mdpi/ic_dial_action_vm.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dial_action_delete.png b/res/drawable-xhdpi/ic_dial_action_delete.png
deleted file mode 100644
index 6788669a7..000000000
Binary files a/res/drawable-xhdpi/ic_dial_action_delete.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dial_action_vm.png b/res/drawable-xhdpi/ic_dial_action_vm.png
deleted file mode 100644
index 2919bbde2..000000000
Binary files a/res/drawable-xhdpi/ic_dial_action_vm.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dial_action_delete.png b/res/drawable-xxhdpi/ic_dial_action_delete.png
deleted file mode 100644
index ca91a7283..000000000
Binary files a/res/drawable-xxhdpi/ic_dial_action_delete.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dial_action_vm.png b/res/drawable-xxhdpi/ic_dial_action_vm.png
deleted file mode 100644
index acac8d8df..000000000
Binary files a/res/drawable-xxhdpi/ic_dial_action_vm.png and /dev/null differ
diff --git a/res/drawable/dialpad_key_colors.xml b/res/drawable/dialpad_key_colors.xml
deleted file mode 100644
index 27b4d4fc5..000000000
--- a/res/drawable/dialpad_key_colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@color/background_dialpad_pressed" />
-    <item android:drawable="@color/background_dialpad" />
-</selector>
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
deleted file mode 100644
index df6f527e9..000000000
--- a/res/layout/dialpad.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 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.
--->
-
-<!-- Dialpad in the Phone app. -->
-<TableLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialpad"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:stretchColumns="*"
-    android:layoutDirection="ltr" >
-
-    <TableRow>
-        <com.android.dialer.dialpad.DialpadKeyButton
-            android:id="@+id/one"
-            style="@style/DialpadKeyButtonStyle">
-            <LinearLayout
-                style="@style/DialpadKeyInternalLayoutStyle">
-                <TextView
-                    android:id="@+id/dialpad_key_number"
-                    style="@style/DialpadKeyNumberStyle"/>
-                <ImageView
-                    android:id="@+id/dialpad_key_voicemail"
-                    style="@style/DialpadKeyLettersStyle"
-                    android:src="@drawable/ic_dial_action_vm"
-                    android:scaleType="fitStart"
-                    android:baselineAlignBottom="true" />
-            </LinearLayout>
-        </com.android.dialer.dialpad.DialpadKeyButton>
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/two"
-            style="@style/DialpadKeyButtonStyle" />
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/three"
-            style="@style/DialpadKeyButtonStyle" />
-    </TableRow>
-
-    <TableRow>
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/four"
-            style="@style/DialpadKeyButtonStyle" />
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/five"
-            style="@style/DialpadKeyButtonStyle" />
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/six"
-            style="@style/DialpadKeyButtonStyle" />
-    </TableRow>
-
-    <TableRow>
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/seven"
-            style="@style/DialpadKeyButtonStyle" />
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/eight"
-            style="@style/DialpadKeyButtonStyle" />
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/nine"
-            style="@style/DialpadKeyButtonStyle" />
-    </TableRow>
-
-    <TableRow>
-        <com.android.dialer.dialpad.DialpadKeyButton
-            android:id="@+id/star"
-            style="@style/DialpadKeyButtonStyle">
-            <LinearLayout
-                style="@style/DialpadKeyInternalLayoutStyle">
-                <TextView
-                    android:id="@id/dialpad_key_number"
-                    style="@style/DialpadKeyStarPoundStyle" />
-                <View
-                    android:layout_height="match_parent"
-                    android:layout_width="@dimen/dialpad_key_letters_width" />
-            </LinearLayout>
-        </com.android.dialer.dialpad.DialpadKeyButton>
-        <include layout="@layout/dialpad_key"
-            android:id="@+id/zero"
-            style="@style/DialpadKeyButtonStyle" />
-        <com.android.dialer.dialpad.DialpadKeyButton
-            android:id="@+id/pound"
-            style="@style/DialpadKeyButtonStyle">
-            <LinearLayout
-                style="@style/DialpadKeyInternalLayoutStyle">
-                <TextView
-                    android:id="@id/dialpad_key_number"
-                    style="@style/DialpadKeyStarPoundStyle" />
-                <View
-                    android:layout_height="match_parent"
-                    android:layout_width="@dimen/dialpad_key_letters_width" />
-            </LinearLayout>
-        </com.android.dialer.dialpad.DialpadKeyButton>
-    </TableRow>
-
-    <TableRow>
-        <FrameLayout
-            android:id="@+id/dialpad_add_contact"
-            android:contentDescription="@string/description_add_contact"
-            style="@style/DialpadBottomKeyButtonStyle"
-            android:visibility="invisible"
-            >
-            <ImageView
-                android:src="@drawable/ic_add_person_dk"
-                android:importantForAccessibility="no"
-                android:paddingRight="@dimen/dialpad_key_letters_width"
-                style="@style/DialpadKeyInternalLayoutStyle"
-                />
-        </FrameLayout>
-        <Space
-            style="@style/DialpadBottomKeyButtonStyle"
-            />
-        <FrameLayout
-            android:id="@+id/dialpad_overflow"
-            android:contentDescription="@string/description_dialpad_overflow"
-            style="@style/DialpadBottomKeyButtonStyle"
-            >
-            <ImageView
-                android:src="@drawable/ic_overflow_menu"
-                android:importantForAccessibility="no"
-                android:paddingRight="@dimen/dialpad_key_letters_width"
-                style="@style/DialpadKeyInternalLayoutStyle"
-                />
-        </FrameLayout>
-    </TableRow>
-</TableLayout>
diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml
deleted file mode 100644
index abbe4f9cd..000000000
--- a/res/layout/dialpad_key.xml
+++ /dev/null
@@ -1,35 +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.
--->
-
-<!-- A layout representing a single key in the dialpad -->
-<com.android.dialer.dialpad.DialpadKeyButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/DialpadKeyButtonStyle" >
-
-    <LinearLayout style="@style/DialpadKeyInternalLayoutStyle">
-
-        <!-- Note in the referenced styles that we assign hard widths to these components
-             because we want them to line up vertically when we arrange them in an MxN grid -->
-
-        <TextView
-            android:id="@+id/dialpad_key_number"
-            style="@style/DialpadKeyNumberStyle" />
-
-        <TextView
-            android:id="@+id/dialpad_key_letters"
-            style="@style/DialpadKeyLettersStyle" />
-    </LinearLayout>
-</com.android.dialer.dialpad.DialpadKeyButton>
\ No newline at end of file
diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml
deleted file mode 100644
index 148e5ac4c..000000000
--- a/res/layout/dialpad_view.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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.
--->
-<view class="com.android.dialer.dialpad.DialpadView"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialpad_view"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:layout_gravity="bottom"
-    android:orientation="vertical"
-    android:layoutDirection="ltr"
-    android:background="@color/background_dialpad">
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="@color/dialpad_separator_line_color" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
-
-    <!-- Text field and possibly soft menu button above the keypad where
-     the digits are displayed. -->
-    <LinearLayout
-        android:id="@+id/digits_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dialpad_digits_height"
-        android:orientation="horizontal">
-
-        <view class="com.android.dialer.dialpad.DigitsEditText"
-            android:id="@+id/digits"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:paddingLeft="@dimen/dialpad_digits_padding"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:background="@android:color/transparent"
-            android:maxLines="1"
-            android:textSize="@dimen/dialpad_digits_text_size"
-            android:freezesText="true"
-            android:focusableInTouchMode="true"
-            android:cursorVisible="false"
-            android:textColor="@color/dialpad_digits_text_color"
-            android:textCursorDrawable="@null"
-            android:fontFamily="sans-serif-light"
-            android:textStyle="normal" />
-
-        <ImageButton
-            android:id="@+id/deleteButton"
-            android:paddingLeft="@dimen/dialpad_digits_padding"
-            android:paddingRight="@dimen/dialpad_digits_padding"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:state_enabled="false"
-            android:background="@drawable/dialpad_key_colors"
-            android:contentDescription="@string/description_delete_button"
-            android:src="@drawable/ic_dial_action_delete" />
-    </LinearLayout>
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="8dp" />
-
-    <include layout="@layout/dialpad" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="8dp" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="@color/dialpad_separator_line_color" />
-</view>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5a6227332..1eb7a6380 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,19 +20,6 @@
     <!-- Secondary text color in the Dialer -->
     <color name="dialtacts_secondary_text_color">#888888</color>
 
-    <!-- Background color of dialpad -->
-    <color name="background_dialpad">#ffffff</color>
-    <!-- Pressed color of dialpad buttons -->
-    <color name="background_dialpad_pressed">#ececec</color>
-    <!-- Primary color of dialpad text, including the call button -->
-    <color name="dialpad_primary_text_color">#3B77E7</color>
-    <!-- Secondary color of dialpad text (used for the letters corresponding to each digit -->
-    <color name="dialpad_secondary_text_color">#8b8b8b</color>
-    <!-- Color of dialpad digits -->
-    <color name="dialpad_digits_text_color">#000000</color>
-    <!-- Color for dialpad separator lines -->
-    <color name="dialpad_separator_line_color">#dadada</color>
-
     <!-- Color of the text describing an unconsumed missed call. -->
     <color name="call_log_missed_call_highlight_color">#FF0000</color>
 
@@ -57,10 +44,6 @@
     <!-- Background color of dialer list items (contacts, call log entries) -->
     <color name="background_dialer_list_items">#ffffff</color>
 
-    <!-- Background color of action bars. Ensure this stays in sync with packages/Telephony
-         actionbar_background_color. -->
-    <color name="actionbar_background_color">#00afcc</color>
-
     <!-- Color of the 1dp divider that separates favorites -->
     <color name="favorite_contacts_separator_color">#d0d0d0</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5095cddbe..76de677cd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -44,24 +44,6 @@
          the main area of a call log entry and the secondary action button. -->
     <dimen name="call_log_list_item_vertical_divider_width">1dp</dimen>
 
-    <!-- Text dimensions for dialpad keys -->
-    <dimen name="dialpad_key_numbers_size">40sp</dimen>
-    <dimen name="dialpad_key_letters_size">13sp</dimen>
-    <dimen name="dialpad_key_star_pound_size">26sp</dimen>
-    <dimen name="dialpad_key_numbers_width">30dp</dimen>
-    <dimen name="dialpad_key_letters_width">50dp</dimen>
-    <dimen name="dialpad_key_height">56sp</dimen>
-    <!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
-    <dimen name="dialpad_bottom_key_height">70dp</dimen>
-    <dimen name="dialpad_key_plus_size">18sp</dimen>
-    <dimen name="dialpad_number_to_letters_padding">11dp</dimen>
-    <dimen name="dialpad_horizontal_padding">5dp</dimen>
-    <dimen name="dialpad_digits_text_size">33sp</dimen>
-    <dimen name="dialpad_digits_height">55dp</dimen>
-    <dimen name="dialpad_digits_padding">16dp</dimen>
-    <dimen name="dialpad_digits_margin_bottom">0px</dimen>
-    <dimen name="dialpad_center_margin">3dp</dimen>
-    <dimen name="dialpad_button_margin">2dp</dimen>
     <!-- Match call_button_height to Phone's dimens/in_call_end_button_height -->
     <dimen name="call_button_height">74dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2575a0b1a..945f6f9ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -290,12 +290,6 @@
     -->
     <string name="description_dial_button">dial</string>
 
-    <!-- String describing the Delete/Backspace ImageButton
-
-         Used by AccessibilityService to announce the purpose of the button.
-    -->
-    <string name="description_delete_button">backspace</string>
-
     <!-- String describing the digits text box containing the number to dial.
 
          Used by AccessibilityService to announce the purpose of the view.
@@ -420,16 +414,6 @@
     -->
     <string name="description_call_log_voicemail">Voicemail</string>
 
-    <!-- String describing the button to add a contact for the current number.
-
-        Note: AccessibilityServices use this attribute to announce what the view represents.
-              This is especially valuable for views without textual representation like ImageView.
-    -->
-    <string name="description_add_contact">Add contact</string>
-
-    <!-- String describing the overflow menu button in the dialpad -->
-    <string name="description_dialpad_overflow">More options</string>
-
     <!-- String describing the button to view the contact for the current number.
 
         Note: AccessibilityServices use this attribute to announce what the view represents.
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 738a0b690..e00c5dd34 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -112,52 +112,6 @@
         <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
     </style>
 
-    <style name="DialpadKeyNumberStyle">
-        <item name="android:textColor">@color/actionbar_background_color</item>
-        <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="DialpadKeyStarPoundStyle">
-        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
-        <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="DialpadKeyLettersStyle">
-        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
-        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:layout_width">@dimen/dialpad_key_letters_width</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">@dimen/dialpad_number_to_letters_padding</item>
-    </style>
-
-    <style name="DialpadKeyButtonStyle">
-        <item name="android:soundEffectsEnabled">false</item>
-        <item name="android:clickable">true</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">@dimen/dialpad_key_height</item>
-        <item name="android:background">@drawable/dialpad_key_colors</item>
-        <item name="android:focusable">true</item>
-    </style>
-
-    <style name="DialpadBottomKeyButtonStyle" parent="DialpadKeyButtonStyle">
-        <item name="android:layout_height">@dimen/dialpad_bottom_key_height</item>
-    </style>
-
-    <style name="DialpadKeyInternalLayoutStyle">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
     <style name="DialtactsActionBarStyle" parent="android:Widget.Quantum.ActionBar">
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="android:backgroundStacked">#ffffff</item>
-- 
cgit v1.2.3