PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add restricted padlock support for listpreference."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-01-26 22:29:43 +00:00
committed by Android (Google) Code Review
parent 679fde4c15 550d068abd
commit 49e9f612d1
10 changed files with 448 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
res/layout/restricted_dialog_singlechoice.xml Normal file
View File

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

2
res/xml/display_settings.xml
View File

@@ -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"

2
res/xml/security_settings_password.xml
View File

@@ -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"

2
res/xml/security_settings_pattern.xml
View File

@@ -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"

2
res/xml/security_settings_pin.xml
View File

@@ -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"