Merge "Brightness slider doesn't jump when panel is open" (ea8c3fad) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -256,7 +256,7 @@ public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {
		public void setExpanded(boolean expanded) {
		if (DEBUG) Log.d(TAG, "setExpanded " + expanded);
		mQsExpanded = expanded;
		mQSPanel.setListening(mListening && mQsExpanded);
		mQSPanel.setListening(mListening, mQsExpanded);
		updateQsState();
		}

		@@ -287,8 +287,7 @@ public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {
		mListening = listening;
		mHeader.setListening(listening);
		mFooter.setListening(listening);
		mQSPanel.setListening(mListening && mQsExpanded);
		mQSPanel.getFooter().setListening(listening);
		mQSPanel.setListening(mListening, mQsExpanded);
		}

		@Override

+15 −6

Original line number	Diff line number	Diff line
		@@ -353,14 +353,23 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne
		if (mListening) {
		refreshAllTiles();
		}
		if (mBrightnessView.getVisibility() == View.VISIBLE) {
		}

		public void setListening(boolean listening, boolean expanded) {
		setListening(listening && expanded);
		getFooter().setListening(listening);
		// 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.
		setBrightnessListening(listening);
		}

		public void setBrightnessListening(boolean listening) {
		if (listening) {
		mBrightnessController.registerCallbacks();
		} else {
		mBrightnessController.unregisterCallbacks();
		}
		}
		}

		public void refreshAllTiles() {
		mBrightnessController.checkRestrictionAndSetEnabled();

+5 −3

Original line number	Diff line number	Diff line
		@@ -460,7 +460,7 @@ public class BrightnessController implements ToggleSlider.Listener {

		private void animateSliderTo(int target) {
		if (!mControlValueInitialized) {
		// Don't animate the first value since it's default state isn't meaningful to users.
		// Don't animate the first value since its default state isn't meaningful to users.
		mControl.setValue(target);
		mControlValueInitialized = true;
		}
		@@ -473,7 +473,9 @@ public class BrightnessController implements ToggleSlider.Listener {
		mControl.setValue((int) animation.getAnimatedValue());
		mExternalChange = false;
		});
		mSliderAnimator.setDuration(SLIDER_ANIMATION_DURATION);
		final long animationDuration = SLIDER_ANIMATION_DURATION * Math.abs(
		mControl.getValue() - target) / GAMMA_SPACE_MAX;
		mSliderAnimator.setDuration(animationDuration);
		mSliderAnimator.start();
		}