diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 17:37:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 17:37:35 +0000 |
| commit | ba5863929a5679b14e8dcc70c9d6f777a675459a (patch) | |
| tree | ae5aca99b530a5f6c985b46b36db3d508da0b300 /res | |
| parent | 5cf2b43f914fa3268d1adf8abace74f34d651baf (diff) | |
| parent | 3dd51556bcbf7addcc17d29dd360165ee7ede1ee (diff) | |
| download | packages_apps_Settings-ba5863929a5679b14e8dcc70c9d6f777a675459a.zip packages_apps_Settings-ba5863929a5679b14e8dcc70c9d6f777a675459a.tar.gz packages_apps_Settings-ba5863929a5679b14e8dcc70c9d6f777a675459a.tar.bz2 | |
am 3dd51556: Merge "Remove vestigial "Choose date format" option."
* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
Remove vestigial "Choose date format" option.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 9 | ||||
| -rw-r--r-- | res/values/strings.xml | 10 | ||||
| -rw-r--r-- | res/xml/date_time_prefs.xml | 5 |
3 files changed, 0 insertions, 24 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 716da00..f0462f3 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -39,15 +39,6 @@ <item>All</item> </string-array> - <!-- There is a setting to control the format of dates displayed throughout the system. This is in the Date & Time Settings screen. These will be adjusted to use punctuation appropriate to the user's locale. --> - <string-array name="date_format_values" translatable="false"> - <!-- The blank item means to use whatever the locale calls for. --> - <item></item> - <item>MM-dd-yyyy</item> - <item>dd-MM-yyyy</item> - <item>yyyy-MM-dd</item> - </string-array> - <!-- Display settings. The delay in inactivity before the screen is turned off. These are shown in a list dialog. --> <string-array name="screen_timeout_entries"> <item>15 seconds</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2ac8213..fc41d2b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -388,12 +388,6 @@ <string name="date_and_time">Date & time</string> <!-- The title of the activity to pick a time zone. --> <string name="choose_timezone">Choose time zone</string> - <!-- Do not translate. Used as the value for a setting. --> - <string name="default_date_format"><xliff:g id="default_date_format">MM/dd/yyyy</xliff:g></string> - - <!-- The option in the date-format picker for using the normal format - called for by the user's locale. --> - <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string> <!-- Label of preview text when tweaking font size --> <string name="display_preview_label">Preview:</string> @@ -711,10 +705,6 @@ <string name="date_time_set_date_title">Date</string> <!-- Date & time setting screen setting option title --> <string name="date_time_set_date">Set date</string> - <!-- Date & time setting screen setting option title. This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) [CHAR LIMIT=30] --> - <string name="date_time_date_format_title">Date format</string> - <!-- Date & time setting screen setting option title. This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) --> - <string name="date_time_date_format">Choose date format</string> <!-- Menu item on Select time zone screen --> <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string> <!-- Menu item on Select time zone screen --> diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml index 6c59ebe..d359d84 100644 --- a/res/xml/date_time_prefs.xml +++ b/res/xml/date_time_prefs.xml @@ -52,9 +52,4 @@ android:title="@string/date_time_24hour" /> - <ListPreference - android:key="date_format" - android:title="@string/date_time_date_format" - android:summary="mm/dd/yyyy"/> - </PreferenceScreen> |