summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-10-19 18:07:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-19 18:07:18 -0700
commit22522289fc0fda5c5fdd8c74e72c9f1f84e421f1 (patch)
treef41e01eeafe8ee28993773e6585bb4aa5d33fbd7 /services
parent098d37c092f126c1b0d19d22fe1d1d043817a3a4 (diff)
parent84e825a84d7dde03042228c79638935c92d13c92 (diff)
downloadframeworks_base-22522289fc0fda5c5fdd8c74e72c9f1f84e421f1.zip
frameworks_base-22522289fc0fda5c5fdd8c74e72c9f1f84e421f1.tar.gz
frameworks_base-22522289fc0fda5c5fdd8c74e72c9f1f84e421f1.tar.bz2
am 84e825a8: Merge "Add hasNavigationBar() to the window manager." into ics-mr0
* commit '84e825a84d7dde03042228c79638935c92d13c92': Add hasNavigationBar() to the window manager.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 68f0e66..3af3e06 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -9263,6 +9263,11 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
+ @Override
+ public boolean hasNavigationBar() {
+ return mPolicy.hasNavigationBar();
+ }
+
void dumpInput(FileDescriptor fd, PrintWriter pw, boolean dumpAll) {
pw.println("WINDOW MANAGER INPUT (dumpsys window input)");
mInputManager.dump(pw);