Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 173e3161 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Some code formatting" into lmp-dev

parents 569aec7b 9e041f02

res/xml/security_settings_lockscreen.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
            android:fragment="com.android.settings.OwnerInfoSettings"

            android:title="@string/owner_info_settings_title"

            android:summary="@string/owner_info_settings_summary"/>



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_unencrypted.xml

+0 −1
Original line number Diff line number Diff line
@@ -28,5 +28,4 @@ 
    

    </PreferenceCategory>





</PreferenceScreen>

res/xml/sim_lock_settings.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
            android:title="@string/sim_pin_toggle"

            android:summaryOn="@string/sim_lock_on"

            android:summaryOff="@string/sim_lock_off"/>



    <com.android.settings.EditPinPreference

            android:key="sim_pin"

            android:dependency="sim_toggle"
@@ -31,4 +32,5 @@ 
            android:dialogMessage="@string/sim_enter_old"

            android:positiveButtonText="@string/sim_enter_ok"

            android:negativeButtonText="@string/sim_enter_cancel"/>



</PreferenceScreen>