Merge cherrypicks of [20611233] into udc-release.

Change-Id: I9a99d91db1d3e217b0ea5a3a7f7cb9af3999f0e7
This commit is contained in:
Android Build Coastguard Worker
2022-12-01 20:14:18 +00:00

View File

@@ -105,16 +105,11 @@
<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 -->