Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev am: b0087167e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312036
Change-Id: Ie07b89f7f2095c42cd30e20d4a9a3031b679b26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ea4e6d3..b920c1b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -158,20 +158,6 @@
<item>1800000</item>
</string-array>
- <string-array name="entries_font_size">
- <item msgid="6490061470416867723">Small</item>
- <item msgid="3579015730662088893">Default</item>
- <item msgid="1678068858001018666">Large</item>
- <item msgid="490158884605093126">Largest</item>
- </string-array>
-
- <string-array name="entryvalues_font_size" translatable="false">
- <item>0.85</item>
- <item>1.0</item>
- <item>1.15</item>
- <item>1.30</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 1d4f6bd..56980a4 100644
--- a/src/com/android/settings/accessibility/FontSizeData.java
+++ b/src/com/android/settings/accessibility/FontSizeData.java
@@ -23,7 +23,7 @@
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;