diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-03-15 15:56:30 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-15 15:59:02 -0700 |
| commit | e760e4204887acd9fb6e4b8b00059659a1367c3b (patch) | |
| tree | 24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/dialer/app/res | |
| parent | e1c143a195540baf5ddc2525129ced08cddccbc0 (diff) | |
Resolve all build resource conflicts.
For simplicity, instead of resolve the nui shortcut string, I
deleted it since it isn't used anymore.
Test: build log
PiperOrigin-RevId: 189260472
Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718
Diffstat (limited to 'java/com/android/dialer/app/res')
| -rw-r--r-- | java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png (renamed from java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png) | bin | 543 -> 543 bytes | |||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png (renamed from java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png) | bin | 454 -> 454 bytes | |||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png (renamed from java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png) | bin | 681 -> 681 bytes | |||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png (renamed from java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png) | bin | 1431 -> 1431 bytes | |||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png (renamed from java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png) | bin | 1687 -> 1687 bytes | |||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml (renamed from java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml) | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/app/res/values/strings.xml | 4 |
8 files changed, 2 insertions, 6 deletions
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png Binary files differindex 34310aa49..34310aa49 100644 --- a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png +++ b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png Binary files differindex 81a67ba6f..81a67ba6f 100644 --- a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png +++ b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png Binary files differindex 0ad839286..0ad839286 100644 --- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png +++ b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png Binary files differindex d07a1d057..d07a1d057 100644 --- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png +++ b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png Binary files differindex 72641c7ab..72641c7ab 100644 --- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png +++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml index 84cda0310..ffdd64edc 100644 --- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml +++ b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml @@ -15,6 +15,6 @@ ~ limitations under the License --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_handle" + android:src="@drawable/old_ic_handle" android:tint="@color/actionbar_background_color"> </bitmap>
\ No newline at end of file diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml index 5e974c45a..cfce81812 100644 --- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml +++ b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml @@ -15,6 +15,6 @@ ~ limitations under the License --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_handle" + android:src="@drawable/old_ic_handle" android:tint="@color/voicemail_icon_disabled_tint"> </bitmap>
\ No newline at end of file diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 7c883299c..e5092f001 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -718,8 +718,4 @@ <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] --> <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string> - - <!-- Name of launcher shortcut for the new UI main activity. - TODO(38502365): Remove this once we're ready to launch the new UI. --> - <string translatable="false" name="nui_shortcut_name">Phone NUI</string> </resources> |
