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

Commit b943be7e authored by Al Sutton's avatar Al Sutton Committed by Android (Google) Code Review
Browse files

Merge "Adapt to refactoring of display config code in SettingsLib"

parents 62950f61 0717e24f

src/com/android/settings/display/DensityPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.widget.EditText; 
import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settingslib.CustomEditTextPreferenceCompat;

import com.android.settingslib.display.DisplayDensityUtils;

import com.android.settingslib.display.DisplayDensityConfiguration;



import java.text.NumberFormat;
@@ -78,7 +78,7 @@ public class DensityPreference extends CustomEditTextPreferenceCompat { 
                final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);

                final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;

                final int densityDpi = Math.max(newDensity, 120);

                DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);

                DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);

            } catch (Exception e) {

                // TODO: display a message instead of silently failing.

                Slog.e(TAG, "Couldn't save density", e);

src/com/android/settings/display/ScreenZoomSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.settings.R; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settingslib.display.DisplayDensityConfiguration;

import com.android.settingslib.display.DisplayDensityUtils;

import com.android.settingslib.search.SearchIndexable;
@@ -100,9 +101,9 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment { 
    protected void commit() {

        final int densityDpi = mValues[mCurrentIndex];

        if (densityDpi == mDefaultDensity) {

            DisplayDensityUtils.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);

            DisplayDensityConfiguration.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);

        } else {

            DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);

            DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);

        }

    }