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

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

Merge "Move entryvalues_font_size to SettingsLib (1/2)"

parents d3ff83eb 44ebe53c
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -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 />
+1 −1
Original line number Diff line number Diff line
@@ -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;