z2_plus: Doze clean up

* remove always enabled option
* use stock fade in delay
* squashed new and updated translations

Change-Id: Ieebf13f88c02d5036a09b5ef83ca1b53bd6771ac

33 files changed, 135 insertions, 99 deletions

diff --git a/doze/res/values-bg/strings.xml b/doze/res/values-bg/strings.xml
index d51d0b3..6853d8f 100644
--- a/doze/res/values-bg/strings.xml
+++ b/doze/res/values-bg/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Атмосферен екран</string>
   <string name="ambient_display_summary">Събуждане на екрана при получаване на известие</string>
-  <string name="always_enabled_title">Винаги разрешено</string>
-  <string name="always_enabled_summary">Останете на линия за събития, веднага след като екранът се изключи</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Сензор за наклон</string>
   <string name="pick_up_title">Отговор</string>
@@ -24,9 +22,9 @@
   <!-- Proximity sensor -->
   <string name="priximity_sensor_title">Сензор за близост</string>
   <string name="hand_wave_gesture_title">Махане с ръка</string>
-  <string name="hand_wave_gesture_summary">Светлинна индикация при махане с ръка</string>
+  <string name="hand_wave_gesture_summary">Показва известията при прекарване на ръка над екрана</string>
   <string name="pocket_gesture_title">Джоб</string>
-  <string name="pocket_gesture_summary">Светлинна индикация при изваждане от джоб</string>
+  <string name="pocket_gesture_summary">Показва известията, когато извадите устройството от джоба си</string>
   <!-- Help text -->
   <string name="dlg_ok">ОK</string>
   <string name="doze_settings_help_title">Помощ</string>
diff --git a/doze/res/values-bs-rBA/strings.xml b/doze/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..c023c08
--- /dev/null
+++ b/doze/res/values-bs-rBA/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 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="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Tilt sensor -->
+  <!-- Proximity sensor -->
+  <!-- Help text -->
+</resources>
diff --git a/doze/res/values-ca/strings.xml b/doze/res/values-ca/strings.xml
index a948814..8903c2c 100644
--- a/doze/res/values-ca/strings.xml
+++ b/doze/res/values-ca/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Pantalla ambient</string>
   <string name="ambient_display_summary">Encen la pantalla quan rebis notificacions</string>
-  <string name="always_enabled_title">Sempre habilitat</string>
-  <string name="always_enabled_summary">Estigues atent als esdeveniments del sensor tan aviat com s\'apagui la pantalla</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Sensor d\'inclinació</string>
   <string name="pick_up_title">Contesta</string>
diff --git a/doze/res/values-cs/strings.xml b/doze/res/values-cs/strings.xml
index 4738828..3c6e7a6 100644
--- a/doze/res/values-cs/strings.xml
+++ b/doze/res/values-cs/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Ambientní displej</string>
   <string name="ambient_display_summary">Probudit obrazovku při upozornění</string>
-  <string name="always_enabled_title">Vždy povolit</string>
-  <string name="always_enabled_summary">Naslouchat událostem senzoru ihned po vypnutí obrazovky</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Senzor náklonu</string>
   <string name="pick_up_title">Sebrání</string>
diff --git a/doze/res/values-da/strings.xml b/doze/res/values-da/strings.xml
index fffc2be..f6f9e6f 100644
--- a/doze/res/values-da/strings.xml
+++ b/doze/res/values-da/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Inaktivitetsvisning</string>
   <string name="ambient_display_summary">Tænder skærmen, når du modtager notifikationer</string>
-  <string name="always_enabled_title">Aktiver altid</string>
-  <string name="always_enabled_summary">Lyt efter sensoraktiviteter så snart skærmen slukkes</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Tilt-sensor</string>
   <string name="pick_up_title">Samle op</string>
diff --git a/doze/res/values-de/strings.xml b/doze/res/values-de/strings.xml
index 033da28..75e5cb1 100644
--- a/doze/res/values-de/strings.xml
+++ b/doze/res/values-de/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Inaktivitätsdisplay</string>
   <string name="ambient_display_summary">Bildschirm einschalten, wenn Sie Benachrichtigungen erhalten</string>
-  <string name="always_enabled_title">Immer aktiviert</string>
-  <string name="always_enabled_summary">Auf den Sensor reagieren, sobald der Bildschirm ausgeschaltet wird</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Neigungssensor</string>
   <string name="pick_up_title">Aufnehmen</string>
