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

Settings: Optimize the selected WFD route preference summary

Browse Source 
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
This commit is contained in:
hoffc
2022-05-06 11:54:04 +08:00
parent 8adb561455
commit 0304a0e88b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wfd/WifiDisplayPreferenceController.java
View File

@@ -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()) {
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;
}
}

8
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -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;
@@ -678,7 +679,12 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
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()) {