diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml index da39428..180dcd0 100644 --- a/res/values/cherish_arrays.xml +++ b/res/values/cherish_arrays.xml @@ -276,4 +276,117 @@ 2 3 + + + + @string/status_bar_clock_position_right + @string/status_bar_clock_position_center + @string/status_bar_clock_position_left + + + + 0 + 1 + 2 + + + + @string/status_bar_clock_position_left + @string/status_bar_clock_position_center + @string/status_bar_clock_position_right + + + + 2 + 1 + 0 + + + + @string/status_bar_clock_position_right + @string/status_bar_clock_position_left + + + + 0 + 2 + + + + @string/status_bar_clock_position_left + @string/status_bar_clock_position_right + + + + 2 + 0 + + + + @string/status_bar_am_pm_hidden + @string/status_bar_am_pm_normal + @string/status_bar_am_pm_small + + + + 2 + 0 + 1 + + + + @string/clock_date_left + @string/clock_date_right + + + + 0 + 1 + + + + @string/status_bar_date_none + @string/status_bar_date_small + @string/status_bar_date_normal + + + + 0 + 1 + 2 + + + + @string/status_bar_date_style_normal + @string/status_bar_date_style_lowercase + @string/status_bar_date_style_uppercase + + + + 0 + 1 + 2 + + + + dd/MM/yy + MM/dd/yy + yyyy-MM-dd + yyyy-dd-MM + dd-MM-yyyy + MM-dd-yyyy + MMM dd + MMM dd, yyyy + MMMM dd, yyyy + EEE + EEE dd + EEE dd/MM + EEE MM/dd + EEE dd MMM + EEE MMM dd + EEE MMMM dd + EEEE dd/MM + EEEE MM/dd + @string/status_bar_date_format_custom + diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index c066e3e..2593c22 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -76,6 +76,13 @@ Choose app Delete Remove selected item? + + + milliseconds + \u0025 + dp + seconds + x1000 ms Quick settings @@ -549,6 +556,53 @@ Double tap power button (slower single tap response), Disables double power tap for camera. Jump to camera gesture is now disabled Long press power button + + + Clock & date + Customize clock & date + Clock seconds + Display seconds next to clock in status bar + Clock style + Right + Left + Center + Hidden + Auto hide + Hide clock if launcher is visible + Hide clock at regular interval + Hide duration + Number of seconds to hide clock + Show duration + Number of seconds to wait before hiding clock + AM/PM style + 24-hour clock is enabled + Normal + Small + Hidden + Date + Hidden + Small + Normal + Date format + Date style + Normal + Lowercase + Uppercase + Custom java format + Must be in DateFormat eg. MM/dd/yy + Enter string + Date position + Right of time + Left of time + Clock font size + + + Clock + Display clock in quick status bar header + + + Date + Display date in quick status bar header Quick Settings UI diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml index 45f215b..879adc3 100644 --- a/res/xml/cherish_settings_quicksettings.xml +++ b/res/xml/cherish_settings_quicksettings.xml @@ -37,6 +37,21 @@ android:entries="@array/quick_pulldown_entries" android:entryValues="@array/quick_pulldown_values" android:defaultValue="0" /> + + + + diff --git a/res/xml/cherish_settings_status_bar_clock.xml b/res/xml/cherish_settings_status_bar_clock.xml new file mode 100644 index 0000000..1cdcc2e --- /dev/null +++ b/res/xml/cherish_settings_status_bar_clock.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml index c5977de..b3c986f 100644 --- a/res/xml/cherish_settings_statusbar.xml +++ b/res/xml/cherish_settings_statusbar.xml @@ -48,6 +48,21 @@ + + + + 0); + mClockDatePosition.setOnPreferenceChangeListener(this); + + mClockDateStyle = (SystemSettingListPreference) findPreference(CLOCK_DATE_STYLE); + mClockDateStyle.setEnabled(dateDisplay > 0); + mClockDateStyle.setOnPreferenceChangeListener(this); + + mClockDateFormat = (ListPreference) findPreference(CLOCK_DATE_FORMAT); + if (mClockDateFormat.getValue() == null) { + mClockDateFormat.setValue("EEE"); + } + parseClockDateFormats(); + mClockDateFormat.setEnabled(dateDisplay > 0); + mClockDateFormat.setOnPreferenceChangeListener(this); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + AlertDialog dialog; + ContentResolver resolver = getActivity().getContentResolver(); + if (preference == mClockDateDisplay) { + int val = Integer.parseInt((String) newValue); + if (val == 0) { + mClockDatePosition.setEnabled(false); + mClockDateStyle.setEnabled(false); + mClockDateFormat.setEnabled(false); + } else { + mClockDatePosition.setEnabled(true); + mClockDateStyle.setEnabled(true); + mClockDateFormat.setEnabled(true); + } + return true; + } else if (preference == mClockDatePosition) { + parseClockDateFormats(); + return true; + } else if (preference == mClockDateStyle) { + parseClockDateFormats(); + return true; + } else if (preference == mClockDateFormat) { + int index = mClockDateFormat.findIndexOfValue((String) newValue); + + if (index == CUSTOM_CLOCK_DATE_FORMAT_INDEX) { + AlertDialog.Builder alert = new AlertDialog.Builder(getActivity()); + alert.setTitle(R.string.status_bar_date_string_edittext_title); + alert.setMessage(R.string.status_bar_date_string_edittext_summary); + + final EditText input = new EditText(getActivity()); + String oldText = Settings.System.getString( + resolver, + Settings.System.STATUS_BAR_CLOCK_DATE_FORMAT); + if (oldText != null) { + input.setText(oldText); + } + alert.setView(input); + + alert.setPositiveButton(R.string.menu_save, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int whichButton) { + String value = input.getText().toString(); + if (value.equals("")) { + return; + } + Settings.System.putString(resolver, + Settings.System.STATUS_BAR_CLOCK_DATE_FORMAT, value); + + return; + } + }); + + alert.setNegativeButton(R.string.menu_cancel, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int which) { + return; + } + }); + dialog = alert.create(); + dialog.show(); + } else { + if ((String) newValue != null) { + Settings.System.putString(resolver, + Settings.System.STATUS_BAR_CLOCK_DATE_FORMAT, (String) newValue); + } + } + return true; + } + return false; + } + + private void parseClockDateFormats() { + String[] dateEntries = getResources().getStringArray( + R.array.status_bar_date_format_entries_values); + CharSequence parsedDateEntries[]; + parsedDateEntries = new String[dateEntries.length]; + Date now = new Date(); + + int lastEntry = dateEntries.length - 1; + int dateFormat = Settings.System.getIntForUser(getActivity() + .getContentResolver(), Settings.System.STATUS_BAR_CLOCK_DATE_STYLE, 0, UserHandle.USER_CURRENT); + for (int i = 0; i < dateEntries.length; i++) { + if (i == lastEntry) { + parsedDateEntries[i] = dateEntries[i]; + } else { + String newDate; + CharSequence dateString = DateFormat.format(dateEntries[i], now); + if (dateFormat == CLOCK_DATE_STYLE_LOWERCASE) { + newDate = dateString.toString().toLowerCase(); + } else if (dateFormat == CLOCK_DATE_STYLE_UPPERCASE) { + newDate = dateString.toString().toUpperCase(); + } else { + newDate = dateString.toString(); + } + + parsedDateEntries[i] = newDate; + } + } + mClockDateFormat.setEntries(parsedDateEntries); + } + + @Override + public int getMetricsCategory() { + return MetricsEvent.CHERISH_SETTINGS; + } + + /** + * For Search. + */ + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.cherish_settings_status_bar_clock); +} \ No newline at end of file