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

Commit 93720cad authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 

Merge commit 'c957ebef' into froyo-plus-aosp

* commit 'c957ebef':
  Add more WindowManager flags to ViewDebug.
parents 14111d14 c957ebef

core/java/android/view/WindowManager.java

+8 −0
Original line number Diff line number Diff line
@@ -405,8 +405,16 @@ public interface WindowManager extends ViewManager { 
                    name = "FLAG_LAYOUT_IN_SCREEN"),

            @ViewDebug.FlagToString(mask = FLAG_DITHER, equals = FLAG_DITHER,

                    name = "FLAG_DITHER"),

            @ViewDebug.FlagToString(mask = FLAG_TURN_SCREEN_ON, equals = FLAG_TURN_SCREEN_ON,

                    name = "FLAG_TURN_SCREEN_ON"),

            @ViewDebug.FlagToString(mask = FLAG_KEEP_SCREEN_ON, equals = FLAG_KEEP_SCREEN_ON,

                    name = "FLAG_KEEP_SCREEN_ON"),

            @ViewDebug.FlagToString(mask = FLAG_SHOW_WHEN_LOCKED, equals = FLAG_SHOW_WHEN_LOCKED,

                    name = "FLAG_SHOW_WHEN_LOCKED"),

            @ViewDebug.FlagToString(mask = FLAG_ALLOW_LOCK_WHILE_SCREEN_ON, equals = FLAG_ALLOW_LOCK_WHILE_SCREEN_ON,

                    name = "FLAG_ALLOW_LOCK_WHILE_SCREEN_ON"),

            @ViewDebug.FlagToString(mask = FLAG_DISMISS_KEYGUARD, equals = FLAG_DISMISS_KEYGUARD,

                    name = "FLAG_DISMISS_KEYGUARD"),

            @ViewDebug.FlagToString(mask = FLAG_FULLSCREEN, equals = FLAG_FULLSCREEN,

                    name = "FLAG_FULLSCREEN"),

            @ViewDebug.FlagToString(mask = FLAG_FORCE_NOT_FULLSCREEN,