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

Merge "Fix NPE for devices w/out soft-nav." into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-08-27 20:16:30 +00:00
committed by Android (Google) Code Review
parent f1c3f28eb9 f6b639773c
commit 373bc29292
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -668,7 +668,9 @@ public class PhoneStatusBar extends BaseStatusBar {
@Override
protected void updateSearchPanel() {
super.updateSearchPanel();
mNavigationBarView.setDelegateView(mSearchPanelView);
if (mNavigationBarView != null) {
mNavigationBarView.setDelegateView(mSearchPanelView);
}
}
@Override
@@ -679,19 +681,23 @@ public class PhoneStatusBar extends BaseStatusBar {
// we want to freeze the sysui state wherever it is
mSearchPanelView.setSystemUiVisibility(mSystemUiVisibility);
WindowManager.LayoutParams lp =
(android.view.WindowManager.LayoutParams) mNavigationBarView.getLayoutParams();
lp.flags &= ~WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
mWindowManager.updateViewLayout(mNavigationBarView, lp);
if (mNavigationBarView != null) {
WindowManager.LayoutParams lp =
(android.view.WindowManager.LayoutParams) mNavigationBarView.getLayoutParams();
lp.flags &= ~WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
mWindowManager.updateViewLayout(mNavigationBarView, lp);
}
}
@Override
public void hideSearchPanel() {
super.hideSearchPanel();
WindowManager.LayoutParams lp =
(android.view.WindowManager.LayoutParams) mNavigationBarView.getLayoutParams();
lp.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
mWindowManager.updateViewLayout(mNavigationBarView, lp);
if (mNavigationBarView != null) {
WindowManager.LayoutParams lp =
(android.view.WindowManager.LayoutParams) mNavigationBarView.getLayoutParams();
lp.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
mWindowManager.updateViewLayout(mNavigationBarView, lp);
}
}
protected int getStatusBarGravity() {
@@ -1897,7 +1903,8 @@ public class PhoneStatusBar extends BaseStatusBar {
mStatusBarWindowState);
// update navigation bar mode
int nbMode = updateBarMode(oldVal, newVal, mNavigationBarView.getBarTransitions(),
int nbMode = mNavigationBarView == null ? -1 : updateBarMode(
oldVal, newVal, mNavigationBarView.getBarTransitions(),
View.NAVIGATION_BAR_TRANSIENT, View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION,
mNavigationBarWindowState);