diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-12-03 10:56:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-03 10:56:19 +0000 |
| commit | 0d77844ea635186a49af814214ded5e49e772b7f (patch) | |
| tree | f20b2fdde0f97239ae0062e083fb4a3c8df78671 /core/java/android | |
| parent | bcb0c8c00d67ecfe9757634e04b72e9b740967e5 (diff) | |
| parent | 44c045512406919711fe5ef022444a545f3a4bd3 (diff) | |
Merge "Let getNavBarPosition() can take displayId"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicyConstants.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index dace388b66f6..ff5583b040ad 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -304,7 +304,7 @@ interface IWindowManager /** * Get the position of the nav bar */ - int getNavBarPosition(); + int getNavBarPosition(int displayId); /** * Lock the device immediately with the specified options (can be null). diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index 260e93890e3e..16bafe2c4f11 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -44,6 +44,7 @@ public interface WindowManagerPolicyConstants { int PRESENCE_EXTERNAL = 1 << 1; // Navigation bar position values + int NAV_BAR_INVALID = -1; int NAV_BAR_LEFT = 1 << 0; int NAV_BAR_RIGHT = 1 << 1; int NAV_BAR_BOTTOM = 1 << 2; |