@@ -30,4 +28,5 @@
   <!-- Help text -->
   <string name="dlg_ok">OK</string>
   <string name="doze_settings_help_title">Hilfe</string>
+  <string name="doze_settings_help_text">Diese Features verwenden Sensoren, um im Standby kurz Benachrichtigungen einzublenden. Der gewählte Sensor wird nur bei Eingang einer Benachrichtigung aktiviert. Dies hilft dabei, den Stromverbrauch zu reduzieren. Alternativ kann der Sensor sofort beim Abschalten des Bildschirms aktiviert werden, wodurch sich jedoch der Stromverbrauch erhöht.</string>
 </resources>
diff --git a/doze/res/values-es-rCO/strings.xml b/doze/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..c023c08
--- /dev/null
+++ b/doze/res/values-es-rCO/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 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="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Tilt sensor -->
+  <!-- Proximity sensor -->
+  <!-- Help text -->
+</resources>
diff --git a/doze/res/values-eu-rES/strings.xml b/doze/res/values-eu-rES/strings.xml
index 5a2ad35..1c9a9c3 100644
--- a/doze/res/values-eu-rES/strings.xml
+++ b/doze/res/values-eu-rES/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Ambient display</string>
   <string name="ambient_display_summary">Piztu pantaila jakinarazpenak jasotzean</string>
-  <string name="always_enabled_title">Gaitu beti</string>
-  <string name="always_enabled_summary">Sentsoreen gertakizunei entzun pantaila itzali eta berehala</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Inklinazio sentsorea</string>
   <string name="pick_up_title">Hartu</string>
diff --git a/doze/res/values-fi/strings.xml b/doze/res/values-fi/strings.xml
index 6806978..56ad485 100644
--- a/doze/res/values-fi/strings.xml
+++ b/doze/res/values-fi/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Ambient-näyttö</string>
   <string name="ambient_display_summary">Herätä näyttö kun saat ilmoituksia</string>
-  <string name="always_enabled_title">Käytä aina</string>
-  <string name="always_enabled_summary">Havaitse sensorin tapahtumia kun näyttö sammuu</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Kallistussensori</string>
   <string name="pick_up_title">Nosto</string>
diff --git a/doze/res/values-fr/strings.xml b/doze/res/values-fr/strings.xml
index c023c08..a705beb 100644
--- a/doze/res/values-fr/strings.xml
+++ b/doze/res/values-fr/strings.xml
@@ -13,7 +13,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="ambient_display_title">Affichage ambiant</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">Capteur d’inclinaison</string>
+  <string name="pick_up_title">Prise en main</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">Capteur de proximité</string>
+  <string name="hand_wave_gesture_title">Passage de la main</string>
+  <string name="pocket_gesture_title">Poche</string>
   <!-- Help text -->
+  <string name="dlg_ok">OK</string>
 </resources>
diff --git a/doze/res/values-ga-rIE/strings.xml b/doze/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..c023c08
--- /dev/null
+++ b/doze/res/values-ga-rIE/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 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="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Tilt sensor -->
+  <!-- Proximity sensor -->
+  <!-- Help text -->
+</resources>
diff --git a/doze/res/values-gl-rES/strings.xml b/doze/res/values-gl-rES/strings.xml
index c023c08..1bd3acd 100644
--- a/doze/res/values-gl-rES/strings.xml
+++ b/doze/res/values-gl-rES/strings.xml
@@ -13,7 +13,20 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="ambient_display_title">Visualización ambiente</string>
+  <string name="ambient_display_summary">Activar a pantalla ao recibir notificacións</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">Sensor de inclinación</string>
+  <string name="pick_up_title">Coller</string>
+  <string name="pick_up_summary">Amosar notificacións ao coller o dispositivo</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">Sensor de proximidade</string>
+  <string name="hand_wave_gesture_title">Pasar a man</string>
+  <string name="hand_wave_gesture_summary">Amosar notificacións ao pasar a man</string>
+  <string name="pocket_gesture_title">Peto</string>
+  <string name="pocket_gesture_summary">Amosar notificacións ao sacar do peto</string>
   <!-- Help text -->
+  <string name="dlg_ok">ACEPTAR</string>
+  <string name="doze_settings_help_title">Axuda</string>
+  <string name="doze_settings_help_text">Estas características usan eventos do sensor para amosar unha notificación latente. O sensor seleccionado habilitarase só cando reciba unha notificación axudando a reducir o consumo da batería. Tamén existe unha opción para activar o sensor así que se apague a pantalla, pero isto causará un maior uso da batería.</string>
 </resources>
