FPII-2357: Fix the Proximity Sensor Tools scope
Start the Proximity Sensor Tools app at the Maintenance settings level
(i.e. _Maintenance_ > _Proximity sensor_).
Change-Id: If8ba254d1a504764fa27082e29f499cdb8f837b2
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7893d7..585bf42 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1430,13 +1430,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physische Tastatur"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Einstellungen für physische Tastatur"</string>
<string name="maintenance_settings_title">"Wartung"</string>
- <string name="proximity_sensor_category">"Näherungssensor"</string>
<string name="proximity_sensor_settings_list_item_title">"Näherungssensor"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostik"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Überprüfe Sensorstatus"</string>
- <string name="sensor_calibration_settings_list_item_title">"Kalibrierung"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Verwende dieses Werkzeug falls du Probleme mit dem Näherungssensor hast"</string>
<string name="development_settings_title" msgid="215179176067683667">"Entwickleroptionen"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Optionen zur App-Entwicklung festlegen"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Entwickleroptionen sind für diesen Nutzer nicht verfügbar."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 79b0264..122f4d0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1428,13 +1428,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physical keyboard"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Physical keyboard settings"</string>
<string name="maintenance_settings_title">"Maintenance"</string>
- <string name="proximity_sensor_category">"Proximity sensor"</string>
<string name="proximity_sensor_settings_list_item_title">"Proximity sensor"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostics"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Check sensor status"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibration"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Use this tool if you\'re encountering issues with the proximity sensor"</string>
<string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 79b0264..122f4d0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1428,13 +1428,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physical keyboard"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Physical keyboard settings"</string>
<string name="maintenance_settings_title">"Maintenance"</string>
- <string name="proximity_sensor_category">"Proximity sensor"</string>
<string name="proximity_sensor_settings_list_item_title">"Proximity sensor"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostics"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Check sensor status"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibration"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Use this tool if you\'re encountering issues with the proximity sensor"</string>
<string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 48b1bbd..1488f4d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1428,13 +1428,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuración de teclado físico"</string>
<string name="maintenance_settings_title">"Mantenimiento"</string>
- <string name="proximity_sensor_category">"Sensor de proximidad"</string>
<string name="proximity_sensor_settings_list_item_title">"Sensor de proximidad"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnóstico"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Verifica el estado del sensor"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibración"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Usa esta herramienta si crees que tu sensor de proximidad no funciona satisfactoriamente"</string>
<string name="development_settings_title" msgid="215179176067683667">"Opciones del programador"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones para desarrollar aplicaciones"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de programador no están disponibles para este usuario."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 517cf07..9df1030 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1429,13 +1429,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ajustes del teclado físico"</string>
<string name="maintenance_settings_title">"Mantenimiento"</string>
- <string name="proximity_sensor_category">"Sensor de proximidad"</string>
<string name="proximity_sensor_settings_list_item_title">"Sensor de proximidad"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnóstico"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Verifica el estado del sensor"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibración"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Usa esta herramienta si crees que tu sensor de proximidad no funciona satisfactoriamente"</string>
<string name="development_settings_title" msgid="215179176067683667">"Opciones de desarrollo"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones de desarrollo de aplicaciones"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de desarrollador no están disponibles para este usuario"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index dce3002..9ac3c52 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1428,13 +1428,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Clavier physique"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Paramètres du clavier physique"</string>
<string name="maintenance_settings_title">"Maintenance"</string>
- <string name="proximity_sensor_category">"Capteur de proximité"</string>
<string name="proximity_sensor_settings_list_item_title">"Capteur de proximité"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostique"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Vérifier l\'état du capteur"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibration"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Utilisez cet outil pour résoudre vos problèmes avec le capteur de proximité"</string>
<string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5b05d7a..81e76ff 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1429,13 +1429,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Clavier physique"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Paramètres du clavier physique"</string>
<string name="maintenance_settings_title">"Maintenance"</string>
- <string name="proximity_sensor_category">"Capteur de proximité"</string>
<string name="proximity_sensor_settings_list_item_title">"Capteur de proximité"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostique"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Vérifier l\'état du capteur"</string>
- <string name="sensor_calibration_settings_list_item_title">"Calibration"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Utilisez cet outil pour résoudre vos problèmes avec le capteur de proximité"</string>
<string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8447a10..baeaafc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1428,13 +1428,8 @@
<string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fysiek toetsenbord"</string>
<string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Instellingen voor vast toetsenbord"</string>
<string name="maintenance_settings_title">"Onderhoud"</string>
- <string name="proximity_sensor_category">"Afstandssensor"</string>
<string name="proximity_sensor_settings_list_item_title">"Afstandssensor"</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">"Diagnostiek"</string>
- <string name="sensor_diagnostics_settings_list_item_summary">"Controleer de sensor status"</string>
- <string name="sensor_calibration_settings_list_item_title">"Kalibrering"</string>
- <string name="sensor_calibration_settings_list_item_summary">"Gebruik deze functie als je problemen ondervindt met de afstandssensor"</string>
<string name="development_settings_title" msgid="215179176067683667">"Opties voor ontwikkelaars"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Opties instellen voor appontwikkeling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Ontwikkelaarsopties zijn niet beschikbaar voor deze gebruiker"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cce2bb4..549f7c0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3476,16 +3476,11 @@
<!-- Summary for built-in keyboard settings -->
<string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
- <!-- Maintenance Settings. the title for the item to take the user to Maintenance settings. -->
+ <!-- Maintenance Settings. The title for the item to take the user to Maintenance settings. -->
<string name="maintenance_settings_title">Maintenance</string>
- <!-- Preference category for proximity sensor settings. [CHAR LIMIT=50] -->
- <string name="proximity_sensor_category">Proximity sensor</string>
+ <!-- Maintenance settings screen, the title for the item to take the user to the Proximity Sensor app. -->
<string name="proximity_sensor_settings_list_item_title">Proximity sensor</string>
<string name="proximity_sensor_settings_list_item_summary">""</string>
- <string name="sensor_diagnostics_settings_list_item_title">Diagnostics</string>
- <string name="sensor_diagnostics_settings_list_item_summary">Check sensor status</string>
- <string name="sensor_calibration_settings_list_item_title">Calibration</string>
- <string name="sensor_calibration_settings_list_item_summary">Use this tool if you\'re encountering issues with the proximity sensor</string>
<!-- Development Settings. the title for the item to take the user to Development settings. Development settings are settings meant for application developers. -->
<string name="development_settings_title">Developer options</string>
diff --git a/res/xml/maintenance_prefs.xml b/res/xml/maintenance_prefs.xml
index bb9da87..0fa7898 100644
--- a/res/xml/maintenance_prefs.xml
+++ b/res/xml/maintenance_prefs.xml
@@ -4,7 +4,12 @@
android:title="@string/maintenance_settings_title">
<PreferenceScreen android:key="proximity_sensor_settings"
- android:fragment="com.android.settings.maintenance.ProximitySensorSettings"
- android:title="@string/proximity_sensor_settings_list_item_title"/>
+ android:title="@string/proximity_sensor_settings_list_item_title">
+
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.fairphone.psensor"
+ android:targetClass="com.fairphone.psensor.CalibrationActivity" />
+
+ </PreferenceScreen>
</PreferenceScreen>
diff --git a/res/xml/proximity_sensor_settings.xml b/res/xml/proximity_sensor_settings.xml
deleted file mode 100644
index fb04efa..0000000
--- a/res/xml/proximity_sensor_settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/maintenance_settings_title">
-
- <!-- <PreferenceScreen android:key="sensor_diagnostics_settings"
- android:title="@string/sensor_diagnostics_settings_list_item_title"
- android:summary="@string/sensor_diagnostics_settings_list_item_summary">
-
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.fairphone.psensor"
- android:targetClass="com.fairphone.psensor.DiagnosticsActivity" />
-
- </PreferenceScreen> -->
-
- <PreferenceScreen android:key="sensor_calibration_settings"
- android:title="@string/sensor_calibration_settings_list_item_title"
- android:summary="@string/sensor_calibration_settings_list_item_summary">
-
- <intent
- android:targetPackage="com.fairphone.psensor"
- android:targetClass="com.fairphone.psensor.CalibrationActivity" />
-
- </PreferenceScreen>
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/MaintenanceSettings.java b/src/com/android/settings/MaintenanceSettings.java
index 0976cb9..d434b51 100644
--- a/src/com/android/settings/MaintenanceSettings.java
+++ b/src/com/android/settings/MaintenanceSettings.java
@@ -10,15 +10,11 @@
public class MaintenanceSettings extends SettingsPreferenceFragment {
// Preference categories
- private static final String PROXIMITY_SENSOR_CATEGORY = "proximity_sensor_category";
-
- private static final String SENSOR_CALIBRATION_PREFERENCE_SCREEN =
- "sensor_calibration_settings";
+ private static final String PROXIMITY_SENSOR_PREFERENCE_SCREEN =
+ "proximity_sensor_settings";
// Preference controls.
- private PreferenceCategory mProximitySensorCategory;
-
- private PreferenceScreen mProximityCalibrationPreferenceScreen;
+ private PreferenceScreen mProximitySensorPreferenceScreen;
@Override
public void onCreate(Bundle icicle) {
diff --git a/src/com/android/settings/maintenance/ProximitySensorSettings.java b/src/com/android/settings/maintenance/ProximitySensorSettings.java
deleted file mode 100644
index e12d477..0000000
--- a/src/com/android/settings/maintenance/ProximitySensorSettings.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.android.settings.maintenance;
-
-import android.os.Bundle;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-
-/**
- * Activity with the proximity sensor settings.
- */
-public class ProximitySensorSettings extends SettingsPreferenceFragment {
-
- // Preference categories
- private static final String PROXIMITY_SENSOR_CATEGORY = "proximity_sensor_category";
-
- private static final String SENSOR_CALIBRATION_PREFERENCE_SCREEN =
- "sensor_calibration_settings";
-
- // Preference controls.
- private PreferenceCategory mProximitySensorCategory;
-
- private PreferenceScreen mProximityCalibrationPreferenceScreen;
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- addPreferencesFromResource(R.xml.proximity_sensor_settings);
- }
-}