psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherish:Remove old font options

Browse Source 
should use system fonts it will better

Removed battery info fonts
Removed date/time lockscreen fonts
Removed weather lockscreen fonts
Removed owner info lockscreen fonts
Removed traffic network fonts
Removed Clock in status fonts

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-05-25 11:53:18 +07:00
parent f496170448
commit be809d0eaa
12 changed files with 1 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
res/values/cherish_arrays.xml
View File

@@ -142,85 +142,6 @@
<item>0</item>
<item>1</item>
</string-array>
<!-- Lock Clock Fonts -->
<string-array name="lock_clock_fonts_entries">
<item>@string/lock_clock_font_stock</item>
<item>@string/lock_clock_font_italic</item>
<item>@string/lock_clock_font_bold</item>
<item>@string/lock_clock_font_bold_italic</item>
<item>@string/lock_clock_font_light_italic</item>
<item>@string/lock_clock_font_light</item>
<item>@string/lock_clock_font_thin_italic</item>
<item>@string/lock_clock_font_thin</item>
<item>@string/lock_clock_font_condensed_normal</item>
<item>@string/lock_clock_font_condensed_italic</item>
<item>@string/lock_clock_font_condensed_bold</item>
<item>@string/lock_clock_font_condensed_bold_italic</item>
<item>@string/lock_clock_font_condensed_light</item>
<item>@string/lock_clock_font_condensed_light_italic</item>
<item>@string/lock_clock_font_medium_normal</item>
<item>@string/lock_clock_font_medium_italic</item>
<item>@string/lock_clock_font_black</item>
<item>@string/lock_clock_font_black_italic</item>
<item>@string/lock_clock_font_dancingscript</item>
<item>@string/lock_clock_font_dancingscript_bold</item>
<item>@string/lock_clock_font_comingsoon</item>
<item>@string/lock_clock_font_notoserif</item>
<item>@string/lock_clock_font_notoserif_italic</item>
<item>@string/lock_clock_font_notoserif_bold</item>
<item>@string/lock_clock_font_notoserif_bold_italic</item>
<item>@string/lock_clock_font_gobold</item>
<item>@string/lock_clock_font_roadrage</item>
<item>@string/lock_clock_font_snowstorm</item>
<item>@string/lock_clock_font_googlesans</item>
<item>@string/lock_clock_font_neoneon</item>
<item>@string/lock_clock_font_themeable</item>
<item>@string/lock_clock_font_samsung</item>
<item>@string/lock_clock_font_mexcellent</item>
<item>@string/lock_clock_font_burnstown</item>
<item>@string/lock_clock_font_dumbledor</item>
<item>@string/lock_clock_font_phantombold</item>
</string-array>
<string-array name="lock_clock_fonts_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
<item>10</item>
<item>11</item>
<item>12</item>
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
<item>17</item>
<item>18</item>
<item>19</item>
<item>20</item>
<item>21</item>
<item>22</item>
<item>23</item>
<item>24</item>
<item>25</item>
<item>26</item>
<item>27</item>
<item>28</item>
<item>29</item>
<item>30</item>
<item>31</item>
<item>32</item>
<item>33</item>
<item>34</item>
<item>35</item>
</string-array>
<!-- Lockscreen clock style -->
<string-array name="lockscreen_clock_titles">
@@ -713,85 +634,6 @@
<item>27</item>
</string-array>
<!-- SB Clock Fonts -->
<string-array name="sb_clock_fonts_entries">
<item>@string/lock_clock_font_stock</item>
<item>@string/lock_clock_font_italic</item>
<item>@string/lock_clock_font_bold</item>
<item>@string/lock_clock_font_bold_italic</item>
<item>@string/lock_clock_font_light_italic</item>
<item>@string/lock_clock_font_light</item>
<item>@string/lock_clock_font_thin_italic</item>
<item>@string/lock_clock_font_thin</item>
<item>@string/lock_clock_font_condensed_normal</item>
<item>@string/lock_clock_font_condensed_italic</item>
<item>@string/lock_clock_font_condensed_bold</item>
<item>@string/lock_clock_font_condensed_bold_italic</item>
<item>@string/lock_clock_font_condensed_light</item>
<item>@string/lock_clock_font_condensed_light_italic</item>
<item>@string/lock_clock_font_medium_normal</item>
<item>@string/lock_clock_font_medium_italic</item>
<item>@string/lock_clock_font_black</item>
<item>@string/lock_clock_font_black_italic</item>
<item>@string/lock_clock_font_dancingscript</item>
<item>@string/lock_clock_font_dancingscript_bold</item>
<item>@string/lock_clock_font_comingsoon</item>
<item>@string/lock_clock_font_notoserif</item>
<item>@string/lock_clock_font_notoserif_italic</item>
<item>@string/lock_clock_font_notoserif_bold</item>
<item>@string/lock_clock_font_notoserif_bold_italic</item>
<item>@string/lock_clock_font_gobold</item>
<item>@string/lock_clock_font_roadrage</item>
<item>@string/lock_clock_font_snowstorm</item>
<item>@string/lock_clock_font_googlesans</item>
<item>@string/lock_clock_font_neoneon</item>
<item>@string/lock_clock_font_themeable</item>
<item>@string/lock_clock_font_samsung</item>
<item>@string/lock_clock_font_mexcellent</item>
<item>@string/lock_clock_font_burnstown</item>
<item>@string/lock_clock_font_dumbledor</item>
<item>@string/lock_clock_font_phantombold</item>
</string-array>
<string-array name="sb_clock_fonts_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
<item>10</item>
<item>11</item>
<item>12</item>
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
<item>17</item>
<item>18</item>
<item>19</item>
<item>20</item>
<item>21</item>
<item>22</item>
<item>23</item>
<item>24</item>
<item>25</item>
<item>26</item>
<item>27</item>
<item>28</item>
<item>29</item>
<item>30</item>
<item>31</item>
<item>33</item>
<item>33</item>
<item>34</item>
<item>35</item>
</string-array>
<!-- Lockscreen Weather styles -->
<string-array name="lockscreen_weather_bg_entries" translatable="false">
<item>@string/lockscreen_date_selection_default</item>