diff --git a/doze/res/values-hr/strings.xml b/doze/res/values-hr/strings.xml
index 1742320..0424dc0 100644
--- a/doze/res/values-hr/strings.xml
+++ b/doze/res/values-hr/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Ambijentni zaslon</string>
   <string name="ambient_display_summary">Probudi zaslon kada primite obavijesti</string>
-  <string name="always_enabled_title">Uvijek omogući</string>
-  <string name="always_enabled_summary">Praćenje senzora čim se zaslon isključi</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Senzor nagiba</string>
   <string name="pick_up_title">Podizanje</string>
diff --git a/doze/res/values-hu/strings.xml b/doze/res/values-hu/strings.xml
index c023c08..ddbfce3 100644
--- a/doze/res/values-hu/strings.xml
+++ b/doze/res/values-hu/strings.xml
@@ -13,7 +13,20 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="ambient_display_title">Környezeti kijelző</string>
+  <string name="ambient_display_summary">Képernyő felébresztése értesítések fogadásakor</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">Dőlés érzékelő</string>
+  <string name="pick_up_title">Kézbevétel</string>
+  <string name="pick_up_summary">Villantsa fel az értesítéseket kézbevételkor</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">Közelség érzékelő</string>
+  <string name="hand_wave_gesture_title">Lebegő simítás</string>
+  <string name="hand_wave_gesture_summary">Értesítések felvillantása lebegő simításnál</string>
+  <string name="pocket_gesture_title">Zseb</string>
+  <string name="pocket_gesture_summary">Értesítések felvillantása zsebből való kivételkor</string>
   <!-- Help text -->
+  <string name="dlg_ok">Rendben</string>
+  <string name="doze_settings_help_title">Súgó</string>
+  <string name="doze_settings_help_text">Ezen funkció az érzékelő eseményeket használja a környezeti kijelző értesítési impulzusaihoz. A választott érzékelő csak akkor engedélyezett, ha a készülék értesítést kap, ez segít csökkenteni az akkumulátor használatát. Lehetőség van a választott érzékelő engedélyezésére is, amint a képernyő kikapcsol, de ez nagyobb akkumulátor használatot jelent.</string>
 </resources>
diff --git a/doze/res/values-it/strings.xml b/doze/res/values-it/strings.xml
index 15530e7..a941fe2 100644
--- a/doze/res/values-it/strings.xml
+++ b/doze/res/values-it/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Display Ambient</string>
   <string name="ambient_display_summary">Accendi lo schermo quando ricevi una notifica</string>
-  <string name="always_enabled_title">Sempre attivo</string>
-  <string name="always_enabled_summary">Attiva i sensori per gli eventi appena lo schermo si spegne</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Sensore inclinazione</string>
   <string name="pick_up_title">Solleva</string>
diff --git a/doze/res/values-iw/strings.xml b/doze/res/values-iw/strings.xml
index b696fe1..15c2890 100644
--- a/doze/res/values-iw/strings.xml
+++ b/doze/res/values-iw/strings.xml
@@ -14,11 +14,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">תצוגת התראות עמומה</string>
+  <string name="ambient_display_summary">הפעל את המסך כשמתקבלות התראות</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">חיישן הטייה</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">חיישן קרבה</string>
+  <string name="hand_wave_gesture_title">הנפת יד</string>
+  <string name="hand_wave_gesture_summary">הדגש התראות בהנפת יד</string>
   <string name="pocket_gesture_title">כיס</string>
   <string name="pocket_gesture_summary">הצג התראות בהוצאה מהכיס</string>
   <!-- Help text -->
   <string name="dlg_ok">אישור</string>
   <string name="doze_settings_help_title">עזרה</string>
+  <string name="doze_settings_help_text">התכונות נעזרות בחיישני אירועים כדי להפעיל הדגשת התראות עם Doze. החיישן הנבחר מופעל רק כאשר המכשיר מקבל התראה, מה שעוזר להקטין את השימוש בסוללה. בנוסף, יש אפשרות להפעיל את החיישן הנבחר ברגע שהמסך נכבה, מה שעלול לגרום לשימוש רב יותר בסוללה.</string>
 </resources>
