summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-17 17:44:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 17:44:24 +0000
commit150b646833f2614021a5d3f3a68efa07d73c87e3 (patch)
tree2b557daa23d8ea67ec3355e969a8af4efb208b6c /res/values/arrays.xml
parent74866c8634e62e02933d436d05e634e6ab6f4594 (diff)
parentba5863929a5679b14e8dcc70c9d6f777a675459a (diff)
downloadpackages_apps_Settings-150b646833f2614021a5d3f3a68efa07d73c87e3.zip
packages_apps_Settings-150b646833f2614021a5d3f3a68efa07d73c87e3.tar.gz
packages_apps_Settings-150b646833f2614021a5d3f3a68efa07d73c87e3.tar.bz2
am ba586392: am 3dd51556: Merge "Remove vestigial "Choose date format" option."
* commit 'ba5863929a5679b14e8dcc70c9d6f777a675459a': Remove vestigial "Choose date format" option.
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r--res/values/arrays.xml9
1 files changed, 0 insertions, 9 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 82c9003..28ac8dd 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>