Merge "Moves WindowMagnificationConnectionImpl.class outside of WindowMagnification" (ec074e0f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java

+0 −95

Original line number	Diff line number	Diff line
		@@ -17,20 +17,16 @@
		package com.android.systemui.accessibility;

		import android.annotation.MainThread;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.content.pm.ActivityInfo;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.os.Handler;
		import android.os.RemoteException;
		import android.util.Log;
		import android.view.SurfaceControl;
		import android.view.accessibility.AccessibilityManager;
		import android.view.accessibility.IRemoteMagnificationAnimationCallback;
		import android.view.accessibility.IWindowMagnificationConnection;
		import android.view.accessibility.IWindowMagnificationConnectionCallback;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
		@@ -174,95 +170,4 @@ public class WindowMagnification extends SystemUI implements WindowMagnifierCall
		mAccessibilityManager.setWindowMagnificationConnection(null);
		//TODO: destroy controllers.
		}

		private static class WindowMagnificationConnectionImpl extends
		IWindowMagnificationConnection.Stub {

		private static final String TAG = "WindowMagnificationConnectionImpl";

		private IWindowMagnificationConnectionCallback mConnectionCallback;
		private final WindowMagnification mWindowMagnification;
		private final Handler mHandler;
		private final ModeSwitchesController mModeSwitchesController;

		WindowMagnificationConnectionImpl(@NonNull WindowMagnification windowMagnification,
		@Main Handler mainHandler, ModeSwitchesController modeSwitchesController) {
		mWindowMagnification = windowMagnification;
		mHandler = mainHandler;
		mModeSwitchesController = modeSwitchesController;
		}

		@Override
		public void enableWindowMagnification(int displayId, float scale, float centerX,
		float centerY, IRemoteMagnificationAnimationCallback callback) {
		mHandler.post(
		() -> mWindowMagnification.enableWindowMagnification(displayId, scale, centerX,
		centerY, callback));
		}

		@Override
		public void setScale(int displayId, float scale) {
		mHandler.post(() -> mWindowMagnification.setScale(displayId, scale));
		}

		@Override
		public void disableWindowMagnification(int displayId,
		IRemoteMagnificationAnimationCallback callback) {
		mHandler.post(() -> mWindowMagnification.disableWindowMagnification(displayId,
		callback));
		}

		@Override
		public void moveWindowMagnifier(int displayId, float offsetX, float offsetY) {
		mHandler.post(
		() -> mWindowMagnification.moveWindowMagnifier(displayId, offsetX, offsetY));
		}

		@Override
		public void showMagnificationButton(int displayId, int magnificationMode) {
		mHandler.post(
		() -> mModeSwitchesController.showButton(displayId, magnificationMode));
		}

		@Override
		public void removeMagnificationButton(int displayId) {
		mHandler.post(
		() -> mModeSwitchesController.removeButton(displayId));
		}

		@Override
		public void setConnectionCallback(IWindowMagnificationConnectionCallback callback) {
		mConnectionCallback = callback;
		}

		void onWindowMagnifierBoundsChanged(int displayId, Rect frame) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onWindowMagnifierBoundsChanged(displayId, frame);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform bounds changed", e);
		}
		}
		}

		void onSourceBoundsChanged(int displayId, Rect sourceBounds) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onSourceBoundsChanged(displayId, sourceBounds);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform source bounds changed", e);
		}
		}
		}

		void onPerformScaleAction(int displayId, float scale) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onPerformScaleAction(displayId, scale);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform performing scale action", e);
		}
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationConnectionImpl.java

0 → 100644

+123 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.systemui.accessibility;

		import android.annotation.NonNull;
		import android.graphics.Rect;
		import android.os.Handler;
		import android.os.RemoteException;
		import android.util.Log;
		import android.view.accessibility.IRemoteMagnificationAnimationCallback;
		import android.view.accessibility.IWindowMagnificationConnection;
		import android.view.accessibility.IWindowMagnificationConnectionCallback;

		import com.android.systemui.dagger.qualifiers.Main;

		/**
		* Implementation of window magnification connection.
		*
		* @see IWindowMagnificationConnection
		*/
		class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.Stub {

		private static final String TAG = "WindowMagnificationConnectionImpl";

		private IWindowMagnificationConnectionCallback mConnectionCallback;
		private final WindowMagnification mWindowMagnification;
		private final Handler mHandler;
		private final ModeSwitchesController mModeSwitchesController;

		WindowMagnificationConnectionImpl(@NonNull WindowMagnification windowMagnification,
		@Main Handler mainHandler, ModeSwitchesController modeSwitchesController) {
		mWindowMagnification = windowMagnification;
		mHandler = mainHandler;
		mModeSwitchesController = modeSwitchesController;
		}

		@Override
		public void enableWindowMagnification(int displayId, float scale, float centerX,
		float centerY, IRemoteMagnificationAnimationCallback callback) {
		mHandler.post(
		() -> mWindowMagnification.enableWindowMagnification(displayId, scale, centerX,
		centerY, callback));
		}

		@Override
		public void setScale(int displayId, float scale) {
		mHandler.post(() -> mWindowMagnification.setScale(displayId, scale));
		}

		@Override
		public void disableWindowMagnification(int displayId,
		IRemoteMagnificationAnimationCallback callback) {
		mHandler.post(() -> mWindowMagnification.disableWindowMagnification(displayId,
		callback));
		}

		@Override
		public void moveWindowMagnifier(int displayId, float offsetX, float offsetY) {
		mHandler.post(
		() -> mWindowMagnification.moveWindowMagnifier(displayId, offsetX, offsetY));
		}

		@Override
		public void showMagnificationButton(int displayId, int magnificationMode) {
		mHandler.post(
		() -> mModeSwitchesController.showButton(displayId, magnificationMode));
		}

		@Override
		public void removeMagnificationButton(int displayId) {
		mHandler.post(
		() -> mModeSwitchesController.removeButton(displayId));
		}

		@Override
		public void setConnectionCallback(IWindowMagnificationConnectionCallback callback) {
		mConnectionCallback = callback;
		}

		void onWindowMagnifierBoundsChanged(int displayId, Rect frame) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onWindowMagnifierBoundsChanged(displayId, frame);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform bounds changed", e);
		}
		}
		}

		void onSourceBoundsChanged(int displayId, Rect sourceBounds) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onSourceBoundsChanged(displayId, sourceBounds);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform source bounds changed", e);
		}
		}
		}

		void onPerformScaleAction(int displayId, float scale) {
		if (mConnectionCallback != null) {
		try {
		mConnectionCallback.onPerformScaleAction(displayId, scale);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to inform performing scale action", e);
		}
		}
		}
		}