58
res/values/cherish_strings.xml
View File

@@ -207,8 +207,6 @@
<!-- Lockscreen battery info indicator -->
<string name="lockscreen_battery_info_title">Lockscreen charging info</string>
<string name="lockscreen_battery_info_summary">Display negociated charger max current and voltage and battery temperature on lockscreen while charging</string>
<string name="lockscreen_battery_info_font_title">Charging info font</string>
<string name="lockscreen_battery_info_dialog_title">Select charging info font</string>
<!-- Fingerprint authentication vibration -->
<string name="fprint_sucess_vib_title">Fingerprint authentication vibration</string>
@@ -258,7 +256,6 @@
<string name="network_traffic_layout">Activity layout</string>
<string name="network_traffic_layout_h">Horizontal</string>
<string name="network_traffic_layout_v">Vertical</string>
<string name="net_traffic_font">Fonts</string>
<!-- Screenshot -->
<string name="screenshot_type_title">Screenshot type</string>
@@ -267,53 +264,6 @@
<string name="screenshot_options_category">Screenshot options</string>
<string name="screenshot_options_summary">Customize screenshot attributes like time, delay,type etc</string>
<!-- Lock Clock Fonts -->
<string name="lock_clock_font_title">Clock font options</string>
<string name="custom_text_clock_font_title">Typo Clock font options</string>
<string name="lock_clock_font_summary">Change the default font of the lockscreen clock widget</string>
<string name="lock_clock_font_dialog_title">Select lock clock font</string>
<string name="lock_clock_font_stock">Normal (default)</string>
<string name="lock_clock_font_bold">Bold</string>
<string name="lock_clock_font_italic">Italic</string>
<string name="lock_clock_font_bold_italic">Bold Italic</string>
<string name="lock_clock_font_light_italic">Light Italic</string>
<string name="lock_clock_font_thin_italic">Thin Italic</string>
<string name="lock_clock_font_light">Light</string>
<string name="lock_clock_font_thin">Thin</string>
<string name="lock_clock_font_condensed_normal">Condensed</string>
<string name="lock_clock_font_condensed_italic">Condensed Italic</string>
<string name="lock_clock_font_condensed_bold">Condensed Bold</string>
<string name="lock_clock_font_condensed_bold_italic">Condensed Bold Italic</string>
<string name="lock_clock_font_condensed_light">Condensed Light</string>
<string name="lock_clock_font_condensed_light_italic">Condensed Light Italic</string>
<string name="lock_clock_font_medium_normal">Medium</string>
<string name="lock_clock_font_medium_italic">Medium Italic</string>
<string name="lock_clock_font_black">Black</string>
<string name="lock_clock_font_black_italic">Black Italic</string>
<string name="lock_clock_font_dancingscript">DancingScript</string>
<string name="lock_clock_font_dancingscript_bold">DancingScript Bold</string>
<string name="lock_clock_font_comingsoon">ComingSoon</string>
<string name="lock_clock_font_notoserif">NotoSerif Normal</string>
<string name="lock_clock_font_notoserif_italic">NotoSerif Italic</string>
<string name="lock_clock_font_notoserif_bold">NotoSerif Bold</string>
<string name="lock_clock_font_notoserif_bold_italic">NotoSerif Bold Italic</string>
<string name="lock_clock_font_gobold">GoBold Light</string>
<string name="lock_clock_font_roadrage">Road Rage</string>
<string name="lock_clock_font_snowstorm">Snowstorm</string>
<string name="lock_clock_font_googlesans">Google Sans</string>
<string name="lock_clock_font_neoneon">Neoneon</string>
<string name="lock_clock_font_themeable">Themeable (or VCR OSD Mono)</string>
<string name="lock_clock_font_samsung">Shamshung</string>
<string name="lock_clock_font_mexcellent">Mexcellent</string>
<string name="lock_clock_font_burnstown">Burnstown</string>
<string name="lock_clock_font_dumbledor">Dumbledor</string>
<string name="lock_clock_font_phantombold">PhantomBold</string>
<!-- Lock Date Fonts -->
<string name="lock_date_font_title">Date font options</string>
<string name="lock_date_font_summary">Change the default font of the lockscreen date widget</string>
<string name="lock_date_font_dialog_title">Select lock date font</string>
<!-- Lock Clock & Date Size -->
<string name="lockdate_font_size_title">Date font size</string>
<string name="lockclock_font_size_title">Clock font size</string>
@@ -742,14 +692,6 @@
<string name="lockscreen_weather_show_image_title">Show Condition Image</string>
<string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
<!-- LS Weather Temp & City Fonts -->
<string name="lock_weather_temp_font_title">LS Weather Temp font</string>
<string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
<string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
<string name="lock_weather_city_font_title">LS Weather City font</string>
<string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
<string name="lock_weather_city_dialog_title">Select lock weather city font</string>
<!-- QS Footer Text -->
<string name="qs_footer_text_title">QS footer text</string>
<string name="qs_footer_text_summary">Display text at bottom of QS panel</string>

