Merge "Add divider between QS and footer." (731f9fa6) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/qs_footer_impl.xml

+10 −4

Original line number	Diff line number	Diff line
		@@ -25,16 +25,22 @@
		android:baselineAligned="false"
		android:clickable="false"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:paddingTop="0dp"
		android:gravity="center_vertical"
		android:orientation="horizontal">
		android:clipToPadding="false">

		<View
		android:id="@+id/qs_footer_divider"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:layout_gravity="top"
		android:background="?android:attr/dividerHorizontal"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginTop="1dp"
		android:layout_marginStart="8dp"
		android:layout_marginEnd="8dp"
		android:layout_gravity="center_vertical"
		android:gravity="end" >

		<LinearLayout

+3 −2

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		private boolean mListening;

		private boolean mShowEmergencyCallsOnly;
		private View mDivider;
		protected MultiUserSwitch mMultiUserSwitch;
		private ImageView mMultiUserAvatar;

		@@ -93,8 +94,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		Resources res = getResources();

		mDivider = findViewById(R.id.qs_footer_divider);
		mEdit = findViewById(android.R.id.edit);
		mEdit.setOnClickListener(view ->
		Dependency.get(ActivityStarter.class).postQSRunnableDismissingKeyguard(() ->
		@@ -162,6 +162,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		@Nullable
		private TouchAnimator createSettingsAlphaAnimator() {
		return new TouchAnimator.Builder()
		.addFloat(mDivider, "alpha", 0, 1)
		.addFloat(mCarrierText, "alpha", 0, 1)
		.addFloat(mActionsContainer, "alpha", 0, 1)
		.build();