diff options
| author | Winson Chung <winsonc@google.com> | 2018-01-25 03:31:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-25 03:31:30 +0000 |
| commit | ab380db64ae440b5a87c70059db081aaaa643d77 (patch) | |
| tree | 9d71d4dfa887894c377a509c48690c87e141109a /core/java/android/view/WindowManager.java | |
| parent | 9399343f42f37804b252341b6dcc25dba69c89dc (diff) | |
| parent | 9f6ba8df3b4c7706a054d3375469e913dbd499eb (diff) | |
Merge changes Ib57ea73f,I5cbd21ed,Id32f03c7,I131df87f
* changes:
4/ Update SysUI shared lib for Recents transition
3/ Add input consumer to capture touches during a Recents transition
2/ Add support for remote Recents animation
1/ Create display content window controller to position stacks in the display
Diffstat (limited to 'core/java/android/view/WindowManager.java')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 3bb3a4c17b8f..1c5e87197750 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -98,11 +98,13 @@ public interface WindowManager extends ViewManager { int DOCKED_BOTTOM = 4; /** @hide */ - final static String INPUT_CONSUMER_PIP = "pip_input_consumer"; + String INPUT_CONSUMER_PIP = "pip_input_consumer"; /** @hide */ - final static String INPUT_CONSUMER_NAVIGATION = "nav_input_consumer"; + String INPUT_CONSUMER_NAVIGATION = "nav_input_consumer"; /** @hide */ - final static String INPUT_CONSUMER_WALLPAPER = "wallpaper_input_consumer"; + String INPUT_CONSUMER_WALLPAPER = "wallpaper_input_consumer"; + /** @hide */ + String INPUT_CONSUMER_RECENTS_ANIMATION = "recents_animation_input_consumer"; /** * Not set up for a transition. |