51
res/xml/cherish_settings_lockscreen.xml
View File

@@ -24,17 +24,6 @@
android:title="@string/lockscreen_battery_info_title"
android:summary="@string/lockscreen_battery_info_summary"
android:defaultValue="true" />
<ListPreference
android:key="lockscreen_battery_info_font"
android:title="@string/lockscreen_battery_info_font_title"
android:dialogTitle="@string/lockscreen_battery_info_dialog_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="28"
android:dependency="lockscreen_battery_info"
android:persistent="false" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="charging_animation"
@@ -91,16 +80,6 @@
android:summary="%s"
android:defaultValue="2" />
<ListPreference
android:key="lock_clock_fonts"
android:title="@string/lock_clock_font_title"
android:dialogTitle="@string/lock_clock_font_dialog_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="34"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="lockclock_font_size"
android:title="@string/lockclock_font_size_title"
@@ -110,16 +89,6 @@
android:persistent="false"
android:defaultValue="65" />
<ListPreference
android:key="custom_text_clock_fonts"
android:title="@string/custom_text_clock_font_title"
android:dialogTitle="@string/lock_clock_font_dialog_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="32"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="custom_text_clock_font_size"
android:title="@string/custom_text_clock_font_size_title"
@@ -141,16 +110,6 @@
android:summary="%s"
android:defaultValue="0" />
<ListPreference
android:key="lock_date_fonts"
android:title="@string/lock_date_font_title"
android:dialogTitle="@string/lock_date_font_dialog_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="32"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="lockdate_font_size"
android:title="@string/lockdate_font_size_title"
@@ -162,16 +121,6 @@
<PreferenceCategory
android:title="Owner Info"/>
<ListPreference
android:key="lock_ownerinfo_fonts"
android:title="@string/lock_ownerinfo_font_title"
android:dialogTitle="@string/lock_ownerinfo_font_dialog_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="0"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="lockowner_font_size"