diff --git a/doze/res/values-ja/strings.xml b/doze/res/values-ja/strings.xml
index c023c08..70e7d49 100644
--- a/doze/res/values-ja/strings.xml
+++ b/doze/res/values-ja/strings.xml
@@ -13,7 +13,20 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="ambient_display_title">常に画面表示ディスプレイ</string>
+  <string name="ambient_display_summary">通知を受信したときに画面を点灯する</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">傾きセンサー</string>
+  <string name="pick_up_title">持ち上げ</string>
+  <string name="pick_up_summary">端末を持ち上げたときに通知を点滅表示する</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">接近センサー</string>
+  <string name="hand_wave_gesture_title">手を振る</string>
+  <string name="hand_wave_gesture_summary">手を振ったときに通知を点滅表示する</string>
+  <string name="pocket_gesture_title">ポケット</string>
+  <string name="pocket_gesture_summary">ポケットから取り出したときに通知を点滅表示する</string>
   <!-- Help text -->
+  <string name="dlg_ok">OK</string>
+  <string name="doze_settings_help_title">ヘルプ</string>
+  <string name="doze_settings_help_text">これらの機能はdoze通知点滅表示を起動するためにセンサーイベントを使用します。電池の使用量を削減するために、端末が通知を受信した時にのみ選択したセンサーが有効になります。画面を消灯した直後から選択したセンサーを有効にするオプションもありますが、電池の使用量が多くなります。</string>
 </resources>
diff --git a/doze/res/values-nb/strings.xml b/doze/res/values-nb/strings.xml
index fb4db6e..9e609c4 100644
--- a/doze/res/values-nb/strings.xml
+++ b/doze/res/values-nb/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Ambient visning</string>
   <string name="ambient_display_summary">Våkne skjermen når du får varsler</string>
-  <string name="always_enabled_title">Alltid aktivere</string>
-  <string name="always_enabled_summary">Lete etter sensor aktivitet etter at skjermen slår seg av</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Tilt sensor</string>
   <string name="pick_up_title">Opp-plukking</string>
diff --git a/doze/res/values-nl/strings.xml b/doze/res/values-nl/strings.xml
index 415461b..6eb179d 100644
--- a/doze/res/values-nl/strings.xml
+++ b/doze/res/values-nl/strings.xml
@@ -15,8 +15,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Omgevingsdisplay</string>
   <string name="ambient_display_summary">Scherm aan bij het ontvangen van meldingen</string>
-  <string name="always_enabled_title">Altijd inschakelen</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">Hellingssensor</string>
   <string name="pick_up_title">Oppakken</string>
   <string name="pick_up_summary">Meldingen laten knipperen bij oppakken</string>
   <!-- Proximity sensor -->
@@ -28,4 +28,5 @@
   <!-- Help text -->
   <string name="dlg_ok">OK</string>
   <string name="doze_settings_help_title">Help</string>
+  <string name="doze_settings_help_text">Deze functies gebruiken sensoren om een Doze-puls te versturen. De gekozen sensor is alleen ingeschakeld als het apparaat een melding ontvangt. Dit helpt het accugebruik te verminderen. Er is ook een optie om de sensor te activeren zodra het scherm uitschakelt, maar dit leidt tot hoger accugebruik.</string>
 </resources>
diff --git a/doze/res/values-pl/strings.xml b/doze/res/values-pl/strings.xml
index c023c08..5f02243 100644
--- a/doze/res/values-pl/strings.xml
+++ b/doze/res/values-pl/strings.xml
@@ -13,7 +13,19 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="ambient_display_title">Aktywny wyświetlacz</string>
+  <string name="ambient_display_summary">Wybudź ekran po odebraniu powiadomienia</string>
   <!-- Tilt sensor -->
+  <string name="tilt_sensor_title">Czujnik pochylenia</string>
+  <string name="pick_up_summary">Pokaż powiadomienia, gdy urządzenie zostało podniesione</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">Czujnik zbliżeniowy</string>
+  <string name="hand_wave_gesture_title">Gest fali</string>
+  <string name="hand_wave_gesture_summary">Pokaż powiadomienia po geście fali</string>
+  <string name="pocket_gesture_title">Wyjęcie z kieszeni</string>
+  <string name="pocket_gesture_summary">Pokaż powiadomienia po wyjęciu z kieszeni</string>
   <!-- Help text -->
