diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /overlay/packages/apps/Settings/res/values/arrays.xml | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'overlay/packages/apps/Settings/res/values/arrays.xml')
| -rw-r--r-- | overlay/packages/apps/Settings/res/values/arrays.xml | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/overlay/packages/apps/Settings/res/values/arrays.xml b/overlay/packages/apps/Settings/res/values/arrays.xml deleted file mode 100644 index 3b47031..0000000 --- a/overlay/packages/apps/Settings/res/values/arrays.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011 The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- 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 msgid="3342301044271143016">15 seconds</item> - <item msgid="8881760709354815449">30 seconds</item> - <item msgid="7589406073232279088">1 minute</item> - <item msgid="7001195990902244174">2 minutes</item> - <item msgid="7489864775127957179">5 minutes</item> - <item msgid="2314124409517439288">10 minutes</item> - </string-array> - - <!-- Do not translate. --> - <string-array name="screen_timeout_values" translatable="false"> - <!-- Do not translate. --> - <item>15000</item> - <!-- Do not translate. --> - <item>30000</item> - <!-- Do not translate. --> - <item>60000</item> - <!-- Do not translate. --> - <item>120000</item> - <!-- Do not translate. --> - <item>300000</item> - <!-- Do not translate. --> - <item>600000</item> - </string-array> -</resources> |