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

Commit 08a81d41 authored by Roman Birg's avatar Roman Birg
Browse files

Settings: fix settings not ready for migration in YOG7D 



Ref: CYNGNOS-1335

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

res/xml/device_info_settings.xml

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



        <!-- Advanced mode -->

        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

            android:key="advanced_mode"

            android:title="@string/advanced_mode_title"

            android:summary="@string/advanced_mode_summary" />

res/xml/notification_drawer_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
            android:title="@string/qs_order_title"

            android:fragment="com.android.settings.cyanogenmod.qs.QSTiles" />



        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

            android:key="sysui_qs_main_tiles"

            android:title="@string/qs_main_tiles_title"

            android:summaryOn="@string/qs_main_tiles_summary_on"
@@ -52,7 +52,7 @@ 
            android:defaultValue="false"

            settings:advanced="true"/>



        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

            android:key="qs_show_brightness_slider"

            android:title="@string/qs_brightness_slider_title"

            android:defaultValue="true"/>

src/com/android/settings/ButtonSettings.java

+4 −5
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settings.search.Indexable;



import cyanogenmod.hardware.CMHardwareManager;

import cyanogenmod.providers.CMSettings;



import java.util.ArrayList;

import java.util.HashMap;
@@ -643,13 +642,13 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 


        /* Save/restore button timeouts to disable them in softkey mode */

        if (enabled) {

            CMSettings.Secure.putInt(context.getContentResolver(),

                    CMSettings.Secure.BUTTON_BRIGHTNESS, 0);

            Settings.Secure.putInt(context.getContentResolver(),

                    Settings.Secure.BUTTON_BRIGHTNESS, 0);

        } else {

            int oldBright = prefs.getInt(ButtonBacklightBrightness.KEY_BUTTON_BACKLIGHT,

                    defaultBrightness);

            CMSettings.Secure.putInt(context.getContentResolver(),

                    CMSettings.Secure.BUTTON_BRIGHTNESS, oldBright);

            Settings.Secure.putInt(context.getContentResolver(),

                    Settings.Secure.BUTTON_BRIGHTNESS, oldBright);

        }

    }

src/com/android/settings/DeviceInfoSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;

import android.widget.Toast;



import com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference;

import com.android.settings.cyanogenmod.SecureSettingSwitchPreference;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Index;

import com.android.settings.search.Indexable;
@@ -103,7 +103,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 


    public static final String KEY_ADVANCED_MODE = "advanced_mode";



    CMSecureSettingSwitchPreference mAdvancedSettings;

    SecureSettingSwitchPreference mAdvancedSettings;



    long[] mHits = new long[3];

    int mDevHitCountdown;
@@ -227,7 +227,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
            }

        }



        mAdvancedSettings = (CMSecureSettingSwitchPreference) findPreference(KEY_ADVANCED_MODE);

        mAdvancedSettings = (SecureSettingSwitchPreference) findPreference(KEY_ADVANCED_MODE);

        // If enabled by default, just remove the setting, because it's confusing.

        removePreferenceIfBoolFalse(KEY_ADVANCED_MODE, !getResources().getBoolean(

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

src/com/android/settings/SettingsActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ import com.android.settings.wifi.SavedAccessPointsWifiSettings; 
import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.p2p.WifiP2pSettings;



import cyanogenmod.providers.CMSettings;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -1479,7 +1477,7 @@ public class SettingsActivity extends Activity 
        if (forceAdvancedMode) {

            return true;

        }

        return (CMSettings.Secure.getInt(context.getContentResolver(),

                CMSettings.Secure.ADVANCED_MODE, 0) == 1);

        return (android.provider.Settings.Secure.getInt(context.getContentResolver(),

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

    }

}