commit e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d
author Wei Wang <weiwa@google.com> Mon Apr 25 21:52:03 2016 -0700
committer Wei Wang <weiwa@google.com> Wed Apr 27 15:51:19 2016 -0700
tree 478cf5468f2b0dac2da7e931ee605845148503ae
parent c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd

Add an entry in developer options for location tools.

This is a temporary place holder for location dogfood tools, which will
be removed before ship.

Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ce9075..c7acb5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7161,6 +7161,9 @@
     <!-- 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>
 

res/xml/development_prefs.xml

diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 6d1a9fc..23fd80a 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -99,6 +99,13 @@
         <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">
 

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5036b9f..8498fe0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -205,6 +205,8 @@
 
     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;
 
@@ -247,6 +249,7 @@
 
     private String mMockLocationApp;
     private Preference mMockLocationAppPref;
+    private Preference mLocationDogfoodTools;
 
     private SwitchPreference mWaitForDebugger;
     private SwitchPreference mVerifyAppsOverUsb;
@@ -394,6 +397,9 @@
         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) {