Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0087167 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev

parents be84e276 3fb6e69f
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -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 />
+1 −1
Original line number Diff line number Diff line
@@ -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;