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/incallui/answer/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/incallui/answer/impl/res/values')
-rw-r--r-- | java/com/android/incallui/answer/impl/res/values/attrs.xml | 3 | ||||
-rw-r--r-- | java/com/android/incallui/answer/impl/res/values/strings.xml | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/java/com/android/incallui/answer/impl/res/values/attrs.xml b/java/com/android/incallui/answer/impl/res/values/attrs.xml index 1086e1ca5..9b0e65d9e 100644 --- a/java/com/android/incallui/answer/impl/res/values/attrs.xml +++ b/java/com/android/incallui/answer/impl/res/values/attrs.xml @@ -20,7 +20,4 @@ <attr name="scaleWidth" format="boolean"/> <attr name="scaleHeight" format="boolean"/> </declare-styleable> - - <item name="match_parent" type="dimen">-1</item> - <item name="wrap_content" type="dimen">-2</item> </resources>
\ No newline at end of file diff --git a/java/com/android/incallui/answer/impl/res/values/strings.xml b/java/com/android/incallui/answer/impl/res/values/strings.xml index 235922047..2bc9ca09f 100644 --- a/java/com/android/incallui/answer/impl/res/values/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values/strings.xml @@ -1,4 +1,19 @@ <?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> <string name="call_incoming_swipe_to_decline_with_message">Swipe from icon to decline with message</string> <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string> @@ -6,8 +21,6 @@ <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string> <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string> <string name="call_incoming_message_custom">Write your own…</string> - <string name="call_incoming_audio_handset">Handset</string> - <string name="call_incoming_audio_speakerphone">Speakerphone</string> <!-- "Respond via SMS" option that lets you compose a custom response. [CHAR LIMIT=30] --> <string name="call_incoming_respond_via_sms_custom_message">Write your own…</string> <!-- "Custom Message" Cancel alert dialog button --> @@ -26,5 +39,5 @@ <!-- Voice prompt of swipe gesture when accessibility is turned on. --> <string description="The message announced to accessibility assistance on incoming call." name="a11y_incoming_call_swipe_gesture_prompt">Two finger swipe up to answer. Two finger swipe down to decline.</string> - <string name="call_incoming_important">Urgent</string> + <string name="call_incoming_important">Important</string> </resources> |