Merge "Remove dead code #12: Remove KeyButtonView.quiescentAlpha" (ab75f637) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java

+0 −39

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import com.android.systemui.statusbar.policy.KeyButtonView;

		public final class NavigationBarTransitions extends BarTransitions {

		private static final int CONTENT_FADE_DURATION = 200;

		private final NavigationBarView mView;
		private final IStatusBarService mBarService;

		@@ -78,48 +76,11 @@ public final class NavigationBarTransitions extends BarTransitions {
		}

		private void applyMode(int mode, boolean animate, boolean force) {
		// apply to key buttons
		final float alpha = alphaForMode(mode);
		setKeyButtonViewQuiescentAlpha(mView.getHomeButton(), alpha, animate);
		setKeyButtonViewQuiescentAlpha(mView.getRecentsButton(), alpha, animate);
		setKeyButtonViewQuiescentAlpha(mView.getMenuButton(), alpha, animate);
		setKeyButtonViewQuiescentAlpha(mView.getImeSwitchButton(), alpha, animate);

		applyBackButtonQuiescentAlpha(mode, animate);

		// apply to lights out
		applyLightsOut(isLightsOut(mode), animate, force);
		}

		private float alphaForMode(int mode) {
		final boolean isOpaque = mode == MODE_OPAQUE \|\| mode == MODE_LIGHTS_OUT;
		return isOpaque ? KeyButtonView.DEFAULT_QUIESCENT_ALPHA : 1f;
		}

		public void applyBackButtonQuiescentAlpha(int mode, boolean animate) {
		float backAlpha = 0;
		backAlpha = maxVisibleQuiescentAlpha(backAlpha, mView.getHomeButton());
		backAlpha = maxVisibleQuiescentAlpha(backAlpha, mView.getRecentsButton());
		backAlpha = maxVisibleQuiescentAlpha(backAlpha, mView.getMenuButton());
		backAlpha = maxVisibleQuiescentAlpha(backAlpha, mView.getImeSwitchButton());
		if (backAlpha > 0) {
		setKeyButtonViewQuiescentAlpha(mView.getBackButton(), backAlpha, animate);
		}
		}

		private static float maxVisibleQuiescentAlpha(float max, View v) {
		if ((v instanceof KeyButtonView) && v.isShown()) {
		return Math.max(max, ((KeyButtonView)v).getQuiescentAlpha());
		}
		return max;
		}

		private void setKeyButtonViewQuiescentAlpha(View button, float alpha, boolean animate) {
		if (button instanceof KeyButtonView) {
		((KeyButtonView) button).setQuiescentAlpha(alpha, animate);
		}
		}

		private void applyLightsOut(boolean lightsOut, boolean animate, boolean force) {
		if (!force && lightsOut == mLightsOut) return;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -369,8 +369,6 @@ public class NavigationBarView extends LinearLayout {
		getBackButton() .setVisibility(disableBack ? View.INVISIBLE : View.VISIBLE);
		getHomeButton() .setVisibility(disableHome ? View.INVISIBLE : View.VISIBLE);
		getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);

		mBarTransitions.applyBackButtonQuiescentAlpha(mBarTransitions.getMode(), true /animate/);
		}

		private boolean inLockTask() {
		@@ -662,10 +660,6 @@ public class NavigationBarView extends LinearLayout {
		+ " " + visibilityToString(button.getVisibility())
		+ " alpha=" + button.getAlpha()
		);
		if (button instanceof KeyButtonView) {
		pw.print(" drawingAlpha=" + ((KeyButtonView)button).getDrawingAlpha());
		pw.print(" quiescentAlpha=" + ((KeyButtonView)button).getQuiescentAlpha());
		}
		}
		pw.println();
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+0 −42

Original line number	Diff line number	Diff line
		@@ -45,20 +45,12 @@ import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;

		public class KeyButtonView extends ImageView {
		private static final String TAG = "StatusBar.KeyButtonView";
		private static final boolean DEBUG = false;

		// TODO: Get rid of this
		public static final float DEFAULT_QUIESCENT_ALPHA = 1f;

		private long mDownTime;
		private int mCode;
		private int mTouchSlop;
		private float mDrawingAlpha = 1f;
		private float mQuiescentAlpha = DEFAULT_QUIESCENT_ALPHA;
		private boolean mSupportsLongpress = true;
		private AudioManager mAudioManager;
		private Animator mAnimateToQuiescent = new ObjectAnimator();

		private final Runnable mCheckLongPress = new Runnable() {
		public void run() {
		@@ -89,9 +81,6 @@ public class KeyButtonView extends ImageView {

		mSupportsLongpress = a.getBoolean(R.styleable.KeyButtonView_keyRepeat, true);


		setDrawingAlpha(mQuiescentAlpha);

		a.recycle();

		setClickable(true);
		@@ -137,37 +126,6 @@ public class KeyButtonView extends ImageView {
		return super.performAccessibilityActionInternal(action, arguments);
		}

		public void setQuiescentAlpha(float alpha, boolean animate) {
		mAnimateToQuiescent.cancel();
		alpha = Math.min(Math.max(alpha, 0), 1);
		if (alpha == mQuiescentAlpha && alpha == mDrawingAlpha) return;
		mQuiescentAlpha = alpha;
		if (DEBUG) Log.d(TAG, "New quiescent alpha = " + mQuiescentAlpha);
		if (animate) {
		mAnimateToQuiescent = animateToQuiescent();
		mAnimateToQuiescent.start();
		} else {
		setDrawingAlpha(mQuiescentAlpha);
		}
		}

		private ObjectAnimator animateToQuiescent() {
		return ObjectAnimator.ofFloat(this, "drawingAlpha", mQuiescentAlpha);
		}

		public float getQuiescentAlpha() {
		return mQuiescentAlpha;
		}

		public float getDrawingAlpha() {
		return mDrawingAlpha;
		}

		public void setDrawingAlpha(float x) {
		setImageAlpha((int) (x * 255));
		mDrawingAlpha = x;
		}

		public boolean onTouchEvent(MotionEvent ev) {
		final int action = ev.getAction();
		int x, y;