am 1b80345: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev

dsandler · Android Git Automerger · commit 6f562e9fabb2 · 2012-11-07T11:15:03.000-08:00
* commit '1b803450255ba1d4e173bd75d5cd9679c5a98915':
  Show the assist ring on center-button longpress on lockscreen.
diff --git 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 @@ private void prepareNavigationBarView() {
         mNavigationBarView.getRecentsButton().setOnClickListener(mRecentsClickListener);
         mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPreloadOnTouchListener);
         mNavigationBarView.getHomeButton().setOnTouchListener(mHomeSearchActionListener);
+        mNavigationBarView.getSearchLight().setOnTouchListener(mHomeSearchActionListener);
         updateSearchPanel();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,7 @@ private void prepareNavigationBarView() {`
`762`	`762`	`mNavigationBarView.getRecentsButton().setOnClickListener(mRecentsClickListener);`
`763`	`763`	`mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPreloadOnTouchListener);`
`764`	`764`	`mNavigationBarView.getHomeButton().setOnTouchListener(mHomeSearchActionListener);`
	`765`	`+ mNavigationBarView.getSearchLight().setOnTouchListener(mHomeSearchActionListener);`
`765`	`766`	`updateSearchPanel();`
`766`	`767`	`}`
`767`	`768`