diff options
author | Kamaljeet Maini <kmaini@cyngn.com> | 2016-03-08 15:45:39 -0800 |
---|---|---|
committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:42:51 -0700 |
commit | cf732b7076d62e2e2862dd2b320c67f101a2fadf (patch) | |
tree | 75bef09134517efa26cd3c0d29809d195fea4b3b /res/layout | |
parent | ade2cdf6b973a6e9e03a7cacf6f624608c42d7ff (diff) | |
download | android_packages_apps_PhoneCommon-cf732b7076d62e2e2862dd2b320c67f101a2fadf.tar.gz android_packages_apps_PhoneCommon-cf732b7076d62e2e2862dd2b320c67f101a2fadf.tar.bz2 android_packages_apps_PhoneCommon-cf732b7076d62e2e2862dd2b320c67f101a2fadf.zip |
Move VoLTE changes to PhoneCommon
While porting VoLTE support from DialerNext to AOSP Dialer, some of
the relevant changes are moved to PhoneCommon.
Change-Id: Id18fe4743af5df133069e889c817937d7847c3b6
Issue-Id: DIALER-720
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/call_method_multiple_providers.xml | 38 | ||||
-rw-r--r-- | res/layout/call_method_spinner_dropdown_item.xml | 28 | ||||
-rw-r--r-- | res/layout/call_method_spinner_item.xml | 28 | ||||
-rw-r--r-- | res/layout/dialer_volte_label.xml | 35 | ||||
-rw-r--r-- | res/layout/dialpad_view_unthemed.xml | 14 |
5 files changed, 121 insertions, 22 deletions
diff --git a/res/layout/call_method_multiple_providers.xml b/res/layout/call_method_multiple_providers.xml new file mode 100644 index 0000000..c7373c0 --- /dev/null +++ b/res/layout/call_method_multiple_providers.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- Sim card selection and VoLTE annunciator. This entire vertical layout + goes away if neither are displayed. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/call_method_multiple_providers" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="vertical" + android:visibility="visible" > + + <!-- Call method spinner. Visible if there is more than one call + method available (e.g. multiple sims or sim + Skype) --> + <Spinner + android:id="@+id/call_method_spinner" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:dropDownWidth="wrap_content" + android:background="@drawable/btn_dialpad_key" + android:gravity="center_vertical" + android:paddingStart="@dimen/call_method_spinner_padding_start" + android:paddingEnd="@dimen/dialpad_digits_padding" /> + +</LinearLayout> diff --git a/res/layout/call_method_spinner_dropdown_item.xml b/res/layout/call_method_spinner_dropdown_item.xml index 02ca7fd..dc3d7b1 100644 --- a/res/layout/call_method_spinner_dropdown_item.xml +++ b/res/layout/call_method_spinner_dropdown_item.xml @@ -16,16 +16,32 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="match_parent" + android:layout_width="@dimen/call_method_spinner_dropdown_item_width" android:layout_height="@dimen/dialpad_digits_height" android:paddingStart="@dimen/call_method_spinner_item_default_padding" android:paddingEnd="@dimen/call_method_spinner_item_default_padding"> - <ImageView - android:id="@+id/call_method_spinner_item_image" - android:layout_width="@dimen/call_method_spinner_icon_size" - android:layout_height="@dimen/call_method_spinner_icon_size" - android:layout_gravity="center_vertical" /> + <LinearLayout + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> + + <ImageView + android:id="@+id/call_method_spinner_item_image" + android:layout_width="@dimen/call_method_spinner_icon_size" + android:layout_height="@dimen/call_method_spinner_icon_size" + android:layout_gravity="center_horizontal" /> + + <!-- VoLTE annunciator. Carriers may customize this annunciator + by overlaying the ic_volte.xml drawable. --> + <ImageView + android:id="@+id/call_method_spinner_volte_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_volte" + android:layout_gravity="center_horizontal" /> + </LinearLayout> <TextView android:id="@+id/call_method_spinner_item_text" diff --git a/res/layout/call_method_spinner_item.xml b/res/layout/call_method_spinner_item.xml index a361306..83f9068 100644 --- a/res/layout/call_method_spinner_item.xml +++ b/res/layout/call_method_spinner_item.xml @@ -20,15 +20,31 @@ android:layout_height="match_parent" android:paddingStart="@dimen/call_method_spinner_item_default_padding" > - <ImageView - android:id="@+id/call_method_spinner_item_image" - android:layout_width="@dimen/call_method_spinner_icon_size" - android:layout_height="@dimen/call_method_spinner_icon_size" - android:layout_gravity="center_vertical" /> + <LinearLayout + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> + + <ImageView + android:id="@+id/call_method_spinner_item_image" + android:layout_width="@dimen/call_method_spinner_icon_size" + android:layout_height="@dimen/call_method_spinner_icon_size" + android:layout_gravity="center_horizontal" /> + + <!-- VoLTE annunciator. Carriers may customize this annunciator + by overlaying the ic_volte.xml drawable. --> + <ImageView + android:id="@+id/call_method_spinner_volte_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_volte" + android:layout_gravity="center_horizontal" /> + </LinearLayout> <ImageView android:id="@+id/call_method_spinner_drop_down_arrow" - android:layout_width="wrap_content" + android:layout_width="@dimen/call_method_spinner_arrow_width" android:layout_height="wrap_content" android:paddingStart="@dimen/call_method_spinner_item_secondary_padding" android:paddingEnd="@dimen/call_method_spinner_item_secondary_padding" diff --git a/res/layout/dialer_volte_label.xml b/res/layout/dialer_volte_label.xml new file mode 100644 index 0000000..461af18 --- /dev/null +++ b/res/layout/dialer_volte_label.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- Sim card selection and VoLTE annunciator. This entire vertical layout + goes away if neither are displayed. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/call_method_volte_single_provider" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="vertical" > + + <!-- VoLTE annunciator. Visible or gone depending on whether + VoLTE is in use. Carriers may customize this annunciator + by overlaying the ic_volte.xml drawable. --> + <ImageView + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:src="@drawable/ic_volte" + android:paddingStart ="@dimen/volte_padding_start" + android:layout_gravity="center_horizontal" /> + +</LinearLayout> diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml index 7ff0280..3ac2f55 100644 --- a/res/layout/dialpad_view_unthemed.xml +++ b/res/layout/dialpad_view_unthemed.xml @@ -107,18 +107,12 @@ android:gravity="center" android:visibility="invisible" /> - <Spinner - android:id="@+id/call_method_spinner" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:dropDownWidth="wrap_content" - android:background="@drawable/btn_dialpad_key" - android:gravity="center_vertical" - android:paddingStart="@dimen/call_method_spinner_padding_start" - android:paddingEnd="@dimen/dialpad_digits_padding" /> + <!-- Sim card selection and VoLTE annunciator. --> + <include layout="@layout/dialer_volte_label" /> + <include layout="@layout/call_method_multiple_providers" /> <view class="com.android.phone.common.dialpad.DigitsEditText" - xmlns:ex="http://schemas.android.com/apk/res-auto" + xmlns:ex="http://schemas.android.com/apk/res-autos" android:id="@+id/digits" android:layout_width="0dp" android:layout_height="match_parent" |