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

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

Browse Source 
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
This commit is contained in:
Wei Wang
2016-06-02 17:22:59 +00:00
committed by android-build-merger
parent 718c84f121 d0d3ca3b7c
commit c687e9bfbd
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7226,9 +7226,6 @@
<!-- Name of the setting to disable the automatic update --> <!-- Name of the setting to disable the automatic update -->
<string name="ota_disable_automatic_update">Automatic system updates</string> <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] --> <!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string> <string name="usage">Usage</string>

7
res/xml/development_prefs.xml
View File

@@ -100,13 +100,6 @@
<intent android:action="com.android.settings.action.DEMO_MODE" /> <intent android:action="com.android.settings.action.DEMO_MODE" />
</PreferenceScreen> </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" <PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category"> android:title="@string/debug_debugging_category">

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

@@ -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 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_DEBUG_APP = 1000;
private static final int RESULT_MOCK_LOCATION_APP = 1001; private static final int RESULT_MOCK_LOCATION_APP = 1001;
@@ -249,7 +247,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private String mMockLocationApp; private String mMockLocationApp;
private Preference mMockLocationAppPref; private Preference mMockLocationAppPref;
private Preference mLocationDogfoodTools;
private SwitchPreference mWaitForDebugger; private SwitchPreference mWaitForDebugger;
private SwitchPreference mVerifyAppsOverUsb; private SwitchPreference mVerifyAppsOverUsb;
@@ -397,9 +394,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY); mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY);
mAllPrefs.add(mMockLocationAppPref); mAllPrefs.add(mMockLocationAppPref);
mLocationDogfoodTools = findPreference(LOCATION_DOGFOOD_TOOLS_KEY);
mAllPrefs.add(mLocationDogfoodTools);
mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY); mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY);
if (!showVerifierSetting()) { if (!showVerifierSetting()) {
if (debugDebuggingCategory != null) { if (debugDebuggingCategory != null) {