Move system icons to the left for lockScreen (2a92ce8a) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/keyguard_status_bar.xml

+31 −29

Original line number	Diff line number	Diff line
		@@ -26,35 +26,51 @@
		android:gravity="center_vertical"
		>

		<LinearLayout
		<RelativeLayout
		android:id="@+id/status_icon_area"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingTop="@dimen/status_bar_padding_top"
		android:layout_alignParentEnd="true"
		android:gravity="center_vertical\|end"
		android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >
		<FrameLayout android:id="@+id/system_icons_container"
		android:layout_width="0dp"
		android:layout_alignParentStart="true"
		android:gravity="center_vertical\|start"
		android:paddingEnd="@dimen/system_icons_keyguard_padding_end"
		android:paddingStart="@dimen/system_icons_keyguard_padding_end" >
		<com.android.keyguard.CarrierText
		android:id="@+id/keyguard_carrier_text"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
		android:gravity="center_vertical\| start" >
		<include layout="@layout/system_icons" />
		</FrameLayout>
		android:paddingTop="@dimen/status_bar_padding_top"
		android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
		android:gravity="center_vertical"
		android:ellipsize="marquee"
		android:textDirection="locale"
		android:textAppearance="@style/TextAppearance.StatusBar.Clock"
		android:textColor="?attr/wallpaperTextColorSecondary"
		android:singleLine="true"
		systemui:showMissingSim="true"
		systemui:showAirplaneMode="true" />

		<com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"
		android:layout_width="@dimen/multi_user_switch_width_keyguard"
		android:layout_height="match_parent"
		android:background="@drawable/ripple_drawable"
		android:layout_marginEnd="@dimen/multi_user_switch_keyguard_margin">
		android:layout_marginRight="@dimen/multi_user_switch_keyguard_margin">
		<ImageView android:id="@+id/multi_user_avatar"
		android:layout_width="@dimen/multi_user_avatar_keyguard_size"
		android:layout_height="@dimen/multi_user_avatar_keyguard_size"
		android:layout_gravity="center"
		android:scaleType="centerInside"/>
		</com.android.systemui.statusbar.phone.MultiUserSwitch>
		</LinearLayout>
		<FrameLayout android:id="@+id/system_icons_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:layout_toRightOf="@id/keyguard_carrier_text"
		android:layout_toLeftOf="@id/multi_user_switch"
		android:gravity="center_vertical\|end" >
		<include layout="@layout/system_icons" />
		</FrameLayout>
		</RelativeLayout>

		<Space
		android:id="@+id/cutout_space_view"
		@@ -63,20 +79,6 @@
		android:gravity="center"
		android:visibility="gone" />

		<com.android.keyguard.CarrierText
		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"
		android:ellipsize="marquee"
		android:textDirection="locale"
		android:textAppearance="@style/TextAppearance.StatusBar.Clock"
		android:textColor="?attr/wallpaperTextColorSecondary"
		android:singleLine="true"
		systemui:showMissingSim="true"
		systemui:showAirplaneMode="true" />


		</com.android.systemui.statusbar.phone.KeyguardStatusBarView>

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

+16 −11

Original line number	Diff line number	Diff line
		@@ -192,8 +192,10 @@ public class KeyguardStatusBarView extends RelativeLayout
		}

		private void updateSystemIconsLayoutParams() {
		LinearLayout.LayoutParams lp =
		(LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();

		LayoutParams lp =
		(LayoutParams) mSystemIconsContainer.getLayoutParams();

		// If the avatar icon is gone, we need to have some end margin to display the system icons
		// correctly.
		int baseMarginEnd = mMultiUserSwitch.getVisibility() == View.GONE
		@@ -246,15 +248,18 @@ public class KeyguardStatusBarView extends RelativeLayout
		mCutoutSpace.setVisibility(View.GONE);
		}

		RelativeLayout.LayoutParams lp = (LayoutParams) mCarrierLabel.getLayoutParams();
		lp.addRule(RelativeLayout.START_OF, R.id.status_icon_area);
		// RelativeLayout.LayoutParams lp = (LayoutParams) mCarrierLabel.getLayoutParams();
		//lp.addRule(RelativeLayout.START_OF, R.id.status_icon_area);

		lp = (LayoutParams) mStatusIconArea.getLayoutParams();
		lp.removeRule(RelativeLayout.RIGHT_OF);
		lp.width = LayoutParams.WRAP_CONTENT;
		// lp = (LayoutParams) mStatusIconArea.getLayoutParams();
		// lp.removeRule(RelativeLayout.RIGHT_OF);
		// lp.width = LayoutParams.WRAP_CONTENT;


		//LinearLayout.LayoutParams llp =(LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();

		LinearLayout.LayoutParams llp =
		(LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();
		LayoutParams llp =
		(LayoutParams) mSystemIconsContainer.getLayoutParams();
		llp.setMarginStart(getResources().getDimensionPixelSize(
		R.dimen.system_icons_super_container_margin_start));
		return true;
		@@ -288,8 +293,8 @@ public class KeyguardStatusBarView extends RelativeLayout
		lp.addRule(RelativeLayout.RIGHT_OF, R.id.cutout_space_view);
		lp.width = LayoutParams.MATCH_PARENT;

		LinearLayout.LayoutParams llp =
		(LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();
		LayoutParams llp =
		(LayoutParams) mSystemIconsContainer.getLayoutParams();
		llp.setMarginStart(0);
		return true;
		}