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>
This commit is contained in:
Candice Lo
2023-02-10 09:19:51 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 15 deletions

View File

@@ -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 />

View File

@@ -23,7 +23,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;