Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am: d0d3ca3b7c
* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
Revert "Add an entry in developer options for location tools."
Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2cff198..7c13146 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7226,9 +7226,6 @@
<!-- Name of the setting to disable the automatic update -->
<string name="ota_disable_automatic_update">Automatic system updates</string>
- <!-- Name of the setting to launch Location Dogfood Tools -->
- <string name="location_dogfood_tools">Location Dogfood Tools</string>
-
<!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index cdee328..29363ad 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -100,13 +100,6 @@
<intent android:action="com.android.settings.action.DEMO_MODE" />
</PreferenceScreen>
- <!--TODO(b/28251942) Remove before ship -->
- <PreferenceScreen
- android:key="location_dogfood_tools"
- android:title="@string/location_dogfood_tools">
- <intent android:action="com.android.apps.location_dogfood.MAIN" />
- </PreferenceScreen>
-
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 6a0abe3..ee6a7e9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -205,8 +205,6 @@
private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
- private static final String LOCATION_DOGFOOD_TOOLS_KEY = "location_dogfood_tools";
-
private static final int RESULT_DEBUG_APP = 1000;
private static final int RESULT_MOCK_LOCATION_APP = 1001;
@@ -249,7 +247,6 @@
private String mMockLocationApp;
private Preference mMockLocationAppPref;
- private Preference mLocationDogfoodTools;
private SwitchPreference mWaitForDebugger;
private SwitchPreference mVerifyAppsOverUsb;
@@ -397,9 +394,6 @@
mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY);
mAllPrefs.add(mMockLocationAppPref);
- mLocationDogfoodTools = findPreference(LOCATION_DOGFOOD_TOOLS_KEY);
- mAllPrefs.add(mLocationDogfoodTools);
-
mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY);
if (!showVerifierSetting()) {
if (debugDebuggingCategory != null) {