diff options
author | Eric Erfanian <erfanian@google.com> | 2017-06-19 12:40:59 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-06-19 20:00:08 +0000 |
commit | ea7890cd5e829ed3f0b5f726561c569690af2030 (patch) | |
tree | 235ab5ab9f9215782c29ef350d275fe12e7b2f74 /java/com/android/dialer/main/impl/res/values | |
parent | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/159428781.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/158012278 (6/05/2017) to cl/159428781 (6/19/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484
Diffstat (limited to 'java/com/android/dialer/main/impl/res/values')
-rw-r--r-- | java/com/android/dialer/main/impl/res/values/strings.xml | 49 | ||||
-rw-r--r-- | java/com/android/dialer/main/impl/res/values/styles.xml | 28 |
2 files changed, 77 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 new file mode 100644 index 000000000..ba8a20b51 --- /dev/null +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> +<resources> + <!-- Name of the main activity. --> + <string name="main_activity_label">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> + + <!-- The description text for the call log tab. --> + <string name="main_call_history_tab_description">Call history</string> + + <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] --> + <string name="search">@android:string/search_go</string> + <!-- A11y announcement to let users know a button will let them search for contacts and places [CHAR LIMIT=NONE] --> + <string name="description_search">Search contacts and places</string> + + <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] --> + <string name="contacts">Contacts</string> + <!-- A11y announcement to let users know a button will let them view their contacts [CHAR LIMIT=NONE] --> + <string name="description_contacts">View Contacts</string> + + <!-- Tab text to show users their call log/call history [CHAR LIMIT=10] --> + <string name="tab_title_call_history">Call History</string> + <!-- Tab text to show users their favorite contacts that they can call in 1 click [CHAR LIMIT=10] --> + <string name="tab_title_speed_dial">Speed Dial</string> + <!-- Tab text to show users their voicemails [CHAR LIMIT=10] --> + <string name="tab_title_voicemail">Voicemail</string> + + <!-- Show users their settings [CHAR LIMIT=20] --> + <string name="settings">Settings</string> + <!-- Send feedback about the app [CHAR LIMIT=20] --> + <string name="main_send_feedback">Send feedback</string> +</resources> diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml new file mode 100644 index 000000000..38c50081b --- /dev/null +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> +<resources> + <style name="NuiMainActivityTheme" parent="Theme.AppCompat.Light.NoActionBar"> + <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> + </style> + + <style name="AppBarTheme" parent="Theme.AppCompat"> + <item name="android:colorPrimary">@color/dialtacts_theme_color</item> + <item name="android:colorAccent">@color/dialer_secondary_color</item> + </style> +</resources> |