From 0717e24f7d725409a0feb9b90ba5885298c14cce Mon Sep 17 00:00:00 2001
From: Al Sutton <alsutton@google.com>
Date: Mon, 19 Aug 2019 16:32:15 +0100
Subject: [PATCH] Adapt to refactoring of display config code in SettingsLib

Bug: 139449903
Test: atest SettingsUnitTest SettingsRoboTests
Change-Id: Ic188fdc02c3fa9590be27ad1bc770255e70b6276
---
 src/com/android/settings/display/DensityPreference.java  | 4 ++--
 src/com/android/settings/display/ScreenZoomSettings.java | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 61c57294bf4..d30a42a0854 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -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);
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index ad6c68533ef..13c76ce2d7b 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -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);
         }
     }