Merge "Move entryvalues_font_size to SettingsLib (1/2)"
This commit is contained in:
@@ -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 />
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user