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

Add an entry in developer options for location tools.

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

Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
This commit is contained in:
Wei Wang
2016-04-25 21:52:03 -07:00
parent c2dae39ab4
commit e1c1a13cba
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7161,6 +7161,9 @@
<!-- 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

@@ -99,6 +99,13 @@
<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,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 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;
@@ -247,6 +249,7 @@ 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;
@@ -394,6 +397,9 @@ 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) {