diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-17 17:22:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-16 23:30:53 +0000 |
commit | e933c08056c7f2c3afe1321ff867c75a8db97a66 (patch) | |
tree | 4a1fe107ec975671a4fb626524f39fd42fabdddf /InCallUI/res | |
parent | 9f9b49aa57a21acf08582b5247694f3e7f56c3cb (diff) | |
parent | af9eefb9174cdb7a4824fc0a8ed6e85754acd0bd (diff) |
Merge "Bring up dialog when an account is not set for the phone call" into lmp-dev
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout/select_account_list_item.xml | 36 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 3 |
2 files changed, 39 insertions, 0 deletions
diff --git a/InCallUI/res/layout/select_account_list_item.xml b/InCallUI/res/layout/select_account_list_item.xml new file mode 100644 index 000000000..0b24c9b9f --- /dev/null +++ b/InCallUI/res/layout/select_account_list_item.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<!-- Layout of a single item in the InCallUI Account Chooser Dialog. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" > + + <ImageView android:id="@+id/icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:scaleType="center" /> + + <TextView android:id="@+id/text" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="start|center_vertical" + android:layout_marginLeft="8dp" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="match_parent" /> +</LinearLayout> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 19ba8a6c8..78fe885cd 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -537,6 +537,9 @@ <!-- This can be used in any application wanting to disable the text "Emergency number" --> <string name="emergency_call_dialog_number_for_display">Emergency number</string> + <!-- Title for Select Account Dialog [CHAR LIMIT=30] --> + <string name="select_account_dialog_title">Select Account</string> + <!-- The digit to be displayed on the 0 key of the dialpad [CHAR LIMIT=1]--> <string name="dialpad_0_number">0</string> <!-- The digit to be displayed on the 1 key of the dialpad [CHAR LIMIT=1]--> |