From 7e31ff431a4e2d2dcb2e70c498578f8aba06fcac Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Wed, 27 Sep 2023 09:30:27 +0800 Subject: [PATCH] Clean up the global action panel The global actions panel has been renamed to power menu and there is a new preference for power menu. The legacy perference for global actions panel is unused. This CL is to remove the preference controller from Settings. Bug: 289967656 Test: manual test and robotest Change-Id: If820f3fa8a188223703ebc6bc68120164108f483 --- ...lobalActionsPanelPreferenceController.java | 73 --------------- ...lActionsPanelPreferenceControllerTest.java | 93 ------------------- 2 files changed, 166 deletions(-) delete mode 100644 src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java diff --git a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java b/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java deleted file mode 100644 index 32a7ba55158..00000000000 --- a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2019 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.gestures; - -import android.content.Context; -import android.provider.Settings; -import android.text.TextUtils; - -import com.android.internal.annotations.VisibleForTesting; - -public class GlobalActionsPanelPreferenceController extends GesturePreferenceController { - private static final String PREF_KEY_VIDEO = "global_actions_panel_video"; - - @VisibleForTesting - protected static final String ENABLED_SETTING = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED; - @VisibleForTesting - protected static final String AVAILABLE_SETTING = - Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE; - - @VisibleForTesting - protected static final String TOGGLE_KEY = "gesture_global_actions_panel_switch"; - - public GlobalActionsPanelPreferenceController(Context context, String key) { - super(context, key); - } - - @Override - public int getAvailabilityStatus() { - int enabled = Settings.Secure.getInt(mContext.getContentResolver(), AVAILABLE_SETTING, 0); - return enabled == 1 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; - } - - @Override - public boolean setChecked(boolean isChecked) { - return Settings.Secure.putInt(mContext.getContentResolver(), ENABLED_SETTING, - isChecked ? 1 : 0); - } - - @Override - protected String getVideoPrefKey() { - return PREF_KEY_VIDEO; - } - - @Override - public boolean isSliceable() { - return TextUtils.equals(getPreferenceKey(), TOGGLE_KEY); - } - - @Override - public boolean isPublicSlice() { - return true; - } - - @Override - public boolean isChecked() { - int enabled = Settings.Secure.getInt(mContext.getContentResolver(), ENABLED_SETTING, 0); - return enabled == 1; - } -} diff --git a/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java deleted file mode 100644 index 65f7ac711af..00000000000 --- a/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2019 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.gestures; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.provider.Settings; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; - -@RunWith(RobolectricTestRunner.class) -public class GlobalActionsPanelPreferenceControllerTest { - - private Context mContext; - private GlobalActionsPanelPreferenceController mController; - - private static final String KEY_GESTURE_PANEL = "gesture_global_actions_panel"; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; - mController = new GlobalActionsPanelPreferenceController(mContext, KEY_GESTURE_PANEL); - } - - @Test - public void testIsChecked_panelEnabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), mController.ENABLED_SETTING, 1); - assertThat(mController.isChecked()).isTrue(); - } - - @Test - public void testIsChecked_panelDisabled() { - Settings.Secure.putInt( - mContext.getContentResolver(), mController.ENABLED_SETTING, 0); - assertThat(mController.isChecked()).isFalse(); - } - - @Test - public void getAvailabilityStatus_panelAvailable() { - Settings.Secure.putInt( - mContext.getContentResolver(), mController.AVAILABLE_SETTING, 1); - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE); - } - - @Test - public void getAvailabilityStatus_panelUnavailable() { - Settings.Secure.putInt( - mContext.getContentResolver(), mController.AVAILABLE_SETTING, 0); - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(mController.CONDITIONALLY_UNAVAILABLE); - } - - @Test - public void isSliceable_correctKey() { - final GlobalActionsPanelPreferenceController controller = - new GlobalActionsPanelPreferenceController(mContext, mController.TOGGLE_KEY); - assertThat(controller.isSliceable()).isTrue(); - } - - @Test - public void isSliceable_incorrectKey() { - final GlobalActionsPanelPreferenceController controller = - new GlobalActionsPanelPreferenceController(mContext, "bad_key"); - assertThat(controller.isSliceable()).isFalse(); - } - - @Test - public void isPublicSlice_returnTrue() { - assertThat(mController.isPublicSlice()).isTrue(); - } -}