From e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 25 Apr 2016 21:52:03 -0700 Subject: [PATCH] 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 | 3 +++ res/xml/development_prefs.xml | 7 +++++++ src/com/android/settings/DevelopmentSettings.java | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ce90759174..c7acb5d65c6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7161,6 +7161,9 @@ Automatic system updates + + Location Dogfood Tools + Usage diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 6d1a9fc0d3b..23fd80a1cb5 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -99,6 +99,13 @@ + + + + + diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 5036b9f20b1..8498fe09d9e 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -205,6 +205,8 @@ 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; @@ -247,6 +249,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private String mMockLocationApp; private Preference mMockLocationAppPref; + private Preference mLocationDogfoodTools; private SwitchPreference mWaitForDebugger; private SwitchPreference mVerifyAppsOverUsb; @@ -394,6 +397,9 @@ 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) {