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

Fix disappearing nav icons. (DO NOT MERGE)

Browse Source 
Bug: 5328284
Change-Id: Iaa20454cff9f5a340da7b0c71190796445e8a205
This commit is contained in:
Daniel Sandler
2011-09-20 10:44:59 -04:00
parent 88b18eb8c2
commit 4cea3b4bd1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,9 +143,15 @@ public class NavigationBarView extends LinearLayout {
final View navButtons = mCurrentView.findViewById(R.id.nav_buttons);
final View lowLights = mCurrentView.findViewById(R.id.lights_out);
// ok, everyone, stop it right there
navButtons.animate().cancel();
lowLights.animate().cancel();
if (!animate) {
lowLights.setVisibility(View.GONE);
navButtons.setAlpha(1f);
navButtons.setAlpha(lightsOut ? 0f : 1f);
lowLights.setAlpha(lightsOut ? 1f : 0f);
lowLights.setVisibility(lightsOut ? View.VISIBLE : View.GONE);
} else {
navButtons.animate()
.alpha(lightsOut ? 0f : 1f)
@@ -153,8 +159,10 @@ public class NavigationBarView extends LinearLayout {
.start();
lowLights.setOnTouchListener(mLightsOutListener);
lowLights.setAlpha(0f);
lowLights.setVisibility(View.VISIBLE);
if (lowLights.getVisibility() == View.GONE) {
lowLights.setAlpha(0f);
lowLights.setVisibility(View.VISIBLE);
}
lowLights.animate()
.alpha(lightsOut ? 1f : 0f)
.setStartDelay(lightsOut ? 500 : 0)