+  <string name="dlg_ok">OK</string>
+  <string name="doze_settings_help_title">Pomoc</string>
+  <string name="doze_settings_help_text">Te funkcje używają czujników, aby pokazywać powiadomienia tylko w odpowiednim momencie. Czujniki są wykorzystywane, kiedy telefon odbierze powiadomienie. Pozwala to w oszczędzaniu baterii. Istnieje również możliwość, aby włączyć wybrany czujnik zaraz po wyłączeniu ekranu, spowoduje to większe zużycie baterii.</string>
 </resources>
diff --git a/doze/res/values-pt-rBR/strings.xml b/doze/res/values-pt-rBR/strings.xml
index 957fec1..444ffc4 100644
--- a/doze/res/values-pt-rBR/strings.xml
+++ b/doze/res/values-pt-rBR/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Tela ambiente</string>
   <string name="ambient_display_summary">Ligar a tela ao receber notificações</string>
-  <string name="always_enabled_title">Sempre habilitado</string>
-  <string name="always_enabled_summary">Monitorar o sensor assim que a tela for desligada</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Sensor de inclinação</string>
   <string name="pick_up_title">Pegar</string>
diff --git a/doze/res/values-pt-rPT/strings.xml b/doze/res/values-pt-rPT/strings.xml
index 33b5879..bedd3d6 100644
--- a/doze/res/values-pt-rPT/strings.xml
+++ b/doze/res/values-pt-rPT/strings.xml
@@ -15,7 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Visualização de ambiente</string>
   <string name="ambient_display_summary">Ligar o ecrã quando receber notificações</string>
-  <string name="always_enabled_title">Permitir sempre</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Sensor de inclinação</string>
   <string name="pick_up_title">Pegar</string>
diff --git a/doze/res/values-ru/strings.xml b/doze/res/values-ru/strings.xml
index dce20e4..326454b 100644
--- a/doze/res/values-ru/strings.xml
+++ b/doze/res/values-ru/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Индикация событий</string>
   <string name="ambient_display_summary">Включать экран при получении уведомлений</string>
-  <string name="always_enabled_title">Всегда включено</string>
-  <string name="always_enabled_summary">Прослушивать события сенсора сразу после отключения экрана</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Датчик наклона</string>
   <string name="pick_up_title">Поднять</string>
diff --git a/doze/res/values-sl/strings.xml b/doze/res/values-sl/strings.xml
index 690ae7c..24e4049 100644
--- a/doze/res/values-sl/strings.xml
+++ b/doze/res/values-sl/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Okoliški zaslon</string>
   <string name="ambient_display_summary">Zbudi zaslon ob prejemu obvestila</string>
-  <string name="always_enabled_title">Vedno omogoči</string>
-  <string name="always_enabled_summary">Poslušaj za dogodke tipal, takoj ko se zaslon izklopi</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Tipalo nagiba</string>
   <string name="pick_up_title">Dvig</string>
diff --git a/doze/res/values-sr/strings.xml b/doze/res/values-sr/strings.xml
index 5ab93dc..fa30ca7 100644
--- a/doze/res/values-sr/strings.xml
+++ b/doze/res/values-sr/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">Амбијент приказ</string>
   <string name="ambient_display_summary">Пробуди екран кад добијеш обавештење</string>
-  <string name="always_enabled_title">Увек омогући</string>
-  <string name="always_enabled_summary">Праћење сензора чим се екран искључи</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">Тилт сензор</string>
   <string name="pick_up_title">Купљење</string>
diff --git a/doze/res/values-sv/strings.xml b/doze/res/values-sv/strings.xml
index c023c08..225a2b8 100644
--- a/doze/res/values-sv/strings.xml
+++ b/doze/res/values-sv/strings.xml
@@ -14,6 +14,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Tilt sensor -->
+  <string name="pick_up_title">Plocka upp</string>
+  <string name="pick_up_summary">Pulsera aviseringarna när enheten plockas upp</string>
   <!-- Proximity sensor -->
+  <string name="priximity_sensor_title">Närhetscensor</string>
+  <string name="pocket_gesture_summary">Pulsera aviseringar när telefonen tas upp ur fickan</string>
   <!-- Help text -->
+  <string name="dlg_ok">OK</string>
+  <string name="doze_settings_help_title">Hjälp</string>
 </resources>
diff --git a/doze/res/values-zh-rCN/strings.xml b/doze/res/values-zh-rCN/strings.xml
index 6d8f437..ee50805 100644
--- a/doze/res/values-zh-rCN/strings.xml
+++ b/doze/res/values-zh-rCN/strings.xml
@@ -15,8 +15,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ambient_display_title">环境显示</string>
   <string name="ambient_display_summary">当接收到通知时唤醒屏幕</string>
