diff options
author | calderwoodra <calderwoodra@google.com> | 2018-01-12 12:25:48 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-12 12:27:26 -0800 |
commit | 4d881e4b22e61913bd2439fba6901bf6cc0e98c5 (patch) | |
tree | c25ff019bf3b4ce6eb7b37483bde4bc6c63876a5 /java/com/android/dialer/main/impl/res/values | |
parent | aa280fa887ee877e6faff55ce3c1c406f113d559 (diff) |
Added Dialpad to NUI.
This change adds the existing dialpad to the new UI and the animation logic
required to show/hide it along with the toolbar. A follow up CL will come
afterwards to combine these animations with the toolbar expanding/collapsing.
known issue: bottom nav appears over the dialpad.
Bug: 181512198
Test: MainActivityTest
PiperOrigin-RevId: 181777370
Change-Id: Ief1591174ebca3a709df6d1d38c8b8ecbdc1878e
Diffstat (limited to 'java/com/android/dialer/main/impl/res/values')
-rw-r--r-- | java/com/android/dialer/main/impl/res/values/strings.xml | 3 | ||||
-rw-r--r-- | java/com/android/dialer/main/impl/res/values/styles.xml | 3 |
2 files changed, 6 insertions, 0 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 ff136e877..f530fa2bf 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -22,6 +22,9 @@ 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> + <!-- The description text for the call log tab. --> <string name="main_call_history_tab_description" tools:ignore="UnusedResources">Call history</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 f94897a8b..26f880dc4 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -19,5 +19,8 @@ <item name="android:colorPrimary">@color/dialtacts_theme_color</item> <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="android:colorAccent">@color/dialer_secondary_color</item> + + <!-- Theme needed for DialpadFragment --> + <item name="dialpad_style">@style/Dialpad.Light</item> </style> </resources> |