Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404 Test: manual, robotest build pass, unit Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
This commit is contained in:
@@ -22,6 +22,7 @@ import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
|
||||
|
||||
/**
|
||||
@@ -62,4 +63,9 @@ public class AdaptiveConnectivityTogglePreferenceController extends
|
||||
mWifiManager.setWifiScoringEnabled(isChecked);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_network;
|
||||
}
|
||||
}
|
||||
|
@@ -120,6 +120,11 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
|
||||
return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_network;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
if (isAvailable()) {
|
||||
|
@@ -22,6 +22,7 @@ import androidx.lifecycle.Lifecycle;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settings.wifi.WifiPickerTrackerHelper;
|
||||
@@ -88,6 +89,11 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
|
||||
updateCarrierNetworkPreference();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_network;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWifiStateChanged() {
|
||||
updateCarrierNetworkPreference();
|
||||
|
@@ -290,7 +290,7 @@ public class ProviderModelSlice extends WifiSlice {
|
||||
final String screenTitle = mContext.getText(R.string.provider_internet_settings).toString();
|
||||
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
|
||||
NetworkProviderSettings.class.getName(), "" /* key */, screenTitle,
|
||||
SettingsEnums.SLICE)
|
||||
SettingsEnums.SLICE, this)
|
||||
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
|
||||
.setData(getUri());
|
||||
}
|
||||
|
@@ -25,6 +25,7 @@ import androidx.lifecycle.OnLifecycleEvent;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settings.datausage.DataSaverBackend;
|
||||
|
||||
@@ -117,6 +118,11 @@ public abstract class TetherBasePreferenceController extends TogglePreferenceCon
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_network;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTetherStateUpdated(@TetherEnabler.TetheringState int state) {
|
||||
mTetheringState = state;
|
||||
|
@@ -145,6 +145,11 @@ public class MobileDataSlice implements CustomSliceable {
|
||||
return new Intent(mContext, MobileNetworkActivity.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_network;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
|
||||
return MobileDataWorker.class;
|
||||
|
@@ -65,6 +65,12 @@ public abstract class TelephonyTogglePreferenceController extends TogglePreferen
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSliceHighlightMenuRes() {
|
||||
// not needed since it's not sliceable
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get carrier config based on specific subscription id.
|
||||
*
|
||||
|
Reference in New Issue
Block a user