diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d84a2bba965..6c84efc811c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1594,7 +1594,8 @@
                        android:resource="@string/notification_suggestion_summary" />
         </activity>
 
-        <activity android:name=".notification.RedactionInterstitial"/>
+        <activity android:name=".notification.RedactionInterstitial"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <activity android:name=".notification.RedactionSettingsStandalone"
                   android:exported="true">
@@ -1641,7 +1642,7 @@
         <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
             android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"
-            android:theme="@style/SetupWizardDisableAppStartingTheme">
+            android:theme="@style/SetupWizardTheme.Light">
             <intent-filter>
                 <action android:name="android.settings.FINGERPRINT_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1661,7 +1662,7 @@
 
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SetupWizardTheme.Light"
             android:label="@string/lock_settings_picker_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1719,25 +1720,30 @@
         <activity android:name="SetupChooseLockPattern"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme" />
+            android:theme="@style/SetupWizardTheme.Light" />
 
-        <activity android:name="ChooseLockPattern" android:exported="false"/>
+        <activity android:name="ChooseLockPattern"
+            android:exported="false"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <activity android:name="SetupChooseLockPassword"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SetupWizardTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize" />
 
-        <activity android:name="ChooseLockPassword" android:exported="false"
+        <activity android:name="ChooseLockPassword"
+            android:exported="false"
+            android:theme="@style/SetupWizardTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name=".SetupEncryptionInterstitial"
             android:label="@string/encryption_interstitial_header"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+            android:theme="@style/SetupWizardTheme.Light"/>
 
-        <activity android:name=".EncryptionInterstitial"/>
+        <activity android:name=".EncryptionInterstitial"
+            android:theme="@style/SetupWizardTheme.Light" />
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".Settings$StatusActivity"
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
deleted file mode 100644
index f79de614c7f..00000000000
--- a/res/layout-land/choose_lock_password.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <!-- "Enter PIN(Password) to unlock" -->
-            <TextView android:id="@+id/headerText"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:layout_marginEnd="6dip"
-                android:layout_marginStart="6dip"
-                android:layout_marginTop="10dip"
-                android:layout_marginBottom="10dip"
-                android:gravity="start"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-            <!-- Password entry field -->
-            <EditText android:id="@+id/password_entry"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:layout_marginBottom="5dip"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:inputType="textPassword"
-                android:imeOptions="actionNext|flagNoExtractUi"
-                android:gravity="center"
-                android:textSize="24sp"
-                style="@style/TextAppearance.PasswordEntry"
-            />
-        </LinearLayout>
-
-        <!-- Alphanumeric keyboard -->
-        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#00000000"
-            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-            android:visibility="gone"
-        />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1">
-            <LinearLayout
-                style="@style/SecurityPreferenceButtonContainer"
-                android:orientation="horizontal"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true">
-
-                <!-- left : cancel -->
-                <Button android:id="@+id/cancel_button"
-                    style="@style/SecurityPreferenceButton"
-                    android:text="@string/lockpassword_cancel_label"/>
-
-                <!-- right : continue -->
-                <Button android:id="@+id/next_button"
-                    style="@style/SecurityPreferenceButton"
-                    android:text="@string/lockpassword_continue_label"/>
-
-            </LinearLayout>
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index f048ba24798..a896ceb04f8 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -1,94 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+    Copyright (C) 2015 The Android Open Source Project
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+    Licensed under the Apache License, Version 2.0 (the "License")
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="horizontal"
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/lock_settings_picker_title">
 
-    <!-- left side: instructions and messages -->
-    <LinearLayout
-            android:orientation="vertical"
+    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+        android:id="@+id/topLayout"
+        style="@style/SuwContentFrame"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- left side: instructions and messages -->
+        <LinearLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1.0"
-            >
+            android:orientation="vertical">
 
-        <!-- header message -->
-        <TextView android:id="@+id/headerText"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="16dp"
-                  android:gravity="center"
-                  android:textSize="18sp"/>
+            <!-- header message -->
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="start|bottom"
+                android:textSize="18sp" />
 
-        <!-- footer can show a message, or confirm / restart buttons -->
-        <RelativeLayout
+            <!-- footer can show a message, or confirm / restart buttons -->
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1.0">
 
