Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2934bc1c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 644693f4: Merge change Ic42763b1 into eclair 

Merge commit '644693f4' into eclair-mr2

* commit '644693f4':
  Fix issue #2242440: Window screen brightness attribute is broken
parents 6bfd8d2a 644693f4

api/6.xml

0 → 100644
+371317 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -167386,7 +167386,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="2008"

 value="2014"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/view/WindowManager.java

+5 −5
Original line number Diff line number Diff line
@@ -279,11 +279,6 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_PRIORITY_PHONE     = FIRST_SYSTEM_WINDOW+7;

        

        /**

         * Window type: panel that slides out from the status bar

         */

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+8;

        

        /**

         * Window type: panel that slides out from the status bar

         */
@@ -319,6 +314,11 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13;



        /**

         * Window type: panel that slides out from the status bar

         */

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14;

        

        /**

         * End of types of system windows.

         */