Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c687e9bf authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

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

am: d0d3ca3b

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

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
parents 718c84f1 d0d3ca3b

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -7226,9 +7226,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>

































res/xml/development_prefs.xml



+0
−7






























Original line number
Diff line number
Diff line







@@ -100,13 +100,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">










































src/com/android/settings/DevelopmentSettings.java



+0
−6






























Original line number
Diff line number
Diff line







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