-            <!-- confirm / restart buttons -->
-            <LinearLayout android:id="@+id/buttonContainer"
-                style="@style/SecurityPreferenceButtonContainer"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                android:orientation="horizontal">
-
-                <!-- left / top button: skip, or re-try -->
-                <Button android:id="@+id/footerLeftButton"
-                    style="@style/SecurityPreferenceButton"
+                <!-- confirm / restart buttons -->
+                <LinearLayout android:id="@+id/buttonContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/lockpattern_restart_button_text"/>
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:orientation="horizontal">
 
-                <!-- right / bottom button: confirm or ok -->
-                <Button android:id="@+id/footerRightButton"
-                    style="@style/SecurityPreferenceButton"
-                    android:layout_width="match_parent"
+                    <!-- left / top button: skip, or re-try -->
+                    <Button android:id="@+id/footerLeftButton"
+                        style="@style/SetupWizardButton.Negative"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/lockpattern_restart_button_text" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <!-- right / bottom button: confirm or ok -->
+                    <Button android:id="@+id/footerRightButton"
+                        style="@style/SetupWizardButton.Positive"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/lockpattern_confirm_button_text" />
+
+                </LinearLayout>
+
+                <!-- message above buttons -->
+                <TextView android:id="@+id/footerText"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/lockpattern_confirm_button_text"/>
+                    android:layout_above="@+id/buttonContainer"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="4dip"
+                    android:textSize="14sp"
+                    android:visibility="gone" />
 
-            </LinearLayout>
+            </RelativeLayout>
 
-            <!-- message above buttons -->
-            <TextView android:id="@+id/footerText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/buttonContainer"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="4dip"
-                android:textSize="14sp"/>
+        </LinearLayout>
 
-        </RelativeLayout>
-    </LinearLayout>
+        <!-- right side: lock pattern -->
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0">
 
-    <View
-         android:background="@*android:drawable/code_lock_left"
-         android:layout_width="2dip"
-         android:layout_height="match_parent" />
+            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 android:layout_gravity="center"
+                 android:background="@color/lock_pattern_background" />
 
-    <!-- right side: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/lock_pattern_background" />
+        </FrameLayout>
 
+    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/setup_choose_lock_pattern.xml b/res/layout-land/setup_choose_lock_pattern.xml
deleted file mode 100644
index 29b2b42df0b..00000000000
--- a/res/layout-land/setup_choose_lock_pattern.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License")
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<com.android.setupwizardlib.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock"
-    settings:suwHeaderText="@string/lock_settings_picker_title">
-
-    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- left side: instructions and messages -->
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
-            android:orientation="vertical">
-
-            <!-- header message -->
-            <TextView android:id="@+id/headerText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="start|bottom"
-                android:textSize="18sp" />
-
-            <!-- footer can show a message, or confirm / restart buttons -->
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1.0">
-
-                <!-- confirm / restart buttons -->
-                <LinearLayout android:id="@+id/buttonContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_alignParentBottom="true"
-                    android:orientation="horizontal">
-
-                    <!-- left / top button: skip, or re-try -->
-                    <Button android:id="@+id/footerLeftButton"
-                        style="@style/SetupWizardButton.Negative"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/lockpattern_restart_button_text" />
-
-                    <Space
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_weight="1" />
-
-                    <!-- right / bottom button: confirm or ok -->
-                    <Button android:id="@+id/footerRightButton"
-                        style="@style/SetupWizardButton.Positive"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/lockpattern_confirm_button_text" />
-
-                </LinearLayout>
-
-                <!-- message above buttons -->
-                <TextView android:id="@+id/footerText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_above="@+id/buttonContainer"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="4dip"
-                    android:textSize="14sp"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <!-- right side: lock pattern -->
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:background="@color/lock_pattern_background" />
-
-    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
deleted file mode 100644
index 199c9ac4cb9..00000000000
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:orientation="horizontal">
-
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-        />
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
-    </LinearLayout>
-
-    <!-- confirm / restart buttons -->
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_continue_label"/>
-
-    </LinearLayout>
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
deleted file mode 100644
index e0d96679e3d..00000000000
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="14dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="0.6"/>
-
-    <!-- lock pattern widget -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-        android:layout_width="354dip"
-        android:layout_height="354dip"
-        android:background="@color/lock_pattern_background"
-        aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/headerText"
-        android:layout_marginTop="16dip"
-        android:layout_toEndOf="@id/lockPattern"
-        android:layout_marginStart="100dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:visibility="gone"/>
-
-    <!-- confirm / restart buttons -->
-    <LinearLayout android:id="@+id/buttonContainer"
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/footerLeftButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_restart_button_text"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/footerRightButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_confirm_button_text"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
deleted file mode 100644
index ca8975ee5db..00000000000
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:layout_gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:textSize="32sp"
-        style="@style/TextAppearance.PasswordEntry"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:layout_marginBottom="30dip"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-    />
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal">
-
-            <Button android:id="@+id/cancel_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_cancel_label"/>
-
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_continue_label"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
deleted file mode 100644
index 7733184935d..00000000000
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- top: instructions and buttons -->
-
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="96dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:visibility="gone"/>
-
-    <!-- bottom: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="354dip"
-         android:layout_height="354dip"
-         android:layout_marginTop="80dip"
-         android:background="@color/lock_pattern_background"
-         aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_restart_button_text"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_confirm_button_text"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index c13d150c804..99657b4e145 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -1,79 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License")
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
 
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:textSize="24sp"
-        style="@style/TextAppearance.PasswordEntry"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
 
     <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-        <!-- left : cancel -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_cancel_label"/>