9
res/xml/clock_settings.xml
View File

@@ -96,15 +96,6 @@
android:title="@string/status_bar_clock_color_title"
android:defaultValue="0xffffffff" />
<ListPreference
android:key="status_bar_clock_font_style"
android:dialogTitle="@string/status_bar_clock_font_style_title"
android:title="@string/status_bar_clock_font_style_title"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="0" />
</PreferenceScreen>

8
res/xml/custom_carrier_label.xml
View File

@@ -29,14 +29,6 @@
android:key="custom_carrier_label"
android:title="@string/custom_carrier_label_title" />
<ListPreference
android:key="status_bar_carrier_font_style"
android:title="@string/status_bar_carrier_font_style_title"
android:dialogTitle="@string/status_bar_carrier_font_style_title"
android:entries="@array/sb_clock_fonts_entries"
android:entryValues="@array/sb_clock_fonts_values"
android:defaultValue="0" />
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="status_bar_carrier_color"
android:title="@string/status_bar_carrier_color"

20
res/xml/omnijaws_settings.xml
View File

@@ -48,16 +48,6 @@
android:title="@string/lockscreen_weather_show_city_title"
android:summary="@string/lockscreen_weather_show_city_summary"
android:defaultValue="true" />
<ListPreference
android:key="lock_weather_city_fonts"
android:title="@string/lock_weather_city_font_title"
android:dialogTitle="@string/lock_weather_city_dialog_title"
android:entries="@array/sb_clock_fonts_entries"
android:entryValues="@array/sb_clock_fonts_values"
android:summary="@string/lock_weather_city_font_summary"
android:dependency="lockscreen_weather_show_city"
android:persistent="false" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_show_temp"
@@ -73,14 +63,4 @@
android:entryValues="@array/lockscreen_weather_bg_values"
android:summary="%s"
android:defaultValue="0" />
<ListPreference
android:key="lock_weather_temp_fonts"
android:title="@string/lock_weather_temp_font_title"
android:dialogTitle="@string/lock_weather_temp_font_dialog_title"
android:entries="@array/sb_clock_fonts_entries"
android:entryValues="@array/sb_clock_fonts_values"
android:summary="@string/lock_weather_temp_font_summary"
android:dependency="lockscreen_weather_show_temp"
android:persistent="false" />
</PreferenceScreen>

8
res/xml/traffic.xml
View File

@@ -60,12 +60,4 @@
settings:defaultValue="42"
settings:units="dp" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="network_traffic_font_style"
android:title="@string/net_traffic_font"
android:entries="@array/lock_clock_fonts_entries"
android:entryValues="@array/lock_clock_fonts_values"
android:summary="%s"
android:defaultValue="0" />
</PreferenceScreen>

15
src/com/cherish/settings/fragments/ClockSettings.java
View File

