summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/phone
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-05-16 18:00:20 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-05-16 18:00:20 -0700
commit49b819d96d19c61a78fa241db4753cbf6c874f11 (patch)
treeb621e23e003d7e0793712bb93a4d6a7becbe5976 /packages/SystemUI/src/com/android/systemui/statusbar/phone
parent0043015c0dc6400f47edd4124b1dfb5881be3c8a (diff)
parente155cb4dc471c494ba011708cbddc4d2cc802295 (diff)
downloadframeworks_base-49b819d96d19c61a78fa241db4753cbf6c874f11.zip
frameworks_base-49b819d96d19c61a78fa241db4753cbf6c874f11.tar.gz
frameworks_base-49b819d96d19c61a78fa241db4753cbf6c874f11.tar.bz2
Merge "NavigationBar : Only inflate once" into cm-10.1
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java2
1 files changed, 1 insertions, 1 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 befa422..84578f6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -485,7 +485,7 @@ public class PhoneStatusBar extends BaseStatusBar {
try {
boolean showNav = mWindowManagerService.hasNavigationBar();
if (DEBUG) Slog.v(TAG, "hasNavigationBar=" + showNav);
- if (showNav && !mRecreating) {
+ if (mNavigationBarView == null && showNav && !mRecreating) {
mNavigationBarView =
(NavigationBarView) View.inflate(context, R.layout.navigation_bar, null);