Merge "Add test and fix null keys in search providers." (268de492) · Commits · e / os / android_packages_apps_Settings

res/xml/data_usage_metered_prefs.xml

+5 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:key="data_usage_metered_prefs"
		android:title="@string/network_restrictions">

		<PreferenceCategory
		@@ -37,6 +39,7 @@

		<com.android.settingslib.widget.FooterPreference
		android:title="@string/data_usage_metered_body"
		android:key="footer_preference"
		android:selectable="false" />

		</PreferenceScreen>

res/xml/location_mode.xml

+16 −14

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:key="location_mode_settings"
		android:title="@string/location_mode_screen_title">

		<com.android.settings.widget.RadioButtonPreference

res/xml/screen_pinning_settings.xml

+7 −5

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:key="screen_pinning_settings_screen"
		android:title="@string/screen_pinning_title">

		<SwitchPreference

res/xml/security_settings_misc.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@
		android:key="screen_pinning_settings"
		android:title="@string/screen_pinning_title"
		android:summary="@string/switch_off_text"
		android:fragment="com.android.settings.ScreenPinningSettings"/>
		android:fragment="com.android.settings.security.ScreenPinningSettings"/>

		<Preference android:key="security_misc_usage_access"
		android:title="@string/usage_access_title"

src/com/android/settings/datausage/DataUsageMeteredSettings.java

+9 −48

Original line number	Diff line number	Diff line
		@@ -14,27 +14,26 @@

		package com.android.settings.datausage;

		import static android.net.wifi.WifiInfo.removeDoubleQuotes;

		import android.app.backup.BackupManager;
		import android.content.Context;
		import android.content.res.Resources;
		import android.net.NetworkPolicyManager;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.provider.SearchIndexableResource;
		import android.support.v7.preference.DropDownPreference;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceCategory;
		import android.text.TextUtils;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.search.SearchIndexableRaw;
		import com.android.settingslib.NetworkPolicyEditor;
		import java.util.ArrayList;

		import java.util.Arrays;
		import java.util.List;

		/**
		@@ -134,49 +133,11 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
		final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
		final Resources res = context.getResources();

		// Add fragment title
		SearchIndexableRaw data = new SearchIndexableRaw(context);
		data.title = res.getString(R.string.data_usage_menu_metered);
		data.screenTitle = res.getString(R.string.data_usage_menu_metered);
		result.add(data);

		// Body
		data = new SearchIndexableRaw(context);
		data.title = res.getString(R.string.data_usage_metered_body);
		data.screenTitle = res.getString(R.string.data_usage_menu_metered);
		result.add(data);

		// Wi-Fi networks category
		data = new SearchIndexableRaw(context);
		data.title = res.getString(R.string.data_usage_metered_wifi);
		data.screenTitle = res.getString(R.string.data_usage_menu_metered);
		result.add(data);

		final WifiManager wifiManager =
		(WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		if (DataUsageUtils.hasWifiRadio(context) && wifiManager.isWifiEnabled()) {
		for (WifiConfiguration config : wifiManager.getConfiguredNetworks()) {
		if (config.SSID != null) {
		final String networkId = config.SSID;

		data = new SearchIndexableRaw(context);
		data.title = removeDoubleQuotes(networkId);
		data.screenTitle = res.getString(R.string.data_usage_menu_metered);
		result.add(data);
		}
		}
		} else {
		data = new SearchIndexableRaw(context);
		data.title = res.getString(R.string.data_usage_metered_wifi_disabled);
		data.screenTitle = res.getString(R.string.data_usage_menu_metered);
		result.add(data);
		}

		return result;
		public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
		boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.data_usage_metered_prefs;
		return Arrays.asList(sir);
		}

		@Override