+        <!-- header text ('Enter Pin') -->
+        <TextView android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:lines="2"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-        <!-- right : continue -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_continue_label"/>
+        <!-- Password entry field -->
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:inputType="textPassword"
+            android:imeOptions="actionNext|flagNoExtractUi"
+            android:textSize="24sp"
+            style="@style/TextAppearance.PasswordEntry"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:gravity="end"
+            android:orientation="horizontal">
+
+            <!-- left : cancel -->
+            <Button android:id="@+id/cancel_button"
+                style="@style/SetupWizardButton.Negative"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lockpassword_cancel_label" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <!-- right : continue -->
+            <Button android:id="@+id/next_button"
+                style="@style/SetupWizardButton.Positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lockpassword_continue_label" />
+
+        </LinearLayout>
+
+        <!-- Spacer between password entry and keyboard -->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"/>
+
+        <!-- Alphanumeric keyboard -->
+        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+            android:visibility="gone"/>
 
     </LinearLayout>
 
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-</LinearLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
deleted file mode 100644
index 94eecef0301..00000000000
--- a/res/layout/choose_lock_pattern.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <!-- takes up all space above button bar at bottom -->
-    <com.android.settings.widget.MatchParentShrinkingLinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minLines="2"
-            android:gravity="center"
-            android:textSize="18sp" />
-
-        <View
-             android:background="@*android:drawable/code_lock_top"
-             android:layout_width="match_parent"
-             android:layout_height="2dip" />
-
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-
-        <!-- bottom line looks bad when button bar is their too, omit in this case -->
-        <!--View
-             android:background="@*android:drawable/code_lock_bottom"
-             android:layout_width="match_parent"
-             android:layout_height="8dip" /-->
-
-        <TextView android:id="@+id/footerText"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:textSize="14sp"/>
-
-    </com.android.settings.widget.MatchParentShrinkingLinearLayout>
-
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
-
-        <!-- left : cancel, or re-try -->
-        <Button android:id="@+id/footerLeftButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right : confirm or ok -->
-        <Button android:id="@+id/footerRightButton"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/setup_choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
similarity index 100%
rename from res/layout/setup_choose_lock_pattern_common.xml
rename to res/layout/choose_lock_pattern_common.xml
diff --git a/res/layout/encryption_interstitial_header.xml b/res/layout/encryption_interstitial_header.xml
index 8d36432edc6..9601fa874c1 100644
--- a/res/layout/encryption_interstitial_header.xml
+++ b/res/layout/encryption_interstitial_header.xml
@@ -20,8 +20,9 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="56dp"
-    android:paddingTop="16dp"
+    android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
+    android:paddingTop="@dimen/suw_description_glif_margin_top"
+    android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+    android:textAppearance="?android:attr/textAppearanceListItem" />
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index 0c4273f5ab3..dcd865a8c95 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -1,77 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
+    Copyright (C) 2015 The Android Open Source Project
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License
+-->
+
+<com.android.setupwizardlib.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingStart="?attr/side_margin"
-    android:paddingEnd="?attr/side_margin">
+    android:icon="@drawable/ic_lock"
+    settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
 
