summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-11-07 09:42:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-07 09:42:36 -0800
commit1b803450255ba1d4e173bd75d5cd9679c5a98915 (patch)
tree6b83bc4a474ea1bed79395bc925519a86d1ad5f2
parent8dbf3b8df0f29d457155e5831dbecf5ba4fff98e (diff)
parent207d548ccf34f7feaa9164ebfa8f81679cb0d55f (diff)
downloadframeworks_base-1b803450255ba1d4e173bd75d5cd9679c5a98915.zip
frameworks_base-1b803450255ba1d4e173bd75d5cd9679c5a98915.tar.gz
frameworks_base-1b803450255ba1d4e173bd75d5cd9679c5a98915.tar.bz2
Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 45886df..5ef32e4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -762,6 +762,7 @@ public class PhoneStatusBar extends BaseStatusBar {
mNavigationBarView.getRecentsButton().setOnClickListener(mRecentsClickListener);
mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPreloadOnTouchListener);
mNavigationBarView.getHomeButton().setOnTouchListener(mHomeSearchActionListener);
+ mNavigationBarView.getSearchLight().setOnTouchListener(mHomeSearchActionListener);
updateSearchPanel();
}