diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml
new file mode 100644
index 0000000..e5e449b
--- /dev/null
+++ b/res/layout/restricted_dialog_singlechoice.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 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="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="?android:attr/dialogPreferredPadding"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall">
+    <CheckedTextView
+            android:id="@+id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorAlertDialogListItem"
+            android:gravity="center_vertical"
+            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+            android:drawablePadding="20dp"
+            android:ellipsize="marquee" />
+    <ImageView
+            android:id="@+id/restricted_lock_icon"
+            android:layout_width="@dimen/restricted_lock_icon_size"
+            android:layout_height="@dimen/restricted_lock_icon_size"
+            android:src="@drawable/ic_settings_lock_outline"
+            android:layout_marginLeft="@dimen/restricted_lock_icon_padding"
+            android:baselineAlignBottom="true"
+            android:scaleType="centerInside"
+            android:visibility="gone" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 0456ace..1780765 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -49,7 +49,7 @@
                 settings:keywords="@string/keywords_display_wallpaper"
                 android:fragment="com.android.settings.WallpaperTypeSettings" />
 
-        <ListPreference
+        <com.android.settings.RestrictedListPreference
                 android:key="screen_timeout"
                 android:title="@string/screen_timeout"
                 android:summary="@string/screen_timeout_summary"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index b610562..a6fe1a4 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -29,7 +29,7 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-        <ListPreference
+        <com.android.settings.RestrictedListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
             android:summary="@string/lock_after_timeout_summary"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 867bed4..f8c4bd9 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -33,7 +33,7 @@
             android:key="visiblepattern"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
 
-        <ListPreference
+        <com.android.settings.RestrictedListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
             android:summary="@string/lock_after_timeout_summary"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index ac09a2c..abab140 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -29,7 +29,7 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-        <ListPreference
+        <com.android.settings.RestrictedListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
             android:summary="@string/lock_after_timeout_summary"