Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev

Browse Source 
am: 39608b8556

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
This commit is contained in:
Jorim Jaggi
2017-04-12 05:18:45 +00:00
committed by android-build-merger
parent 56fa529c28 39608b8556
commit 11a99404ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/WindowManager.java
View File

@@ -978,8 +978,9 @@ public interface WindowManager extends ViewManager {
* seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has * seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has
* also been set. * also been set.
* @deprecated Use {@link #FLAG_SHOW_WHEN_LOCKED} or {@link KeyguardManager#dismissKeyguard} * @deprecated Use {@link #FLAG_SHOW_WHEN_LOCKED} or {@link KeyguardManager#dismissKeyguard}
* instead. The Keyguard should never be dismissed automatically repeatedly as it also * instead. Since keyguard was dismissed all the time as long as an activity with this flag
* guards against unintentional touches. * on its window was focused, keyguard couldn't guard against unintentional touches on the
* screen, which isn't desired.
*/ */
@Deprecated @Deprecated
public static final int FLAG_DISMISS_KEYGUARD = 0x00400000; public static final int FLAG_DISMISS_KEYGUARD = 0x00400000;