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

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 1159a0a79c

Browse Source 
am: 2e8d2fabfc

* commit '2e8d2fabfcb815a2199195dd1a7669b59338fdf4':
  Remove Secure Startup option from Security Settings

Change-Id: I32d3c509f0b7ba03acc8f933d2840bb92c293872
This commit is contained in:
Clara Bayarri
2016-04-29 17:43:41 +00:00
committed by android-build-merger
parent 79a6c4ada3 2e8d2fabfc
commit c970be3876
4 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/security_settings_password_sub.xml
View File

@@ -35,10 +35,5 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary"/>
<SwitchPreference
android:key="require_cred_before_startup"
android:title="@string/lockpattern_settings_require_cred_before_startup"
android:summary="@string/lockpattern_settings_require_password_before_startup_summary"/>
</PreferenceScreen>

5
res/xml/security_settings_pattern_sub.xml
View File

@@ -39,10 +39,5 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary"/>
<SwitchPreference
android:key="require_cred_before_startup"
android:title="@string/lockpattern_settings_require_cred_before_startup"
android:summary="@string/lockpattern_settings_require_pattern_before_startup_summary"/>
</PreferenceScreen>

5
res/xml/security_settings_pin_sub.xml
View File

@@ -35,10 +35,5 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary"/>
<SwitchPreference
android:key="require_cred_before_startup"
android:title="@string/lockpattern_settings_require_cred_before_startup"
android:summary="@string/lockpattern_settings_require_pin_before_startup_summary"/>
</PreferenceScreen>