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

Remove summary provider

Browse Source 
- use SummaryProvider to provide the summary of UserSettings
- use WifiDisplayPreferenceController to replace the summary loader
in WifiDisplaySettings
- use ConfigureNotificationPreferernceController to replace the
sumary load in ConfigureNotificationSettings

Fixes: 141653158
Test: robolectric
Change-Id: Id5f5ed645707caa0b25ecae5252174cbf017651c
This commit is contained in:
Raff Tsai
2019-10-02 16:43:23 +08:00
parent 9e3a9fd255
commit 6db277ebb7
21 changed files with 399 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,6 @@ import android.net.wifi.p2p.WifiP2pManager.Channel;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.util.Slog;
import android.util.TypedValue;
@@ -64,15 +63,11 @@ import androidx.preference.SwitchPreference;
import com.android.internal.app.MediaRouteDialogPresenter;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
/**
* The Settings screen for WifiDisplay configuration and connection management.
*
@@ -767,74 +762,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
}
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final Context mContext;
private final SummaryLoader mSummaryLoader;
private final MediaRouter mRouter;
private final MediaRouter.Callback mRouterCallback = new MediaRouter.SimpleCallback() {
@Override
public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
updateSummary();
}
@Override
public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
updateSummary();
}
@Override
public void onRouteAdded(MediaRouter router, RouteInfo info) {
updateSummary();
}
@Override
public void onRouteRemoved(MediaRouter router, RouteInfo info) {
updateSummary();
}
@Override
public void onRouteChanged(MediaRouter router, RouteInfo info) {
updateSummary();
}
};
public SummaryProvider(Context context, SummaryLoader summaryLoader) {
mContext = context;
mSummaryLoader = summaryLoader;
mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
}
@Override
public void setListening(boolean listening) {
if (listening) {
mRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mRouterCallback);
updateSummary();
} else {
mRouter.removeCallback(mRouterCallback);
}
}
private void updateSummary() {
String summary = mContext.getString(R.string.disconnected);
final int routeCount = mRouter.getRouteCount();
for (int i = 0; i < routeCount; i++) {
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);
break;
}
}
mSummaryLoader.setSummary(this, summary);
}
}
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
= (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.wifi_display_settings);
}