summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTiger Huang <tigerhuang@google.com>2018-11-29 20:06:45 +0800
committerTiger Huang <tigerhuang@google.com>2018-12-03 16:10:27 +0800
commit44c045512406919711fe5ef022444a545f3a4bd3 (patch)
treeadb50876e8e831d90dfc85f5c47d0494b8f1c302 /core/java/android
parentff9d6ab69fef9469d8603a30f26e42ab7dcb7f1c (diff)
Let getNavBarPosition() can take displayId
Navigation bar can show on non-default display now. So the caller should specify which display the desired navigation bar is on. Bug: 117474929 Test: atest QuickStepControllerTest Change-Id: Ibe06a6c7778134204502e6456860d69bea2a9061
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/IWindowManager.aidl2
-rw-r--r--core/java/android/view/WindowManagerPolicyConstants.java1
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;