diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-26 16:15:31 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-26 16:15:31 +0000 |
commit | 10471072bac3c742e6960d1a5319e6db5d5f39bb (patch) | |
tree | 93ada276f339ce13e872971c4e1c8e926f0b3e6a | |
parent | da5fdba9515c9a2097aa6425fcf33745dc46c713 (diff) | |
parent | 46a8f767244fabf8e3da01acc4b8f76be1011d15 (diff) | |
download | base-10471072bac3c742e6960d1a5319e6db5d5f39bb.tar.gz |
Merge cherrypicks of [10850445, 10858416, 10858417, 10850446, 10858375, 10858376, 10858377] into qt-d4-release
Change-Id: I26eb127d8d747bf3dfde50700218829b282c4c1f
5 files changed, 38 insertions, 21 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index 66c0c5c275ed..416ee8147e33 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -30,6 +30,7 @@ android:id="@+id/status_icon_area" android:layout_width="wrap_content" android:layout_height="match_parent" + android:paddingTop="@dimen/status_bar_padding_top" android:layout_alignParentEnd="true" android:gravity="center_vertical|end" > <FrameLayout android:id="@+id/system_icons_container" @@ -66,6 +67,7 @@ android:id="@+id/keyguard_carrier_text" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="@dimen/status_bar_padding_top" android:layout_marginStart="@dimen/keyguard_carrier_text_margin" android:layout_toStartOf="@id/system_icons_container" android:gravity="center_vertical" diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml index 54fb2168dfa9..615749a44561 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml @@ -25,7 +25,8 @@ android:orientation="horizontal" android:clickable="true" android:paddingStart="@dimen/status_bar_padding_start" - android:paddingEnd="@dimen/status_bar_padding_end" > + android:paddingEnd="@dimen/status_bar_padding_end" + android:paddingTop="@dimen/status_bar_padding_top" > <com.android.systemui.statusbar.policy.Clock android:id="@+id/clock" diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 6fb5590df6ed..818d1d77177b 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -26,7 +26,6 @@ android:layout_weight="1" android:layout_height="match_parent" android:paddingEnd="@dimen/signal_cluster_battery_padding" - android:paddingTop="@dimen/status_bar_padding_top" android:gravity="center_vertical" android:orientation="horizontal"/> @@ -36,4 +35,4 @@ android:clipToPadding="false" android:clipChildren="false" systemui:textAppearance="@style/TextAppearance.StatusBar.Clock" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index a28b60dbe13c..c69a03246ef4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -402,10 +402,15 @@ public class QuickStatusBarHeader extends RelativeLayout implements cutout, getDisplay()); if (padding == null) { mSystemIconsView.setPaddingRelative( - getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start), 0, - getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end), 0); + getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start), + getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top), + getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end), + 0); } else { - mSystemIconsView.setPadding(padding.first, 0, padding.second, 0); + mSystemIconsView.setPadding( + padding.first, + getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top), + padding.second, 0); } return super.onApplyWindowInsets(insets); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index c2317bab891e..2835201df243 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -129,6 +129,7 @@ public class PhoneStatusBarView extends PanelBar { @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); + updateResources(); // May trigger cutout space layout-ing if (updateOrientationAndCutout(newConfig.orientation)) { @@ -292,9 +293,28 @@ public class PhoneStatusBarView extends PanelBar { mCutoutSideNudge = getResources().getDimensionPixelSize( R.dimen.display_cutout_margin_consumption); + boolean isRtl = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; + + int statusBarPaddingTop = getResources().getDimensionPixelSize( + R.dimen.status_bar_padding_top); + int statusBarPaddingStart = getResources().getDimensionPixelSize( + R.dimen.status_bar_padding_start); + int statusBarPaddingEnd = getResources().getDimensionPixelSize( + R.dimen.status_bar_padding_end); + ViewGroup.LayoutParams layoutParams = getLayoutParams(); mStatusBarHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_height); layoutParams.height = mStatusBarHeight; + + View sbContents = findViewById(R.id.status_bar_contents); + sbContents.setPadding( + isRtl ? statusBarPaddingEnd : statusBarPaddingStart, + statusBarPaddingTop, + isRtl ? statusBarPaddingStart : statusBarPaddingEnd, + 0); + + findViewById(R.id.notification_lights_out).setPadding(0, statusBarPaddingStart, 0, 0); + setLayoutParams(layoutParams); } @@ -360,7 +380,6 @@ public class PhoneStatusBarView extends PanelBar { * Returns a Pair of integers where * - Pair.first is the left margin inset * - Pair.second is the right margin inset - * This method always assumes the cutout is on the top when the device is in portrait mode. */ public static Pair<Integer, Integer> cornerCutoutMargins(DisplayCutout cutout, Display display) { @@ -375,22 +394,13 @@ public class PhoneStatusBarView extends PanelBar { Point size = new Point(); display.getRealSize(size); - Rect bounds = new Rect(); - switch (rotationOrientation) { - case RotationUtils.ROTATION_LANDSCAPE: - boundsFromDirection(cutout, Gravity.LEFT, bounds); - break; - case RotationUtils.ROTATION_SEASCAPE: - boundsFromDirection(cutout, Gravity.RIGHT, bounds); - break; - case RotationUtils.ROTATION_NONE: - boundsFromDirection(cutout, Gravity.TOP, bounds); - break; - case RotationUtils.ROTATION_UPSIDE_DOWN: - // we assume the cutout is always on top in portrait mode - return null; + if (rotationOrientation != RotationUtils.ROTATION_NONE) { + return new Pair<>(cutout.getSafeInsetLeft(), cutout.getSafeInsetRight()); } + Rect bounds = new Rect(); + boundsFromDirection(cutout, Gravity.TOP, bounds); + if (statusBarHeight >= 0 && bounds.top > statusBarHeight) { return null; } |