Add button for activating modes manually
Fixes: 308819907 Flag: android.app.modes_ui Test: ZenModeButtonPreferenceControllerTest Test: atest com.android.settings.notification.modes Change-Id: Id018d360c648dd948d2f950ca67cfbea71cc5c68
This commit is contained in:
@@ -41,7 +41,7 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon
|
||||
@Nullable
|
||||
protected ZenModesBackend mBackend;
|
||||
|
||||
@Nullable // only until updateZenMode() is called
|
||||
@Nullable // only until setZenMode() is called
|
||||
private ZenMode mZenMode;
|
||||
|
||||
@NonNull
|
||||
@@ -65,7 +65,22 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return Flags.modesUi();
|
||||
if (mZenMode != null) {
|
||||
return Flags.modesUi() && isAvailable(mZenMode);
|
||||
} else {
|
||||
return Flags.modesUi();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isAvailable(@NonNull ZenMode zenMode) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called by parent Fragment onAttach, for any methods (such as isAvailable()) that need
|
||||
// zen mode info before onStart. Most callers should use updateZenMode instead, which will
|
||||
// do any further necessary propagation.
|
||||
protected final void setZenMode(@NonNull ZenMode zenMode) {
|
||||
mZenMode = zenMode;
|
||||
}
|
||||
|
||||
// Called by the parent Fragment onStart, which means it will happen before resume.
|
||||
|
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.notification.modes;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
import android.content.Context;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController {
|
||||
|
||||
private Button mZenButton;
|
||||
|
||||
public ZenModeButtonPreferenceController(Context context, String key, ZenModesBackend backend) {
|
||||
super(context, key, backend);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable(ZenMode zenMode) {
|
||||
return zenMode.getRule().isManualInvocationAllowed() && zenMode.getRule().isEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
|
||||
if (mZenButton == null) {
|
||||
mZenButton = ((LayoutPreference) preference).findViewById(R.id.activate_mode);
|
||||
}
|
||||
mZenButton.setOnClickListener(v -> {
|
||||
if (zenMode.isActive()) {
|
||||
mBackend.deactivateMode(zenMode);
|
||||
} else {
|
||||
mBackend.activateMode(zenMode, null);
|
||||
}
|
||||
});
|
||||
if (zenMode.isActive()) {
|
||||
mZenButton.setText(R.string.zen_mode_button_turn_off);
|
||||
} else {
|
||||
mZenButton.setText(R.string.zen_mode_button_turn_on);
|
||||
}
|
||||
}
|
||||
}
|
@@ -37,6 +37,7 @@ public class ZenModeFragment extends ZenModeFragmentBase {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
List<AbstractPreferenceController> prefControllers = new ArrayList<>();
|
||||
prefControllers.add(new ZenModeHeaderController(context, "header", this, mBackend));
|
||||
prefControllers.add(new ZenModeButtonPreferenceController(context, "activate", mBackend));
|
||||
prefControllers.add(new ZenModePeopleLinkPreferenceController(
|
||||
context, "zen_mode_people", mBackend));
|
||||
prefControllers.add(new ZenModeOtherLinkPreferenceController(
|
||||
|
@@ -53,10 +53,25 @@ abstract class ZenModeFragmentBase extends ZenModesFragmentBase {
|
||||
if (!reloadMode(id)) {
|
||||
Log.d(TAG, "Mode id " + id + " not found");
|
||||
toastAndFinish();
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
Log.d(TAG, "Mode id required to set mode config settings");
|
||||
toastAndFinish();
|
||||
return;
|
||||
}
|
||||
if (mZenMode != null) {
|
||||
// Propagate mode info through to controllers.
|
||||
for (List<AbstractPreferenceController> list : getPreferenceControllers()) {
|
||||
try {
|
||||
for (AbstractPreferenceController controller : list) {
|
||||
// mZenMode guaranteed non-null from reloadMode() above
|
||||
((AbstractZenModePreferenceController) controller).setZenMode(mZenMode);
|
||||
}
|
||||
} catch (ClassCastException e) {
|
||||
// ignore controllers that aren't AbstractZenModePreferenceController
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -51,6 +51,7 @@ class ZenModeHeaderController extends AbstractZenModePreferenceController {
|
||||
if (mFragment == null) {
|
||||
return;
|
||||
}
|
||||
preference.setSelectable(false);
|
||||
|
||||
if (mHeaderController == null) {
|
||||
final LayoutPreference pref = (LayoutPreference) preference;
|
||||
|
@@ -60,17 +60,15 @@ abstract class ZenModesFragmentBase extends RestrictedDashboardFragment {
|
||||
mContext = context;
|
||||
mBackend = ZenModesBackend.getInstance(context);
|
||||
super.onAttach(context);
|
||||
mSettingsObserver.register();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
updateZenModeState();
|
||||
mSettingsObserver.register();
|
||||
if (isUiRestricted()) {
|
||||
if (isUiRestrictedByOnlyAdmin()) {
|
||||
getPreferenceScreen().removeAll();
|
||||
return;
|
||||
} else {
|
||||
finish();
|
||||
}
|
||||
@@ -84,8 +82,8 @@ abstract class ZenModesFragmentBase extends RestrictedDashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
mSettingsObserver.unregister();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user