@@ -60,7 +60,6 @@ public class ClockSettings extends SettingsPreferenceFragment implements
private static final String STATUS_BAR_CLOCK_DATE_FORMAT = "clock_date_format";
private static final String STATUS_BAR_CLOCK_COLOR = "status_bar_clock_color";
private static final String STATUS_BAR_CLOCK_SIZE = "status_bar_clock_size";
private static final String STATUS_BAR_CLOCK_FONT_STYLE = "status_bar_clock_font_style";
public static final int CLOCK_DATE_STYLE_LOWERCASE = 1;
public static final int CLOCK_DATE_STYLE_UPPERCASE = 2;
private static final int CUSTOM_CLOCK_DATE_FORMAT_INDEX = 18;
@@ -77,7 +76,6 @@ public class ClockSettings extends SettingsPreferenceFragment implements
private ListPreference mClockDateFormat;
private ColorPickerPreference mClockColor;
private CustomSeekBarPreference mClockSize;
private ListPreference mClockFontStyle;
private ListPreference mClockDatePosition;
@Override
@@ -127,12 +125,6 @@ public class ClockSettings extends SettingsPreferenceFragment implements
mClockSize.setValue(clockSize / 1);
mClockSize.setOnPreferenceChangeListener(this);
mClockFontStyle = (ListPreference) findPreference(STATUS_BAR_CLOCK_FONT_STYLE);
int showClockFont = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_CLOCK_FONT_STYLE, 0);
mClockFontStyle.setValue(String.valueOf(showClockFont));
mClockFontStyle.setOnPreferenceChangeListener(this);
if (DateFormat.is24HourFormat(getActivity())) {
mStatusBarAmPm.setEnabled(false);
mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);
@@ -236,13 +228,6 @@ public class ClockSettings extends SettingsPreferenceFragment implements
Settings.System.putInt(resolver,
Settings.System.STATUS_BAR_CLOCK_SIZE, width);
return true;
} else if (preference == mClockFontStyle) {
int showClockFont = Integer.valueOf((String) newValue);
int index = mClockFontStyle.findIndexOfValue((String) newValue);
Settings.System.putInt(resolver, Settings.System.
STATUS_BAR_CLOCK_FONT_STYLE, showClockFont);
mClockFontStyle.setSummary(mClockFontStyle.getEntries()[index]);
return true;
} else if (preference == mClockDateDisplay) {
int clockDateDisplay = Integer.valueOf((String) newValue);
int index = mClockDateDisplay.findIndexOfValue((String) newValue);

15
src/com/cherish/settings/fragments/CustomCarrierLabel.java
View File

@@ -45,7 +45,6 @@ public class CustomCarrierLabel extends SettingsPreferenceFragment
private static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label";
private static final String STATUS_BAR_CARRIER_COLOR = "status_bar_carrier_color";
private static final String STATUS_BAR_CARRIER_FONT_SIZE = "status_bar_carrier_font_size";
private static final String CARRIER_FONT_STYLE = "status_bar_carrier_font_style";
static final int DEFAULT_STATUS_CARRIER_COLOR = 0xffffffff;
@@ -53,7 +52,6 @@ public class CustomCarrierLabel extends SettingsPreferenceFragment
private String mCustomCarrierLabelText;
private ColorPickerPreference mCarrierColorPicker;
private CustomSeekBarPreference mStatusBarCarrierSize;
private ListPreference mCarrierFontStyle;
@Override
public void onCreate(Bundle icicle) {
@@ -82,12 +80,6 @@ public class CustomCarrierLabel extends SettingsPreferenceFragment
Settings.System.STATUS_BAR_CARRIER_FONT_SIZE, 14);
mStatusBarCarrierSize.setValue(StatusBarCarrierSize / 1);
mStatusBarCarrierSize.setOnPreferenceChangeListener(this);
mCarrierFontStyle = (ListPreference) findPreference(CARRIER_FONT_STYLE);
int showCarrierFont = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_CARRIER_FONT_STYLE, 0);
mCarrierFontStyle.setValue(String.valueOf(showCarrierFont));
mCarrierFontStyle.setOnPreferenceChangeListener(this);
}
@Override
@@ -116,13 +108,6 @@ public class CustomCarrierLabel extends SettingsPreferenceFragment
Settings.System.putInt(resolver,
Settings.System.STATUS_BAR_CARRIER_FONT_SIZE, width);
return true;
} else if (preference == mCarrierFontStyle) {
int showCarrierFont = Integer.valueOf((String) newValue);
int index = mCarrierFontStyle.findIndexOfValue((String) newValue);
Settings.System.putInt(resolver, Settings.System.
STATUS_BAR_CARRIER_FONT_STYLE, showCarrierFont);
mCarrierFontStyle.setSummary(mCarrierFontStyle.getEntries()[index]);
return true;
}
return false;
}

