From 9066a5c8b3e2e6a2c8e9d961f306e53e399fca2f Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 22 Jan 2015 18:35:11 -0800
Subject: Setup lock screen go back one screen at a time

SetupChooseLockGeneric no longer finishes itself when it receives a
RESULT_CANCELED result from an activity it started.

Bug: 18631770
Change-Id: I892b76847904225fe607b9406d6e76f932daa062
---
 src/com/android/settings/SetupRedactionInterstitial.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/com/android/settings/SetupRedactionInterstitial.java')

diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 453e7299c..badfe8dcd 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -67,6 +67,7 @@ public class SetupRedactionInterstitial extends RedactionInterstitial
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
         SetupWizardUtils.setImmersiveMode(this, bar);
+        bar.getBackButton().setEnabled(false);
     }
 
     @Override
-- 
cgit v1.2.3