Merge "Remove temporary logging for NO_SCREENSHOT bug/." into sc-v2-dev (3c229866) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/SystemUiProxy.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.view.RemoteAnimationAdapter;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;

		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.MainThreadInitializedObject;
		import com.android.launcher3.util.SplitConfigurationOptions;
		import com.android.systemui.shared.recents.ISystemUiProxy;
		@@ -52,12 +51,12 @@ import com.android.wm.shell.pip.IPip;
		import com.android.wm.shell.pip.IPipAnimationListener;
		import com.android.wm.shell.recents.IRecentTasks;
		import com.android.wm.shell.recents.IRecentTasksListener;
		import com.android.wm.shell.util.GroupedRecentTaskInfo;
		import com.android.wm.shell.splitscreen.ISplitScreen;
		import com.android.wm.shell.splitscreen.ISplitScreenListener;
		import com.android.wm.shell.startingsurface.IStartingWindow;
		import com.android.wm.shell.startingsurface.IStartingWindowListener;
		import com.android.wm.shell.transition.IShellTransitions;
		import com.android.wm.shell.util.GroupedRecentTaskInfo;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -469,8 +468,6 @@ public class SystemUiProxy implements ISystemUiProxy,
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call handleImageBundleAsScreenshot");
		}
		} else if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_SCREENSHOT, "sysuiproxy, no proxy available");
		}
		}

quickstep/src/com/android/quickstep/util/ImageActionUtils.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import androidx.core.content.FileProvider;

		import com.android.internal.app.ChooserActivity;
		import com.android.launcher3.BuildConfig;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.quickstep.SystemUiProxy;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.recents.utilities.BitmapUtil;
		@@ -78,9 +77,6 @@ public class ImageActionUtils {
		public static void saveScreenshot(SystemUiProxy systemUiProxy, Bitmap screenshot,
		Rect screenshotBounds,
		Insets visibleInsets, Task.TaskKey task) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_SCREENSHOT, "image action utils calling into sysuiproxy");
		}
		systemUiProxy.handleImageBundleAsScreenshot(BitmapUtil.hardwareBitmapToBundle(screenshot),
		screenshotBounds, visibleInsets, task);
		}

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.View;
		import android.view.View.OnClickListener;
		import android.widget.FrameLayout;
		@@ -31,7 +30,6 @@ import androidx.annotation.Nullable;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Insettable;
		import com.android.launcher3.R;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.MultiValueAlpha;
		import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
		import com.android.quickstep.SysUINavigationMode;
		@@ -114,10 +112,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		protected void onFinishInflate() {
		super.onFinishInflate();
		findViewById(R.id.action_screenshot).setOnClickListener(this);
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_SCREENSHOT, "Inflated OverviewActionsView and added screenshot"
		+ " listener.");
		}

		mSplitButton = findViewById(R.id.action_split);
		mSplitButton.setOnClickListener(this);
		@@ -129,19 +123,11 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		* @param callbacks for callbacks, or {@code null} to clear the listener.
		*/
		public void setCallbacks(T callbacks) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_SCREENSHOT, "OverviewActionsView setCallbacks: " + callbacks);
		}
		mCallbacks = callbacks;
		}

		@Override
		public void onClick(View view) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_SCREENSHOT, "OverviewActionsView - onClick"
		+ " callbacks: " + mCallbacks + " view id: " + view.getId() + " "
		+ " is screenshot? " + (view.getId() == R.id.action_screenshot));
		}
		if (mCallbacks == null) {
		return;
		}

src/com/android/launcher3/testing/TestProtocol.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -126,5 +126,4 @@ public final class TestProtocol {
		public static final String TASK_VIEW_ID_CRASH = "b/195430732";
		public static final String NO_DROP_TARGET = "b/195031154";
		public static final String NULL_INT_SET = "b/200572078";
		public static final String NO_SCREENSHOT = "b/202414125";
		}