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

Merge changes Ib49af35a,Iaa20454c into ics-factoryrom

Browse Source 
* changes:
  Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
  Fix disappearing nav icons. (DO NOT MERGE)
This commit is contained in:
Daniel Sandler
2011-09-20 10:25:11 -07:00
committed by Android (Google) Code Review
parent 20e93c0507 3144a6ca15
commit ee0835b95d
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
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)
@@ -236,15 +244,6 @@ public class NavigationBarView extends LinearLayout {
mCurrentView = mRotatedViews[Surface.ROTATION_0];
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
try {
mBarService.setSystemUiVisibility(0);
} catch (android.os.RemoteException ex) {
}
return false; // pass it on
}
public void reorient() {
final int rot = mDisplay.getRotation();
for (int i=0; i<4; i++) {