diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-17 18:49:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 18:49:22 +0000 |
| commit | 3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d (patch) | |
| tree | 34c82c3d2b9ae2cc30ac558f6dc28f5b06bbe3b2 /packages/SystemUI | |
| parent | af81434023d19cfd486c84c210f2b6540a2bab35 (diff) | |
| parent | 6819b9a85c5de6a115bb0d247e811095b1d46146 (diff) | |
| download | frameworks_base-3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d.zip frameworks_base-3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d.tar.gz frameworks_base-3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d.tar.bz2 | |
Merge "Remove focusablilty of the status bar." into mnc-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 3118d08..a5b3a83 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -25,7 +25,7 @@ android:id="@+id/status_bar" android:background="@drawable/system_bar_background" android:orientation="vertical" - android:focusable="true" + android:focusable="false" android:descendantFocusability="afterDescendants" > 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 4b04ec7..f0927a8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2070,7 +2070,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // Expand the window to encompass the full screen in anticipation of the drag. // This is only possible to do atomically because the status bar is at the top of the screen! mStatusBarWindowManager.setPanelVisible(true); - mStatusBarView.setFocusable(false); visibilityChanged(true); mWaitingForKeyguardExit = false; @@ -2202,7 +2201,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // Shrink the window to the size of the status bar only mStatusBarWindowManager.setPanelVisible(false); mStatusBarWindowManager.setForceStatusBarVisible(false); - mStatusBarView.setFocusable(true); // Close any "App info" popups that might have snuck on-screen dismissPopups(); |