add option to change icon label size separately

Author: hundeva

res/values/lean_strings.xml

@@ -98,6 +98,7 @@
     <string name="double_tap_to_lock_disable_warning">By disabling admin access, you will not be able to use double tap to lock on your home screen.</string>
 
     <string name="icon_size_title">Icon size</string>
+    <string name="icon_text_size_title">Icon label size</string>
 
     <string name="icon_size_extra_small">Extra small (-25%)</string>
     <string name="icon_size_small">Small (-10%)</string>

res/xml/launcher_preferences.xml

@@ -264,6 +264,15 @@
                 android:summary="%s"
                 android:title="@string/icon_size_title" />
 
+            <ListPreference
+                android:defaultValue="average"
+                android:entries="@array/icon_size_names"
+                android:entryValues="@array/icon_size_values"
+                android:key="pref_icon_text_size"
+                android:persistent="true"
+                android:summary="%s"
+                android:title="@string/icon_text_size_title" />
+
         </PreferenceCategory>
 
         <PreferenceCategory

src/com/android/launcher3/InvariantDeviceProfile.java

@@ -157,7 +157,8 @@ public InvariantDeviceProfile(InvariantDeviceProfile p) {
         iconSize = interpolatedDeviceProfileOut.iconSize * iconSizeModifier;
         landscapeIconSize = interpolatedDeviceProfileOut.landscapeIconSize * iconSizeModifier;
         iconBitmapSize = Utilities.pxFromDp(iconSize, dm);
-        iconTextSize = interpolatedDeviceProfileOut.iconTextSize * iconSizeModifier;
+        float iconTextSizeModifier = LeanSettings.getIconTextSizeModifier(context);
+        iconTextSize = interpolatedDeviceProfileOut.iconTextSize * iconTextSizeModifier;
         fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
 
         // If the partner customization apk contains any grid overrides, apply them

src/com/google/android/apps/nexuslauncher/SettingsActivity.java

@@ -116,6 +116,7 @@ public void onCreate(Bundle bundle) {
             findPreference(LeanSettings.HOTSEAT_ICONS).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.FORCE_COLORED_G_ICON).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.ICON_SIZE).setOnPreferenceChangeListener(this);
+            findPreference(LeanSettings.ICON_TEXT_SIZE).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.HOTSEAT_BACKGROUND).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.DARK_BOTTOM_SEARCH_BAR).setOnPreferenceChangeListener(this);
             findPreference(LeanSettings.DARK_TOP_SEARCH_BAR).setOnPreferenceChangeListener(this);
@@ -201,6 +202,7 @@ public boolean onPreferenceChange(Preference preference, final Object newValue)
                 case LeanSettings.GRID_ROWS:
                 case LeanSettings.HOTSEAT_ICONS:
                 case LeanSettings.ICON_SIZE:
+                case LeanSettings.ICON_TEXT_SIZE:
                     if (preference instanceof ListPreference) {
                         ((ListPreference) preference).setValue((String) newValue);
                     }

src/com/hdeva/launcher/LeanSettings.java

@@ -24,6 +24,7 @@ public class LeanSettings {
     public static final String FORCE_COLORED_G_ICON = "pref_colored_g_icon";
     public static final String DOUBLE_TAP_TO_LOCK = "pref_double_tap_to_lock";
     public static final String ICON_SIZE = "pref_icon_size";
+    public static final String ICON_TEXT_SIZE = "pref_icon_text_size";
     public static final String RESET_APP_VISIBILITY_ON_DEFAULT_ICON_PACK = "pref_reset_app_visibility_on_default_icon_pack";
     public static final String SEARCH_PROVIDER = "pref_search_provider";
     public static final String HOTSEAT_BACKGROUND = "pref_hotseat_background";
@@ -65,6 +66,7 @@ public class LeanSettings {
     private static final boolean FORCE_COLORED_G_ICON_DEFAULT = false;
     private static final boolean DOUBLE_TAP_TO_LOCK_DEFAULT = false;
     private static final String ICON_SIZE_DEFAULT = "average";
+    private static final String ICON_TEXT_SIZE_DEFAULT = "average";
     private static final boolean RESET_APP_VISIBILITY_ON_DEFAULT_ICON_PACK_DEFAULT = true;
     private static final String SEARCH_PROVIDER_DEFAULT = "https://www.google.com";
     private static final String HOTSEAT_BACKGROUND_DEFAULT = "100";
@@ -204,9 +206,18 @@ private static int getIconCount(Context context, String preferenceName, String p
     }
 
     public static float getIconSizeModifier(Context context) {
-        String saved = prefs(context).getString(ICON_SIZE, ICON_SIZE_DEFAULT);
+        String modifier = prefs(context).getString(ICON_SIZE, ICON_SIZE_DEFAULT);
+        return translateModifier(modifier);
+    }
+
+    public static float getIconTextSizeModifier(Context context) {
+        String modifier = prefs(context).getString(ICON_TEXT_SIZE, ICON_TEXT_SIZE_DEFAULT);
+        return translateModifier(modifier);
+    }
+
+    private static float translateModifier(String modifier) {
         float offset;
-        switch (saved) {
+        switch (modifier) {
             case "extrasmall":
                 offset = 0.75F;
                 break;