diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-01-30 13:36:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-30 13:36:47 -0800 |
| commit | 71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd (patch) | |
| tree | dba4cd9810194f79c94725d6c0b34217d667a729 | |
| parent | f2057d907b5d9c75086337e840f70b5061b2a5aa (diff) | |
| parent | 2ed08d2e70250517e5578dd650c96b14aacf9ba5 (diff) | |
| download | frameworks_base-71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd.zip frameworks_base-71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd.tar.gz frameworks_base-71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd.tar.bz2 | |
Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index bd8391a..715bb83 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -95,6 +95,7 @@ public class TabletStatusBar extends StatusBar implements public static final int MSG_HIDE_CHROME = 1031; public static final int MSG_OPEN_INPUT_METHODS_PANEL = 1040; public static final int MSG_CLOSE_INPUT_METHODS_PANEL = 1041; + public static final int MSG_STOP_TICKER = 2000; // Fitts' Law assistance for LatinIME; TODO: replace with a more general approach private static final boolean FAKE_SPACE_BAR = true; @@ -583,6 +584,9 @@ public class TabletStatusBar extends StatusBar implements mShadow.setVisibility(View.VISIBLE); notifyLightsChanged(false); break; + case MSG_STOP_TICKER: + mTicker.halt(); + break; } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java index 98f718b..4e2faf7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java @@ -51,6 +51,8 @@ public class TabletStatusBarView extends FrameLayout { mHandler.sendEmptyMessage(TabletStatusBar.MSG_CLOSE_RECENTS_PANEL); mHandler.removeMessages(TabletStatusBar.MSG_CLOSE_INPUT_METHODS_PANEL); mHandler.sendEmptyMessage(TabletStatusBar.MSG_CLOSE_INPUT_METHODS_PANEL); + mHandler.removeMessages(TabletStatusBar.MSG_STOP_TICKER); + mHandler.sendEmptyMessage(TabletStatusBar.MSG_STOP_TICKER); for (int i=0; i < mPanels.length; i++) { if (mPanels[i] != null && mPanels[i].getVisibility() == View.VISIBLE) { |