From c1d526ca6742a59b099d307ce7c64b36366f47d3 Mon Sep 17 00:00:00 2001 From: Nancy Chen Date: Thu, 11 Feb 2016 13:35:07 -0800 Subject: [DO NOT MERGE] Adjust multi-window UI for InCallUI <100% modes. This CL is a direct copy from ag/864936. The original CL missed the move from InCallUI to Dialer/InCallUI. Origianl description: Multi-window mode reduces the available screen real estate for the InCallUI. As a result, some changes need to be made so important information is still shown. When the UI has <100% of its normal screen real estate: * Remove large photo * Shift hangup button down the way the resource files should be interpreted: * The base layout/ is the default layout, in this case, it is the multi-window layout * layout-h600hdp is the layout used when the screen height is >=600 dp, which is the layout in 100% screen size (this is a direct copy of the old layout/ file(s) * layout-w600dp-land is the layout used when the device is in landscape mode with a width >=600 dp (this is a direct renaming from *-land/) Bug:26253432 Change-Id: I3db194a1e5b3334d10ab76806644b1a0769ad777 (cherry picked from commit fc1929393b506e7f7665be49424336ac2b7a02ae) --- InCallUI/res/layout-h600dp/call_card_fragment.xml | 173 +++++++++++ InCallUI/res/layout-land/call_card_fragment.xml | 158 ---------- .../res/layout-w600dp-land/call_card_fragment.xml | 158 ++++++++++ InCallUI/res/layout/call_card_fragment.xml | 266 ++++++++-------- InCallUI/res/layout/primary_call_info.xml | 333 ++++++++++----------- InCallUI/res/values-h600dp/dimens.xml | 24 ++ InCallUI/res/values-land/colors.xml | 21 -- InCallUI/res/values-land/dimens.xml | 26 -- InCallUI/res/values-w600dp-land/colors.xml | 21 ++ InCallUI/res/values-w600dp-land/dimens.xml | 26 ++ InCallUI/res/values/dimens.xml | 8 +- 11 files changed, 696 insertions(+), 518 deletions(-) create mode 100644 InCallUI/res/layout-h600dp/call_card_fragment.xml delete mode 100644 InCallUI/res/layout-land/call_card_fragment.xml create mode 100644 InCallUI/res/layout-w600dp-land/call_card_fragment.xml create mode 100644 InCallUI/res/values-h600dp/dimens.xml delete mode 100644 InCallUI/res/values-land/colors.xml delete mode 100644 InCallUI/res/values-land/dimens.xml create mode 100644 InCallUI/res/values-w600dp-land/colors.xml create mode 100644 InCallUI/res/values-w600dp-land/dimens.xml diff --git a/InCallUI/res/layout-h600dp/call_card_fragment.xml b/InCallUI/res/layout-h600dp/call_card_fragment.xml new file mode 100644 index 000000000..c3ae877e7 --- /dev/null +++ b/InCallUI/res/layout-h600dp/call_card_fragment.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml deleted file mode 100644 index c71cf07a6..000000000 --- a/InCallUI/res/layout-land/call_card_fragment.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/InCallUI/res/layout-w600dp-land/call_card_fragment.xml b/InCallUI/res/layout-w600dp-land/call_card_fragment.xml new file mode 100644 index 000000000..c71cf07a6 --- /dev/null +++ b/InCallUI/res/layout-w600dp-land/call_card_fragment.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index 760e4e261..09e148512 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -17,151 +17,141 @@ --> + android:layout_width="match_parent" + android:layout_height="match_parent"> + + android:orientation="vertical" + android:elevation="@dimen/primary_call_elevation" + android:background="@color/incall_call_banner_background_color" + android:clipChildren="false" + android:clipToPadding="false" + android:alpha="0.9"> + + + + + + + - - - - - - - - + - + + + + + + + + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index 5dcebd0dd..2aa583c18 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -21,212 +21,201 @@ other status info. This info is shown as a "banner" overlaid across the top of contact photo. --> - - - - - - + + + + - + + + android:layout_weight="0" + android:layout_marginEnd="8dp" + android:baselineAlignBottom="true" + android:tint="@color/incall_accent_color" + android:scaleType="center" + android:visibility="gone" /> - + + - - + - + - + - + - + + android:layout_height="wrap_content" + android:layout_marginTop="-5dp" + android:fontFamily="sans-serif-light" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="@dimen/call_name_text_size" + android:singleLine="true" + ex:resizing_text_min_size="@dimen/call_name_text_min_size" /> + + + + - - - - - - - - + + + + + + + - - + android:layout_weight="1" + android:orientation="horizontal"> - - - - - - - - - - - - - - + - + + + + + diff --git a/InCallUI/res/values-h600dp/dimens.xml b/InCallUI/res/values-h600dp/dimens.xml new file mode 100644 index 000000000..12f48d9b5 --- /dev/null +++ b/InCallUI/res/values-h600dp/dimens.xml @@ -0,0 +1,24 @@ + + + + + 90dp + + 15dp + + -24dp + diff --git a/InCallUI/res/values-land/colors.xml b/InCallUI/res/values-land/colors.xml deleted file mode 100644 index 77eea2e68..000000000 --- a/InCallUI/res/values-land/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - #000000 - diff --git a/InCallUI/res/values-land/dimens.xml b/InCallUI/res/values-land/dimens.xml deleted file mode 100644 index 59a5a9a87..000000000 --- a/InCallUI/res/values-land/dimens.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - true - - 40dp - - 30dp - diff --git a/InCallUI/res/values-w600dp-land/colors.xml b/InCallUI/res/values-w600dp-land/colors.xml new file mode 100644 index 000000000..77eea2e68 --- /dev/null +++ b/InCallUI/res/values-w600dp-land/colors.xml @@ -0,0 +1,21 @@ + + + + + + #000000 + diff --git a/InCallUI/res/values-w600dp-land/dimens.xml b/InCallUI/res/values-w600dp-land/dimens.xml new file mode 100644 index 000000000..59a5a9a87 --- /dev/null +++ b/InCallUI/res/values-w600dp-land/dimens.xml @@ -0,0 +1,26 @@ + + + + + + true + + 40dp + + 30dp + diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index 439bb41f5..d6c47a2c7 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -21,7 +21,9 @@ - 90dp + 0dp + 20dp + 3dp 2dp - 8dp + 2dp 50dp -- cgit v1.2.3