-  <string name="always_enabled_title">始终启用</string>
-  <string name="always_enabled_summary">当屏幕关闭后立即监听传感器事件</string>
   <!-- Tilt sensor -->
   <string name="tilt_sensor_title">倾斜传感器</string>
   <string name="pick_up_title">拿起</string>
diff --git a/doze/res/values/strings.xml b/doze/res/values/strings.xml
index 9643190..63146cb 100644
--- a/doze/res/values/strings.xml
+++ b/doze/res/values/strings.xml
@@ -16,9 +16,6 @@
     <string name="ambient_display_title">Ambient display</string>
     <string name="ambient_display_summary">Wake screen when you receive notifications</string>
 
-    <string name="always_enabled_title">Always enable</string>
-    <string name="always_enabled_summary">Listen for sensor events as soon as the screen turns off</string>
-
     <!-- Tilt sensor -->
     <string name="tilt_sensor_title">Tilt sensor</string>
     <string name="pick_up_title">Pick up</string>
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index 09e27b5..dfa608b 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -33,13 +33,6 @@
             android:summary="@string/pick_up_summary"
             android:dependency="ambient_display" />
 
-        <SwitchPreference
-            android:key="tilt_always"
-            android:defaultValue="false"
-            android:title="@string/always_enabled_title"
-            android:summary="@string/always_enabled_summary"
-            android:dependency="ambient_display" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -60,13 +53,6 @@
             android:summary="@string/pocket_gesture_summary"
             android:dependency="ambient_display" />
 
-        <SwitchPreference
-            android:key="proximity_always"
-            android:defaultValue="false"
-            android:title="@string/always_enabled_title"
-            android:summary="@string/always_enabled_summary"
-            android:dependency="ambient_display" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeService.java b/doze/src/com/cyanogenmod/settings/doze/DozeService.java
index 354d97f..2ee79bf 100644
--- a/doze/src/com/cyanogenmod/settings/doze/DozeService.java
+++ b/doze/src/com/cyanogenmod/settings/doze/DozeService.java
@@ -75,11 +75,11 @@ public class DozeService extends Service {
 
     private void onDisplayOff() {
         if (DEBUG) Log.d(TAG, "Display off");
-        if (Utils.pickUpEnabled(this) && Utils.tiltAlwaysEnabled(this)) {
+        if (Utils.pickUpEnabled(this)) {
             mTiltSensor.enable();
         }
-        if (Utils.proximityAlwaysEnabled(this) && (Utils.handwaveGestureEnabled(this) ||
-                Utils.pocketGestureEnabled(this))) {
+        if (Utils.handwaveGestureEnabled(this) ||
+                Utils.pocketGestureEnabled(this)) {
             mProximitySensor.enable();
         }
     }
diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java b/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java
index d2c408a..2e179bc 100644
--- a/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java
+++ b/doze/src/com/cyanogenmod/settings/doze/DozeSettings.java
@@ -41,10 +41,8 @@ public class DozeSettings extends PreferenceActivity implements OnPreferenceChan
 
     private SwitchPreference mAmbientDisplayPreference;
     private SwitchPreference mPickUpPreference;
-    private SwitchPreference mTiltAlwaysPreference;
     private SwitchPreference mHandwavePreference;
     private SwitchPreference mPocketPreference;
-    private SwitchPreference mProximityAlwaysPreference;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -65,10 +63,6 @@ public class DozeSettings extends PreferenceActivity implements OnPreferenceChan
         mAmbientDisplayPreference.setChecked(dozeEnabled);
         mAmbientDisplayPreference.setOnPreferenceChangeListener(this);
 
-        mTiltAlwaysPreference =
-            (SwitchPreference) findPreference(Utils.TILT_ALWAYS_KEY);
-        mTiltAlwaysPreference.setOnPreferenceChangeListener(this);
-
         mPickUpPreference =
             (SwitchPreference) findPreference(Utils.PICK_UP_KEY);
         mPickUpPreference.setOnPreferenceChangeListener(this);
@@ -81,20 +75,13 @@ public class DozeSettings extends PreferenceActivity implements OnPreferenceChan
             (SwitchPreference) findPreference(Utils.GESTURE_POCKET_KEY);
         mPocketPreference.setOnPreferenceChangeListener(this);
 
-        mProximityAlwaysPreference =
-            (SwitchPreference) findPreference(Utils.PROXIMITY_ALWAYS_KEY);
-        mProximityAlwaysPreference.setOnPreferenceChangeListener(this);
-
         final ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
-
-        updateAlwaysEnabledPreference();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        updateAlwaysEnabledPreference();
     }
 
     @Override
@@ -116,25 +103,16 @@ public class DozeSettings extends PreferenceActivity implements OnPreferenceChan
             return true;
         } else if (Utils.PICK_UP_KEY.equals(key)) {
             mPickUpPreference.setChecked(value);
-            updateAlwaysEnabledPreference();
             Utils.startService(mContext);
             return true;
-        } else if (Utils.TILT_ALWAYS_KEY.equals(key)) {
-            mTiltAlwaysPreference.setChecked(value);
-            return true;
         } else if (Utils.GESTURE_HAND_WAVE_KEY.equals(key)) {
             mHandwavePreference.setChecked(value);
-            updateAlwaysEnabledPreference();
             Utils.startService(mContext);
             return true;
         } else if (Utils.GESTURE_POCKET_KEY.equals(key)) {
             mPocketPreference.setChecked(value);
-            updateAlwaysEnabledPreference();
             Utils.startService(mContext);
             return true;
-        } else if (Utils.PROXIMITY_ALWAYS_KEY.equals(key)) {
-            mProximityAlwaysPreference.setChecked(value);
-            return true;
         }
         return false;
     }
