summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-08-29 15:43:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-29 15:43:55 -0700
commitd5ea3b464795d4e6adbdd174d1bd2f78b628e280 (patch)
tree0660fe4a3b1da16acabfee6874051887ba056a16 /policy/src/com/android
parent0552cbcf29f266f608e8326bc467b6afb13b7f3a (diff)
parentbd6e1500aedc5461e832f69e76341bff0e55fa2b (diff)
downloadframeworks_base-d5ea3b464795d4e6adbdd174d1bd2f78b628e280.zip
frameworks_base-d5ea3b464795d4e6adbdd174d1bd2f78b628e280.tar.gz
frameworks_base-d5ea3b464795d4e6adbdd174d1bd2f78b628e280.tar.bz2
Merge "Add initial multi-display support." into jb-mr1-dev
Diffstat (limited to 'policy/src/com/android')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 1786020..ef31dd6 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -110,6 +110,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVE
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
import static android.view.WindowManager.LayoutParams.TYPE_DRAG;
import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
import static android.view.WindowManager.LayoutParams.TYPE_HIDDEN_NAV_CONSUMER;
@@ -220,14 +221,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
static final int NAVIGATION_BAR_PANEL_LAYER = 20;
// system-level error dialogs
static final int SYSTEM_ERROR_LAYER = 21;
+ // used to simulate secondary display devices
+ static final int DISPLAY_OVERLAY_LAYER = 22;
// the drag layer: input for drag-and-drop is associated with this window,
// which sits above all other focusable windows
- static final int DRAG_LAYER = 22;
- static final int SECURE_SYSTEM_OVERLAY_LAYER = 23;
- static final int BOOT_PROGRESS_LAYER = 24;
+ static final int DRAG_LAYER = 23;
+ static final int SECURE_SYSTEM_OVERLAY_LAYER = 24;
+ static final int BOOT_PROGRESS_LAYER = 25;
// the (mouse) pointer layer
- static final int POINTER_LAYER = 25;
- static final int HIDDEN_NAV_CONSUMER_LAYER = 26;
+ static final int POINTER_LAYER = 26;
+ static final int HIDDEN_NAV_CONSUMER_LAYER = 27;
static final int APPLICATION_MEDIA_SUBLAYER = -2;
static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1;
@@ -1329,6 +1332,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return SCREENSAVER_LAYER;
case TYPE_UNIVERSE_BACKGROUND:
return UNIVERSE_BACKGROUND_LAYER;
+ case TYPE_DISPLAY_OVERLAY:
+ return DISPLAY_OVERLAY_LAYER;
}
Log.e(TAG, "Unknown window type: " + type);
return APPLICATION_LAYER;