diff options
author | wangqi <wangqi@google.com> | 2018-06-25 14:43:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-26 13:42:44 -0700 |
commit | 19e85a54d723bbe23e51bed70df89bd3861570d7 (patch) | |
tree | 10e0660a4daa441cb7edcba3a0039232b6924c12 /java/com/android/incallui/answer/impl/res | |
parent | 5578d928bf777f721ec0ec04c84ddb7d3ea56edb (diff) |
Change reply with sms to chip.
Bug: 79878432
Test: manual
PiperOrigin-RevId: 202022343
Change-Id: I7239b13e53a537e20af4b2684a53108aeea16025
Diffstat (limited to 'java/com/android/incallui/answer/impl/res')
3 files changed, 72 insertions, 0 deletions
diff --git a/java/com/android/incallui/answer/impl/res/drawable/secondary_action_chip_background.xml b/java/com/android/incallui/answer/impl/res/drawable/secondary_action_chip_background.xml new file mode 100644 index 000000000..a185ebb3c --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/drawable/secondary_action_chip_background.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 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 + --> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/dialer_divider_line_color"> + <item> + <shape> + <solid android:color="?android:attr/colorBackgroundFloating"/> + <stroke + android:width="1dp" + android:color="@color/dialer_divider_line_color"/> + <padding + android:bottom="9dp" + android:left="8dp" + android:right="8dp" + android:top="9dp"/> + <corners android:radius="40dp"/> + </shape> + </item> +</ripple> diff --git a/java/com/android/incallui/answer/impl/res/layout/secondary_action_chip.xml b/java/com/android/incallui/answer/impl/res/layout/secondary_action_chip.xml new file mode 100644 index 000000000..dd4199b0c --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/layout/secondary_action_chip.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 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 + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/secondary_action_chip_background" + android:clickable="true" + android:layout_marginEnd="8dp" + android:orientation="horizontal"> + <ImageView + android:id="@+id/secondary_action_icon" + android:layout_width="20dp" + android:layout_height="20dp" + android:tint="?android:attr/colorPrimary"/> + <TextView + android:id="@+id/secondary_action_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + style="@style/Dialer.TextAppearance.SubHeader"/> +</LinearLayout> 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 2bc9ca09f..ac56460f1 100644 --- a/java/com/android/incallui/answer/impl/res/values/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values/strings.xml @@ -20,6 +20,8 @@ <string name="call_incoming_default_label_answer_and_release_second">Swipe up to answer and hold ongoing call</string> <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> + <!-- Reply with SMS option on incoming call screen. [CHAT LIMIT=20] --> + <string name="call_incoming_reply_with_sms">Reply</string> <string name="call_incoming_message_custom">Write your own…</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> |