Clean up DND slice in search.
- Remove the controller in SoundSettings, just use the common one. - Update a bunch of IDs so ZenModeSliceBuilder maps to the toggle button in zen_mode_settings.xml This is needed so the slice intent (left target when shown in search) is the same as what we index from search side. Previously the search indexer is finding zen_mode from sound page but the slice itself is reporting a deep link into zenModeSettings page. Fixes: 130437726 Test: robotest Change-Id: Ic41d2d93afa1f748e3282e23010199a0fa078645
This commit is contained in:
@@ -33,11 +33,12 @@ import com.android.settingslib.widget.LayoutPreference;
|
||||
public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
|
||||
public static final String KEY = "zen_mode_toggle";
|
||||
|
||||
private static final String TAG = "EnableZenModeButton";
|
||||
protected static final String KEY = "zen_mode_settings_button_container";
|
||||
private final FragmentManager mFragment;
|
||||
private Button mZenButtonOn;
|
||||
private Button mZenButtonOff;
|
||||
private FragmentManager mFragment;
|
||||
|
||||
public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle, FragmentManager
|
||||
fragment) {
|
||||
@@ -60,13 +61,13 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
|
||||
super.updateState(preference);
|
||||
|
||||
if (null == mZenButtonOn) {
|
||||
mZenButtonOn = (Button) ((LayoutPreference) preference)
|
||||
mZenButtonOn = ((LayoutPreference) preference)
|
||||
.findViewById(R.id.zen_mode_settings_turn_on_button);
|
||||
updateZenButtonOnClickListener();
|
||||
}
|
||||
|
||||
if (null == mZenButtonOff) {
|
||||
mZenButtonOff = (Button) ((LayoutPreference) preference)
|
||||
mZenButtonOff = ((LayoutPreference) preference)
|
||||
.findViewById(R.id.zen_mode_settings_turn_off_button);
|
||||
mZenButtonOff.setOnClickListener(v -> {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
|
||||
Reference in New Issue
Block a user