diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-31 16:13:53 +0000 |
commit | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (patch) | |
tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/dialer/main/impl/res/values | |
parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
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..d3eb6d73e --- /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 xmlns:tools="http://schemas.android.com/tools"> + <!-- 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> + + <!-- The description text for the call log tab. --> + <string name="main_call_history_tab_description" tools:ignore="UnusedResources">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> |