Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase navigation icon brightness by 10%" into ics-mr0

Browse Source
This commit is contained in:
Justin Ho
2011-10-27 16:37:02 -07:00
committed by Android (Google) Code Review
parent e7ff39066c bceff71b92
commit 9e7407ed2b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ public class KeyButtonView extends ImageView {
private static final String TAG = "StatusBar.KeyButtonView"; private static final String TAG = "StatusBar.KeyButtonView";
final float GLOW_MAX_SCALE_FACTOR = 1.8f; final float GLOW_MAX_SCALE_FACTOR = 1.8f;
final float BUTTON_QUIESCENT_ALPHA = 0.6f;
IWindowManager mWindowManager; IWindowManager mWindowManager;
long mDownTime; long mDownTime;
@@ -86,7 +87,7 @@ public class KeyButtonView extends ImageView {
mGlowBG = a.getDrawable(R.styleable.KeyButtonView_glowBackground); mGlowBG = a.getDrawable(R.styleable.KeyButtonView_glowBackground);
if (mGlowBG != null) { if (mGlowBG != null) {
mDrawingAlpha = 0.5f; mDrawingAlpha = BUTTON_QUIESCENT_ALPHA;
} }
a.recycle(); a.recycle();
@@ -175,8 +176,10 @@ public class KeyButtonView extends ImageView {
if (pressed != isPressed()) { if (pressed != isPressed()) {
AnimatorSet as = new AnimatorSet(); AnimatorSet as = new AnimatorSet();
if (pressed) { if (pressed) {
if (mGlowScale < 1.7f) mGlowScale = 1.7f; if (mGlowScale < GLOW_MAX_SCALE_FACTOR)
if (mGlowAlpha < 0.5f) mGlowAlpha = 0.5f; mGlowScale = GLOW_MAX_SCALE_FACTOR;
if (mGlowAlpha < BUTTON_QUIESCENT_ALPHA)
mGlowAlpha = BUTTON_QUIESCENT_ALPHA;
setDrawingAlpha(1f); setDrawingAlpha(1f);
as.playTogether( as.playTogether(
ObjectAnimator.ofFloat(this, "glowAlpha", 1f), ObjectAnimator.ofFloat(this, "glowAlpha", 1f),
@@ -187,7 +190,7 @@ public class KeyButtonView extends ImageView {
as.playTogether( as.playTogether(
ObjectAnimator.ofFloat(this, "glowAlpha", 0f), ObjectAnimator.ofFloat(this, "glowAlpha", 0f),
ObjectAnimator.ofFloat(this, "glowScale", 1f), ObjectAnimator.ofFloat(this, "glowScale", 1f),
ObjectAnimator.ofFloat(this, "drawingAlpha", 0.5f) ObjectAnimator.ofFloat(this, "drawingAlpha", BUTTON_QUIESCENT_ALPHA)
); );
as.setDuration(500); as.setDuration(500);
} }