Merge changes I5694a38e,I488f90aa,Ie9644dc8,I8d5b5b53,Ib8a0fa19 into qt-r1-dev (0f1159df) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/qs/car/CarQSFragment.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -170,11 +170,6 @@ public class CarQSFragment extends Fragment implements QS {
	// No detail panel to close.		// No detail panel to close.
	}		}

	@Override
	public void setKeyguardShowing(boolean keyguardShowing) {
	// No keyguard to show.
	}

	@Override		@Override
	public void animateHeaderSlidingIn(long delay) {		public void animateHeaderSlidingIn(long delay) {
	// No header to animate.		// No header to animate.

packages/SystemUI/Android.bp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,7 @@ android_library {
	"--extra-packages",		"--extra-packages",
	"com.android.keyguard",		"com.android.keyguard",
	],		],
			kotlincflags: ["-Xjvm-default=enable"],

	plugins: ["dagger2-compiler-2.19"],		plugins: ["dagger2-compiler-2.19"],
	}		}
	@@ -128,6 +129,7 @@ android_library {
	"telephony-common",		"telephony-common",
	"android.test.base",		"android.test.base",
	],		],
			kotlincflags: ["-Xjvm-default=enable"],
	aaptflags: [		aaptflags: [
	"--extra-packages",		"--extra-packages",
	"com.android.keyguard:com.android.systemui",		"com.android.keyguard:com.android.systemui",
	@@ -155,6 +157,8 @@ android_app {
	"telephony-common",		"telephony-common",
	],		],

			kotlincflags: ["-Xjvm-default=enable"],

	dxflags: ["--multi-dex"],		dxflags: ["--multi-dex"],
	aaptflags: [		aaptflags: [
	"--extra-packages",		"--extra-packages",
	@@ -191,6 +195,8 @@ android_app {
	"telephony-common",		"telephony-common",
	],		],

			kotlincflags: ["-Xjvm-default=enable"],

	srcs: [		srcs: [
	"legacy/recents/src/*/.java",		"legacy/recents/src/*/.java",
	"legacy/recents/src/*/I.aidl",		"legacy/recents/src/*/I.aidl",

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ public interface QS extends FragmentBase {

	String ACTION = "com.android.systemui.action.PLUGIN_QS";		String ACTION = "com.android.systemui.action.PLUGIN_QS";

	int VERSION = 6;		int VERSION = 7;

	String TAG = "QS";		String TAG = "QS";

	@@ -51,7 +51,7 @@ public interface QS extends FragmentBase {
	void setListening(boolean listening);		void setListening(boolean listening);
	boolean isShowingDetail();		boolean isShowingDetail();
	void closeDetail();		void closeDetail();
	void setKeyguardShowing(boolean keyguardShowing);		default void setShowCollapsedOnKeyguard(boolean showCollapsedOnKeyguard) {}
	void animateHeaderSlidingIn(long delay);		void animateHeaderSlidingIn(long delay);
	void animateHeaderSlidingOut();		void animateHeaderSlidingOut();
	void setQsExpansion(float qsExpansionFraction, float headerTranslation);		void setQsExpansion(float qsExpansionFraction, float headerTranslation);

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -48,9 +48,11 @@ import com.android.systemui.statusbar.NotificationMediaManager;
	import com.android.systemui.statusbar.ScrimView;		import com.android.systemui.statusbar.ScrimView;
	import com.android.systemui.statusbar.notification.NotificationEntryManager;		import com.android.systemui.statusbar.notification.NotificationEntryManager;
	import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
			import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
	import com.android.systemui.statusbar.notification.collection.NotificationData;		import com.android.systemui.statusbar.notification.collection.NotificationData;
	import com.android.systemui.statusbar.phone.DozeParameters;		import com.android.systemui.statusbar.phone.DozeParameters;
	import com.android.systemui.statusbar.phone.KeyguardBouncer;		import com.android.systemui.statusbar.phone.KeyguardBouncer;
			import com.android.systemui.statusbar.phone.KeyguardBypassController;
	import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;		import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
	import com.android.systemui.statusbar.phone.LockIcon;		import com.android.systemui.statusbar.phone.LockIcon;
	import com.android.systemui.statusbar.phone.LockscreenWallpaper;		import com.android.systemui.statusbar.phone.LockscreenWallpaper;
	@@ -145,10 +147,14 @@ public class SystemUIFactory {
	}		}

	public NotificationIconAreaController createNotificationIconAreaController(Context context,		public NotificationIconAreaController createNotificationIconAreaController(Context context,
	StatusBar statusBar, StatusBarStateController statusBarStateController,		StatusBar statusBar,
			NotificationWakeUpCoordinator wakeUpCoordinator,
			KeyguardBypassController keyguardBypassController,
			StatusBarStateController statusBarStateController,
	NotificationListener listener) {		NotificationListener listener) {
	return new NotificationIconAreaController(context, statusBar, statusBarStateController,		return new NotificationIconAreaController(context, statusBar, statusBarStateController,
	listener, Dependency.get(NotificationMediaManager.class));		wakeUpCoordinator, keyguardBypassController, listener,
			Dependency.get(NotificationMediaManager.class));
	}		}

	public KeyguardIndicationController createKeyguardIndicationController(Context context,		public KeyguardIndicationController createKeyguardIndicationController(Context context,

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

+29 −4

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
	private int mNumQuickTiles;		private int mNumQuickTiles;
	private float mLastPosition;		private float mLastPosition;
	private QSTileHost mHost;		private QSTileHost mHost;
			private boolean mShowCollapsedOnKeyguard;

	public QSAnimator(QS qs, QuickQSPanel quickPanel, QSPanel panel) {		public QSAnimator(QS qs, QuickQSPanel quickPanel, QSPanel panel) {
	mQs = qs;		mQs = qs;
	@@ -98,12 +99,32 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

	public void setOnKeyguard(boolean onKeyguard) {		public void setOnKeyguard(boolean onKeyguard) {
	mOnKeyguard = onKeyguard;		mOnKeyguard = onKeyguard;
	mQuickQsPanel.setVisibility(mOnKeyguard ? View.INVISIBLE : View.VISIBLE);		updateQQSVisibility();
	if (mOnKeyguard) {		if (mOnKeyguard) {
	clearAnimationState();		clearAnimationState();
	}		}
	}		}


			/**
			* Sets whether or not the keyguard is currently being shown with a collapsed header.
			*/
			void setShowCollapsedOnKeyguard(boolean showCollapsedOnKeyguard) {
			mShowCollapsedOnKeyguard = showCollapsedOnKeyguard;
			updateQQSVisibility();
			setCurrentPosition();
			}


			private void setCurrentPosition() {
			setPosition(mLastPosition);
			}

			private void updateQQSVisibility() {
			mQuickQsPanel.setVisibility(mOnKeyguard
			&& !mShowCollapsedOnKeyguard ? View.INVISIBLE : View.VISIBLE);
			}

	public void setHost(QSTileHost qsh) {		public void setHost(QSTileHost qsh) {
	mHost = qsh;		mHost = qsh;
	qsh.addCallback(this);		qsh.addCallback(this);
	@@ -322,7 +343,11 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
	public void setPosition(float position) {		public void setPosition(float position) {
	if (mFirstPageAnimator == null) return;		if (mFirstPageAnimator == null) return;
	if (mOnKeyguard) {		if (mOnKeyguard) {
	return;		if (mShowCollapsedOnKeyguard) {
			position = 0;
			} else {
			position = 1;
			}
	}		}
	mLastPosition = position;		mLastPosition = position;
	if (mOnFirstPage && mAllowFancy) {		if (mOnFirstPage && mAllowFancy) {
	@@ -356,7 +381,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

	@Override		@Override
	public void onAnimationStarted() {		public void onAnimationStarted() {
	mQuickQsPanel.setVisibility(mOnKeyguard ? View.INVISIBLE : View.VISIBLE);		updateQQSVisibility();
	if (mOnFirstPage) {		if (mOnFirstPage) {
	final int N = mQuickQsViews.size();		final int N = mQuickQsViews.size();
	for (int i = 0; i < N; i++) {		for (int i = 0; i < N; i++) {
	@@ -410,7 +435,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
	@Override		@Override
	public void run() {		public void run() {
	updateAnimators();		updateAnimators();
	setPosition(mLastPosition);		setCurrentPosition();
	}		}
	};		};
	}		}