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

Commit 06297f11 authored by Roman Birg's avatar Roman Birg Committed by Steve Kondik
Browse files

SettingsProvider: add advanced_mode 



Change-Id: Ie9b4cf5b8543a6b5c3f19bca148e9294b66301e0
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent c5017462

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -5871,6 +5871,13 @@ public final class Settings { 
                "navigation_ring_targets_2",

        };



        /**

         * Whether to enable "advanced mode" for the current user.

         * Boolean setting. 0 = no, 1 = yes.

         * @hide

         */

        public static final String ADVANCED_MODE = "advanced_mode";



        /**

         * This are the settings to be backed up.

         *

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -238,4 +238,7 @@ 
    <integer name="def_people_lookup">1</integer>

    <!-- 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.System.Secure.ADVANCED_MODE. -->

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

</resources>

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

+20 −1
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 = 121;

    private static final int DATABASE_VERSION = 122;



    private static final String HEADSET = "_headset";

    private static final String SPEAKER = "_speaker";
@@ -1938,6 +1938,22 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            upgradeVersion = 121;

        }



        if (upgradeVersion < 122) {

            db.beginTransaction();

            SQLiteStatement stmt = null;

            try {

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

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

                loadBooleanSetting(stmt, Secure.ADVANCED_MODE,

                        R.bool.def_advanced_mode);

                db.setTransactionSuccessful();

            } finally {

                db.endTransaction();

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

            }

            upgradeVersion = 122;

        }



        // *** Remember to update DATABASE_VERSION above!



        if (upgradeVersion != currentVersion) {
@@ -2699,6 +2715,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadBooleanSetting(stmt, Settings.Secure.STATS_COLLECTION,

                    R.bool.def_cm_stats_collection);



            loadBooleanSetting(stmt, Settings.Secure.ADVANCED_MODE,

                    R.bool.def_advanced_mode);



            loadDefaultThemeSettings(stmt);

            loadProtectedSmsSetting(stmt);

        } finally {