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

50 files changed, 25 insertions, 1483 deletions

diff --git a/overlay/packages/apps/Camera/res/values/config.xml b/overlay/packages/apps/Camera2/res/values/config.xml
index 255d6ad..ec5a188 100644
--- a/overlay/packages/apps/Camera/res/values/config.xml
+++ b/overlay/packages/apps/Camera2/res/values/config.xml
@@ -26,9 +26,5 @@
     <bool name="hasSamsungCamSettings">true</bool>
     <!-- Use ZSL mode -->
     <bool name="enableZSL">true</bool>
-    <!-- Magic for enabling ZSL on Samsung cameras -->
-    <bool name="sendMagicSamsungZSLCommand">true</bool>
-    <!-- The camera removes the focus modes by default when touch-to-focus
-         exists. Use this option to change that behavior -->
-    <bool name="wantsFocusModes">true</bool>
+    <bool name="useContinuosFocusForTouch">true</bool>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-af/arrays.xml b/overlay/packages/apps/Settings/res/values-af/arrays.xml
deleted file mode 100644
index 4f2780f..0000000
--- a/overlay/packages/apps/Settings/res/values-af/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekondes"</item>
-    <item msgid="8672738773876256432">"30 sekondes"</item>
-    <item msgid="465923292941002466">"1 minuut"</item>
-    <item msgid="7955177189296850016">"2 minute"</item>
-    <item msgid="1244255986255344525">"5 minute"</item>
-    <item msgid="294890536998091748">"10 minute"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-am/arrays.xml b/overlay/packages/apps/Settings/res/values-am/arrays.xml
deleted file mode 100644
index 73deb95..0000000
--- a/overlay/packages/apps/Settings/res/values-am/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 ሰከንዶች"</item>
-    <item msgid="8672738773876256432">"30 ሰከንዶች"</item>
-    <item msgid="465923292941002466">"1 ደቂቃ"</item>
-    <item msgid="7955177189296850016">"2 ደቂቃዎች"</item>
-    <item msgid="1244255986255344525">"5 ደቂቃዎች"</item>
-    <item msgid="294890536998091748">"10 ደቂቃዎች"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ar/arrays.xml b/overlay/packages/apps/Settings/res/values-ar/arrays.xml
deleted file mode 100644
index 396b12e..0000000
--- a/overlay/packages/apps/Settings/res/values-ar/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 ثانية"</item>
-    <item msgid="8672738773876256432">"30 ثانية"</item>
-    <item msgid="465923292941002466">"دقيقة واحدة"</item>
-    <item msgid="7955177189296850016">"دقيقتان"</item>
-    <item msgid="1244255986255344525">"5 دقائق"</item>
-    <item msgid="294890536998091748">"10 دقائق"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-bg/arrays.xml b/overlay/packages/apps/Settings/res/values-bg/arrays.xml
deleted file mode 100644
index 7c35aca..0000000
--- a/overlay/packages/apps/Settings/res/values-bg/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 секунди"</item>
-    <item msgid="8672738773876256432">"30 секунди"</item>
-    <item msgid="465923292941002466">"1 минута"</item>
-    <item msgid="7955177189296850016">"2 минути"</item>
-    <item msgid="1244255986255344525">"5 минути"</item>
-    <item msgid="294890536998091748">"10 минути"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ca/arrays.xml b/overlay/packages/apps/Settings/res/values-ca/arrays.xml
deleted file mode 100644
index 7b8afb8..0000000
--- a/overlay/packages/apps/Settings/res/values-ca/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segons"</item>
-    <item msgid="8672738773876256432">"30 segons"</item>
-    <item msgid="465923292941002466">"1 minut"</item>
-    <item msgid="7955177189296850016">"2 minuts"</item>
-    <item msgid="1244255986255344525">"5 minuts"</item>
-    <item msgid="294890536998091748">"10 minuts"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-cs/arrays.xml b/overlay/packages/apps/Settings/res/values-cs/arrays.xml
deleted file mode 100644
index 266d10e..0000000
--- a/overlay/packages/apps/Settings/res/values-cs/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 s."</item>
-    <item msgid="8672738773876256432">"30 s."</item>
-    <item msgid="465923292941002466">"1 min."</item>
-    <item msgid="7955177189296850016">"2 min."</item>
-    <item msgid="1244255986255344525">"5 min."</item>
-    <item msgid="294890536998091748">"10 min."</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-da/arrays.xml b/overlay/packages/apps/Settings/res/values-da/arrays.xml
deleted file mode 100644
index 5286122..0000000
--- a/overlay/packages/apps/Settings/res/values-da/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekunder"</item>
-    <item msgid="8672738773876256432">"30 sekunder"</item>
-    <item msgid="465923292941002466">"1 minut"</item>
-    <item msgid="7955177189296850016">"2 minutter"</item>
-    <item msgid="1244255986255344525">"5 minutter"</item>
-    <item msgid="294890536998091748">"10 minutter"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-de/arrays.xml b/overlay/packages/apps/Settings/res/values-de/arrays.xml
deleted file mode 100644
index a185f05..0000000
--- a/overlay/packages/apps/Settings/res/values-de/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 Sekunden"</item>
-    <item msgid="8672738773876256432">"30 Sekunden"</item>
-    <item msgid="465923292941002466">"1 Minute"</item>
-    <item msgid="7955177189296850016">"2 Minuten"</item>
-    <item msgid="1244255986255344525">"5 Minuten"</item>
-    <item msgid="294890536998091748">"10 Minuten"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-el/arrays.xml b/overlay/packages/apps/Settings/res/values-el/arrays.xml
deleted file mode 100644
index c5b4111..0000000
--- a/overlay/packages/apps/Settings/res/values-el/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 δευτερόλεπτα"</item>
-    <item msgid="8672738773876256432">"30 δευτερόλεπτα"</item>
-    <item msgid="465923292941002466">"1 λεπτό"</item>
-    <item msgid="7955177189296850016">"2 λεπτά"</item>
-    <item msgid="1244255986255344525">"5 λεπτά"</item>
-    <item msgid="294890536998091748">"10 λεπτά"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-en-rGB/arrays.xml b/overlay/packages/apps/Settings/res/values-en-rGB/arrays.xml
deleted file mode 100644
index d99e0a6..0000000
--- a/overlay/packages/apps/Settings/res/values-en-rGB/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 seconds"</item>
-    <item msgid="8672738773876256432">"30 seconds"</item>
-    <item msgid="465923292941002466">"1 minute"</item>
-    <item msgid="7955177189296850016">"2 minutes"</item>
-    <item msgid="1244255986255344525">"5 minutes"</item>
-    <item msgid="294890536998091748">"10 minutes"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-es-rUS/arrays.xml b/overlay/packages/apps/Settings/res/values-es-rUS/arrays.xml
deleted file mode 100644
index 9d0d76b..0000000
--- a/overlay/packages/apps/Settings/res/values-es-rUS/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segundos"</item>
-    <item msgid="8672738773876256432">"30 segundos"</item>
-    <item msgid="465923292941002466">"1 minuto"</item>
-    <item msgid="7955177189296850016">"2 minutos"</item>
-    <item msgid="1244255986255344525">"5 minutos"</item>
-    <item msgid="294890536998091748">"10 minutos"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-es/arrays.xml b/overlay/packages/apps/Settings/res/values-es/arrays.xml
deleted file mode 100644
index 9d0d76b..0000000
--- a/overlay/packages/apps/Settings/res/values-es/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segundos"</item>
-    <item msgid="8672738773876256432">"30 segundos"</item>
-    <item msgid="465923292941002466">"1 minuto"</item>
-    <item msgid="7955177189296850016">"2 minutos"</item>
-    <item msgid="1244255986255344525">"5 minutos"</item>
-    <item msgid="294890536998091748">"10 minutos"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-fa/arrays.xml b/overlay/packages/apps/Settings/res/values-fa/arrays.xml
deleted file mode 100644
index bf95ca8..0000000
--- a/overlay/packages/apps/Settings/res/values-fa/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 ثانیه"</item>
-    <item msgid="8672738773876256432">"30 ثانیه"</item>
-    <item msgid="465923292941002466">"1 دقیقه"</item>
-    <item msgid="7955177189296850016">"2 دقیقه"</item>
-    <item msgid="1244255986255344525">"5 دقیقه"</item>
-    <item msgid="294890536998091748">"10 دقیقه"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-fi/arrays.xml b/overlay/packages/apps/Settings/res/values-fi/arrays.xml
deleted file mode 100644
index 7bf4c62..0000000
--- a/overlay/packages/apps/Settings/res/values-fi/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekuntia"</item>
-    <item msgid="8672738773876256432">"30 sekuntia"</item>
-    <item msgid="465923292941002466">"1 minuutti"</item>
-    <item msgid="7955177189296850016">"2 minuuttia"</item>
-    <item msgid="1244255986255344525">"5 minuuttia"</item>
-    <item msgid="294890536998091748">"10 minuuttia"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-fr/arrays.xml b/overlay/packages/apps/Settings/res/values-fr/arrays.xml
deleted file mode 100644
index cb9e4ff..0000000
--- a/overlay/packages/apps/Settings/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 secondes"</item>
-    <item msgid="8672738773876256432">"30 secondes"</item>
-    <item msgid="465923292941002466">"1 minute"</item>
-    <item msgid="7955177189296850016">"2 minutes"</item>
-    <item msgid="1244255986255344525">"5 minutes"</item>
-    <item msgid="294890536998091748">"10 minutes"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-hi/arrays.xml b/overlay/packages/apps/Settings/res/values-hi/arrays.xml
deleted file mode 100644
index 7c2f835..0000000
--- a/overlay/packages/apps/Settings/res/values-hi/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 सेकंड"</item>
-    <item msgid="8672738773876256432">"30 सेकंड"</item>
-    <item msgid="465923292941002466">"1 मिनट"</item>
-    <item msgid="7955177189296850016">"2 मिनट"</item>
-    <item msgid="1244255986255344525">"5 मिनट"</item>
-    <item msgid="294890536998091748">"10 मिनट"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-hr/arrays.xml b/overlay/packages/apps/Settings/res/values-hr/arrays.xml
deleted file mode 100644
index 5e0c117..0000000
--- a/overlay/packages/apps/Settings/res/values-hr/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekundi"</item>
-    <item msgid="8672738773876256432">"30 sekundi"</item>
-    <item msgid="465923292941002466">"1 minuta"</item>
-    <item msgid="7955177189296850016">"2 minute"</item>
-    <item msgid="1244255986255344525">"5 minuta"</item>
-    <item msgid="294890536998091748">"10 minuta"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-hu/arrays.xml b/overlay/packages/apps/Settings/res/values-hu/arrays.xml
deleted file mode 100644
index 208464e..0000000
--- a/overlay/packages/apps/Settings/res/values-hu/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 másodperc"</item>
-    <item msgid="8672738773876256432">"30 másodperc"</item>
-    <item msgid="465923292941002466">"1 perc"</item>
-    <item msgid="7955177189296850016">"2 perc"</item>
-    <item msgid="1244255986255344525">"5 perc"</item>
-    <item msgid="294890536998091748">"10 perc"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-in/arrays.xml b/overlay/packages/apps/Settings/res/values-in/arrays.xml
deleted file mode 100644
index b3c4776..0000000
--- a/overlay/packages/apps/Settings/res/values-in/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 detik"</item>
-    <item msgid="8672738773876256432">"30 detik"</item>
-    <item msgid="465923292941002466">"1 menit"</item>
-    <item msgid="7955177189296850016">"2 menit"</item>
-    <item msgid="1244255986255344525">"5 menit"</item>
-    <item msgid="294890536998091748">"10 menit"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-it/arrays.xml b/overlay/packages/apps/Settings/res/values-it/arrays.xml
deleted file mode 100644
index 3d923d3..0000000
--- a/overlay/packages/apps/Settings/res/values-it/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 secondi"</item>
-    <item msgid="8672738773876256432">"30 secondi"</item>
-    <item msgid="465923292941002466">"1 minuto"</item>
-    <item msgid="7955177189296850016">"2 minuti"</item>
-    <item msgid="1244255986255344525">"5 minuti"</item>
-    <item msgid="294890536998091748">"10 minuti"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-iw/arrays.xml b/overlay/packages/apps/Settings/res/values-iw/arrays.xml
deleted file mode 100644
index 4a90801..0000000
--- a/overlay/packages/apps/Settings/res/values-iw/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 שניות"</item>
-    <item msgid="8672738773876256432">"30 שניות"</item>
-    <item msgid="465923292941002466">"דקה אחת"</item>
-    <item msgid="7955177189296850016">"2 דקות"</item>
-    <item msgid="1244255986255344525">"5 דקות"</item>
-    <item msgid="294890536998091748">"10 דקות"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ja/arrays.xml b/overlay/packages/apps/Settings/res/values-ja/arrays.xml
deleted file mode 100644
index abde1bf..0000000
--- a/overlay/packages/apps/Settings/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15秒"</item>
-    <item msgid="8672738773876256432">"30秒"</item>
-    <item msgid="465923292941002466">"1分"</item>
-    <item msgid="7955177189296850016">"2分"</item>
-    <item msgid="1244255986255344525">"5分"</item>
-    <item msgid="294890536998091748">"10分"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ko/arrays.xml b/overlay/packages/apps/Settings/res/values-ko/arrays.xml
deleted file mode 100644
index d2b686f..0000000
--- a/overlay/packages/apps/Settings/res/values-ko/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15초"</item>
-    <item msgid="8672738773876256432">"30초"</item>
-    <item msgid="465923292941002466">"1분"</item>
-    <item msgid="7955177189296850016">"2분"</item>
-    <item msgid="1244255986255344525">"5분"</item>
-    <item msgid="294890536998091748">"10분"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-lt/arrays.xml b/overlay/packages/apps/Settings/res/values-lt/arrays.xml
deleted file mode 100644
index 3028803..0000000
--- a/overlay/packages/apps/Settings/res/values-lt/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sek."</item>
-    <item msgid="8672738773876256432">"30 sek."</item>
-    <item msgid="465923292941002466">"1 min."</item>
-    <item msgid="7955177189296850016">"2 min."</item>
-    <item msgid="1244255986255344525">"5 min."</item>
-    <item msgid="294890536998091748">"10 min."</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-lv/arrays.xml b/overlay/packages/apps/Settings/res/values-lv/arrays.xml
deleted file mode 100644
index 19ffffd..0000000
--- a/overlay/packages/apps/Settings/res/values-lv/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekundes"</item>
-    <item msgid="8672738773876256432">"30 sekundes"</item>
-    <item msgid="465923292941002466">"1 minūte"</item>
-    <item msgid="7955177189296850016">"2 minūtes"</item>
-    <item msgid="1244255986255344525">"5 minūtes"</item>
-    <item msgid="294890536998091748">"10 minūtes"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ms/arrays.xml b/overlay/packages/apps/Settings/res/values-ms/arrays.xml
deleted file mode 100644
index 0f5b80d..0000000
--- a/overlay/packages/apps/Settings/res/values-ms/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 saat"</item>
-    <item msgid="8672738773876256432">"30 saat"</item>
-    <item msgid="465923292941002466">"1 minit"</item>
-    <item msgid="7955177189296850016">"2 minit"</item>
-    <item msgid="1244255986255344525">"5 minit"</item>
-    <item msgid="294890536998091748">"10 minit"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-nb/arrays.xml b/overlay/packages/apps/Settings/res/values-nb/arrays.xml
deleted file mode 100644
index c5db781..0000000
--- a/overlay/packages/apps/Settings/res/values-nb/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekunder"</item>
-    <item msgid="8672738773876256432">"30 sekunder"</item>
-    <item msgid="465923292941002466">"Ett minutt"</item>
-    <item msgid="7955177189296850016">"To minutter"</item>
-    <item msgid="1244255986255344525">"Fem minutter"</item>
-    <item msgid="294890536998091748">"Ti minutter"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-nl/arrays.xml b/overlay/packages/apps/Settings/res/values-nl/arrays.xml
deleted file mode 100644
index aa15318..0000000
--- a/overlay/packages/apps/Settings/res/values-nl/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 seconden"</item>
-    <item msgid="8672738773876256432">"30 seconden"</item>
-    <item msgid="465923292941002466">"1 minuut"</item>
-    <item msgid="7955177189296850016">"2 minuten"</item>
-    <item msgid="1244255986255344525">"5 minuten"</item>
-    <item msgid="294890536998091748">"10 minuten"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-pl/arrays.xml b/overlay/packages/apps/Settings/res/values-pl/arrays.xml
deleted file mode 100644
index 265da14..0000000
--- a/overlay/packages/apps/Settings/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekund"</item>
-    <item msgid="8672738773876256432">"30 sekund"</item>
-    <item msgid="465923292941002466">"1 minuta"</item>
-    <item msgid="7955177189296850016">"2 minuty"</item>
-    <item msgid="1244255986255344525">"5 minut"</item>
-    <item msgid="294890536998091748">"10 minut"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-pt-rPT/arrays.xml b/overlay/packages/apps/Settings/res/values-pt-rPT/arrays.xml
deleted file mode 100644
index 9d0d76b..0000000
--- a/overlay/packages/apps/Settings/res/values-pt-rPT/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segundos"</item>
-    <item msgid="8672738773876256432">"30 segundos"</item>
-    <item msgid="465923292941002466">"1 minuto"</item>
-    <item msgid="7955177189296850016">"2 minutos"</item>
-    <item msgid="1244255986255344525">"5 minutos"</item>
-    <item msgid="294890536998091748">"10 minutos"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-pt/arrays.xml b/overlay/packages/apps/Settings/res/values-pt/arrays.xml
deleted file mode 100644
index 1e00250..0000000
--- a/overlay/packages/apps/Settings/res/values-pt/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segundos"</item>
-    <item msgid="8672738773876256432">"30 segundos"</item>
-    <item msgid="465923292941002466">"Um minuto"</item>
-    <item msgid="7955177189296850016">"Dois minutos"</item>
-    <item msgid="1244255986255344525">"Cinco minutos"</item>
-    <item msgid="294890536998091748">"10 minutos"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ro/arrays.xml b/overlay/packages/apps/Settings/res/values-ro/arrays.xml
deleted file mode 100644
index 903ea72..0000000
--- a/overlay/packages/apps/Settings/res/values-ro/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 secunde"</item>
-    <item msgid="8672738773876256432">"30 de secunde"</item>
-    <item msgid="465923292941002466">"1 minut"</item>
-    <item msgid="7955177189296850016">"2 minute"</item>
-    <item msgid="1244255986255344525">"5 minute"</item>
-    <item msgid="294890536998091748">"10 minute"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ru/arrays.xml b/overlay/packages/apps/Settings/res/values-ru/arrays.xml
deleted file mode 100644
index b4d5e6e..0000000
--- a/overlay/packages/apps/Settings/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 секунд"</item>
-    <item msgid="8672738773876256432">"30 секунд"</item>
-    <item msgid="465923292941002466">"1 минута"</item>
-    <item msgid="7955177189296850016">"2 минуты"</item>
-    <item msgid="1244255986255344525">"5 минут"</item>
-    <item msgid="294890536998091748">"10 минут"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sk/arrays.xml b/overlay/packages/apps/Settings/res/values-sk/arrays.xml
deleted file mode 100644
index f6ffc42..0000000
--- a/overlay/packages/apps/Settings/res/values-sk/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 s"</item>
-    <item msgid="8672738773876256432">"30 s"</item>
-    <item msgid="465923292941002466">"1 min."</item>
-    <item msgid="7955177189296850016">"2 min."</item>
-    <item msgid="1244255986255344525">"5 min."</item>
-    <item msgid="294890536998091748">"10 min."</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sl/arrays.xml b/overlay/packages/apps/Settings/res/values-sl/arrays.xml
deleted file mode 100644
index c660d19..0000000
--- a/overlay/packages/apps/Settings/res/values-sl/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 s"</item>
-    <item msgid="8672738773876256432">"30 s"</item>
-    <item msgid="465923292941002466">"1 min"</item>
-    <item msgid="7955177189296850016">"2 min"</item>
-    <item msgid="1244255986255344525">"5 min"</item>
-    <item msgid="294890536998091748">"10 min"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sr/arrays.xml b/overlay/packages/apps/Settings/res/values-sr/arrays.xml
deleted file mode 100644
index bea8b75..0000000
--- a/overlay/packages/apps/Settings/res/values-sr/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 секунди"</item>
-    <item msgid="8672738773876256432">"30 секунди"</item>
-    <item msgid="465923292941002466">"1 минут"</item>
-    <item msgid="7955177189296850016">"2 минута"</item>
-    <item msgid="1244255986255344525">"5 минута"</item>
-    <item msgid="294890536998091748">"10 минута"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sv/arrays.xml b/overlay/packages/apps/Settings/res/values-sv/arrays.xml
deleted file mode 100644
index c28821f..0000000
--- a/overlay/packages/apps/Settings/res/values-sv/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 sekunder"</item>
-    <item msgid="8672738773876256432">"30 sekunder"</item>
-    <item msgid="465923292941002466">"1 minut"</item>
-    <item msgid="7955177189296850016">"2 minuter"</item>
-    <item msgid="1244255986255344525">"5 minuter"</item>
-    <item msgid="294890536998091748">"10 minuter"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sw/arrays.xml b/overlay/packages/apps/Settings/res/values-sw/arrays.xml
deleted file mode 100644
index 1eda2bd..0000000
--- a/overlay/packages/apps/Settings/res/values-sw/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"Sekunde 15"</item>
-    <item msgid="8672738773876256432">"sekunde 30"</item>
-    <item msgid="465923292941002466">"Dakika 1"</item>
-    <item msgid="7955177189296850016">"Dakika 2"</item>
-    <item msgid="1244255986255344525">"Dakika 5"</item>
-    <item msgid="294890536998091748">"Dakika 10"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-th/arrays.xml b/overlay/packages/apps/Settings/res/values-th/arrays.xml
deleted file mode 100644
index 0a62eb2..0000000
--- a/overlay/packages/apps/Settings/res/values-th/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 วินาที"</item>
-    <item msgid="8672738773876256432">"30 วินาที"</item>
-    <item msgid="465923292941002466">"1 นาที"</item>
-    <item msgid="7955177189296850016">"2 นาที"</item>
-    <item msgid="1244255986255344525">"5 นาที"</item>
-    <item msgid="294890536998091748">"10 นาที"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-tl/arrays.xml b/overlay/packages/apps/Settings/res/values-tl/arrays.xml
deleted file mode 100644
index f6eed62..0000000
--- a/overlay/packages/apps/Settings/res/values-tl/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 segundo"</item>
-    <item msgid="8672738773876256432">"30 segundo"</item>
-    <item msgid="465923292941002466">"1 minuto"</item>
-    <item msgid="7955177189296850016">"2 minuto"</item>
-    <item msgid="1244255986255344525">"5 minuto"</item>
-    <item msgid="294890536998091748">"10 minuto"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-tr/arrays.xml b/overlay/packages/apps/Settings/res/values-tr/arrays.xml
deleted file mode 100644
index 4c0aecc..0000000
--- a/overlay/packages/apps/Settings/res/values-tr/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 saniye"</item>
-    <item msgid="8672738773876256432">"30 saniye"</item>
-    <item msgid="465923292941002466">"1 dakika"</item>
-    <item msgid="7955177189296850016">"2 dakika"</item>
-    <item msgid="1244255986255344525">"5 dakika"</item>
-    <item msgid="294890536998091748">"10 dakika"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-uk/arrays.xml b/overlay/packages/apps/Settings/res/values-uk/arrays.xml
deleted file mode 100644
index 3406602..0000000
--- a/overlay/packages/apps/Settings/res/values-uk/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 секунд"</item>
-    <item msgid="8672738773876256432">"30 секунд"</item>
-    <item msgid="465923292941002466">"1 хвилина"</item>
-    <item msgid="7955177189296850016">"2 хвилини"</item>
-    <item msgid="1244255986255344525">"5 хвилин"</item>
-    <item msgid="294890536998091748">"10 хвилин"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-vi/arrays.xml b/overlay/packages/apps/Settings/res/values-vi/arrays.xml
deleted file mode 100644
index c6de6bd..0000000
--- a/overlay/packages/apps/Settings/res/values-vi/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 giây"</item>
-    <item msgid="8672738773876256432">"30 giây"</item>
-    <item msgid="465923292941002466">"1 phút"</item>
-    <item msgid="7955177189296850016">"2 phút"</item>
-    <item msgid="1244255986255344525">"5 phút"</item>
-    <item msgid="294890536998091748">"10 phút"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-zh-rCN/arrays.xml b/overlay/packages/apps/Settings/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index cb28ca4..0000000
--- a/overlay/packages/apps/Settings/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 秒"</item>
-    <item msgid="8672738773876256432">"30 秒"</item>
-    <item msgid="465923292941002466">"1 分钟"</item>
-    <item msgid="7955177189296850016">"2 分钟"</item>
-    <item msgid="1244255986255344525">"5 分钟"</item>
-    <item msgid="294890536998091748">"10 分钟"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-zh-rTW/arrays.xml b/overlay/packages/apps/Settings/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index eb9329b..0000000
--- a/overlay/packages/apps/Settings/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 秒"</item>
-    <item msgid="8672738773876256432">"30 秒"</item>
-    <item msgid="465923292941002466">"1 分鐘"</item>
-    <item msgid="7955177189296850016">"2 分鐘"</item>
-    <item msgid="1244255986255344525">"5 分鐘"</item>
-    <item msgid="294890536998091748">"10 分鐘"</item>
-  </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-zu/arrays.xml b/overlay/packages/apps/Settings/res/values-zu/arrays.xml
deleted file mode 100644
index e675fbb..0000000
--- a/overlay/packages/apps/Settings/res/values-zu/arrays.xml
+++ /dev/null
@@ -1,31 +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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"Imizuzwana engu-15"</item>
-    <item msgid="8672738773876256432">"30 amasekhondi"</item>
-    <item msgid="465923292941002466">"1 iminithi"</item>
-    <item msgid="7955177189296850016">"2 amaminithi"</item>
-    <item msgid="1244255986255344525">"5 amaminithii"</item>
-    <item msgid="294890536998091748">"10 amaminithi"</item>
-  </string-array>
-</resources>
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>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
new file mode 100644
index 0000000..0cb3e7b
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The CyanogenMod 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="urnasis:names:tc:xliff:document:1.2 ">
+    <!-- Whether or not the dock settings are to be displayed for this device when docked -->
+    <bool name="has_dock_settings">true</bool>
+</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
index f33a11e..5ba34c6 100644
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -16,12 +16,9 @@
 -->
 
 <resources xmlns:xliff="urnasis:names:tc:xliff:document:1.2 ">
-    <!-- LED Flashlight -->
-    <bool name="has_led_flash">true</bool>
-
-    <!-- Dock Settings -->
-    <bool name="has_dock_settings">true</bool>
-
     <!-- Volume Rocker Wake -->
     <bool name="config_show_volumeRockerWake">true</bool>
+
+    <!-- Home button wake support -->
+    <bool name="config_show_homeWake">true</bool>
 </resources>