-    <TextView
-        android:id="@+id/message"
+    <LinearLayout
+        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/redaction_vertical_margins"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:text="@string/lock_screen_notifications_interstitial_message"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <RadioGroup
-        android:id="@+id/radio_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/redaction_vertical_margins"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:checkedButton="@+id/redact_sensitive">
-
-        <com.android.settings.RestrictedRadioButton
-            android:id="@+id/show_all"
+        <TextView
+            style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_show" />
+            android:text="@string/lock_screen_notifications_interstitial_message" />
 
-        <com.android.settings.RestrictedRadioButton
-            android:id="@+id/redact_sensitive"
+        <RadioGroup
+            android:id="@+id/radio_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_hide" />
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
+            android:checkedButton="@+id/redact_sensitive">
 
-        <RadioButton
-            android:id="@+id/hide_all"
-            android:layout_width="match_parent"
+            <com.android.settings.RestrictedRadioButton
+                android:id="@+id/show_all"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_show" />
+
+            <com.android.settings.RestrictedRadioButton
+                android:id="@+id/redact_sensitive"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_hide" />
+
+            <RadioButton
+                android:id="@+id/hide_all"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_screen_notifications_summary_disable" />
+
+            <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
+                 SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
+            <com.android.settings.RestrictedCheckBox
+                android:id="@+id/lockscreen_remote_input"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
+                android:text="@string/lockscreen_remote_input" />
+
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/redaction_done_button"
+            style="@style/SetupWizardButton.Positive"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/RedactionItemAndLabel"
-            android:text="@string/lock_screen_notifications_summary_disable" />
+            android:layout_gravity="end"
+            android:text="@string/app_notifications_dialog_done" />
 
-    </RadioGroup>
+    </LinearLayout>
 
-    <com.android.settings.RestrictedCheckBox
-        android:id="@+id/lockscreen_remote_input"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/RedactionItemAndLabel"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:text="@string/lockscreen_remote_input" />
-
-</LinearLayout>
\ No newline at end of file
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
deleted file mode 100644
index 99657b4e145..00000000000
--- a/res/layout/setup_choose_lock_password.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License")
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<com.android.setupwizardlib.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock"
-    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
-
-    <LinearLayout
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <!-- header text ('Enter Pin') -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lines="2"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoExtractUi"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:gravity="end"
-            android:orientation="horizontal">
-
-            <!-- left : cancel -->
-            <Button android:id="@+id/cancel_button"
-                style="@style/SetupWizardButton.Negative"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lockpassword_cancel_label" />
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <!-- right : continue -->
-            <Button android:id="@+id/next_button"
-                style="@style/SetupWizardButton.Positive"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lockpassword_continue_label" />
-
-        </LinearLayout>
-
-        <!-- Spacer between password entry and keyboard -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"/>
-
-        <!-- Alphanumeric keyboard -->
-        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#00000000"
-            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-            android:visibility="gone"/>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
deleted file mode 100644
index 6a85de1a98a..00000000000
--- a/res/layout/setup_redaction_interstitial.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License
--->
-
-<com.android.setupwizardlib.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock"
-    settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
-
-    <LinearLayout
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            style="@style/SuwDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/lock_screen_notifications_interstitial_message" />
-
-        <RadioGroup
-            android:id="@+id/radio_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/redaction_vertical_margins"
-            android:checkedButton="@+id/redact_sensitive">
-
-            <com.android.settings.RestrictedRadioButton
-                android:id="@+id/show_all"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_show" />
-
-            <com.android.settings.RestrictedRadioButton
-                android:id="@+id/redact_sensitive"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_hide" />
-
-            <RadioButton
-                android:id="@+id/hide_all"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_screen_notifications_summary_disable" />
-
-            <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
-                 SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
-            <com.android.settings.RestrictedCheckBox
-                android:id="@+id/lockscreen_remote_input"
-                style="@style/SuwRadioButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/redaction_vertical_margins"
-                android:text="@string/lockscreen_remote_input" />
-
-        </RadioGroup>
-
-        <Button
-            android:id="@+id/redaction_next_button"
-            style="@style/SetupWizardButton.Positive"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:text="@string/next_label" />
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.GlifLayout>
diff --git a/res/values-sw600dp/aliases.xml b/res/values-sw600dp/aliases.xml
index 51ee5bc9a85..a3bf39aa8bb 100644
--- a/res/values-sw600dp/aliases.xml
+++ b/res/values-sw600dp/aliases.xml
@@ -19,7 +19,7 @@
      <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