82
src/com/cherish/settings/fragments/LockScreenSettings.java
View File

@@ -48,18 +48,14 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
public class LockScreenSettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener {
private static final String LOCK_CLOCK_FONTS = "lock_clock_fonts";
private static final String CUSTOM_TEXT_CLOCK_FONTS = "custom_text_clock_fonts";
private static final String LOCK_DATE_FONTS = "lock_date_fonts";
private static final String CLOCK_FONT_SIZE = "lockclock_font_size";
private static final String CUSTOM_TEXT_CLOCK_FONT_SIZE = "custom_text_clock_font_size";
private static final String DATE_FONT_SIZE = "lockdate_font_size";
private static final String LOCK_OWNERINFO_FONTS = "lock_ownerinfo_fonts";
private static final String LOCKOWNER_FONT_SIZE = "lockowner_font_size";
private static final String KEY_FOD_RECOGNIZING_ANIMATION = "fod_recognizing_animation";
private static final String KEY_FOD_RECOGNIZING_ANIMATION_LIST = "fod_recognizing_animation_list";
private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
private static final String KEY_CHARGE_INFO_FONT = "lockscreen_battery_info_font";
static final int MODE_DISABLED = 0;
static final int MODE_NIGHT = 1;
@@ -67,11 +63,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
static final int MODE_MIXED_SUNSET = 3;
static final int MODE_MIXED_SUNRISE = 4;
private ListPreference mLockClockFonts;
private ListPreference mLockDateFonts;
private ListPreference mTextClockFonts;
private ListPreference mLockOwnerInfoFonts;
private ListPreference mChargingInfoFont;
private CustomSeekBarPreference mClockFontSize;
private CustomSeekBarPreference mDateFontSize;
private CustomSeekBarPreference mOwnerInfoFontSize;
@@ -87,20 +78,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
final PreferenceScreen prefScreen = getPreferenceScreen();
Resources resources = getResources();
// Lockscren Clock Fonts
mLockClockFonts = (ListPreference) findPreference(LOCK_CLOCK_FONTS);
mLockClockFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCK_CLOCK_FONTS, 34)));
mLockClockFonts.setSummary(mLockClockFonts.getEntry());
mLockClockFonts.setOnPreferenceChangeListener(this);
// Lockscren Date Fonts
mLockDateFonts = (ListPreference) findPreference(LOCK_DATE_FONTS);
mLockDateFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCK_DATE_FONTS, 32)));
mLockDateFonts.setSummary(mLockDateFonts.getEntry());
mLockDateFonts.setOnPreferenceChangeListener(this);
// Lock Clock Size
mClockFontSize = (CustomSeekBarPreference) findPreference(CLOCK_FONT_SIZE);
mClockFontSize.setValue(Settings.System.getInt(getContentResolver(),
@@ -113,32 +90,12 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
Settings.System.LOCKDATE_FONT_SIZE, 18));
mDateFontSize.setOnPreferenceChangeListener(this);
// Lockscren OwnerInfo Fonts
mLockOwnerInfoFonts = (ListPreference) findPreference(LOCK_OWNERINFO_FONTS);
mLockOwnerInfoFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCK_OWNERINFO_FONTS, 0)));
mLockOwnerInfoFonts.setSummary(mLockOwnerInfoFonts.getEntry());
mLockOwnerInfoFonts.setOnPreferenceChangeListener(this);
// Lockscren OwnerInfo Size
mOwnerInfoFontSize = (CustomSeekBarPreference) findPreference(LOCKOWNER_FONT_SIZE);
mOwnerInfoFontSize.setValue(Settings.System.getInt(getContentResolver(),
Settings.System.LOCKOWNER_FONT_SIZE,21));
mOwnerInfoFontSize.setOnPreferenceChangeListener(this);
// Lockscren Text Clock Fonts
mTextClockFonts = (ListPreference) findPreference(CUSTOM_TEXT_CLOCK_FONTS);
mTextClockFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.CUSTOM_TEXT_CLOCK_FONTS, 32)));
mTextClockFonts.setSummary(mTextClockFonts.getEntry());
mTextClockFonts.setOnPreferenceChangeListener(this);
mChargingInfoFont = (ListPreference) findPreference(KEY_CHARGE_INFO_FONT);
mChargingInfoFont.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCKSCREEN_BATTERY_INFO_FONT, 28)));
mChargingInfoFont.setSummary(mChargingInfoFont.getEntry());
mChargingInfoFont.setOnPreferenceChangeListener(this);
// Custom Text Clock Size
mCustomTextClockFontSize = (CustomSeekBarPreference) findPreference(CUSTOM_TEXT_CLOCK_FONT_SIZE);
mCustomTextClockFontSize.setValue(Settings.System.getInt(getContentResolver(),
@@ -189,26 +146,7 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver resolver = getActivity().getContentResolver();
if (preference == mLockClockFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_CLOCK_FONTS,
Integer.valueOf((String) newValue));
mLockClockFonts.setValue(String.valueOf(newValue));
mLockClockFonts.setSummary(mLockClockFonts.getEntry());
return true;
} else if (preference == mTextClockFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.CUSTOM_TEXT_CLOCK_FONTS,
Integer.valueOf((String) newValue));
mTextClockFonts.setValue(String.valueOf(newValue));
mTextClockFonts.setSummary(mTextClockFonts.getEntry());
return true;
} else if (preference == mLockDateFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_DATE_FONTS,
Integer.valueOf((String) newValue));
mLockDateFonts.setValue(String.valueOf(newValue));
mLockDateFonts.setSummary(mLockDateFonts.getEntry());
return true;
} else if (preference == mClockFontSize) {
if (preference == mClockFontSize) {
int top = (Integer) newValue;
Settings.System.putInt(getContentResolver(),
Settings.System.LOCKCLOCK_FONT_SIZE, top*1);
@@ -223,24 +161,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
Settings.System.putInt(getContentResolver(),
Settings.System.LOCKDATE_FONT_SIZE, top*1);
return true;
} else if (preference == mLockOwnerInfoFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_OWNERINFO_FONTS,
Integer.valueOf((String) newValue));
mLockOwnerInfoFonts.setValue(String.valueOf(newValue));
mLockOwnerInfoFonts.setSummary(mLockOwnerInfoFonts.getEntry());
return true;
} else if (preference == mOwnerInfoFontSize) {
int top = (Integer) newValue;
Settings.System.putInt(getContentResolver(),
Settings.System.LOCKOWNER_FONT_SIZE, top*1);
return true;
} else if (preference == mChargingInfoFont) {
int value = Integer.valueOf((String) newValue);
Settings.System.putInt(getContentResolver(),
Settings.System.LOCKSCREEN_BATTERY_INFO_FONT, value);
mChargingInfoFont.setValue(String.valueOf(value));
mChargingInfoFont.setSummary(mChargingInfoFont.getEntry());
return true;
}
return false;
}

