PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add an entry in developer options for location tools." into nyc-dev

Browse Source
This commit is contained in:
Wei Wang
2016-04-28 05:57:30 +00:00
committed by Android (Google) Code Review
parent aee8d8c7e1 e1c1a13cba
commit 920cf0a7b3
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/DevelopmentSettings.java
View File

@@ -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) {