commit 7779bf1ce8243d9f856c05db3cc5a37a8227a970
author Jason Monk <jmonk@google.com> Mon Jul 14 10:20:21 2014 -0400
committer Jason Monk <jmonk@google.com> Mon Jul 14 19:43:13 2014 +0000
tree 9a687a4d2c5496fcb950f4f80a27364386bcd646
parent 5c6a8e322227354acbded5c49f44c0b289021bf5

Finalizing lock-to-app UX

Simplifications have happened to remove the enter/exit layouts
and just use a toast to notify the user, and the in text icons
have been removed.

The enter dialog now has a checkbox to see if the lockscreen
should be locked on exit (since it isn't in settings anymore).

Also updated strings.

Bug: 15836599
Change-Id: I3ab685bf3672c8a7f9d83d12e81f0099968cdfde

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index bc184c6..52ffbee 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3268,6 +3268,7 @@
                                     Settings.System.LOCK_TO_APP_EXIT_LOCKED) != 0;
                             if (shouldLockKeyguard) {
                                 mWindowManager.lockNow(null);
+                                mWindowManager.dismissKeyguard();
                             }
                         } catch (SettingNotFoundException e) {
                             // No setting, don't lock.