-     <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
+     <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
      <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
 </resources>
 
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 0901157644f..12f2710aa6c 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -21,7 +21,7 @@
      <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
-     <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
+     <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
      <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
 </resources>
 
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5eb5132b334..6db6f763a8e 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -32,7 +32,6 @@ import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
 import android.os.Bundle;
-import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
@@ -42,9 +41,7 @@ import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.EventLog;
 import android.util.Log;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.Toast;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b3826b75ca3..5a8960c8b7f 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -25,7 +25,6 @@ import android.inputmethodservice.KeyboardView;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.UserHandle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -40,6 +39,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
@@ -50,6 +50,7 @@ import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
 import com.android.internal.widget.TextViewInputDisabler;
 import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizardlib.GlifLayout;
 
 public class ChooseLockPassword extends SettingsActivity {
     public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
@@ -143,6 +144,8 @@ public class ChooseLockPassword extends SettingsActivity {
         super.onCreate(savedInstanceState);
         CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
         setTitle(msg);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
     }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
@@ -287,7 +290,10 @@ public class ChooseLockPassword extends SettingsActivity {
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.choose_lock_password, container, false);
+            GlifLayout layout = (GlifLayout) inflater.inflate(
+                    R.layout.choose_lock_password, container, false);
+            layout.setHeaderText(getActivity().getTitle());
+            return layout;
         }
 
         @Override
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 2e9f76775ca..59fa2c7eb09 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -21,12 +21,12 @@ import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -37,6 +37,7 @@ import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockPatternView.DisplayMode;
 import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizardlib.GlifLayout;
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
@@ -113,6 +114,8 @@ public class ChooseLockPattern extends SettingsActivity {
         super.onCreate(savedInstanceState);
         CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
         setTitle(msg);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
     }
 
     @Override
@@ -391,7 +394,10 @@ public class ChooseLockPattern extends SettingsActivity {
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.choose_lock_pattern, container, false);
+            final GlifLayout layout = (GlifLayout) inflater.inflate(
+                    R.layout.choose_lock_pattern, container, false);
+            layout.setHeaderText(getActivity().getTitle());
+            return layout;
         }
 
         @Override
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e9e2a7c14d0..d34b456b05e 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -23,19 +23,26 @@ import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.utils.SettingsDividerItemDecoration;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 import java.util.List;
 
 public class EncryptionInterstitial extends SettingsActivity {
-    private final static String TAG = EncryptionInterstitial.class.getSimpleName();
+    private static final String TAG = EncryptionInterstitial.class.getSimpleName();
 
     protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality";
     protected static final String EXTRA_UNLOCK_METHOD_INTENT = "extra_unlock_method_intent";
@@ -63,6 +70,13 @@ public class EncryptionInterstitial extends SettingsActivity {
                 .putExtra(EXTRA_UNLOCK_METHOD_INTENT, unlockMethodIntent);
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
+    }
+
     public static class EncryptionInterstitialFragment extends SettingsPreferenceFragment
             implements DialogInterface.OnClickListener {
 
@@ -126,7 +140,8 @@ public class EncryptionInterstitial extends SettingsActivity {
                     disableId = R.string.encrypt_dont_require_password;
                     break;
             }
-            TextView message = createHeaderView();
+            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
+                    R.layout.encryption_interstitial_header, null, false);
             message.setText(msgId);
             setHeaderView(message);
 
@@ -138,10 +153,25 @@ public class EncryptionInterstitial extends SettingsActivity {
                     EXTRA_REQUIRE_PASSWORD, true));
         }
 
