resolved conflicts for merge of 05be6d6f to master

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

1 files changed, 12 insertions, 0 deletions

diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index 3d19380d5959..5a418f3edecd 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -466,6 +466,18 @@ public interface WindowManagerPolicy {
     public int getMaxWallpaperLayer();
     
     /**
+     * Return the display width available after excluding the window
+     * decor.
+     */
+    public int getNonDecorDisplayWidth(int fullWidth);
+
+    /**
+     * Return the display height available after excluding the screen
+     * decor.
+     */
+    public int getNonDecorDisplayHeight(int fullHeight);
+
+    /**
      * Return whether the given window should forcibly hide everything
      * behind it.  Typically returns true for the keyguard.
      */