diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-16 00:16:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-16 00:16:50 +0000 |
| commit | 80f7f77106755946947c5f99e39b040d7c1c4f08 (patch) | |
| tree | 24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/dialer/main/impl/res/values | |
| parent | ecb63000f5d94a5b7ebdf4f6ff08fcc942fce952 (diff) | |
| parent | e760e4204887acd9fb6e4b8b00059659a1367c3b (diff) | |
Merge "Resolve all build resource conflicts."
Diffstat (limited to 'java/com/android/dialer/main/impl/res/values')
| -rw-r--r-- | java/com/android/dialer/main/impl/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/main/impl/res/values/styles.xml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml index 4e65432e5..121820383 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -18,10 +18,6 @@ <!-- Name of the main activity. --> <string name="main_activity_label" tools:ignore="UnusedResources">Phone</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 name="nui_shortcut_name">Phone NUI</string> - <!-- Title for the activity that dials the phone, when launched directly into the dialpad --> <string name="dialpad_activity_title">Phone Keypad</string> diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index 47fdbac93..387b1d79e 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -46,12 +46,12 @@ <!-- Required for actionmode/multiselect to render properly. --> <!-- TODO(calderwoodra): Check to see if we can remove this after NewVoicemailFragment launches --> - <item name="actionModeStyle">@style/ActionModeStyle</item> + <item name="actionModeStyle">@style/NuiActionModeStyle</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> </style> <!-- Colors our actionbar in action mode to dialer theme color. --> - <style name="ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode"> + <style name="NuiActionModeStyle" parent="@style/Widget.AppCompat.ActionMode"> <item name="background">@color/dialer_theme_color</item> <item name="titleTextStyle">@style/ActionModeTitleTextStyle</item> </style> |