-        protected TextView createHeaderView() {
-            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
-                    R.layout.encryption_interstitial_header, null, false);
-            return message;
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+            layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
+
+            layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
+            layout.setHeaderText(getActivity().getTitle());
+
+            // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
+            // PreferenceFragment.
+            setDivider(null);
+        }
+
+        @Override
+        public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+                Bundle savedInstanceState) {
+            GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
+            return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
         }
 
         protected void startLockIntent() {
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index 94cc7281631..f0a9a262354 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -21,13 +21,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.android.setupwizardlib.GlifLayout;
-
 /**
  * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
  * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
@@ -90,22 +85,6 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
 
     public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
 
-        private GlifLayout mLayout;
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            mLayout = (GlifLayout) inflater.inflate(
-                    R.layout.setup_choose_lock_password, container, false);
-            return mLayout;
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            mLayout.setHeaderText(getActivity().getTitle());
-        }
-
         @Override
         protected Intent getRedactionInterstitialIntent(Context context) {
             return null;
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 2978196fb52..09b951e0e1e 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -20,14 +20,7 @@ import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.os.Bundle;
 import android.os.UserHandle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import com.android.setupwizardlib.GlifLayout;
 
 /**
  * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -70,13 +63,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
         return SetupChooseLockPatternFragment.class;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
-
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
         resid = SetupWizardUtils.getTheme(getIntent());
@@ -85,15 +71,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
 
     public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
 
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            final GlifLayout layout = (GlifLayout) inflater.inflate(
-                    R.layout.setup_choose_lock_pattern, container, false);
-            layout.setHeaderText(getActivity().getTitle());
-            return layout;
-        }
-
         @Override
         protected Intent getRedactionInterstitialIntent(Context context) {
             return null;
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 56585b1ceb0..59e4d073100 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -25,7 +25,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.android.settings.utils.SettingsDividerItemDecoration;
 import com.android.setupwizardlib.GlifPreferenceLayout;
@@ -94,13 +93,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
             setDivider(null);
         }
 
-        @Override
-        protected TextView createHeaderView() {
-            TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
-                    R.layout.setup_encryption_interstitial_header, null, false);
-            return message;
-        }
-
         @Override
         public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
                                                  Bundle savedInstanceState) {
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 225fe46dcbd..d527585738c 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -19,11 +19,8 @@ package com.android.settings;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.LinearLayout;
 
 import com.android.settings.notification.RedactionInterstitial;
 
@@ -55,39 +52,8 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
+    public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {
 
-    public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment
-            implements View.OnClickListener {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.setup_redaction_interstitial, container, false);
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            final Button button = (Button) view.findViewById(R.id.redaction_next_button);
-            button.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (v.getId() == R.id.redaction_next_button) {
-                final SetupRedactionInterstitial activity =
-                        (SetupRedactionInterstitial) getActivity();
-                if (activity != null) {
-                    activity.setResult(RESULT_OK, activity.getResultIntentData());
-                    finish();
-                }
-            }
-        }
+        // Setup wizard specific UI customizations can be done here
     }
 }
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 84ae35de401..b3ef85e5b94 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -25,8 +25,9 @@ import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
+import android.widget.Button;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -59,6 +60,13 @@ public class RedactionInterstitial extends SettingsActivity {
         return RedactionInterstitialFragment.class.getName().equals(fragmentName);
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
+    }
+
     /**
      * Create an intent for launching RedactionInterstitial.
      * @return An intent to launch the activity is if is available, @null if the activity is not
@@ -66,10 +74,6 @@ public class RedactionInterstitial extends SettingsActivity {
      */
     public static Intent createStartIntent(Context ctx, int userId) {
         return new Intent(ctx, RedactionInterstitial.class)
-                .putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true)
-                .putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null)
-                .putExtra(EXTRA_PREFS_SET_NEXT_TEXT, ctx.getString(
-                        R.string.app_notifications_dialog_done))
                 .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID,
                         Utils.isManagedProfile(UserManager.get(ctx), userId)
                             ? R.string.lock_screen_notifications_interstitial_title_profile
@@ -78,7 +82,8 @@ public class RedactionInterstitial extends SettingsActivity {
     }
 
     public static class RedactionInterstitialFragment extends SettingsPreferenceFragment
-            implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener {
+            implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener,
+            View.OnClickListener {
 
         private RadioGroup mRadioGroup;
         private RestrictedRadioButton mShowAllButton;
@@ -120,6 +125,20 @@ public class RedactionInterstitial extends SettingsActivity {
                 ((RadioButton) view.findViewById(R.id.hide_all))
                     .setText(R.string.lock_screen_notifications_summary_disable_profile);
             }
+
+            final Button button = (Button) view.findViewById(R.id.redaction_done_button);
+            button.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v.getId() == R.id.redaction_done_button) {
+                final RedactionInterstitial activity = (RedactionInterstitial) getActivity();
+                if (activity != null) {
+                    activity.setResult(RESULT_OK, activity.getResultIntentData());
+                    finish();
+                }
+            }
         }
 
         @Override