15
src/com/cherish/settings/fragments/Traffic.java
View File

@@ -53,7 +53,6 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
private static final String NETWORK_TRAFFIC_FONT_SIZE = "network_traffic_font_size";
private static final String NETWORK_TRAFFIC_FONT_STYLE = "network_traffic_font_style";
private ListPreference mNetTrafficLocation;
private ListPreference mNetTrafficType;
@@ -61,7 +60,6 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
private CustomSeekBarPreference mNetTrafficSize;
private CustomSeekBarPreference mThreshold;
private SystemSettingSwitchPreference mShowArrows;
private SystemSettingListPreference mNetTrafficFont;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -104,12 +102,6 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
mThreshold.setOnPreferenceChangeListener(this);
mShowArrows = (SystemSettingSwitchPreference) findPreference("network_traffic_arrow");
mNetTrafficFont = (SystemSettingListPreference) findPreference(NETWORK_TRAFFIC_FONT_STYLE); int
netTrafFont = Settings.System.getInt(resolver,
Settings.System.NETWORK_TRAFFIC_FONT_STYLE, 0);
mNetTrafficFont.setValue(String.valueOf(netTrafFont));
mNetTrafficFont.setOnPreferenceChangeListener(this);
int netMonitorEnabled = Settings.System.getIntForUser(resolver,
Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT);
if (netMonitorEnabled == 1) {
@@ -179,13 +171,6 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
Settings.System.putInt(getActivity().getContentResolver(),
Settings.System.NETWORK_TRAFFIC_FONT_SIZE, width);
return true;
} else if (preference == mNetTrafficFont) {
int netTrafFont = Integer.valueOf((String) objValue);
int index = mNetTrafficFont.findIndexOfValue((String) objValue);
Settings.System.putInt(getActivity().getContentResolver(), Settings.System.
NETWORK_TRAFFIC_FONT_STYLE, netTrafFont);
mNetTrafficFont.setSummary(mNetTrafficFont.getEntries()[index]);
return true;
}
return false;
}

