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

Merge "Use status_bar_padding_top for status bar elements" into rvc-dev

Browse Source
This commit is contained in:
Evan Laird
2020-05-04 20:23:02 +00:00
committed by Android (Google) Code Review
parent 1e15db9ce4 2174f555ff
commit cd0281ea95
4 changed files with 24 additions and 3 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

@@ -26,7 +26,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"

3
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"/>
@@ -36,4 +35,4 @@
android:clipToPadding="false" android:clipToPadding="false"
android:clipChildren="false" android:clipChildren="false"
systemui:textAppearance="@style/TextAppearance.StatusBar.Clock" /> systemui:textAppearance="@style/TextAppearance.StatusBar.Clock" />
</LinearLayout> </LinearLayout>

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

@@ -125,6 +125,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()) { if (updateOrientationAndCutout()) {
@@ -298,6 +299,24 @@ public class PhoneStatusBarView extends PanelBar {
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 - waterfallTopInset; layoutParams.height = mStatusBarHeight - waterfallTopInset;
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);
View sbContents = findViewById(R.id.status_bar_contents);
sbContents.setPaddingRelative(
statusBarPaddingStart,
statusBarPaddingTop,
statusBarPaddingEnd,
0);
findViewById(R.id.notification_lights_out)
.setPaddingRelative(0, statusBarPaddingStart, 0, 0);
setLayoutParams(layoutParams); setLayoutParams(layoutParams);
} }