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

am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1

Browse Source 
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
  Fix sticky menu icon on tablet status bar.
This commit is contained in:
Daniel Sandler
2011-12-05 19:04:13 -08:00
committed by Android Git Automerger
parent 7cd1851d82 f66664a50e
commit 83f79c9098
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
View File

@@ -168,7 +168,6 @@ public class TabletStatusBar extends StatusBar implements
NetworkController mNetworkController; NetworkController mNetworkController;
ViewGroup mBarContents; ViewGroup mBarContents;
LayoutTransition mBarContentsLayoutTransition;
// hide system chrome ("lights out") support // hide system chrome ("lights out") support
View mShadow; View mShadow;
@@ -461,19 +460,6 @@ public class TabletStatusBar extends StatusBar implements
} }
mBarContents = (ViewGroup) sb.findViewById(R.id.bar_contents); mBarContents = (ViewGroup) sb.findViewById(R.id.bar_contents);
// layout transitions for the status bar's contents
mBarContentsLayoutTransition = new LayoutTransition();
// add/removal will fade as normal
mBarContentsLayoutTransition.setAnimator(LayoutTransition.APPEARING,
ObjectAnimator.ofFloat(null, "alpha", 0f, 1f));
mBarContentsLayoutTransition.setAnimator(LayoutTransition.DISAPPEARING,
ObjectAnimator.ofFloat(null, "alpha", 1f, 0f));
// no animations for siblings on change: just jump into place please
mBarContentsLayoutTransition.setAnimator(LayoutTransition.CHANGE_APPEARING, null);
mBarContentsLayoutTransition.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, null);
// quick like bunny
mBarContentsLayoutTransition.setDuration(250 * (DEBUG?10:1));
mBarContents.setLayoutTransition(mBarContentsLayoutTransition);
// the whole right-hand side of the bar // the whole right-hand side of the bar
mNotificationArea = sb.findViewById(R.id.notificationArea); mNotificationArea = sb.findViewById(R.id.notificationArea);
@@ -522,7 +508,13 @@ public class TabletStatusBar extends StatusBar implements
mMenuButton = mNavigationArea.findViewById(R.id.menu); mMenuButton = mNavigationArea.findViewById(R.id.menu);
mRecentButton = mNavigationArea.findViewById(R.id.recent_apps); mRecentButton = mNavigationArea.findViewById(R.id.recent_apps);
mRecentButton.setOnClickListener(mOnClickListener); mRecentButton.setOnClickListener(mOnClickListener);
mNavigationArea.setLayoutTransition(mBarContentsLayoutTransition);
LayoutTransition lt = new LayoutTransition();
lt.setDuration(250);
// don't wait for these transitions; we just want icons to fade in/out, not move around
lt.setDuration(LayoutTransition.CHANGE_APPEARING, 0);
lt.setDuration(LayoutTransition.CHANGE_DISAPPEARING, 0);
mNavigationArea.setLayoutTransition(lt);
// no multi-touch on the nav buttons // no multi-touch on the nav buttons
mNavigationArea.setMotionEventSplittingEnabled(false); mNavigationArea.setMotionEventSplittingEnabled(false);