30
src/com/cherish/settings/preferences/fragments/OmniJawsSettings.java
View File

@@ -55,13 +55,9 @@ public class OmniJawsSettings extends SettingsPreferenceFragment implements
private static final String DEFAULT_WEATHER_ICON_PREFIX = "outline";
private static final String WEATHER_SERVICE_PACKAGE = "org.omnirom.omnijaws";
private static final String CHRONUS_ICON_PACK_INTENT = "com.dvtonder.chronus.ICON_PACK";
private static final String LOCK_WEATHER_TEMP_FONTS = "lock_weather_temp_fonts";
private static final String LOCK_WEATHER_CITY_FONTS = "lock_weather_city_fonts";
private PreferenceCategory mWeatherCategory;
private ListPreference mWeatherIconPack;
ListPreference mLockTempFonts;
ListPreference mLockCityFonts;
@Override
public int getMetricsCategory() {
@@ -103,20 +99,6 @@ public class OmniJawsSettings extends SettingsPreferenceFragment implements
mWeatherIconPack.setSummary(mWeatherIconPack.getEntry());
mWeatherIconPack.setOnPreferenceChangeListener(this);
}
// Lockscren Weather Temp Fonts
mLockTempFonts = (ListPreference) findPreference(LOCK_WEATHER_TEMP_FONTS);
mLockTempFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCK_WEATHER_TEMP_FONTS, 27)));
mLockTempFonts.setSummary(mLockTempFonts.getEntry());
mLockTempFonts.setOnPreferenceChangeListener(this);
// Lockscren Weather City Fonts
mLockCityFonts = (ListPreference) findPreference(LOCK_WEATHER_CITY_FONTS);
mLockCityFonts.setValue(String.valueOf(Settings.System.getInt(
getContentResolver(), Settings.System.LOCK_WEATHER_CITY_FONTS, 27)));
mLockCityFonts.setSummary(mLockCityFonts.getEntry());
mLockCityFonts.setOnPreferenceChangeListener(this);
}
public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -127,18 +109,6 @@ public class OmniJawsSettings extends SettingsPreferenceFragment implements
int valueIndex = mWeatherIconPack.findIndexOfValue(value);
mWeatherIconPack.setSummary(mWeatherIconPack.getEntries()[valueIndex]);
return true;
} else if (preference == mLockTempFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_WEATHER_TEMP_FONTS,
Integer.valueOf((String) objValue));
mLockTempFonts.setValue(String.valueOf(objValue));
mLockTempFonts.setSummary(mLockTempFonts.getEntry());
return true;
} else if (preference == mLockCityFonts) {
Settings.System.putInt(getContentResolver(), Settings.System.LOCK_WEATHER_CITY_FONTS,
Integer.valueOf((String) objValue));
mLockCityFonts.setValue(String.valueOf(objValue));
mLockCityFonts.setSummary(mLockCityFonts.getEntry());
return true;
}
return false;
}