Merge "QS footer drag handle" (5fc7a076) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/qs_footer_drag_handle.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<shape
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle" >
		<solid
		android:color="#e5e5e5" />
		<corners android:radius="2dp" />
		</shape>

packages/SystemUI/res/layout/qs_footer_impl.xml

+90 −62

Original line number	Diff line number	Diff line
		@@ -32,11 +32,20 @@

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:layout_height="match_parent"
		android:layout_marginStart="8dp"
		android:layout_marginEnd="8dp"
		android:gravity="end" >

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1" >
		<!-- Add an extra 8dp margin before carrier text without shifting it right -->
		<android.widget.Space
		android:layout_width="8dp"
		android:layout_height="match_parent" />

		<com.android.keyguard.CarrierText
		android:id="@+id/qs_carrier_text"
		android:layout_width="0dp"
		@@ -48,7 +57,25 @@
		android:textColor="?android:attr/textColorPrimary"
		android:textDirection="locale"
		android:singleLine="true" />
		</LinearLayout>

		<FrameLayout
		android:layout_width="24dp"
		android:layout_height="match_parent" >
		<View
		android:id="@+id/qs_drag_handle_view"
		android:layout_width="match_parent"
		android:layout_height="4dp"
		android:layout_marginTop="28dp"
		android:background="@drawable/qs_footer_drag_handle" />
		</FrameLayout>

		<LinearLayout
		android:id="@+id/qs_footer_actions_container"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:gravity="end" >
		<com.android.systemui.statusbar.phone.MultiUserSwitch
		android:id="@+id/multi_user_switch"
		android:layout_width="48dp"
		@@ -107,5 +134,6 @@

		</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
		</LinearLayout>
		</LinearLayout>

		</com.android.systemui.qs.QSFooterImpl>

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -84,6 +84,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		protected View mEdit;
		private TouchAnimator mAnimator;

		private View mActionsContainer;

		public QSFooterImpl(Context context, AttributeSet attrs) {
		super(context, attrs);
		}
		@@ -107,6 +109,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		mMultiUserSwitch = findViewById(R.id.multi_user_switch);
		mMultiUserAvatar = mMultiUserSwitch.findViewById(R.id.multi_user_avatar);

		mActionsContainer = findViewById(R.id.qs_footer_actions_container);

		// RenderThread is doing more harm than good when touching the header (to expand quick
		// settings), so disable it for this view
		((RippleDrawable) mSettingsButton.getBackground()).setForceSoftware(true);
		@@ -158,10 +162,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		@Nullable
		private TouchAnimator createSettingsAlphaAnimator() {
		return new TouchAnimator.Builder()
		.addFloat(mEdit, "alpha", 0, 1)
		.addFloat(mMultiUserSwitch, "alpha", 0, 1)
		.addFloat(mCarrierText, "alpha", 0, 1)
		.addFloat(mSettingsButton, "alpha", 0, 1)
		.addFloat(mActionsContainer, "alpha", 0, 1)
		.build();
		}

		@@ -269,6 +271,11 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,

		@Override
		public void onClick(View v) {
		// Don't do anything until view are unhidden
		if (!mExpanded) {
		return;
		}

		if (v == mSettingsButton) {
		if (!Dependency.get(DeviceProvisionedController.class).isCurrentUserSetup()) {
		// If user isn't setup just unlock the device and dump them back at SUW.

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+1 −1

File changed.

Contains only whitespace changes.