Merge "Do not use mStaleListener if tile is listening" into tm-dev am:... (c9a1bd69) · Commits · e / os / android_frameworks_base

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

+9 −1

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

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

	int VERSION = 14;		int VERSION = 15;

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

	@@ -50,6 +50,14 @@ public interface QS extends FragmentBase {
	void setOverscrolling(boolean overscrolling);		void setOverscrolling(boolean overscrolling);
	void setExpanded(boolean qsExpanded);		void setExpanded(boolean qsExpanded);
	void setListening(boolean listening);		void setListening(boolean listening);

			/**
			* Set whether QQS/QS is visible or not.
			*
			* This is different from setExpanded, as it will be true when QQS is visible. In particular,
			* it should be false when device is locked and only notifications (in lockscreen) are visible.
			*/
			void setQsVisible(boolean qsVisible);
	boolean isShowingDetail();		boolean isShowingDetail();
	void closeDetail();		void closeDetail();
	void animateHeaderSlidingOut();		void animateHeaderSlidingOut();

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

+28 −4

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	private static final boolean DEBUG = false;		private static final boolean DEBUG = false;
	private static final String EXTRA_EXPANDED = "expanded";		private static final String EXTRA_EXPANDED = "expanded";
	private static final String EXTRA_LISTENING = "listening";		private static final String EXTRA_LISTENING = "listening";
			private static final String EXTRA_VISIBLE = "visible";

	private final Rect mQsBounds = new Rect();		private final Rect mQsBounds = new Rect();
	private final StatusBarStateController mStatusBarStateController;		private final StatusBarStateController mStatusBarStateController;
	@@ -148,6 +149,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca

	private boolean mOverScrolling;		private boolean mOverScrolling;

			// Whether QQS or QS is visible. When in lockscreen, this is true if and only if QQS or QS is
			// visible;
			private boolean mQsVisible;

	@Inject		@Inject
	public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,		public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,
	QSTileHost qsTileHost,		QSTileHost qsTileHost,
	@@ -224,6 +229,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	mQSCustomizerController.init();		mQSCustomizerController.init();
	mQSCustomizerController.setQs(this);		mQSCustomizerController.setQs(this);
	if (savedInstanceState != null) {		if (savedInstanceState != null) {
			setQsVisible(savedInstanceState.getBoolean(EXTRA_VISIBLE));
	setExpanded(savedInstanceState.getBoolean(EXTRA_EXPANDED));		setExpanded(savedInstanceState.getBoolean(EXTRA_EXPANDED));
	setListening(savedInstanceState.getBoolean(EXTRA_LISTENING));		setListening(savedInstanceState.getBoolean(EXTRA_LISTENING));
	setEditLocation(view);		setEditLocation(view);
	@@ -285,6 +291,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	super.onSaveInstanceState(outState);		super.onSaveInstanceState(outState);
	outState.putBoolean(EXTRA_EXPANDED, mQsExpanded);		outState.putBoolean(EXTRA_EXPANDED, mQsExpanded);
	outState.putBoolean(EXTRA_LISTENING, mListening);		outState.putBoolean(EXTRA_LISTENING, mListening);
			outState.putBoolean(EXTRA_VISIBLE, mQsVisible);
	if (mQSCustomizerController != null) {		if (mQSCustomizerController != null) {
	mQSCustomizerController.saveInstanceState(outState);		mQSCustomizerController.saveInstanceState(outState);
	}		}
	@@ -303,6 +310,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	return mQsExpanded;		return mQsExpanded;
	}		}

			@VisibleForTesting
			boolean isQsVisible() {
			return mQsVisible;
			}

	@Override		@Override
	public View getHeader() {		public View getHeader() {
	return mHeader;		return mHeader;
	@@ -458,7 +470,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	public void setExpanded(boolean expanded) {		public void setExpanded(boolean expanded) {
	if (DEBUG) Log.d(TAG, "setExpanded " + expanded);		if (DEBUG) Log.d(TAG, "setExpanded " + expanded);
	mQsExpanded = expanded;		mQsExpanded = expanded;
	mQSPanelController.setListening(mListening, mQsExpanded);		updateQsPanelControllerListening();
	updateQsState();		updateQsState();
	}		}

	@@ -486,9 +498,20 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	public void setListening(boolean listening) {		public void setListening(boolean listening) {
	if (DEBUG) Log.d(TAG, "setListening " + listening);		if (DEBUG) Log.d(TAG, "setListening " + listening);
	mListening = listening;		mListening = listening;
	mQSContainerImplController.setListening(listening);		mQSContainerImplController.setListening(listening && mQsVisible);
	mQSFooterActionController.setListening(listening);		mQSFooterActionController.setListening(listening && mQsVisible);
	mQSPanelController.setListening(mListening, mQsExpanded);		updateQsPanelControllerListening();
			}

			private void updateQsPanelControllerListening() {
			mQSPanelController.setListening(mListening && mQsVisible, mQsExpanded);
			}

			@Override
			public void setQsVisible(boolean visible) {
			if (DEBUG) Log.d(TAG, "setQsVisible " + visible);
			mQsVisible = visible;
			setListening(mListening);
	}		}

	@Override		@Override
	@@ -837,6 +860,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
	indentingPw.println("mHeaderAnimating: " + mHeaderAnimating);		indentingPw.println("mHeaderAnimating: " + mHeaderAnimating);
	indentingPw.println("mStackScrollerOverscrolling: " + mStackScrollerOverscrolling);		indentingPw.println("mStackScrollerOverscrolling: " + mStackScrollerOverscrolling);
	indentingPw.println("mListening: " + mListening);		indentingPw.println("mListening: " + mListening);
			indentingPw.println("mQsVisible: " + mQsVisible);
	indentingPw.println("mLayoutDirection: " + mLayoutDirection);		indentingPw.println("mLayoutDirection: " + mLayoutDirection);
	indentingPw.println("mLastQSExpansion: " + mLastQSExpansion);		indentingPw.println("mLastQSExpansion: " + mLastQSExpansion);
	indentingPw.println("mLastPanelFraction: " + mLastPanelFraction);		indentingPw.println("mLastPanelFraction: " + mLastPanelFraction);

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -161,9 +161,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
	/** */		/** */
	public void setListening(boolean listening, boolean expanded) {		public void setListening(boolean listening, boolean expanded) {
	setListening(listening && expanded);		setListening(listening && expanded);
	if (mView.isListening()) {
	refreshAllTiles();
	}

	// Set the listening as soon as the QS fragment starts listening regardless of the		// Set the listening as soon as the QS fragment starts listening regardless of the
	//expansion, so it will update the current brightness before the slider is visible.		//expansion, so it will update the current brightness before the slider is visible.

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -308,12 +308,17 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
	}		}

	void setListening(boolean listening) {		void setListening(boolean listening) {
			if (mView.isListening() == listening) return;
	mView.setListening(listening);		mView.setListening(listening);

	if (mView.getTileLayout() != null) {		if (mView.getTileLayout() != null) {
	mQSLogger.logAllTilesChangeListening(listening, mView.getDumpableTag(), mCachedSpecs);		mQSLogger.logAllTilesChangeListening(listening, mView.getDumpableTag(), mCachedSpecs);
	mView.getTileLayout().setListening(listening, mUiEventLogger);		mView.getTileLayout().setListening(listening, mUiEventLogger);
	}		}

			if (mView.isListening()) {
			refreshAllTiles();
			}
	}		}

	boolean switchTileLayout(boolean force) {		boolean switchTileLayout(boolean force) {

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

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -104,15 +104,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
	mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);		mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);
	}		}

	@Override
	void setListening(boolean listening) {
	super.setListening(listening);
	}

	public boolean isListening() {
	return mView.isListening();
	}

	private void setMaxTiles(int parseNumTiles) {		private void setMaxTiles(int parseNumTiles) {
	mView.setMaxTiles(parseNumTiles);		mView.setMaxTiles(parseNumTiles);
	setTiles();		setTiles();