@@ -167,12 +145,4 @@ public class DozeSettings extends PreferenceActivity implements OnPreferenceChan
         HelpDialogFragment fragment = new HelpDialogFragment();
         fragment.show(getFragmentManager(), "help_dialog");
     }
-
-    private void updateAlwaysEnabledPreference() {
-        boolean tiltEnabled = Utils.pickUpEnabled(mContext);
-        boolean proximityEnabled = Utils.handwaveGestureEnabled(mContext)
-                || Utils.pocketGestureEnabled(mContext);
-        mTiltAlwaysPreference.setEnabled(tiltEnabled);
-        mProximityAlwaysPreference.setEnabled(proximityEnabled);
-    }
 }
diff --git a/doze/src/com/cyanogenmod/settings/doze/Utils.java b/doze/src/com/cyanogenmod/settings/doze/Utils.java
index bdc696b..767cd96 100644
--- a/doze/src/com/cyanogenmod/settings/doze/Utils.java
+++ b/doze/src/com/cyanogenmod/settings/doze/Utils.java
@@ -35,10 +35,8 @@ public final class Utils {
 
     protected static final String AMBIENT_DISPLAY_KEY = "ambient_display";
     protected static final String PICK_UP_KEY = "pick_up";
-    protected static final String TILT_ALWAYS_KEY = "tilt_always";
     protected static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave";
     protected static final String GESTURE_POCKET_KEY = "gesture_pocket";
-    protected static final String PROXIMITY_ALWAYS_KEY = "proximity_always";
 
     protected static void startService(Context context) {
         if (DEBUG) Log.d(TAG, "Starting service");
@@ -77,11 +75,6 @@ public final class Utils {
                 .getBoolean(PICK_UP_KEY, false);
     }
 
-    protected static boolean tiltAlwaysEnabled(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(TILT_ALWAYS_KEY, false);
-    }
-
     protected static boolean handwaveGestureEnabled(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(GESTURE_HAND_WAVE_KEY, false);
@@ -92,11 +85,6 @@ public final class Utils {
                 .getBoolean(GESTURE_POCKET_KEY, false);
     }
 
-    protected static boolean proximityAlwaysEnabled(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(PROXIMITY_ALWAYS_KEY, false);
-    }
-
     protected static boolean sensorsEnabled(Context context) {
         return pickUpEnabled(context) || handwaveGestureEnabled(context)
                 || pocketGestureEnabled(context);
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index b008822..1c71edf 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -40,9 +40,6 @@
     <!-- Doze: check proximity sensor before pulsing from intent? -->
     <bool name="doze_proximity_check_before_pulse_intent">true</bool>
 
-    <!-- Doze: pulse parameter - how long does it take to fade in after an intent? -->
-    <integer name="doze_pulse_duration_in_intent">0</integer>
-
     <!-- Doze: pulse parameter - delay to wait for the screen to wake up after an intent -->
     <integer name="doze_pulse_delay_in_intent">0</integer>