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

Merge "Some code formatting" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-29 01:01:03 +00:00
committed by Android (Google) Code Review
parent 569aec7b4d 9e041f02ec
commit 173e31619a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/security_settings_lockscreen.xml
View File

@@ -32,6 +32,7 @@
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:title="@string/owner_info_settings_title" android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary"/> android:summary="@string/owner_info_settings_summary"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

1
res/xml/security_settings_unencrypted.xml
View File

@@ -28,5 +28,4 @@
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

4
res/xml/sim_lock_settings.xml
View File

@@ -23,6 +23,7 @@
android:title="@string/sim_pin_toggle" android:title="@string/sim_pin_toggle"
android:summaryOn="@string/sim_lock_on" android:summaryOn="@string/sim_lock_on"
android:summaryOff="@string/sim_lock_off"/> android:summaryOff="@string/sim_lock_off"/>
<com.android.settings.EditPinPreference <com.android.settings.EditPinPreference
android:key="sim_pin" android:key="sim_pin"
android:dependency="sim_toggle" android:dependency="sim_toggle"
@@ -31,4 +32,5 @@
android:dialogMessage="@string/sim_enter_old" android:dialogMessage="@string/sim_enter_old"
android:positiveButtonText="@string/sim_enter_ok" android:positiveButtonText="@string/sim_enter_ok"
android:negativeButtonText="@string/sim_enter_cancel"/> android:negativeButtonText="@string/sim_enter_cancel"/>
</PreferenceScreen>
</PreferenceScreen>