Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev

Browse Source
This commit is contained in:
Evan Laird
2020-03-18 18:37:56 +00:00
committed by Android (Google) Code Review
parent 65964e053e bc95ab7a39
commit 27a0ee31b6
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/keyguard_status_bar.xml
View File

@@ -30,6 +30,7 @@
android:id="@+id/status_icon_area" android:id="@+id/status_icon_area"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="@dimen/status_bar_padding_top"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:gravity="center_vertical|end" > android:gravity="center_vertical|end" >
<FrameLayout android:id="@+id/system_icons_container" <FrameLayout android:id="@+id/system_icons_container"
@@ -66,6 +67,7 @@
android:id="@+id/keyguard_carrier_text" android:id="@+id/keyguard_carrier_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="@dimen/status_bar_padding_top"
android:layout_marginStart="@dimen/keyguard_carrier_text_margin" android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
android:layout_toStartOf="@id/system_icons_container" android:layout_toStartOf="@id/system_icons_container"
android:gravity="center_vertical" android:gravity="center_vertical"

3
packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml
View File

@@ -25,7 +25,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:clickable="true" android:clickable="true"
android:paddingStart="@dimen/status_bar_padding_start" 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 <com.android.systemui.statusbar.policy.Clock
android:id="@+id/clock" android:id="@+id/clock"

1
packages/SystemUI/res/layout/system_icons.xml
View File

@@ -26,7 +26,6 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingEnd="@dimen/signal_cluster_battery_padding" android:paddingEnd="@dimen/signal_cluster_battery_padding"
android:paddingTop="@dimen/status_bar_padding_top"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"/> android:orientation="horizontal"/>

11
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -402,10 +402,15 @@ public class QuickStatusBarHeader extends RelativeLayout implements
cutout, getDisplay()); cutout, getDisplay());
if (padding == null) { if (padding == null) {
mSystemIconsView.setPaddingRelative( mSystemIconsView.setPaddingRelative(
getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start), 0, getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start),
getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end), 0); getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top),
getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end),
0);
} else { } 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); return super.onApplyWindowInsets(insets);

20
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
View File

@@ -131,6 +131,7 @@ public class PhoneStatusBarView extends PanelBar {
@Override @Override
protected void onConfigurationChanged(Configuration newConfig) { protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
updateResources();
// May trigger cutout space layout-ing // May trigger cutout space layout-ing
if (updateOrientationAndCutout(newConfig.orientation)) { if (updateOrientationAndCutout(newConfig.orientation)) {
@@ -297,9 +298,28 @@ public class PhoneStatusBarView extends PanelBar {
mCutoutSideNudge = getResources().getDimensionPixelSize( mCutoutSideNudge = getResources().getDimensionPixelSize(
R.dimen.display_cutout_margin_consumption); 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(); ViewGroup.LayoutParams layoutParams = getLayoutParams();
mStatusBarHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_height); mStatusBarHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_height);
layoutParams.height = mStatusBarHeight; 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); setLayoutParams(layoutParams);
} }