Snap for 9647254 from 0deba05b3407665cab26b0bffba68a5ea0679463 to tm-qpr3-release (be6bcba3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -30978,7 +30978,6 @@ package android.os {
		field public static final int S = 31; // 0x1f
		field public static final int S_V2 = 32; // 0x20
		field public static final int TIRAMISU = 33; // 0x21
		field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710
		}

		public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

+0 −5

Original line number	Diff line number	Diff line
		@@ -1167,11 +1167,6 @@ public class Build {
		* Tiramisu.
		*/
		public static final int TIRAMISU = 33;

		/**
		* Upside Down Cake.
		*/
		public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
		}

		/** The type of build, like "user" or "eng". */

+6 −4

Original line number	Diff line number	Diff line
		@@ -58,11 +58,13 @@ public class DreamActivity extends Activity {
		setTitle(title);
		}

		final Bundle extras = getIntent().getExtras();
		mCallback = (DreamService.DreamActivityCallbacks) extras.getBinder(EXTRA_CALLBACK);

		if (mCallback != null) {
		final Object callback = getIntent().getExtras().getBinder(EXTRA_CALLBACK);
		if (callback instanceof DreamService.DreamActivityCallbacks) {
		mCallback = (DreamService.DreamActivityCallbacks) callback;
		mCallback.onActivityCreated(this);
		} else {
		mCallback = null;
		finishAndRemoveTask();
		}
		}

+3 −13

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class DesktopTasksController(
		fun showDesktopApps() {
		ProtoLog.v(WM_SHELL_DESKTOP_MODE, "showDesktopApps")
		val wct = WindowContainerTransaction()
		bringDesktopAppsToFront(wct, force = true)
		bringDesktopAppsToFront(wct)

		// Execute transaction if there are pending operations
		if (!wct.isEmpty) {
		@@ -156,19 +156,9 @@ class DesktopTasksController(
		?: WINDOWING_MODE_UNDEFINED
		}

		private fun bringDesktopAppsToFront(wct: WindowContainerTransaction, force: Boolean = false) {
		val activeTasks = desktopModeTaskRepository.getActiveTasks()

		// Skip if all tasks are already visible
		if (!force && activeTasks.all(desktopModeTaskRepository::isVisibleTask)) {
		ProtoLog.d(
		WM_SHELL_DESKTOP_MODE,
		"bringDesktopAppsToFront: active tasks are already in front, skipping."
		)
		return
		}

		private fun bringDesktopAppsToFront(wct: WindowContainerTransaction) {
		ProtoLog.v(WM_SHELL_DESKTOP_MODE, "bringDesktopAppsToFront")
		val activeTasks = desktopModeTaskRepository.getActiveTasks()

		// First move home to front and then other tasks on top of it
		moveHomeTaskToFront(wct)

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 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.
		-->

		<shape
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<solid android:color="?androidprv:attr/colorAccentPrimary" />
		<corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
		</shape>
		No newline at end of file