Remove more thin wrappers from the shared lib (7d4a22c8) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,11 +17,10 @@
		package com.android.systemui.shared.recents.model;

		import static android.app.WindowConfiguration.ROTATION_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
		import static android.graphics.Bitmap.Config.ARGB_8888;

		import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_UNDEFINED;

		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.graphics.Point;

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityCompat.java

deleted100644 → 0

+0 −45

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.systemui.shared.system;

		import android.app.Activity;
		import android.view.View;
		import android.view.ViewHierarchyEncoder;

		import java.io.ByteArrayOutputStream;

		public class ActivityCompat {
		private final Activity mWrapped;

		public ActivityCompat(Activity activity) {
		mWrapped = activity;
		}

		/**
		* @see Activity#registerRemoteAnimations
		*/
		public void registerRemoteAnimations(RemoteAnimationDefinitionCompat definition) {
		mWrapped.registerRemoteAnimations(definition.getWrapped());
		}

		/**
		* @see Activity#unregisterRemoteAnimations
		*/
		public void unregisterRemoteAnimations() {
		mWrapped.unregisterRemoteAnimations();
		}
		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java

deleted100644 → 0

+0 −85

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.shared.system;

		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

		import android.app.ActivityOptions;
		import android.content.Context;
		import android.os.Handler;

		/**
		* Wrapper around internal ActivityOptions creation.
		*/
		public abstract class ActivityOptionsCompat {

		/**
		* @return ActivityOptions for starting a task in freeform.
		*/
		public static ActivityOptions makeFreeformOptions() {
		final ActivityOptions options = ActivityOptions.makeBasic();
		options.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);
		return options;
		}

		public static ActivityOptions makeRemoteAnimation(
		RemoteAnimationAdapterCompat remoteAnimationAdapter) {
		return ActivityOptions.makeRemoteAnimation(remoteAnimationAdapter.getWrapped(),
		remoteAnimationAdapter.getRemoteTransition().getTransition());
		}

		/**
		* Constructs an ActivityOptions object that will delegate its transition handling to a
		* `remoteTransition`.
		*/
		public static ActivityOptions makeRemoteTransition(RemoteTransitionCompat remoteTransition) {
		return ActivityOptions.makeRemoteTransition(remoteTransition.getTransition());
		}

		/**
		* Returns ActivityOptions for overriding task transition animation.
		*/
		public static ActivityOptions makeCustomAnimation(Context context, int enterResId,
		int exitResId, final Runnable callback, final Handler callbackHandler) {
		return ActivityOptions.makeCustomTaskAnimation(context, enterResId, exitResId,
		callbackHandler,
		new ActivityOptions.OnAnimationStartedListener() {
		@Override
		public void onAnimationStarted(long elapsedRealTime) {
		if (callback != null) {
		callbackHandler.post(callback);
		}
		}
		}, null /* finishedListener */);
		}

		/**
		* Sets the flag to freeze the recents task list reordering as a part of launching the activity.
		*/
		public static ActivityOptions setFreezeRecentTasksList(ActivityOptions opts) {
		opts.setFreezeRecentTasksReordering();
		return opts;
		}

		/**
		* Sets the launch event time from launcher.
		*/
		public static ActivityOptions setLauncherSourceInfo(ActivityOptions opts, long uptimeMillis) {
		opts.setSourceInfo(ActivityOptions.SourceInfo.TYPE_LAUNCHER, uptimeMillis);
		return opts;
		}
		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/ContextUtils.java

deleted100644 → 0

+0 −28

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.shared.system;

		import android.annotation.UserIdInt;
		import android.content.Context;

		public class ContextUtils {

		/** Get the user associated with this context */
		public static @UserIdInt int getUserId(Context context) {
		return context.getUserId();
		}
		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/KeyguardManagerCompat.java

deleted100644 → 0

+0 −32

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.systemui.shared.system;

		import android.app.KeyguardManager;
		import android.content.Context;

		public class KeyguardManagerCompat {
		private final KeyguardManager mKeyguardManager;

		public KeyguardManagerCompat(Context context) {
		mKeyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
		}

		public boolean isDeviceLocked(int userId) {
		return mKeyguardManager.isDeviceLocked(userId);
		}
		}