From a0b28146ba3f1c3936ee64b4897af945eb562dc5 Mon Sep 17 00:00:00 2001
From: Wei Wang <weiwa@google.com>
Date: Thu, 2 Jun 2016 04:42:02 +0000
Subject: [PATCH] Revert "Add an entry in developer options for location
 tools."

Bug:28251942

This reverts commit e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d.

Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
---
 res/values/strings.xml                            | 3 ---
 res/xml/development_prefs.xml                     | 7 -------
 src/com/android/settings/DevelopmentSettings.java | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c7acb5d65c6..0ce90759174 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7161,9 +7161,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 23fd80a1cb5..6d1a9fc0d3b 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -99,13 +99,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 8498fe09d9e..5036b9f20b1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -205,8 +205,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     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 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     private String mMockLocationApp;
     private Preference mMockLocationAppPref;
-    private Preference mLocationDogfoodTools;
 
     private SwitchPreference mWaitForDebugger;
     private SwitchPreference mVerifyAppsOverUsb;
@@ -397,9 +394,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         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) {