summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPattern.java
diff options
context:
space:
mode:
authorLucky Zhang <luckyzh@google.com>2014-12-11 18:10:01 -0800
committerLucky Zhang <luckyzh@google.com>2014-12-11 18:10:01 -0800
commit47811fe057052df5ea20db06696d589965092b4b (patch)
tree62afda1dec31e88db28562859dbc03adb7b63d7f /src/com/android/settings/ChooseLockPattern.java
parent14ff2f7c30b8258807f44afb815ccc71dc574c1c (diff)
downloadpackages_apps_Settings-47811fe057052df5ea20db06696d589965092b4b.zip
packages_apps_Settings-47811fe057052df5ea20db06696d589965092b4b.tar.gz
packages_apps_Settings-47811fe057052df5ea20db06696d589965092b4b.tar.bz2
[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
Diffstat (limited to 'src/com/android/settings/ChooseLockPattern.java')
-rw-r--r--src/com/android/settings/ChooseLockPattern.java6
1 files changed, 3 insertions, 3 deletions
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;
}
}
}