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

Commit 87f08cde authored by Danesh M's avatar Danesh M Committed by Gerrit Code Review
Browse files

Merge "Don't show phone unlock targets for devices without voice (1/2)" into cm-10.2

parents 130aee4b 7ab6784e

packages/SettingsProvider/res/values/defaults.xml

+2 −1
Original line number Diff line number Diff line
@@ -190,8 +190,9 @@ 
    2. Left -->

    <integer name="def_qs_quick_pulldown">0</integer>



    <!-- Default for Settings.System.LOCKSCREEN_TARGETS. -->

    <!-- Defaults for Settings.System.LOCKSCREEN_TARGETS. -->

    <string name="def_lockscreen_targets" translatable="false"></string>

    <string name="def_lockscreen_targets_no_telephony" translatable="false"></string>



    <!-- Default for Settings.System.UI_FORCE_OVERFLOW_BUTTON. -->

    <integer name="def_force_overflow_button">0</integer>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+8 −2
Original line number Diff line number Diff line
@@ -2033,8 +2033,14 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.System.QS_QUICK_PULLDOWN,

                    R.integer.def_qs_quick_pulldown);



            if (mContext.getResources()

                    .getBoolean(com.android.internal.R.bool.config_voice_capable)) {

                loadStringSetting(stmt, Settings.System.LOCKSCREEN_TARGETS,

                        R.string.def_lockscreen_targets);

            } else {

                loadStringSetting(stmt, Settings.System.LOCKSCREEN_TARGETS,

                        R.string.def_lockscreen_targets_no_telephony);

            }



            loadIntegerSetting(stmt, Settings.System.UI_FORCE_OVERFLOW_BUTTON,

                    R.integer.def_force_overflow_button);