diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 63ce206..06604f7 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -444,4 +444,10 @@ Weather City Color Weather Icon Color YES + + + OwnerInfo font options + Change the default font of the lockscreen owner info + Select lock ownerinfo font + Owner info font size diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml index 4f2b76e..6bf2d5d 100644 --- a/res/xml/cherish_settings_lockscreen.xml +++ b/res/xml/cherish_settings_lockscreen.xml @@ -69,6 +69,16 @@ android:summary="@string/lockscreen_colors_summary" android:fragment="com.cherish.settings.fragments.LockColors" /> + + + diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java index b32a400..5ab7ccc 100644 --- a/src/com/cherish/settings/fragments/LockScreenSettings.java +++ b/src/com/cherish/settings/fragments/LockScreenSettings.java @@ -48,11 +48,15 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements 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 static final String LOCK_OWNERINFO_FONTS = "lock_ownerinfo_fonts"; + private static final String LOCKOWNER_FONT_SIZE = "lockowner_font_size"; private ListPreference mLockClockFonts; private ListPreference mLockDateFonts; + private ListPreference mLockOwnerInfoFonts; private CustomSeekBarPreference mClockFontSize; private CustomSeekBarPreference mDateFontSize; + private CustomSeekBarPreference mOwnerInfoFontSize; @Override public void onCreate(Bundle icicle) { @@ -88,6 +92,19 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements mDateFontSize.setValue(Settings.System.getInt(getContentResolver(), 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); } public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -115,6 +132,17 @@ 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; } return false; }