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

Commit 716ff200 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1835-master-max_brightness' into 'master' 

Turn off high brightness by default

See merge request !68
parents fedc4747 818f19d3

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+21 −16
Original line number Diff line number Diff line
@@ -367,23 +367,28 @@ public class MainActivity extends AppCompatActivity { 
            Log.d(TAG, "onCreate: time after updating folder history: " + (System.currentTimeMillis() - debug_time));



        SharedPreferences.Editor editor = sharedPreferences.edit();

        if (DeviceSettings.isMurenaOne()) {

            boolean isFirstTime = sharedPreferences.getBoolean("isFirstTimeMurenaOne", true);

            if (isFirstTime && applicationInterface.getEdgeModePref().equals("default")) {

        int isFirstTime = sharedPreferences.getInt("isFirstTimeChange", 0);

        switch (isFirstTime) {

            case 0:

                String edge_pref = applicationInterface.getEdgeModePref();

                if (DeviceSettings.isMurenaOne() && edge_pref.equals("default")) {

                    editor.putString(PreferenceKeys.EdgeModePreferenceKey, "off");

                editor.putBoolean("isFirstTimeMurenaOne", false);

                editor.apply();

            }

                }



        boolean isFirstTimeSaveLocation = sharedPreferences.getBoolean("isFirstTimeSaveLocation", true);

        String save_location = sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "Camera");



        if (isFirstTimeSaveLocation && save_location.equals("OpenCamera")) {

                String save_location = sharedPreferences.getString(

                        PreferenceKeys.SaveLocationPreferenceKey, "Camera");

                if (save_location.equals("OpenCamera")) {

                    editor.putString(PreferenceKeys.SaveLocationPreferenceKey, "Camera");

            editor.putBoolean("isFirstTimeSaveLocation", false);

            editor.apply();

                }

                isFirstTime++;

            case 1:

                editor.putBoolean(PreferenceKeys.MaxBrightnessPreferenceKey, false);

                isFirstTime++;

                break;

            default:

                break;

        }



        editor.putInt("isFirstTimeChange", isFirstTime).apply();



        // set up sensors

        mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
@@ -3906,7 +3911,7 @@ public class MainActivity extends AppCompatActivity { 
        // done here rather than onCreate, so that changing it in preferences takes effect without restarting app

        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);

        final WindowManager.LayoutParams layout = getWindow().getAttributes();

        if( force_max || sharedPreferences.getBoolean(PreferenceKeys.MaxBrightnessPreferenceKey, true) ) {

        if( force_max || sharedPreferences.getBoolean(PreferenceKeys.MaxBrightnessPreferenceKey, false) ) {

            layout.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL;

        }

        else {

app/src/main/res/xml/preferences.xml

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ 
                android:key="preference_max_brightness"

                android:title="@string/preference_max_brightness"

                android:summary="@string/preference_max_brightness_summary"

                android:defaultValue="true"

                android:defaultValue="false"

                />



        </PreferenceScreen>