Refactor WifiSlice to CustomSliceManager
Modify the WifiSliceCode to follow the pattern for Slices that do not match existing UI components. Test: robotests Bug: 80263568 Change-Id: Id69e019608777282f4b64ff945e8c30c97aaf577
This commit is contained in:
Matthew Fritze
committed by
Matt Fritze
Matt Fritze
parent
3df19f92b0
commit
7f0a30226a
@@ -36,6 +36,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SubSettings;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.slices.CustomSliceable;
|
||||
import com.android.settings.slices.SliceBroadcastReceiver;
|
||||
import com.android.settings.slices.SliceBuilderUtils;
|
||||
|
||||
@@ -48,7 +49,7 @@ import androidx.slice.builders.SliceAction;
|
||||
/**
|
||||
* Utility class to build a Wifi Slice, and handle all associated actions.
|
||||
*/
|
||||
public class WifiSliceBuilder {
|
||||
public class WifiSlice implements CustomSliceable {
|
||||
|
||||
/**
|
||||
* Backing Uri for the Wifi Slice.
|
||||
@@ -60,41 +61,43 @@ public class WifiSliceBuilder {
|
||||
.appendPath(KEY_WIFI)
|
||||
.build();
|
||||
|
||||
/**
|
||||
* Action notifying a change on the Wifi Slice.
|
||||
*/
|
||||
public static final String ACTION_WIFI_SLICE_CHANGED =
|
||||
"com.android.settings.wifi.action.WIFI_CHANGED";
|
||||
private final Context mContext;
|
||||
|
||||
public static final IntentFilter INTENT_FILTER = new IntentFilter();
|
||||
|
||||
static {
|
||||
INTENT_FILTER.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
|
||||
INTENT_FILTER.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
|
||||
public WifiSlice(Context context) {
|
||||
mContext = context;
|
||||
}
|
||||
|
||||
private WifiSliceBuilder() {
|
||||
@Override
|
||||
public Uri getUri() {
|
||||
return WIFI_URI;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IntentFilter getIntentFilter() {
|
||||
final IntentFilter filter = new IntentFilter();
|
||||
filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
|
||||
filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
|
||||
return filter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a Wifi Slice bound to {@link #WIFI_URI}.
|
||||
* <p>
|
||||
* Note that you should register a listener for {@link #INTENT_FILTER} to get changes for Wifi.
|
||||
*/
|
||||
public static Slice getSlice(Context context) {
|
||||
final boolean isWifiEnabled = isWifiEnabled(context);
|
||||
final IconCompat icon = IconCompat.createWithResource(context,
|
||||
@Override
|
||||
public Slice getSlice() {
|
||||
final boolean isWifiEnabled = isWifiEnabled();
|
||||
final IconCompat icon = IconCompat.createWithResource(mContext,
|
||||
R.drawable.ic_settings_wireless);
|
||||
final String title = context.getString(R.string.wifi_settings);
|
||||
final CharSequence summary = getSummary(context);
|
||||
@ColorInt final int color = Utils.getColorAccentDefaultColor(context);
|
||||
final PendingIntent toggleAction = getBroadcastIntent(context);
|
||||
final PendingIntent primaryAction = getPrimaryAction(context);
|
||||
final String title = mContext.getString(R.string.wifi_settings);
|
||||
final CharSequence summary = getSummary();
|
||||
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
|
||||
final PendingIntent toggleAction = getBroadcastIntent(mContext);
|
||||
final PendingIntent primaryAction = getPrimaryAction();
|
||||
final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
|
||||
final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
|
||||
isWifiEnabled);
|
||||
|
||||
return new ListBuilder(context, WIFI_URI, ListBuilder.INFINITY)
|
||||
return new ListBuilder(mContext, WIFI_URI, ListBuilder.INFINITY)
|
||||
.setAccentColor(color)
|
||||
.addRow(new RowBuilder()
|
||||
.setTitle(title)
|
||||
@@ -108,8 +111,9 @@ public class WifiSliceBuilder {
|
||||
* Update the current wifi status to the boolean value keyed by
|
||||
* {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
|
||||
*/
|
||||
public static void handleUriChange(Context context, Intent intent) {
|
||||
final WifiManager wifiManager = context.getSystemService(WifiManager.class);
|
||||
@Override
|
||||
public void onNotifyChange(Intent intent) {
|
||||
final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
|
||||
final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
|
||||
wifiManager.isWifiEnabled());
|
||||
wifiManager.setWifiEnabled(newState);
|
||||
@@ -118,20 +122,21 @@ public class WifiSliceBuilder {
|
||||
// handle it.
|
||||
}
|
||||
|
||||
public static Intent getIntent(Context context) {
|
||||
final String screenTitle = context.getText(R.string.wifi_settings).toString();
|
||||
@Override
|
||||
public Intent getIntent() {
|
||||
final String screenTitle = mContext.getText(R.string.wifi_settings).toString();
|
||||
final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
|
||||
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(context,
|
||||
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
|
||||
WifiSettings.class.getName(), KEY_WIFI, screenTitle,
|
||||
MetricsEvent.DIALOG_WIFI_AP_EDIT)
|
||||
.setClassName(context.getPackageName(), SubSettings.class.getName())
|
||||
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
|
||||
.setData(contentUri);
|
||||
|
||||
return intent;
|
||||
}
|
||||
|
||||
private static boolean isWifiEnabled(Context context) {
|
||||
final WifiManager wifiManager = context.getSystemService(WifiManager.class);
|
||||
private boolean isWifiEnabled() {
|
||||
final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
|
||||
|
||||
switch (wifiManager.getWifiState()) {
|
||||
case WifiManager.WIFI_STATE_ENABLED:
|
||||
@@ -145,38 +150,31 @@ public class WifiSliceBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
private static CharSequence getSummary(Context context) {
|
||||
final WifiManager wifiManager = context.getSystemService(WifiManager.class);
|
||||
private CharSequence getSummary() {
|
||||
final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
|
||||
|
||||
switch (wifiManager.getWifiState()) {
|
||||
case WifiManager.WIFI_STATE_ENABLED:
|
||||
final String ssid = WifiInfo.removeDoubleQuotes(wifiManager.getConnectionInfo()
|
||||
.getSSID());
|
||||
if (TextUtils.equals(ssid, WifiSsid.NONE)) {
|
||||
return context.getText(R.string.disconnected);
|
||||
return mContext.getText(R.string.disconnected);
|
||||
}
|
||||
return ssid;
|
||||
case WifiManager.WIFI_STATE_ENABLING:
|
||||
return context.getText(R.string.disconnected);
|
||||
return mContext.getText(R.string.disconnected);
|
||||
case WifiManager.WIFI_STATE_DISABLED:
|
||||
case WifiManager.WIFI_STATE_DISABLING:
|
||||
return context.getText(R.string.switch_off_text);
|
||||
return mContext.getText(R.string.switch_off_text);
|
||||
case WifiManager.WIFI_STATE_UNKNOWN:
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private static PendingIntent getPrimaryAction(Context context) {
|
||||
final Intent intent = getIntent(context);
|
||||
return PendingIntent.getActivity(context, 0 /* requestCode */,
|
||||
private PendingIntent getPrimaryAction() {
|
||||
final Intent intent = getIntent();
|
||||
return PendingIntent.getActivity(mContext, 0 /* requestCode */,
|
||||
intent, 0 /* flags */);
|
||||
}
|
||||
|
||||
private static PendingIntent getBroadcastIntent(Context context) {
|
||||
final Intent intent = new Intent(ACTION_WIFI_SLICE_CHANGED);
|
||||
intent.setClass(context, SliceBroadcastReceiver.class);
|
||||
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
|
||||
PendingIntent.FLAG_CANCEL_CURRENT);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user