diff options
| author | Justin Ho <justinho@google.com> | 2011-10-28 02:14:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 02:14:05 +0000 |
| commit | a196c688ed1c8aa92d711b53c4dabd7d1399e740 (patch) | |
| tree | f434560bf0a425b5b3f089eab47f4dd0d9770e0c /packages/SystemUI/src/com/android | |
| parent | 64653ac2fa32a679f0695495764146a4be47897e (diff) | |
| parent | 9e7407ed2b18800291612fb9fb355ef062801f07 (diff) | |
| download | frameworks_base-a196c688ed1c8aa92d711b53c4dabd7d1399e740.zip frameworks_base-a196c688ed1c8aa92d711b53c4dabd7d1399e740.tar.gz frameworks_base-a196c688ed1c8aa92d711b53c4dabd7d1399e740.tar.bz2 | |
am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
* commit '9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
Diffstat (limited to 'packages/SystemUI/src/com/android')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 3a06068..5e5bc1a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -45,6 +45,7 @@ public class KeyButtonView extends ImageView { private static final String TAG = "StatusBar.KeyButtonView"; final float GLOW_MAX_SCALE_FACTOR = 1.8f; + final float BUTTON_QUIESCENT_ALPHA = 0.6f; IWindowManager mWindowManager; long mDownTime; @@ -86,7 +87,7 @@ public class KeyButtonView extends ImageView { mGlowBG = a.getDrawable(R.styleable.KeyButtonView_glowBackground); if (mGlowBG != null) { - mDrawingAlpha = 0.5f; + mDrawingAlpha = BUTTON_QUIESCENT_ALPHA; } a.recycle(); @@ -175,8 +176,10 @@ public class KeyButtonView extends ImageView { if (pressed != isPressed()) { AnimatorSet as = new AnimatorSet(); if (pressed) { - if (mGlowScale < 1.7f) mGlowScale = 1.7f; - if (mGlowAlpha < 0.5f) mGlowAlpha = 0.5f; + if (mGlowScale < GLOW_MAX_SCALE_FACTOR) + mGlowScale = GLOW_MAX_SCALE_FACTOR; + if (mGlowAlpha < BUTTON_QUIESCENT_ALPHA) + mGlowAlpha = BUTTON_QUIESCENT_ALPHA; setDrawingAlpha(1f); as.playTogether( ObjectAnimator.ofFloat(this, "glowAlpha", 1f), @@ -187,7 +190,7 @@ public class KeyButtonView extends ImageView { as.playTogether( ObjectAnimator.ofFloat(this, "glowAlpha", 0f), ObjectAnimator.ofFloat(this, "glowScale", 1f), - ObjectAnimator.ofFloat(this, "drawingAlpha", 0.5f) + ObjectAnimator.ofFloat(this, "drawingAlpha", BUTTON_QUIESCENT_ALPHA) ); as.setDuration(500); } |