Merge "Remove screenrecord flag code from global actions" into sc-dev (5b1beb39) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -2325,7 +2325,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";
		}

core/java/android/util/FeatureFlagUtils.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 =
		@@ -59,7 +58,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");

core/java/com/android/internal/util/ScreenRecordHelper.java

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		/*
		* 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);
		}
		}

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -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

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -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(