Merge "Settings: Optimize the selected WFD route preference summary" (1143a4e8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wfd/WifiDisplayPreferenceController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settings.wfd;
		import android.content.Context;
		import android.media.MediaRouter;
		import android.media.MediaRouter.RouteInfo;
		import android.text.TextUtils;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		@@ -87,7 +88,12 @@ public class WifiDisplayPreferenceController extends BasePreferenceController im
		final MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
		if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)
		&& route.isSelected() && !route.isConnecting()) {
		CharSequence status = route.getStatus();
		if (!TextUtils.isEmpty(status)) {
		summary = status;
		} else {
		summary = mContext.getString(R.string.wifi_display_status_connected);
		}
		break;
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.provider.Settings;
		import android.text.TextUtils;
		import android.util.Slog;
		import android.util.TypedValue;
		import android.view.Menu;
		@@ -677,9 +678,14 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
		setOrder(ORDER_CONNECTED);
		if (route.isConnecting()) {
		setSummary(R.string.wifi_display_status_connecting);
		} else {
		CharSequence status = route.getStatus();
		if (!TextUtils.isEmpty(status)) {
		setSummary(status);
		} else {
		setSummary(R.string.wifi_display_status_connected);
		}
		}
		} else {
		if (isEnabled()) {
		setOrder(ORDER_AVAILABLE);