Merge "Index the System status page" into oc-mr1-dev (6203bde8) · Commits · e / os / android_packages_apps_Settings

res/xml/device_info_status.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -23,13 +23,13 @@
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/battery_status_title"
		android:summary="@string/device_info_not_available" />
		android:summary="@string/summary_placeholder" />
		<Preference
		android:key="battery_level"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/battery_level_title"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="sim_status"
		@@ -52,41 +52,41 @@
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/wifi_advanced_ip_address_title"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="wifi_mac_address"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_wifi_mac_address"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="bt_address"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_bt_address"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="serial_number"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_serial_number"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="up_time"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_up_time"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="wimax_mac_address"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_wimax_mac_address"
		android:summary="@string/device_info_not_available"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		</PreferenceScreen>

src/com/android/settings/deviceinfo/Status.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.os.Message;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserManager;
		import android.provider.SearchIndexableResource;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;
		import android.text.TextUtils;
		@@ -40,13 +41,17 @@ import com.android.internal.util.ArrayUtils;
		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;

		import java.lang.ref.WeakReference;
		import java.util.Arrays;
		import java.util.List;

		import static android.content.Context.CONNECTIVITY_SERVICE;
		import static android.content.Context.WIFI_SERVICE;

		public class Status extends SettingsPreferenceFragment {
		public class Status extends SettingsPreferenceFragment implements Indexable {

		private static final String KEY_BATTERY_STATUS = "battery_status";
		private static final String KEY_BATTERY_LEVEL = "battery_level";
		@@ -302,4 +307,19 @@ public class Status extends SettingsPreferenceFragment {

		return h + ":" + pad(m) + ":" + pad(s);
		}

		/**
		* For Search.
		*/
		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {

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

src/com/android/settings/search/SearchIndexableResources.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import com.android.settings.datausage.DataUsageMeteredSettings;
		import com.android.settings.datausage.DataUsageSummary;
		import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
		import com.android.settings.development.DevelopmentSettings;
		import com.android.settings.deviceinfo.Status;
		import com.android.settings.deviceinfo.StorageDashboardFragment;
		import com.android.settings.deviceinfo.StorageSettings;
		import com.android.settings.display.AmbientDisplaySettings;
		@@ -189,6 +190,7 @@ public final class SearchIndexableResources {
		addIndex(PrintSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_print);
		addIndex(DevelopmentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_development);
		addIndex(DeviceInfoSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
		addIndex(Status.class, NO_DATA_RES_ID, 0 /* icon */);
		addIndex(LegalSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
		addIndex(ZenModeVisualInterruptionSettings.class,
		R.xml.zen_mode_visual_interruptions_settings,

src/com/android/settings/wifi/ConfigureWifiSettings.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ import static android.content.Context.WIFI_SERVICE;

		import android.content.Context;
		import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.NetworkScoreManager;
		import android.net.wifi.WifiManager;
		import android.provider.SearchIndexableResource;
		@@ -42,6 +44,8 @@ public class ConfigureWifiSettings extends DashboardFragment {

		private static final String TAG = "ConfigureWifiSettings";

		public static final String KEY_IP_ADDRESS = "current_ip_address";

		private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
		private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;

		@@ -114,5 +118,22 @@ public class ConfigureWifiSettings extends DashboardFragment {
		sir.xmlResId = R.xml.wifi_configure_settings;
		return Arrays.asList(sir);
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		List<String> keys = super.getNonIndexableKeys(context);

		// If connected to WiFi, this IP address will be the same as the Status IP.
		// Or, if there is no connection they will say unavailable.
		ConnectivityManager cm = (ConnectivityManager)
		context.getSystemService(Context.CONNECTIVITY_SERVICE);
		NetworkInfo info = cm.getActiveNetworkInfo();
		if (info == null
		\|\| info.getType() == ConnectivityManager.TYPE_WIFI) {
		keys.add(KEY_IP_ADDRESS);
		}

		return keys;
		}
		};
		}

tests/robotests/assets/grandfather_not_implementing_indexable

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ com.android.settings.applications.ProcessStatsDetail
		com.android.settings.wifi.WifiInfo
		com.android.settings.applications.VrListenerSettings
		com.android.settings.inputmethod.UserDictionaryList
		com.android.settings.deviceinfo.Status
		com.android.settings.datausage.DataSaverSummary
		com.android.settings.notification.ChannelNotificationSettings
		com.android.settings.datausage.AppDataUsage