diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 0665047..cbde4e0 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -421,4 +421,9 @@ Date font options Change the default font of the lockscreen date widget Select lock date font + + + Date font size + Clock font size + diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml index 256833d..8a15448 100644 --- a/res/xml/cherish_settings_lockscreen.xml +++ b/res/xml/cherish_settings_lockscreen.xml @@ -62,6 +62,24 @@ android:summary="@string/lock_date_font_summary" android:persistent="false" /> + + + + diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java index dbd5401..b32a400 100644 --- a/src/com/cherish/settings/fragments/LockScreenSettings.java +++ b/src/com/cherish/settings/fragments/LockScreenSettings.java @@ -39,15 +39,20 @@ import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.cherish.settings.preferences.SystemSettingListPreference; +import com.cherish.settings.preferences.CustomSeekBarPreference; public class LockScreenSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { private static final String LOCK_CLOCK_FONTS = "lock_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 DATE_FONT_SIZE = "lockdate_font_size"; private ListPreference mLockClockFonts; private ListPreference mLockDateFonts; + private CustomSeekBarPreference mClockFontSize; + private CustomSeekBarPreference mDateFontSize; @Override public void onCreate(Bundle icicle) { @@ -71,6 +76,18 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements 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(), + Settings.System.LOCKCLOCK_FONT_SIZE, 78)); + mClockFontSize.setOnPreferenceChangeListener(this); + + // Lock Date Size + mDateFontSize = (CustomSeekBarPreference) findPreference(DATE_FONT_SIZE); + mDateFontSize.setValue(Settings.System.getInt(getContentResolver(), + Settings.System.LOCKDATE_FONT_SIZE, 18)); + mDateFontSize.setOnPreferenceChangeListener(this); } public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -88,6 +105,16 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements mLockDateFonts.setValue(String.valueOf(newValue)); mLockDateFonts.setSummary(mLockDateFonts.getEntry()); return true; + } else if (preference == mClockFontSize) { + int top = (Integer) newValue; + Settings.System.putInt(getContentResolver(), + Settings.System.LOCKCLOCK_FONT_SIZE, top*1); + return true; + } else if (preference == mDateFontSize) { + int top = (Integer) newValue; + Settings.System.putInt(getContentResolver(), + Settings.System.LOCKDATE_FONT_SIZE, top*1); + return true; } return false; }