am a6f6e5a3: am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

* commit 'a6f6e5a35be333921f47d768d053054280552fa5':
  [FRP] Notification screen slides in wrong direction
This commit is contained in:
Lucky Zhang
2014-12-15 18:46:24 +00:00
committed by Android Git Automerger

View File

@@ -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;
}
}
}