diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-28 11:42:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-28 11:42:24 +0000 |
| commit | 18439804f48198ef77bb80ff19b60fca6e824450 (patch) | |
| tree | 3cb43c0e10a3fe58f5794c1a0066546ff71c9f65 /core/java/android | |
| parent | e30fc89f6ef268e45c3879a03c4d294ca4f1ba1c (diff) | |
| parent | ea6e7f0401018e9b859658ceb8bb94f47e837339 (diff) | |
Merge "Support hasNavigationBar per display(1/2)"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 6 | ||||
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 308a00020db9..6c4c3f1e6e40 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -294,9 +294,11 @@ interface IWindowManager void setNavBarVirtualKeyHapticFeedbackEnabled(boolean enabled); /** - * Device has a software navigation bar (separate from the status bar). + * Device has a software navigation bar (separate from the status bar) on specific display. + * + * @param displayId the id of display to check if there is a software navigation bar. */ - boolean hasNavigationBar(); + boolean hasNavigationBar(int displayId); /** * Get the position of the nav bar diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 767cd33c2625..d03d97e1b219 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -393,7 +393,7 @@ public class ViewConfiguration { case HAS_PERMANENT_MENU_KEY_AUTODETECT: { IWindowManager wm = WindowManagerGlobal.getWindowManagerService(); try { - sHasPermanentMenuKey = !wm.hasNavigationBar(); + sHasPermanentMenuKey = !wm.hasNavigationBar(context.getDisplayId()); sHasPermanentMenuKeySet = true; } catch (RemoteException ex) { sHasPermanentMenuKey = false; |