From 47811fe057052df5ea20db06696d589965092b4b Mon Sep 17 00:00:00 2001 From: Lucky Zhang Date: Thu, 11 Dec 2014 18:10:01 -0800 Subject: [FRP] Notification screen slides in wrong direction The method that launches notification screen from choose lock activity finished the original activity before starting the new activity. This made the system think it is a backward transition instead of a forward one. Swapping the order to start new activity first and then finish old activity fixed the problem. This also changes the behavior in settings. However, it seems like this is also the desired behavior for settings. Bug: 18723199 Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6 --- src/com/android/settings/ChooseLockPattern.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index e454ed1..38f908e 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -578,12 +578,12 @@ public class ChooseLockPattern extends SettingsActivity { utils.setVisiblePatternEnabled(true); } - getActivity().setResult(RESULT_FINISHED); - getActivity().finish(); - mDone = true; if (!wasSecureBefore) { startActivity(getRedactionInterstitialIntent(getActivity())); } + getActivity().setResult(RESULT_FINISHED); + getActivity().finish(); + mDone = true; } } } -- cgit v1.1