diff options
author | Eric Erfanian <erfanian@google.com> | 2017-04-06 23:10:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 23:10:13 +0000 |
commit | 01a86435499d66b267765f89b7dd9c83c158ddfe (patch) | |
tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/dialer/dialpadview | |
parent | a21467406351a08813a3fedbdd361fcc18a51d89 (diff) | |
parent | d8046e520a866b9948ee9ba47cf642b441ca8e23 (diff) |
Update AOSP Dialer source from internal google3 repository at cl/152373142.
am: d8046e520a
Change-Id: I1155c69ffb6c96513e5820df18d1ecdcdaea8582
Diffstat (limited to 'java/com/android/dialer/dialpadview')
24 files changed, 6 insertions, 6 deletions
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png Binary files differdeleted file mode 100644 index 1a9cd75a0..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index e588d90e9..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png Binary files differdeleted file mode 100644 index 4706112d6..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png Binary files differdeleted file mode 100644 index 262e9df91..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_close_black_24dp.png Binary files differdeleted file mode 100644 index 40a1a84e3..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_close_black_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 64a52d030..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_voicemail.png Binary files differdeleted file mode 100644 index e84d8f4a8..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialpad_voicemail.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_overflow_menu.png Binary files differdeleted file mode 100644 index 0e720ddbd..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_overflow_menu.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_close_black_24dp.png Binary files differdeleted file mode 100644 index 6bc437298..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_close_black_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 87bc11364..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_voicemail.png Binary files differdeleted file mode 100644 index 0b4e18389..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialpad_voicemail.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_overflow_menu.png Binary files differdeleted file mode 100644 index 915607633..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_overflow_menu.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_close_black_24dp.png Binary files differdeleted file mode 100644 index 51b4401ca..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_close_black_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 186508a9f..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_voicemail.png Binary files differdeleted file mode 100644 index a0a7c9d28..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialpad_voicemail.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_overflow_menu.png Binary files differdeleted file mode 100644 index 92526f5a6..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_overflow_menu.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_close_black_24dp.png Binary files differdeleted file mode 100644 index df42feecb..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_close_black_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index c974a8005..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_voicemail.png Binary files differdeleted file mode 100644 index c6e8be023..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_dialpad_voicemail.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_overflow_menu.png Binary files differdeleted file mode 100644 index 9028bd437..000000000 --- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/ic_overflow_menu.png +++ /dev/null diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml index 65a2308fc..6f178f0e1 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="fitCenter" - android:src="@drawable/ic_dialpad_voicemail" + android:src="@drawable/quantum_ic_voicemail_white_24" android:tint="@color/dialpad_voicemail_tint"/> </FrameLayout> </LinearLayout> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml index 36f62c85d..88594401f 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml @@ -32,7 +32,7 @@ android:layout_centerInParent="true" android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top" android:scaleType="fitCenter" - android:src="@drawable/ic_dialpad_voicemail" + android:src="@drawable/quantum_ic_voicemail_white_24" android:tint="?attr/dialpad_voicemail_tint"/> <!-- Place empty text view so vertical height is same as other dialpad keys. --> <TextView style="@style/DialpadKeyLettersStyle"/> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml index 4b08c6de7..9f69f983a 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml @@ -80,7 +80,7 @@ android:background="@drawable/btn_dialpad_key" android:contentDescription="@string/description_dialpad_back" android:gravity="center" - android:src="@drawable/ic_close_black_24dp" + android:src="@drawable/quantum_ic_close_white_24" android:tint="?attr/dialpad_icon_tint" android:tintMode="src_in" android:visibility="gone"/> @@ -95,7 +95,7 @@ android:background="@drawable/btn_dialpad_key" android:contentDescription="@string/description_dialpad_overflow" android:gravity="center" - android:src="@drawable/ic_overflow_menu" + android:src="@drawable/quantum_ic_more_vert_white_24" android:tint="?attr/dialpad_icon_tint" android:tintMode="src_in" android:visibility="gone"/> @@ -129,7 +129,7 @@ android:paddingRight="@dimen/dialpad_digits_padding" android:background="@drawable/btn_dialpad_key" android:contentDescription="@string/description_delete_button" - android:src="@drawable/ic_dialpad_delete" + android:src="@drawable/quantum_ic_backspace_white_24" android:state_enabled="false" android:tint="?attr/dialpad_icon_tint" android:tintMode="src_in"/> diff --git a/java/com/android/dialer/dialpadview/res/values-de/strings.xml b/java/com/android/dialer/dialpadview/res/values-de/strings.xml index b3b13fb2f..c93ce4d4f 100644 --- a/java/com/android/dialer/dialpadview/res/values-de/strings.xml +++ b/java/com/android/dialer/dialpadview/res/values-de/strings.xml @@ -21,5 +21,5 @@ <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mehr Optionen"</string> <string name="description_delete_button" msgid="8431313818404527096">"Rücktaste"</string> <string name="description_image_button_plus" msgid="8936338119824589388">"Plus"</string> - <string name="description_voicemail_button" msgid="4187006295368768215">"Mailbox-Nachricht"</string> + <string name="description_voicemail_button" msgid="4187006295368768215">"Mailboxnachricht"</string> </resources> |