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

Commit d43d7920 authored by Roman Birg's avatar Roman Birg
Browse files

Settings: move advanced mode to Settings provider 



Change-Id: I8636df8a6034d576a923bb1f756be18d380f978d
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 12bd1f31

res/xml/device_info_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        </PreferenceScreen>



        <!-- Advanced mode -->

        <SwitchPreference

        <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

            android:key="advanced_mode"

            android:title="@string/advanced_mode_title"/>

src/com/android/settings/DeviceInfoSettings.java

+3 −9
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.text.TextUtils; 
import android.telephony.TelephonyManager;

import android.util.Log;

import android.widget.Toast;

import com.android.settings.cyanogenmod.SecureSettingSwitchPreference;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Index;

import com.android.settings.search.Indexable;
@@ -88,10 +89,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 


    static final int TAPS_TO_BE_A_DEVELOPER = 7;



    public static final String PREFS_FILE = "device";

    public static final String KEY_ADVANCED_MODE = "advanced_mode";



    SwitchPreference mAdvancedSettings;

    SecureSettingSwitchPreference mAdvancedSettings;



    long[] mHits = new long[3];

    int mDevHitCountdown;
@@ -195,7 +195,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
                getPreferenceScreen().removePreference(pref);

            }

        }

        mAdvancedSettings = (SwitchPreference) findPreference(KEY_ADVANCED_MODE);

        mAdvancedSettings = (SecureSettingSwitchPreference) findPreference(KEY_ADVANCED_MODE);

    }



    @Override
@@ -281,12 +281,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
                    Log.e(LOG_TAG, "Unable to start activity " + intent.toString());

                }

            }

        } else if (preference.getKey().equals(KEY_ADVANCED_MODE)) {

            final boolean isEnabled = mAdvancedSettings.isChecked();

            getActivity().getSharedPreferences(PREFS_FILE, 0)

                    .edit()

                    .putBoolean(KEY_ADVANCED_MODE, isEnabled)

                    .apply();

        }

        return super.onPreferenceTreeClick(preferenceScreen, preference);

    }

src/com/android/settings/SettingsActivity.java

+4 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.FragmentManager; 
import android.app.FragmentTransaction;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -1423,11 +1424,9 @@ public class SettingsActivity extends Activity 
    }



    public static boolean showAdvancedPreferences(Context context) {

        boolean defValue = context.getResources().getBoolean(

                R.bool.config_default_advanced_mode_enabled) || !Build.TYPE.equals("user");



        return context.getSharedPreferences(DeviceInfoSettings.PREFS_FILE, 0)

                .getBoolean(DeviceInfoSettings.KEY_ADVANCED_MODE, defValue);

        return android.provider.Settings.Secure.getInt(

                context.getContentResolver(),

                android.provider.Settings.Secure.ADVANCED_MODE, 1) == 1;

    }