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

Commit 0586321e authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e"

parents 49323d33 ef5445f8

res/xml/security_settings_password_sub.xml

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
                android:title="@string/lock_after_timeout"

                android:summary="@string/lock_after_timeout_summary"

                android:entries="@array/lock_after_timeout_entries"

                android:entryValues="@array/lock_after_timeout_values"

                android:persistent="false"/>

                android:entryValues="@array/lock_after_timeout_values" />



        <SwitchPreference

                android:key="power_button_instantly_locks"

res/xml/security_settings_pattern_sub.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
                android:title="@string/lock_after_timeout"

                android:summary="@string/lock_after_timeout_summary"

                android:entries="@array/lock_after_timeout_entries"

                android:entryValues="@array/lock_after_timeout_values"

                android:persistent="false"/>

                android:entryValues="@array/lock_after_timeout_values" />



        <SwitchPreference

                android:key="power_button_instantly_locks"

res/xml/security_settings_pin_sub.xml

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
                android:title="@string/lock_after_timeout"

                android:summary="@string/lock_after_timeout_summary"

                android:entries="@array/lock_after_timeout_entries"

                android:entryValues="@array/lock_after_timeout_values"

                android:persistent="false"/>

                android:entryValues="@array/lock_after_timeout_values" />



        <SwitchPreference

                android:key="power_button_instantly_locks"

src/com/android/settings/GearPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class GearPreference extends Preference implements View.OnClickListener { 


    public void setOnGearClickListener(OnGearClickListener l) {

        mOnGearClickListener = l;

        notifyChanged();

    }



    @Override