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

Merge "Fix height of keyguard status bar" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-14 13:48:34 +00:00
committed by Android (Google) Code Review
parent e3125c7e89 5abb8d118d
commit 49748cd136
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_header_height_keyguard" android:layout_height="@dimen/status_bar_header_height_keyguard"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="center_vertical"
> >
<LinearLayout <LinearLayout
@@ -33,7 +34,7 @@
android:gravity="center_vertical|end" > android:gravity="center_vertical|end" >
<FrameLayout android:id="@+id/system_icons_container" <FrameLayout android:id="@+id/system_icons_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/status_bar_height" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="@dimen/system_icons_super_container_margin_start" android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
android:gravity="center_vertical|end" android:gravity="center_vertical|end"

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
View File

@@ -128,13 +128,7 @@ public class KeyguardStatusBarView extends RelativeLayout
mMultiUserSwitch.setLayoutParams(lp); mMultiUserSwitch.setLayoutParams(lp);
// System icons // System icons
lp = (MarginLayoutParams) mStatusIconArea.getLayoutParams();
lp.height = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.status_bar_height);
lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams(); lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams();
lp.height = getResources().getDimensionPixelSize(
R.dimen.status_bar_height);
lp.setMarginStart(getResources().getDimensionPixelSize( lp.setMarginStart(getResources().getDimensionPixelSize(
R.dimen.system_icons_super_container_margin_start)); R.dimen.system_icons_super_container_margin_start));
mSystemIconsContainer.setLayoutParams(lp); mSystemIconsContainer.setLayoutParams(lp);