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

Commit 1ce2abb9 authored by Michael Bestas's avatar Michael Bestas Committed by Steve Kondik
Browse files

Move default value for Settings.Secure.ADVANCED_MODE to core 

* Move it out of SettingsProvider so it can be used in other packages
* Upgrade DB version to force enable advanced mode when the overlay is true

Change-Id: I7caf5dbda570b1b087f37fa18f8d0c14824d9a6f
parent 0ca4e1a2

core/res/res/values/cm_symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -297,4 +297,7 @@ 
    <java-symbol type="integer" name="config_dayColorTemperature" />

    <java-symbol type="integer" name="config_nightColorTemperature" />

    <java-symbol type="integer" name="config_outdoorAmbientLux" />



    <!-- Advanced settings switch -->

    <java-symbol type="bool" name="config_advancedSettingsMode" />

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2306,4 +2306,7 @@ 
    <integer name="config_dayColorTemperature">6500</integer>

    <integer name="config_nightColorTemperature">4500</integer>

    <integer name="config_outdoorAmbientLux">9000</integer>



    <!-- Boolean to enable the advanced settings switch -->

    <bool name="config_advancedSettingsMode">true</bool>

</resources>

packages/SettingsProvider/res/values/defaults.xml

+0 −3
Original line number Diff line number Diff line
@@ -246,9 +246,6 @@ 
    <!-- Default protected sms originating address values of Settings.Secure.PROTECTED_SMS_ADDRESSES -->

    <string-array name="def_protected_sms_list_values"></string-array>



    <!-- Defaults for Settings.Secure.ADVANCED_MODE. -->

    <bool name="def_advanced_mode">true</bool>



    <!-- Default for Settings.System.QS_QUICK_PULLDOWN.

         0. Off

         1. Right

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

+23 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'

    // is properly propagated through your change.  Not doing so will result in a loss of user

    // settings.

    private static final int DATABASE_VERSION = 124;

    private static final int DATABASE_VERSION = 125;



    private static final String HEADSET = "_headset";

    private static final String SPEAKER = "_speaker";
@@ -1945,7 +1945,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"

                        + " VALUES(?,?);");

                loadBooleanSetting(stmt, Secure.ADVANCED_MODE,

                        R.bool.def_advanced_mode);

                        com.android.internal.R.bool.config_advancedSettingsMode);

                db.setTransactionSuccessful();

            } finally {

                db.endTransaction();
@@ -1992,6 +1992,26 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            upgradeVersion = 124;

        }



        if (upgradeVersion < 125) {

            // Force enable advanced settings if the overlay defaults to true

            if (mContext.getResources().getBoolean(

                    com.android.internal.R.bool.config_advancedSettingsMode)) {

                db.beginTransaction();

                SQLiteStatement stmt = null;

                try {

                    stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)"

                            + " VALUES(?,?);");

                    loadBooleanSetting(stmt, Secure.ADVANCED_MODE,

                            com.android.internal.R.bool.config_advancedSettingsMode);

                    db.setTransactionSuccessful();

                } finally {

                    db.endTransaction();

                    if (stmt != null) stmt.close();

                }

            }

            upgradeVersion = 125;

        }



        // *** Remember to update DATABASE_VERSION above!



        if (upgradeVersion != currentVersion) {
@@ -2763,7 +2783,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                    R.bool.def_cm_stats_collection);



            loadBooleanSetting(stmt, Settings.Secure.ADVANCED_MODE,

                    R.bool.def_advanced_mode);

                    com.android.internal.R.bool.config_advancedSettingsMode);



            loadDefaultThemeSettings(stmt);

            loadProtectedSmsSetting(stmt);