diff options
3 files changed, 23 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 05ed089..c0c39d0 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -38,5 +38,9 @@ <!-- Whether or not we show the number in the bar. --> <bool name="config_statusBarShowNumber">true</bool> + <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be + autodetected from the Configuration. --> + <bool name="config_showNavigationBar">true</bool> + </resources> 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 ef78740..e66a1a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -147,7 +147,7 @@ public class PhoneStatusBar extends StatusBar { private View mIntruderAlertView; // on-screen navigation buttons - private NavigationBarView mNavigationBarView; + private NavigationBarView mNavigationBarView = null; // the tracker view TrackingView mTrackingView; @@ -236,8 +236,15 @@ public class PhoneStatusBar extends StatusBar { mIntruderAlertView.setVisibility(View.GONE); mIntruderAlertView.setClickable(true); - mNavigationBarView = - (NavigationBarView) View.inflate(context, R.layout.navigation_bar, null); + try { + boolean showNav = res.getBoolean(R.bool.config_showNavigationBar); + if (showNav) { + mNavigationBarView = + (NavigationBarView) View.inflate(context, R.layout.navigation_bar, null); + } + } catch (Resources.NotFoundException ex) { + // no nav bar for you + } PhoneStatusBarView sb = (PhoneStatusBarView)View.inflate(context, R.layout.status_bar, null); @@ -310,12 +317,16 @@ public class PhoneStatusBar extends StatusBar { // For small-screen devices (read: phones) that lack hardware navigation buttons private void addNavigationBar() { + if (mNavigationBarView == null) return; + mNavigationBarView.reorient(); WindowManagerImpl.getDefault().addView( mNavigationBarView, getNavigationBarLayoutParams()); } private void repositionNavigationBar() { + if (mNavigationBarView == null) return; + mNavigationBarView.reorient(); WindowManagerImpl.getDefault().updateViewLayout( mNavigationBarView, getNavigationBarLayoutParams()); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 75768f0..b562b7b 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2870,9 +2870,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - try { - mStatusBarService.userActivity(); - } catch (RemoteException ex) {} + if (mStatusBarService != null) { + try { + mStatusBarService.userActivity(); + } catch (RemoteException ex) {} + } } Runnable mScreenLockTimeout = new Runnable() { |