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

Commit cb05c276 authored by Yvonne Wong's avatar Yvonne Wong Committed by Roman Birg
Browse files

Switch to use CMSettings for settings not involved in bootclasspath 

Issue-Id: CYNGNOS-831
Change-Id: Icffbdc9f04398f55f8356b094a1d5ed120a212ce
parent d59de63a

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ 
    <uses-permission android:name="android.permission.ACCESS_FINGERPRINT_SERVICE" />

    <uses-permission android:name="com.cyngn.stats.SEND_ANALYTICS" />

    <uses-permission android:name="cyanogenmod.permission.MODIFY_PROFILES" />

    <uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS"/>

    <uses-permission android:name="cyanogenmod.permission.WRITE_SECURE_SETTINGS"/>



    <permission

        android:name="cyanogenmod.permission.PROTECTED_APP"

res/xml/anonymous_stats.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:title="@string/anonymous_statistics_title"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">



    <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

    <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

            android:key="stats_collection"

            android:title="@string/stats_collection_title"

            android:summary="@string/stats_collection_summary"

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.SecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

            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.SecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

            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.SecureSettingSwitchPreference

        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference

            android:key="qs_show_brightness_slider"

            android:title="@string/qs_brightness_slider_title"

            android:defaultValue="true"/>

src/com/android/settings/ButtonSettings.java

+7 −6
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 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;
@@ -442,8 +443,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        try {

            // Only show the navigation bar category on devices that have a navigation bar

            // unless we are forcing it via development settings

            boolean forceNavbar = android.provider.Settings.Secure.getInt(resolver,

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

            boolean forceNavbar = Settings.Secure.getInt(resolver,

                    Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) == 1;

            boolean hasNavBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar()

                    || forceNavbar;
@@ -642,13 +643,13 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 


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

        if (enabled) {

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

                    Settings.Secure.BUTTON_BRIGHTNESS, 0);

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

                    CMSettings.Secure.BUTTON_BRIGHTNESS, 0);

        } else {

            int oldBright = prefs.getInt(ButtonBacklightBrightness.KEY_BUTTON_BACKLIGHT,

                    defaultBrightness);

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

                    Settings.Secure.BUTTON_BRIGHTNESS, oldBright);

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

                    CMSettings.Secure.BUTTON_BRIGHTNESS, oldBright);

        }

    }