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

Merge "Settings: Optimize the selected WFD route preference summary"

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-16 11:32:24 +00:00
committed by Gerrit Code Review
parent 33a080ad7a 0304a0e88b
commit 1143a4e8dc
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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