From 749dea4ada432f64412a691d637c0acc192eceba Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Tue, 2 Mar 2021 20:01:32 -0500 Subject: [PATCH] Remove screenrecord flag code from global actions The flag was added before screen record was a full feature and is no longer necessary to maintain Fixes: 118826991 Test: atest com.android.systemui.globalactions Change-Id: I728a2d8c7c8527d8a6a61c1bc9feb833724afeb8 --- core/api/test-current.txt | 1 - core/java/android/util/FeatureFlagUtils.java | 2 - .../internal/util/ScreenRecordHelper.java | 49 ------------------- .../globalactions/GlobalActionsDialog.java | 18 +------ .../GlobalActionsDialogTest.java | 20 -------- 5 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 core/java/com/android/internal/util/ScreenRecordHelper.java diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 1e5a6f12f96bc..e2f8671567861 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2305,7 +2305,6 @@ package android.util { field public static final String FFLAG_PREFIX = "sys.fflag."; field public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; field public static final String PERSIST_PREFIX = "persist.sys.fflag.override."; - field public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press"; field public static final String SETTINGS_WIFITRACKER2 = "settings_wifitracker2"; } diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 2b577d04b18d7..083e6db063824 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -39,7 +39,6 @@ public class FeatureFlagUtils { public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override."; public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; - public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press"; public static final String SETTINGS_WIFITRACKER2 = "settings_wifitracker2"; /** @hide */ public static final String SETTINGS_DO_NOT_RESTORE_PRESERVED = @@ -57,7 +56,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_audio_switcher", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); - DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false"); DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false"); DEFAULT_FLAGS.put("settings_skip_direction_mutable", "true"); DEFAULT_FLAGS.put(SETTINGS_WIFITRACKER2, "true"); diff --git a/core/java/com/android/internal/util/ScreenRecordHelper.java b/core/java/com/android/internal/util/ScreenRecordHelper.java deleted file mode 100644 index ec7ed4e0008af..0000000000000 --- a/core/java/com/android/internal/util/ScreenRecordHelper.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2018 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.internal.util; - -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; - -/** - * Helper class to initiate a screen recording - */ -public class ScreenRecordHelper { - private final Context mContext; - - /** - * Create a new ScreenRecordHelper for the given context - * @param context - */ - public ScreenRecordHelper(Context context) { - mContext = context; - } - - /** - * Show dialog of screen recording options to user. - */ - public void launchRecordPrompt() { - final ComponentName launcherComponent = ComponentName.unflattenFromString( - mContext.getResources().getString( - com.android.internal.R.string.config_screenRecorderComponent)); - final Intent intent = new Intent(); - intent.setComponent(launcherComponent); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mContext.startActivity(intent); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index d85b10167697f..1f67276bfbae5 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -79,7 +79,6 @@ import android.transition.AutoTransition; import android.transition.TransitionManager; import android.transition.TransitionSet; import android.util.ArraySet; -import android.util.FeatureFlagUtils; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.IWindowManager; @@ -114,7 +113,6 @@ import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.util.EmergencyAffordanceManager; -import com.android.internal.util.ScreenRecordHelper; import com.android.internal.util.ScreenshotHelper; import com.android.internal.view.RotationPolicy; import com.android.internal.widget.LockPatternUtils; @@ -242,7 +240,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, private final boolean mShowSilentToggle; private final EmergencyAffordanceManager mEmergencyAffordanceManager; private final ScreenshotHelper mScreenshotHelper; - private final ScreenRecordHelper mScreenRecordHelper; private final ActivityStarter mActivityStarter; private final SysuiColorExtractor mSysuiColorExtractor; private final IStatusBarService mStatusBarService; @@ -378,7 +375,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, mEmergencyAffordanceManager = new EmergencyAffordanceManager(context); mScreenshotHelper = new ScreenshotHelper(context); - mScreenRecordHelper = new ScreenRecordHelper(context); mConfigurationController.addCallback(this); @@ -979,7 +975,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, } @VisibleForTesting - class ScreenshotAction extends SinglePressAction implements LongPressAction { + class ScreenshotAction extends SinglePressAction { final String KEY_SYSTEM_NAV_2BUTTONS = "system_nav_2buttons"; public ScreenshotAction() { @@ -1024,18 +1020,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, return NAV_BAR_MODE_2BUTTON == mContext.getResources().getInteger( com.android.internal.R.integer.config_navBarInteractionMode); } - - - @Override - public boolean onLongPress() { - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SCREENRECORD_LONG_PRESS)) { - mUiEventLogger.log(GlobalActionsEvent.GA_SCREENSHOT_LONG_PRESS); - mScreenRecordHelper.launchRecordPrompt(); - } else { - onPress(); - } - return true; - } } @VisibleForTesting diff --git a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java index 1062fae52e7a7..eedf09936b4d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java @@ -46,16 +46,12 @@ import android.service.dreams.IDreamManager; import android.telephony.TelephonyManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; -import android.util.FeatureFlagUtils; import android.view.IWindowManager; import android.view.View; import android.view.WindowManagerPolicyConstants; import android.widget.FrameLayout; import androidx.test.filters.SmallTest; -import androidx.test.uiautomator.By; -import androidx.test.uiautomator.UiObject2; -import androidx.test.uiautomator.Until; import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.logging.MetricsLogger; @@ -250,22 +246,6 @@ public class GlobalActionsDialogTest extends SysuiTestCase { verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent.GA_SCREENSHOT_PRESS); } - @Test - public void testShouldLogScreenshotLongPress() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SCREENRECORD_LONG_PRESS, true); - GlobalActionsDialog.ScreenshotAction screenshotAction = - mGlobalActionsDialog.makeScreenshotActionForTesting(); - screenshotAction.onLongPress(); - verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent.GA_SCREENSHOT_LONG_PRESS); - - // Dismiss ScreenRecordDialog opened by the long press above. - final UiObject2 cancelButton = getUiDevice().wait( - Until.findObject(By.text(CANCEL_BUTTON)), UI_TIMEOUT_MILLIS); - if (cancelButton != null) { - cancelButton.click(); - } - } - @Test public void testShouldShowScreenshot() { mContext.getOrCreateTestableResources().addOverride(