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

Commit f781045d authored by Roman Birg's avatar Roman Birg Committed by Brint E. Kriebel
Browse files

Settings: persist backlight brightness setting 



Save the user value locally every time it is modified so we can retreive
it reliably.

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

src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java

+11 −0
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.app.AlertDialog; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.preference.DialogPreference;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.util.AttributeSet;

import android.view.View;
@@ -43,6 +45,8 @@ public class ButtonBacklightBrightness extends DialogPreference implements 
        SeekBar.OnSeekBarChangeListener {

    private static final int DEFAULT_BUTTON_TIMEOUT = 5;



    public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";



    private Window mWindow;



    private BrightnessControl mButtonBrightness;
@@ -159,6 +163,13 @@ public class ButtonBacklightBrightness extends DialogPreference implements 
            return;

        }



        if (mButtonBrightness != null) {

            PreferenceManager.getDefaultSharedPreferences(getContext())

                    .edit()

                    .putInt(KEY_BUTTON_BACKLIGHT, mButtonBrightness.getBrightness(false))

                    .apply();

        }



        applyTimeout(mTimeoutBar.getProgress());

        if (mButtonBrightness != null) {

            mButtonBrightness.applyBrightness();

src/com/android/settings/cyanogenmod/ButtonSettings.java

+2 −11
Original line number Diff line number Diff line
@@ -534,7 +534,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            Settings.System.putInt(context.getContentResolver(),

                    Settings.System.BUTTON_BRIGHTNESS, 0);

        } else {

            int oldBright = prefs.getInt("pre_navbar_button_backlight", defaultBrightness);

            int oldBright = prefs.getInt(ButtonBacklightBrightness.KEY_BUTTON_BACKLIGHT,

                    defaultBrightness);

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

                    Settings.System.BUTTON_BRIGHTNESS, oldBright);

        }
@@ -609,16 +610,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            mDisableNavigationKeys.setEnabled(false);



            mNavigationPreferencesCat.setEnabled(false);



            if (mDisableNavigationKeys.isChecked()) {

                // enabling virtual nav keys, back it up lights setting

                final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(

                        getActivity());

                int currentBrightness = Settings.System.getInt(getActivity().getContentResolver(),

                        Settings.System.BUTTON_BRIGHTNESS, -1);

                prefs.edit().putInt("pre_navbar_button_backlight", currentBrightness).apply();

            }



            writeDisableNavkeysOption(getActivity(), mDisableNavigationKeys.isChecked());

            updateDisableNavkeysOption();

            mHandler.postDelayed(new Runnable() {