commit 0304a0e88bf54d17eb84780e62314590a465f606
author hoffc <quic_hoffc@quicinc.com> Fri May 06 11:54:04 2022 +0800
committer hoffc <quic_hoffc@quicinc.com> Mon May 09 09:22:57 2022 +0800
tree 29fd3b1aba9dcdcb52798f7bb645644c3fb4e3f6
parent 8adb56145537abd6a116d762da44fc47800136b2

Settings: Optimize the selected WFD route preference summary

RouteInfo has several status values, such as unavailable status. But according to current logic, unavailable status will be displayed as connnected. it is not reasonable.

Update and optimize the route preference summary with the real WFD status value.

Change-Id: Iacd10e0133d06ef0b86da38cf763fe7def6ed7de
Buganizer: 231656030

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

diff --git a/src/com/android/settings/wfd/WifiDisplayPreferenceController.java b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
index a83a56b..b15396b 100644
--- a/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
+++ b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java
@@ -19,6 +19,7 @@
 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 @@
             final MediaRouter.RouteInfo route = mRouter.getRouteAt(i);
             if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)
                     && route.isSelected() && !route.isConnecting()) {
-                summary = mContext.getString(R.string.wifi_display_status_connected);
+                CharSequence status = route.getStatus();
+                if (!TextUtils.isEmpty(status)) {
+                    summary = status;
+                } else {
+                    summary = mContext.getString(R.string.wifi_display_status_connected);
+                }
                 break;
             }
         }

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

diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 19b6c54..8562e5f 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -38,6 +38,7 @@
 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;
@@ -678,7 +679,12 @@
                 if (route.isConnecting()) {
                     setSummary(R.string.wifi_display_status_connecting);
                 } else {
-                    setSummary(R.string.wifi_display_status_connected);
+                    CharSequence status = route.getStatus();
+                    if (!TextUtils.isEmpty(status)) {
+                        setSummary(status);
+                    } else {
+                        setSummary(R.string.wifi_display_status_connected);
+                    }
                 }
             } else {
                 if (isEnabled()) {