From 44ebe53cb87892d7b2c5f79eb398bbafdcc173fd Mon Sep 17 00:00:00 2001
From: chihtinglo <chihtinglo@google.com>
Date: Thu, 9 Feb 2023 16:50:44 +0800
Subject: [PATCH] Move entryvalues_font_size to SettingsLib (1/2)

Since creating the seekbar for changing font size in SystemUI requires
the size of the value entry array and the values in the array.
Therefore, we move the resource to SettingsLib to share the usage.

Bug: 242326166
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Test: Maually test the availability of changing font size through
Settings page

Change-Id: If630bd9c9c27823c210410b53342b921a11bbfb9
---
 res/values/arrays.xml                                | 12 ------------
 .../android/settings/accessibility/FontSizeData.java |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 20554429d0b..e672e24a285 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -105,18 +105,6 @@
         <item>1800000</item>
     </string-array>
 
-    <!-- NOTE: if you change this, you must also add the corresponding scale key and lookup table to
-         frameworks/base/core/java/android/content/res/FontScaleLookupTableFactory.java -->
-    <string-array name="entryvalues_font_size" translatable="false">
-        <item>0.85</item>
-        <item>1.0</item>
-        <item>1.15</item>
-        <item>1.30</item>
-        <item>1.50</item>
-        <item>1.80</item>
-        <item>2.0</item>
-    </string-array>
-
     <!-- Wi-Fi settings -->
 
     <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />
diff --git a/src/com/android/settings/accessibility/FontSizeData.java b/src/com/android/settings/accessibility/FontSizeData.java
index 6db76c9a649..88aa1aa99ce 100644
--- a/src/com/android/settings/accessibility/FontSizeData.java
+++ b/src/com/android/settings/accessibility/FontSizeData.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.provider.Settings;
 
-import com.android.settings.R;
+import com.android.settingslib.R;
 
 import java.util.Arrays;
 import java.util.List;