diff options
298 files changed, 8055 insertions, 5553 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 5db077220b20..dfacbc425181 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -140,11 +140,17 @@ "ravenwood-presubmit": [ { "name": "CtsUtilTestCasesRavenwood", - "host": true + "host": true, + "file_patterns": [ + "[Rr]avenwood" + ] }, { "name": "RavenwoodBivalentTest", - "host": true + "host": true, + "file_patterns": [ + "[Rr]avenwood" + ] } ], "postsubmit-managedprofile-stress": [ diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ce0d38ffe9ad..8dd4adc27b34 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3676,6 +3676,7 @@ package android.view { public static final class Display.Mode implements android.os.Parcelable { ctor public Display.Mode(int, int, float); + method public boolean isSynthetic(); method public boolean matches(int, int, float); } diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index e57630bfd5ed..68063c4a1a50 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -233,6 +233,10 @@ public class ActivityManager { private static final RateLimitingCache<List<RunningAppProcessInfo>> mRunningProcessesCache = new RateLimitingCache<>(10, 4); + /** Rate-Limiting Cache that allows no more than 200 calls to the service per second. */ + private static final RateLimitingCache<List<ProcessErrorStateInfo>> mErrorProcessesCache = + new RateLimitingCache<>(10, 2); + /** * Map of callbacks that have registered for {@link UidFrozenStateChanged} events. * Will be called when a Uid has become frozen or unfrozen. @@ -3685,6 +3689,16 @@ public class ActivityManager { * specified. */ public List<ProcessErrorStateInfo> getProcessesInErrorState() { + if (Flags.rateLimitGetProcessesInErrorState()) { + return mErrorProcessesCache.get(() -> { + return getProcessesInErrorStateInternal(); + }); + } else { + return getProcessesInErrorStateInternal(); + } + } + + private List<ProcessErrorStateInfo> getProcessesInErrorStateInternal() { try { return getService().getProcessesInErrorState(); } catch (RemoteException e) { diff --git a/core/java/android/app/ApplicationStartInfo.java b/core/java/android/app/ApplicationStartInfo.java index 0ff55149bf6e..1e9a79bca65a 100644 --- a/core/java/android/app/ApplicationStartInfo.java +++ b/core/java/android/app/ApplicationStartInfo.java @@ -210,6 +210,11 @@ public final class ApplicationStartInfo implements Parcelable { public static final int START_TIMESTAMP_SURFACEFLINGER_COMPOSITION_COMPLETE = 7; /** + * @see #getMonoticCreationTimeMs + */ + private long mMonoticCreationTimeMs; + + /** * @see #getStartupState */ private @StartupState int mStartupState; @@ -487,6 +492,15 @@ public final class ApplicationStartInfo implements Parcelable { } /** + * Monotonic elapsed time persisted across reboots. + * + * @hide + */ + public long getMonoticCreationTimeMs() { + return mMonoticCreationTimeMs; + } + + /** * The process id. * * <p class="note"> Note: field will be set for any {@link #getStartupState} value.</p> @@ -669,7 +683,9 @@ public final class ApplicationStartInfo implements Parcelable { } /** @hide */ - public ApplicationStartInfo() {} + public ApplicationStartInfo(long monotonicCreationTimeMs) { + mMonoticCreationTimeMs = monotonicCreationTimeMs; + } /** @hide */ public ApplicationStartInfo(ApplicationStartInfo other) { @@ -686,6 +702,7 @@ public final class ApplicationStartInfo implements Parcelable { mStartIntent = other.mStartIntent; mLaunchMode = other.mLaunchMode; mWasForceStopped = other.mWasForceStopped; + mMonoticCreationTimeMs = other.mMonoticCreationTimeMs; } private ApplicationStartInfo(@NonNull Parcel in) { @@ -708,6 +725,7 @@ public final class ApplicationStartInfo implements Parcelable { in.readParcelable(Intent.class.getClassLoader(), android.content.Intent.class); mLaunchMode = in.readInt(); mWasForceStopped = in.readBoolean(); + mMonoticCreationTimeMs = in.readLong(); } private static String intern(@Nullable String source) { @@ -786,6 +804,7 @@ public final class ApplicationStartInfo implements Parcelable { } proto.write(ApplicationStartInfoProto.LAUNCH_MODE, mLaunchMode); proto.write(ApplicationStartInfoProto.WAS_FORCE_STOPPED, mWasForceStopped); + proto.write(ApplicationStartInfoProto.MONOTONIC_CREATION_TIME_MS, mMonoticCreationTimeMs); proto.end(token); } @@ -869,6 +888,10 @@ public final class ApplicationStartInfo implements Parcelable { mWasForceStopped = proto.readBoolean( ApplicationStartInfoProto.WAS_FORCE_STOPPED); break; + case (int) ApplicationStartInfoProto.MONOTONIC_CREATION_TIME_MS: + mMonoticCreationTimeMs = proto.readLong( + ApplicationStartInfoProto.MONOTONIC_CREATION_TIME_MS); + break; } } proto.end(token); @@ -881,6 +904,8 @@ public final class ApplicationStartInfo implements Parcelable { sb.append(prefix) .append("ApplicationStartInfo ").append(seqSuffix).append(':') .append('\n') + .append(" monotonicCreationTimeMs=").append(mMonoticCreationTimeMs) + .append('\n') .append(" pid=").append(mPid) .append(" realUid=").append(mRealUid) .append(" packageUid=").append(mPackageUid) @@ -949,14 +974,15 @@ public final class ApplicationStartInfo implements Parcelable { && mDefiningUid == o.mDefiningUid && mReason == o.mReason && mStartupState == o.mStartupState && mStartType == o.mStartType && mLaunchMode == o.mLaunchMode && TextUtils.equals(mProcessName, o.mProcessName) - && timestampsEquals(o) && mWasForceStopped == o.mWasForceStopped; + && timestampsEquals(o) && mWasForceStopped == o.mWasForceStopped + && mMonoticCreationTimeMs == o.mMonoticCreationTimeMs; } @Override public int hashCode() { return Objects.hash(mPid, mRealUid, mPackageUid, mDefiningUid, mReason, mStartupState, - mStartType, mLaunchMode, mProcessName, - mStartupTimestampsNs); + mStartType, mLaunchMode, mProcessName, mStartupTimestampsNs, + mMonoticCreationTimeMs); } private boolean timestampsEquals(@NonNull ApplicationStartInfo other) { diff --git a/core/java/android/app/activity_manager.aconfig b/core/java/android/app/activity_manager.aconfig index d9594d3e4c31..32e6e80cc3e9 100644 --- a/core/java/android/app/activity_manager.aconfig +++ b/core/java/android/app/activity_manager.aconfig @@ -93,3 +93,14 @@ flag { } } +flag { + namespace: "backstage_power" + name: "rate_limit_get_processes_in_error_state" + description: "Rate limit calls to getProcessesInErrorState using a cache" + is_fixed_read_only: true + bug: "361146083" + metadata { + purpose: PURPOSE_BUGFIX + } +} + diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index cb57c7bd565d..abb0d8d88cce 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3767,7 +3767,7 @@ public class Intent implements Parcelable, Cloneable { * <p>The Intent will have the following extra value:</p> * <ul> * <li><em>{@link android.content.Intent#EXTRA_PHONE_NUMBER}</em> - - * the phone number originally intended to be dialed.</li> + * the phone number dialed.</li> * </ul> * <p class="note">Starting in Android 15, this broadcast is no longer sent as an ordered * broadcast. The <code>resultData</code> no longer has any effect and will not determine the @@ -3800,6 +3800,14 @@ public class Intent implements Parcelable, Cloneable { * {@link android.Manifest.permission#PROCESS_OUTGOING_CALLS} * permission to receive this Intent.</p> * + * <p class="note">Starting in {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, this broadcast is + * no longer sent as an ordered broadcast, and does not allow activity launches. This means + * that receivers may no longer change the phone number for the outgoing call, or cancel the + * outgoing call. This functionality is only possible using the + * {@link android.telecom.CallRedirectionService} API. Although background receivers are + * woken up to handle this intent, no guarantee is made as to the timeliness of the broadcast. + * </p> + * * <p class="note">This is a protected intent that can only be sent * by the system. * diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index 48d27855db74..a60c48e0aa8c 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -80,7 +80,6 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicBoolean; /** @@ -355,14 +354,7 @@ public class CameraDeviceImpl extends CameraDevice mCameraId = cameraId; if (Flags.singleThreadExecutor()) { mDeviceCallback = new ClientStateCallback(executor, callback); - mDeviceExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - Thread thread = Executors.defaultThreadFactory().newThread(r); - thread.setName("CameraDeviceExecutor"); - return thread; - } - }); + mDeviceExecutor = Executors.newSingleThreadExecutor(); } else { mDeviceCallback = callback; mDeviceExecutor = executor; diff --git a/core/java/android/hardware/radio/flags.aconfig b/core/java/android/hardware/radio/flags.aconfig index c9ab62ddc27f..c99dc049aac9 100644 --- a/core/java/android/hardware/radio/flags.aconfig +++ b/core/java/android/hardware/radio/flags.aconfig @@ -8,3 +8,11 @@ flag { description: "Feature flag for improved HD radio support with less vendor extensions" bug: "280300929" } + +flag { + name: "hd_radio_emergency_alert_system" + is_exported: true + namespace: "car_framework" + description: "Feature flag for HD radio emergency alert system support" + bug: "361348719" +} diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java index 4cc057a8e0ed..e80efd2a9380 100644 --- a/core/java/android/os/ParcelFileDescriptor.java +++ b/core/java/android/os/ParcelFileDescriptor.java @@ -41,7 +41,6 @@ import android.content.ContentResolver; import android.net.Uri; import android.os.MessageQueue.OnFileDescriptorEventListener; import android.ravenwood.annotation.RavenwoodKeepWholeClass; -import android.ravenwood.annotation.RavenwoodNativeSubstitutionClass; import android.ravenwood.annotation.RavenwoodReplace; import android.ravenwood.annotation.RavenwoodThrow; import android.system.ErrnoException; @@ -77,8 +76,6 @@ import java.nio.ByteOrder; * you to close it when done with it. */ @RavenwoodKeepWholeClass -@RavenwoodNativeSubstitutionClass( - "com.android.platform.test.ravenwood.nativesubstitution.ParcelFileDescriptor_host") public class ParcelFileDescriptor implements Parcelable, Closeable { private static final String TAG = "ParcelFileDescriptor"; @@ -206,11 +203,11 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { } mWrapped = null; mFd = fd; - setFdOwner(mFd); + IoUtils.setFdOwner(mFd, this); mCommFd = commChannel; if (mCommFd != null) { - setFdOwner(mCommFd); + IoUtils.setFdOwner(mCommFd, this); } mGuard.open("close"); @@ -298,7 +295,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { public static @NonNull ParcelFileDescriptor wrap(@NonNull ParcelFileDescriptor pfd, @NonNull Handler handler, @NonNull OnCloseListener listener) throws IOException { final FileDescriptor original = new FileDescriptor(); - setFdInt(original, pfd.detachFd()); + original.setInt$(pfd.detachFd()); return fromFd(original, handler, listener); } @@ -363,18 +360,10 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { } } - @RavenwoodReplace private static void closeInternal(FileDescriptor fd) { IoUtils.closeQuietly(fd); } - private static void closeInternal$ravenwood(FileDescriptor fd) { - try { - Os.close(fd); - } catch (ErrnoException ignored) { - } - } - /** * Create a new ParcelFileDescriptor that is a dup of an existing * FileDescriptor. This obeys standard POSIX semantics, where the @@ -385,7 +374,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { try { final FileDescriptor fd = new FileDescriptor(); int intfd = Os.fcntlInt(orig, (isAtLeastQ() ? F_DUPFD_CLOEXEC : F_DUPFD), 0); - setFdInt(fd, intfd); + fd.setInt$(intfd); return new ParcelFileDescriptor(fd); } catch (ErrnoException e) { throw e.rethrowAsIOException(); @@ -418,12 +407,12 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { */ public static ParcelFileDescriptor fromFd(int fd) throws IOException { final FileDescriptor original = new FileDescriptor(); - setFdInt(original, fd); + original.setInt$(fd); try { final FileDescriptor dup = new FileDescriptor(); int intfd = Os.fcntlInt(original, (isAtLeastQ() ? F_DUPFD_CLOEXEC : F_DUPFD), 0); - setFdInt(dup, intfd); + dup.setInt$(intfd); return new ParcelFileDescriptor(dup); } catch (ErrnoException e) { throw e.rethrowAsIOException(); @@ -446,7 +435,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { */ public static ParcelFileDescriptor adoptFd(int fd) { final FileDescriptor fdesc = new FileDescriptor(); - setFdInt(fdesc, fd); + fdesc.setInt$(fd); return new ParcelFileDescriptor(fdesc); } @@ -703,7 +692,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { @RavenwoodThrow(reason = "Os.readlink() and Os.stat()") public static File getFile(FileDescriptor fd) throws IOException { try { - final String path = Os.readlink("/proc/self/fd/" + getFdInt(fd)); + final String path = Os.readlink("/proc/self/fd/" + fd.getInt$()); if (OsConstants.S_ISREG(Os.stat(path).st_mode) || OsConstants.S_ISCHR(Os.stat(path).st_mode)) { return new File(path); @@ -783,7 +772,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { if (mClosed) { throw new IllegalStateException("Already closed"); } - return getFdInt(mFd); + return mFd.getInt$(); } } @@ -805,7 +794,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { if (mClosed) { throw new IllegalStateException("Already closed"); } - int fd = acquireRawFd(mFd); + int fd = IoUtils.acquireRawFd(mFd); writeCommStatusAndClose(Status.DETACHED, null); mClosed = true; mGuard.close(); @@ -1265,38 +1254,6 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { } } - private static native void setFdInt$ravenwood(FileDescriptor fd, int fdInt); - private static native int getFdInt$ravenwood(FileDescriptor fd); - - @RavenwoodReplace - private static void setFdInt(FileDescriptor fd, int fdInt) { - fd.setInt$(fdInt); - } - - @RavenwoodReplace - private static int getFdInt(FileDescriptor fd) { - return fd.getInt$(); - } - - @RavenwoodReplace - private void setFdOwner(FileDescriptor fd) { - IoUtils.setFdOwner(fd, this); - } - - private void setFdOwner$ravenwood(FileDescriptor fd) { - // FD owners currently unsupported under Ravenwood; ignored - } - - @RavenwoodReplace - private int acquireRawFd(FileDescriptor fd) { - return IoUtils.acquireRawFd(fd); - } - - private int acquireRawFd$ravenwood(FileDescriptor fd) { - // FD owners currently unsupported under Ravenwood; return FD directly - return getFdInt(fd); - } - @RavenwoodReplace private static boolean isAtLeastQ() { return (VMRuntime.getRuntime().getTargetSdkVersion() >= Build.VERSION_CODES.Q); diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index db06a6ba0ef5..3b2041b0d50a 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -838,16 +838,11 @@ public class Process { /** * Returns true if the current process is a 64-bit runtime. */ - @android.ravenwood.annotation.RavenwoodReplace + @android.ravenwood.annotation.RavenwoodKeep public static final boolean is64Bit() { return VMRuntime.getRuntime().is64Bit(); } - /** @hide */ - public static final boolean is64Bit$ravenwood() { - return "amd64".equals(System.getProperty("os.arch")); - } - private static volatile ThreadLocal<SomeArgs> sIdentity$ravenwood; /** @hide */ diff --git a/core/java/android/service/dreams/DreamOverlayService.java b/core/java/android/service/dreams/DreamOverlayService.java index 17d2790eac96..013ec5f35761 100644 --- a/core/java/android/service/dreams/DreamOverlayService.java +++ b/core/java/android/service/dreams/DreamOverlayService.java @@ -28,7 +28,9 @@ import android.os.RemoteException; import android.util.Log; import android.view.WindowManager; +import java.lang.ref.WeakReference; import java.util.concurrent.Executor; +import java.util.function.Consumer; /** @@ -52,43 +54,51 @@ public abstract class DreamOverlayService extends Service { // An {@link IDreamOverlayClient} implementation that identifies itself when forwarding // requests to the {@link DreamOverlayService} private static class OverlayClient extends IDreamOverlayClient.Stub { - private final DreamOverlayService mService; + private final WeakReference<DreamOverlayService> mService; private boolean mShowComplications; private ComponentName mDreamComponent; IDreamOverlayCallback mDreamOverlayCallback; - OverlayClient(DreamOverlayService service) { + OverlayClient(WeakReference<DreamOverlayService> service) { mService = service; } + private void applyToDream(Consumer<DreamOverlayService> consumer) { + final DreamOverlayService service = mService.get(); + + if (service != null) { + consumer.accept(service); + } + } + @Override public void startDream(WindowManager.LayoutParams params, IDreamOverlayCallback callback, String dreamComponent, boolean shouldShowComplications) throws RemoteException { mDreamComponent = ComponentName.unflattenFromString(dreamComponent); mShowComplications = shouldShowComplications; mDreamOverlayCallback = callback; - mService.startDream(this, params); + applyToDream(dreamOverlayService -> dreamOverlayService.startDream(this, params)); } @Override public void wakeUp() { - mService.wakeUp(this); + applyToDream(dreamOverlayService -> dreamOverlayService.wakeUp(this)); } @Override public void endDream() { - mService.endDream(this); + applyToDream(dreamOverlayService -> dreamOverlayService.endDream(this)); } @Override public void comeToFront() { - mService.comeToFront(this); + applyToDream(dreamOverlayService -> dreamOverlayService.comeToFront(this)); } @Override public void onWakeRequested() { if (Flags.dreamWakeRedirect()) { - mService.onWakeRequested(); + applyToDream(DreamOverlayService::onWakeRequested); } } @@ -161,17 +171,24 @@ public abstract class DreamOverlayService extends Service { }); } - private IDreamOverlay mDreamOverlay = new IDreamOverlay.Stub() { + private static class DreamOverlay extends IDreamOverlay.Stub { + private final WeakReference<DreamOverlayService> mService; + + DreamOverlay(DreamOverlayService service) { + mService = new WeakReference<>(service); + } + @Override public void getClient(IDreamOverlayClientCallback callback) { try { - callback.onDreamOverlayClient( - new OverlayClient(DreamOverlayService.this)); + callback.onDreamOverlayClient(new OverlayClient(mService)); } catch (RemoteException e) { Log.e(TAG, "could not send client to callback", e); } } - }; + } + + private final IDreamOverlay mDreamOverlay = new DreamOverlay(this); public DreamOverlayService() { } @@ -195,6 +212,12 @@ public abstract class DreamOverlayService extends Service { } } + @Override + public void onDestroy() { + mCurrentClient = null; + super.onDestroy(); + } + @Nullable @Override public final IBinder onBind(@NonNull Intent intent) { diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index 40070c7557bc..d33c95e06677 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -297,3 +297,10 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "typeface_redesign" + namespace: "text" + description: "Decouple variation settings, weight and style information from Typeface class" + bug: "361260253" +} diff --git a/core/java/android/util/LruCache.java b/core/java/android/util/LruCache.java index be1ec4187ddc..9845f9e7b804 100644 --- a/core/java/android/util/LruCache.java +++ b/core/java/android/util/LruCache.java @@ -18,7 +18,6 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; @@ -226,16 +225,10 @@ public class LruCache<K, V> { } } - @android.ravenwood.annotation.RavenwoodReplace private Map.Entry<K, V> eldest() { return map.eldest(); } - private Map.Entry<K, V> eldest$ravenwood() { - final Iterator<Map.Entry<K, V>> it = map.entrySet().iterator(); - return it.hasNext() ? it.next() : null; - } - /** * Removes the entry for {@code key} if it exists. * diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 15b0c13de524..1f7ed8be357c 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -2344,6 +2344,8 @@ public final class Display { * SurfaceControl.DisplayMode * @hide */ + @SuppressWarnings("UnflaggedApi") // For testing only + @TestApi public boolean isSynthetic() { return mIsSynthetic; } diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 72d2d3b538b3..326e34b258e5 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -128,7 +128,16 @@ import java.util.Objects; * ev.getPointerId(p), ev.getX(p), ev.getY(p)); * } * } - * </code></pre></p> + * </code></pre></p><p> + * Developers should keep in mind that it is especially important to consume all samples + * in a batched event when processing relative values that report changes since the last + * event or sample. Examples of such relative axes include {@link #AXIS_RELATIVE_X}, + * {@link #AXIS_RELATIVE_Y}, and many of the axes prefixed with {@code AXIS_GESTURE_}. + * In these cases, developers should first consume all historical values using + * {@link #getHistoricalAxisValue(int, int)} and then consume the current values using + * {@link #getAxisValue(int)} like in the example above, as these relative values are + * not accumulated in a batched event. + * </p> * * <h3>Device Types</h3> * <p> @@ -1117,6 +1126,9 @@ public final class MotionEvent extends InputEvent implements Parcelable { * the location but this axis reports the difference which allows the app to see * how the mouse is moved. * </ul> + * </p><p> + * These values are relative to the state from the last sample, not accumulated, so developers + * should make sure to process this axis value for all batched historical samples. * </p> * * @see #getAxisValue(int, int) @@ -1130,6 +1142,9 @@ public final class MotionEvent extends InputEvent implements Parcelable { * Axis constant: The movement of y position of a motion event. * <p> * This is similar to {@link #AXIS_RELATIVE_X} but for y-axis. + * </p><p> + * These values are relative to the state from the last sample, not accumulated, so developers + * should make sure to process this axis value for all batched historical samples. * </p> * * @see #getAxisValue(int, int) @@ -1324,8 +1339,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { * swipe gesture starts at X = 500 then moves to X = 400, this axis would have a value of * -0.1. * </ul> - * These values are relative to the state from the last event, not accumulated, so developers - * should make sure to process this axis value for all batched historical events. + * These values are relative to the state from the last sample, not accumulated, so developers + * should make sure to process this axis value for all batched historical samples. * <p> * This axis is only set on the first pointer in a motion event. */ @@ -1345,8 +1360,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { * <li>For a touch pad, reports the distance that should be scrolled in the X axis as a result * of the user's two-finger scroll gesture, in display pixels. * </ul> - * These values are relative to the state from the last event, not accumulated, so developers - * should make sure to process this axis value for all batched historical events. + * These values are relative to the state from the last sample, not accumulated, so developers + * should make sure to process this axis value for all batched historical samples. * <p> * This axis is only set on the first pointer in a motion event. */ @@ -1367,8 +1382,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { * making a pinch gesture, as a proportion of the previous distance. For example, if the fingers * were 50 units apart and are now 52 units apart, the scale factor would be 1.04. * </ul> - * These values are relative to the state from the last event, not accumulated, so developers - * should make sure to process this axis value for all batched historical events. + * These values are relative to the state from the last sample, not accumulated, so developers + * should make sure to process this axis value for all batched historical samples. * <p> * This axis is only set on the first pointer in a motion event. */ diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 0d0207ff7c0e..e14249cc028b 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -2513,9 +2513,16 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } mIsFloating = a.getBoolean(R.styleable.Window_windowIsFloating, false); + + // For floating windows that are *allowed* to fill the screen (like Wear) content + // should still be wrapped if they're not explicitly requested as fullscreen. + final boolean isFloatingAndFullscreen = mIsFloating + && mAllowFloatingWindowsFillScreen + && a.getBoolean(R.styleable.Window_windowFullscreen, false); + int flagsToUpdate = (FLAG_LAYOUT_IN_SCREEN|FLAG_LAYOUT_INSET_DECOR) & (~getForcedWindowFlags()); - if (mIsFloating && !mAllowFloatingWindowsFillScreen) { + if (mIsFloating && !isFloatingAndFullscreen) { setLayout(WRAP_CONTENT, WRAP_CONTENT); setFlags(0, flagsToUpdate); } else { diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl index 1d43f6f083e6..c834dde56bfe 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -209,11 +209,6 @@ oneway interface IStatusBar void onDisplayReady(int displayId); /** - * Notifies System UI whether the recents animation is running or not. - */ - void onRecentsAnimationStateChanged(boolean running); - - /** * Notifies System UI side of system bar attribute change on the specified display. * * @param displayId the ID of the display to notify. diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java index 1e2cad41065d..1e965c5db7ae 100644 --- a/core/java/com/android/internal/util/ArrayUtils.java +++ b/core/java/com/android/internal/util/ArrayUtils.java @@ -49,81 +49,41 @@ public class ArrayUtils { private ArrayUtils() { /* cannot be instantiated */ } - @android.ravenwood.annotation.RavenwoodReplace public static byte[] newUnpaddedByteArray(int minLen) { return (byte[])VMRuntime.getRuntime().newUnpaddedArray(byte.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace public static char[] newUnpaddedCharArray(int minLen) { return (char[])VMRuntime.getRuntime().newUnpaddedArray(char.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int[] newUnpaddedIntArray(int minLen) { return (int[])VMRuntime.getRuntime().newUnpaddedArray(int.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace public static boolean[] newUnpaddedBooleanArray(int minLen) { return (boolean[])VMRuntime.getRuntime().newUnpaddedArray(boolean.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace public static long[] newUnpaddedLongArray(int minLen) { return (long[])VMRuntime.getRuntime().newUnpaddedArray(long.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace public static float[] newUnpaddedFloatArray(int minLen) { return (float[])VMRuntime.getRuntime().newUnpaddedArray(float.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace public static Object[] newUnpaddedObjectArray(int minLen) { return (Object[])VMRuntime.getRuntime().newUnpaddedArray(Object.class, minLen); } - @android.ravenwood.annotation.RavenwoodReplace @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static <T> T[] newUnpaddedArray(Class<T> clazz, int minLen) { return (T[])VMRuntime.getRuntime().newUnpaddedArray(clazz, minLen); } - public static byte[] newUnpaddedByteArray$ravenwood(int minLen) { - return new byte[minLen]; - } - - public static char[] newUnpaddedCharArray$ravenwood(int minLen) { - return new char[minLen]; - } - - public static int[] newUnpaddedIntArray$ravenwood(int minLen) { - return new int[minLen]; - } - - public static boolean[] newUnpaddedBooleanArray$ravenwood(int minLen) { - return new boolean[minLen]; - } - - public static long[] newUnpaddedLongArray$ravenwood(int minLen) { - return new long[minLen]; - } - - public static float[] newUnpaddedFloatArray$ravenwood(int minLen) { - return new float[minLen]; - } - - public static Object[] newUnpaddedObjectArray$ravenwood(int minLen) { - return new Object[minLen]; - } - - public static <T> T[] newUnpaddedArray$ravenwood(Class<T> clazz, int minLen) { - return (T[]) Array.newInstance(clazz, minLen); - } - /** * Checks if the beginnings of two byte arrays are equal. * diff --git a/core/java/com/android/internal/widget/floatingtoolbar/LocalFloatingToolbarPopup.java b/core/java/com/android/internal/widget/floatingtoolbar/LocalFloatingToolbarPopup.java index bc729f10d74c..b6383d9f0754 100644 --- a/core/java/com/android/internal/widget/floatingtoolbar/LocalFloatingToolbarPopup.java +++ b/core/java/com/android/internal/widget/floatingtoolbar/LocalFloatingToolbarPopup.java @@ -437,9 +437,8 @@ public final class LocalFloatingToolbarPopup implements FloatingToolbarPopup { // Initialize x ensuring that the toolbar isn't rendered behind the nav bar in // landscape. - final int x = Math.min( - contentRectOnScreen.centerX() - mPopupWindow.getWidth() / 2, - mViewPortOnScreen.right - mPopupWindow.getWidth()); + final int x = Math.clamp(contentRectOnScreen.centerX() - mPopupWindow.getWidth() / 2, + mViewPortOnScreen.left, mViewPortOnScreen.right - mPopupWindow.getWidth()); final int y; diff --git a/core/proto/android/app/appstartinfo.proto b/core/proto/android/app/appstartinfo.proto index 8de54586ab73..78cf6f464558 100644 --- a/core/proto/android/app/appstartinfo.proto +++ b/core/proto/android/app/appstartinfo.proto @@ -40,4 +40,5 @@ message ApplicationStartInfoProto { optional bytes start_intent = 10; optional AppStartLaunchMode launch_mode = 11; optional bool was_force_stopped = 12; + optional int64 monotonic_creation_time_ms = 13; } diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto index 58f39a9208da..42c591be60cc 100644 --- a/core/proto/android/server/activitymanagerservice.proto +++ b/core/proto/android/server/activitymanagerservice.proto @@ -1045,7 +1045,7 @@ message AppsExitInfoProto { repeated Package packages = 2; } -// sync with com.android.server.am.am.ProcessList.java +// LINT.IfChange message AppsStartInfoProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; @@ -1064,4 +1064,6 @@ message AppsStartInfoProto { repeated User users = 2; } repeated Package packages = 2; + optional int64 monotonic_time = 3; } +// LINT.ThenChange(/services/core/java/com/android/server/am/AppStartInfoTracker.java) diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml index 118acacc5e52..a7240ffc6012 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -443,4 +443,20 @@ <!-- Telephony satellite gateway intent for handling carrier roaming to satellite is using ESOS messaging. --> <string name="config_satellite_carrier_roaming_esos_provisioned_intent_action" translatable="false"></string> <java-symbol type="string" name="config_satellite_carrier_roaming_esos_provisioned_intent_action" /> + + <!-- The time duration in minutes to wait before retry validating a possible change + in satellite allowed region. The default value is 10 minutes. --> + <integer name="config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region">10</integer> + <java-symbol type="integer" name="config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region" /> + + <!-- The maximum retry count to validate a possible change in satellite allowed region. + The default value is 3 minutes. --> + <integer name="config_satellite_max_retry_count_for_validating_possible_change_in_allowed_region">3</integer> + <java-symbol type="integer" name="config_satellite_max_retry_count_for_validating_possible_change_in_allowed_region" /> + + <!-- The time duration in minutes for location query throttle interval. + The default value is 10 minutes. --> + <integer name="config_satellite_location_query_throttle_interval_minutes">10</integer> + <java-symbol type="integer" name="config_satellite_location_query_throttle_interval_minutes" /> + </resources> diff --git a/core/res/res/values/config_tv_external_input_logging.xml b/core/res/res/values/config_tv_external_input_logging.xml index 72e30be00a02..293a183ffeca 100644 --- a/core/res/res/values/config_tv_external_input_logging.xml +++ b/core/res/res/values/config_tv_external_input_logging.xml @@ -24,27 +24,39 @@ entries do not follow the convention, but all new entries should. --> <resources> - <bool name="config_tvExternalInputLoggingDisplayNameFilterEnabled">false</bool> + <bool name="config_tvExternalInputLoggingDisplayNameFilterEnabled">true</bool> <string-array name="config_tvExternalInputLoggingDeviceOnScreenDisplayNames"> - <item>Chromecast</item> + <item>ADT-4</item> <item>Chromecast HD</item> - <item>SHIELD</item> - <item>Roku</item> - <item>Roku Express 4</item> - <item>Home Theater</item> <item>Fire TV Stick</item> - <item>PlayStation 5</item> + <item>Freebox Player</item> + <item>Home Theater</item> + <item>Jarvis</item> <item>NintendoSwitch</item> + <item>onn. 4K Plus S</item> + <item>onn. Streaming</item> + <item>PlayStation 4</item> + <item>PlayStation 5</item> + <item>Roku 3</item> + <item>Roku Express 4</item> </string-array> <string-array name="config_tvExternalInputLoggingDeviceBrandNames"> - <item>Chromecast</item> - <item>SHIELD</item> - <item>Roku</item> <item>Apple</item> + <item>Chromecast</item> <item>Fire TV</item> - <item>PlayStation</item> + <item>Freebox</item> + <item>Google</item> + <item>MiBOX</item> + <item>Microsoft</item> <item>Nintendo</item> + <item>NVIDIA</item> + <item>onn.</item> + <item>PlayStation</item> + <item>Roku</item> + <item>SHIELD</item> + <item>Sony</item> + <item>XBOX</item> </string-array> </resources> diff --git a/data/fonts/Android.bp b/data/fonts/Android.bp index 1a3a0f60f2dc..cbaac21aa10b 100644 --- a/data/fonts/Android.bp +++ b/data/fonts/Android.bp @@ -71,6 +71,8 @@ prebuilt_fonts_xml { }, } +// TODO(nona): Change this to use generate_font_fallback to be able to generate XML from +// per family JSON config prebuilt_fonts_xml { name: "font_fallback.xml", src: "font_fallback.xml", @@ -94,3 +96,33 @@ filegroup { "DroidSansMono.ttf", ], } + +genrule { + name: "generate_font_fallback", + tools: [":generate_fonts_xml"], + tool_files: [ + "alias.json", + "fallback_order.json", + ], + srcs: [ + ":CarroisGothicSC", + ":ComingSoon", + ":CutiveMono", + ":DancingScript", + ":DroidSansMono", + ":Roboto", + ":RobotoFlex", + ":SourceSansPro", + ":noto-fonts", + ], + exclude_srcs: [ + "alias.json", + "fallback_order.json", + ], + out: ["font_fallback.xml"], + cmd: "$(location :generate_fonts_xml) " + + "--alias=$(location alias.json) " + + "--fallback=$(location fallback_order.json) " + + "$(in) " + + "-o $(out)", +} diff --git a/data/fonts/alias.json b/data/fonts/alias.json new file mode 100644 index 000000000000..b5b867a49259 --- /dev/null +++ b/data/fonts/alias.json @@ -0,0 +1,37 @@ +[ + // sans-serif aliases + { "name": "arial", "to": "sans-serif" }, + { "name": "helvetica", "to": "sans-serif" }, + { "name": "tahoma", "to": "sans-serif" }, + { "name": "verdana", "to": "sans-serif" }, + { "name": "sans-serif-black", "to": "sans-serif", "weight": "900" }, + { "name": "sans-serif-light", "to": "sans-serif", "weight": "300" }, + { "name": "sans-serif-medium", "to": "sans-serif", "weight": "500" }, + { "name": "sans-serif-thin", "to": "sans-serif", "weight": "100" }, + + // sans-serif-condensed aliases + { "name": "sans-serif-condensed-light", "to": "sans-serif-condensed", "weight": "300" }, + { "name": "sans-serif-condensed-medium", "to": "sans-serif-condensed", "weight": "500" }, + + // serif aliases + { "name": "ITC Stone Serif", "to": "serif" }, + { "name": "baskerville", "to": "serif" }, + { "name": "fantasy", "to": "serif" }, + { "name": "georgia", "to": "serif" }, + { "name": "goudy", "to": "serif" }, + { "name": "palatino", "to": "serif" }, + { "name": "times new roman", "to": "serif" }, + { "name": "times", "to": "serif" }, + { "name": "serif-bold", "to": "serif", "weight": "700" }, + + // monospace aliases + { "name": "monaco", "to": "monospace" }, + { "name": "sans-serif-monospace", "to": "monospace" }, + + // serif-monospace aliases + { "name": "courier new", "to": "serif-monospace" }, + { "name": "courier", "to": "serif-monospace" }, + + // source-sans-pro aliases + { "name": "source-sans-pro-semi-bold", "to": "source-sans-pro", "weight": "600" } +] diff --git a/data/fonts/fallback_order.json b/data/fonts/fallback_order.json new file mode 100644 index 000000000000..2fc3f3e3fc5b --- /dev/null +++ b/data/fonts/fallback_order.json @@ -0,0 +1,136 @@ +[ + { "lang": "und-Arab" }, + { "lang": "und-Ethi" }, + { "lang": "und-Hebr" }, + { "lang": "und-Thai" }, + { "lang": "und-Armn" }, + { "lang": "und-Geor,und-Geok" }, + { "lang": "und-Deva" }, + { "lang": "und-Gujr" }, + { "lang": "und-Guru" }, + { "lang": "und-Taml" }, + { "lang": "und-Mlym" }, + { "lang": "und-Beng" }, + { "lang": "und-Telu" }, + { "lang": "und-Knda" }, + { "lang": "und-Orya" }, + { "lang": "und-Sinh" }, + { "lang": "und-Khmr" }, + { "lang": "und-Laoo" }, + { "lang": "und-Mymr" }, + { "lang": "und-Thaa" }, + { "lang": "und-Cham" }, + { "lang": "und-Ahom" }, + { "lang": "und-Adlm" }, + { "lang": "und-Avst" }, + { "lang": "und-Bali" }, + { "lang": "und-Bamu" }, + { "lang": "und-Batk" }, + { "lang": "und-Brah" }, + { "lang": "und-Bugi" }, + { "lang": "und-Buhd" }, + { "lang": "und-Cans" }, + { "lang": "und-Cari" }, + { "lang": "und-Cakm" }, + { "lang": "und-Cher" }, + { "lang": "und-Copt" }, + { "lang": "und-Xsux" }, + { "lang": "und-Cprt" }, + { "lang": "und-Dsrt" }, + { "lang": "und-Egyp" }, + { "lang": "und-Elba" }, + { "lang": "und-Glag" }, + { "lang": "und-Goth" }, + { "lang": "und-Hano" }, + { "lang": "und-Armi" }, + { "lang": "und-Phli" }, + { "lang": "und-Prti" }, + { "lang": "und-Java" }, + { "lang": "und-Kthi" }, + { "lang": "und-Kali" }, + { "lang": "und-Khar" }, + { "lang": "und-Lepc" }, + { "lang": "und-Limb" }, + { "lang": "und-Linb" }, + { "lang": "und-Lisu" }, + { "lang": "und-Lyci" }, + { "lang": "und-Lydi" }, + { "lang": "und-Mand" }, + { "lang": "und-Mtei" }, + { "lang": "und-Talu" }, + { "lang": "und-Nkoo" }, + { "lang": "und-Ogam" }, + { "lang": "und-Olck" }, + { "lang": "und-Ital" }, + { "lang": "und-Xpeo" }, + { "lang": "und-Sarb" }, + { "lang": "und-Orkh" }, + { "lang": "und-Osge" }, + { "lang": "und-Osma" }, + { "lang": "und-Phnx" }, + { "lang": "und-Rjng" }, + { "lang": "und-Runr" }, + { "lang": "und-Samr" }, + { "lang": "und-Saur" }, + { "lang": "und-Shaw" }, + { "lang": "und-Sund" }, + { "lang": "und-Sylo" }, + { "lang": "und-Syre" }, + { "lang": "und-Syrn" }, + { "lang": "und-Syrj" }, + { "lang": "und-Tglg" }, + { "lang": "und-Tagb" }, + { "lang": "und-Lana" }, + { "lang": "und-Tavt" }, + { "lang": "und-Tibt" }, + { "lang": "und-Tfng" }, + { "lang": "und-Ugar" }, + { "lang": "und-Vaii" }, + // NotoSansSymbol-Regular-Subsetted doesn't have any language but should be + // placed before the CJK fonts for reproducing the same fallback order. + { "id": "NotoSansSymbols-Regular-Subsetted" }, + { "lang": "zh-Hans" }, + { "lang": "zh-Hant,zh-Bopo" }, + { "lang": "ja" }, + { "lang": "ko" }, + { "lang": "und-Zsye" }, + { "lang": "und-Zsym" }, + { "lang": "und-Tale" }, + { "lang": "und-Yiii" }, + { "lang": "und-Mong" }, + { "lang": "und-Phag" }, + { "lang": "und-Hluw" }, + { "lang": "und-Bass" }, + { "lang": "und-Bhks" }, + { "lang": "und-Hatr" }, + { "lang": "und-Lina" }, + { "lang": "und-Mani" }, + { "lang": "und-Marc" }, + { "lang": "und-Merc" }, + { "lang": "und-Plrd" }, + { "lang": "und-Mroo" }, + { "lang": "und-Mult" }, + { "lang": "und-Nbat" }, + { "lang": "und-Newa" }, + { "lang": "und-Narb" }, + { "lang": "und-Perm" }, + { "lang": "und-Hmng" }, + { "lang": "und-Palm" }, + { "lang": "und-Pauc" }, + { "lang": "und-Shrd" }, + { "lang": "und-Sora" }, + { "lang": "und-Gong" }, + { "lang": "und-Rohg" }, + { "lang": "und-Khoj" }, + { "lang": "und-Gonm" }, + { "lang": "und-Wcho" }, + { "lang": "und-Wara" }, + { "lang": "und-Gran" }, + { "lang": "und-Modi" }, + { "lang": "und-Dogr" }, + { "lang": "und-Medf" }, + { "lang": "und-Soyo" }, + { "lang": "und-Takr" }, + { "lang": "und-Hmnp" }, + { "lang": "und-Yezi" } +] diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 1a3aa8eec5ec..b338a2ae2b79 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -46,9 +46,6 @@ filegroup { srcs: [ "src/com/android/wm/shell/common/bubbles/*.kt", "src/com/android/wm/shell/common/bubbles/*.java", - "src/com/android/wm/shell/common/desktopmode/*.kt", - "src/com/android/wm/shell/pip/PipContentOverlay.java", - "src/com/android/wm/shell/util/**/*.java", ], path: "src", } @@ -208,6 +205,7 @@ android_library { // TODO(b/168581922) protologtool do not support kotlin(*.kt) ":wm_shell-sources-kt", ":wm_shell-aidls", + ":wm_shell-shared-aidls", ], resource_dirs: [ "res", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.aidl b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.aidl index 15797cdb9aba..e21bf8fb723c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.aidl +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.aidl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Android Open Source Project + * Copyright (C) 2024 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. @@ -14,6 +14,6 @@ * limitations under the License. */ -package com.android.wm.shell.util; +package com.android.wm.shell.shared; parcelable GroupedRecentTaskInfo;
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.java index a2d2b9aff597..65e079ef4f72 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/GroupedRecentTaskInfo.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/GroupedRecentTaskInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Android Open Source Project + * Copyright (C) 2024 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.util; +package com.android.wm.shell.shared; import android.annotation.IntDef; import android.app.ActivityManager; @@ -25,6 +25,8 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.wm.shell.shared.split.SplitBounds; + import java.util.Arrays; import java.util.List; import java.util.Set; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.aidl b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl index c968e809bf61..f7ddf71245e1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.aidl +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package com.android.wm.shell.common.desktopmode; +package com.android.wm.shell.shared.desktopmode; parcelable DesktopModeTransitionSource;
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt index dbbf178613b5..d15fbed409b8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/desktopmode/DesktopModeTransitionSource.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeTransitionSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.common.desktopmode +package com.android.wm.shell.shared.desktopmode import android.os.Parcel import android.os.Parcelable diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java index ff2d46e11107..cf39415b3fe6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/pip/PipContentOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2024 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.pip; +package com.android.wm.shell.shared.pip; import static android.util.TypedValue.COMPLEX_UNIT_DIP; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/SplitBounds.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/split/SplitBounds.java index 88b752822a20..7c1faa667d9a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/SplitBounds.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/split/SplitBounds.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Android Open Source Project + * Copyright (C) 2024 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.wm.shell.util; +package com.android.wm.shell.shared.split; import android.graphics.Rect; import android.os.Parcel; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMode.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMode.java index 31c8f1e45007..cca750014fc1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMode.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMode.java @@ -18,8 +18,8 @@ package com.android.wm.shell.desktopmode; import android.graphics.Region; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.shared.annotations.ExternalThread; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import java.util.concurrent.Executor; import java.util.function.Consumer; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt index eca3c1fdc65a..dba8c9367654 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt @@ -16,7 +16,7 @@ package com.android.wm.shell.desktopmode -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.UNKNOWN +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.UNKNOWN import com.android.wm.shell.sysui.ShellCommandHandler import java.io.PrintWriter diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypes.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypes.kt index b24bd10eaa0d..d6fccd116061 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypes.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypes.kt @@ -17,7 +17,7 @@ package com.android.wm.shell.desktopmode import android.view.WindowManager.TransitionType -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TYPES /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index ffd534b6b814..2852631656b5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -69,7 +69,6 @@ import com.android.wm.shell.common.RemoteCallable import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SingleInstanceRemoteListener import com.android.wm.shell.common.SyncTransactionQueue -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.compatui.isTopActivityExemptFromDesktopWindowing import com.android.wm.shell.desktopmode.DesktopModeTaskRepository.VisibleTasksListener import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.DragStartState @@ -89,6 +88,7 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVI import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.DESKTOP_DENSITY_OVERRIDE import com.android.wm.shell.shared.desktopmode.DesktopModeStatus.useDesktopOverrideDensity +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT import com.android.wm.shell.splitscreen.SplitScreenController diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java index 04506c1e66f2..80e106f3990b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java @@ -41,7 +41,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.jank.InteractionJankMonitor; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java index 171378f9a164..e87be520cc91 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java @@ -44,7 +44,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.jank.Cuj; import com.android.internal.jank.InteractionJankMonitor; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.transition.Transitions; import java.util.ArrayList; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl index a7ec2037706d..b036e40e6e16 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl @@ -18,8 +18,8 @@ package com.android.wm.shell.desktopmode; import android.app.ActivityManager.RunningTaskInfo; import android.window.RemoteTransition; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.desktopmode.IDesktopTaskListener; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; /** * Interface that is exposed to remote callers to manipulate desktop mode features. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java index b0c896fbe516..4df649ca8c93 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java @@ -43,6 +43,7 @@ import com.android.launcher3.icons.IconProvider; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.shared.animation.Interpolators; +import com.android.wm.shell.shared.pip.PipContentOverlay; import com.android.wm.shell.transition.Transitions; import java.lang.annotation.Retention; @@ -418,7 +419,7 @@ public class PipAnimationController { } SurfaceControl getContentOverlayLeash() { - return mContentOverlay == null ? null : mContentOverlay.mLeash; + return mContentOverlay == null ? null : mContentOverlay.getLeash(); } void setColorContentOverlay(Context context) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 2de545a829ad..e4cd10f37d37 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -91,6 +91,7 @@ import com.android.wm.shell.pip.phone.PipMotionHelper; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.shared.animation.Interpolators; import com.android.wm.shell.shared.annotations.ShellMainThread; +import com.android.wm.shell.shared.pip.PipContentOverlay; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.transition.Transitions; @@ -361,8 +362,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, SurfaceControl mPipOverlay; /** - * The app bounds used for the buffer size of the - * {@link com.android.wm.shell.pip.PipContentOverlay.PipAppIconOverlay}. + * The app bounds used for the buffer size of the {@link PipContentOverlay.PipAppIconOverlay}. * * Note that this is empty if the overlay is removed or if it's some other type of overlay * defined in {@link PipContentOverlay}. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java index b102e40147e1..05d19846bfee 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java @@ -75,6 +75,7 @@ import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.shared.TransitionUtil; +import com.android.wm.shell.shared.pip.PipContentOverlay; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.CounterRotatorHelper; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index ed18712b283d..c6b1a7218103 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -50,10 +50,10 @@ import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; -import com.android.wm.shell.pip.PipContentOverlay; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.pip2.animation.PipAlphaAnimator; import com.android.wm.shell.pip2.animation.PipEnterExitAnimator; +import com.android.wm.shell.shared.pip.PipContentOverlay; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/IRecentTasks.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/IRecentTasks.aidl index 4048c5b8feab..ebfd3571ae6d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/IRecentTasks.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/IRecentTasks.aidl @@ -24,7 +24,7 @@ import android.os.Bundle; import android.view.IRecentsAnimationRunner; import com.android.wm.shell.recents.IRecentTasksListener; -import com.android.wm.shell.util.GroupedRecentTaskInfo; +import com.android.wm.shell.shared.GroupedRecentTaskInfo; /** * Interface that is exposed to remote callers to fetch recent tasks. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasks.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasks.java index 77b8663861ab..8c5d1e7e069d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasks.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasks.java @@ -19,8 +19,8 @@ package com.android.wm.shell.recents; import android.annotation.Nullable; import android.graphics.Color; +import com.android.wm.shell.shared.GroupedRecentTaskInfo; import com.android.wm.shell.shared.annotations.ExternalThread; -import com.android.wm.shell.util.GroupedRecentTaskInfo; import java.util.List; import java.util.concurrent.Executor; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index 2f0af8557538..39bea1bed447 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -51,16 +51,16 @@ import com.android.wm.shell.common.TaskStackListenerCallback; import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.GroupedRecentTaskInfo; import com.android.wm.shell.shared.annotations.ExternalThread; import com.android.wm.shell.shared.annotations.ShellMainThread; import com.android.wm.shell.shared.desktopmode.DesktopModeFlags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.split.SplitBounds; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.GroupedRecentTaskInfo; -import com.android.wm.shell.util.SplitBounds; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index 7a9eb1c582b7..c90da052dd72 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -30,7 +30,7 @@ import static android.window.TransitionInfo.FLAG_MOVED_TO_TOP; import static android.window.TransitionInfo.FLAG_TRANSLUCENT; import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION; -import static com.android.wm.shell.util.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; +import static com.android.wm.shell.shared.split.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; import android.annotation.Nullable; import android.annotation.SuppressLint; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 0b5c75104f65..95f864a775be 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -133,13 +133,13 @@ import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.recents.RecentTasksController; import com.android.wm.shell.shared.TransactionPool; import com.android.wm.shell.shared.TransitionUtil; +import com.android.wm.shell.shared.split.SplitBounds; import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition; import com.android.wm.shell.shared.split.SplitScreenConstants.SplitPosition; import com.android.wm.shell.splitscreen.SplitScreen.StageType; import com.android.wm.shell.splitscreen.SplitScreenController.ExitReason; import com.android.wm.shell.transition.DefaultMixedHandler; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.SplitBounds; import com.android.wm.shell.windowdecor.WindowDecorViewModel; import dalvik.annotation.optimization.NeverCompile; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index a9a4e1093392..4fc6c4489f2b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -18,8 +18,8 @@ package com.android.wm.shell.transition; import static android.app.ActivityOptions.ANIM_CLIP_REVEAL; import static android.app.ActivityOptions.ANIM_CUSTOM; -import static android.app.ActivityOptions.ANIM_FROM_STYLE; import static android.app.ActivityOptions.ANIM_NONE; +import static android.app.ActivityOptions.ANIM_FROM_STYLE; import static android.app.ActivityOptions.ANIM_OPEN_CROSS_PROFILE_APPS; import static android.app.ActivityOptions.ANIM_SCALE_UP; import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/OWNERS b/libs/WindowManager/Shell/src/com/android/wm/shell/util/OWNERS deleted file mode 100644 index 482aaab6bc74..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/OWNERS +++ /dev/null @@ -1 +0,0 @@ -per-file KtProtolog.kt = file:platform/development:/tools/winscope/OWNERS diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index 20a406f61ed3..1f95667f4e35 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -97,7 +97,6 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.MultiInstanceHelper; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator; import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.desktopmode.DesktopTasksController.SnapPosition; @@ -107,6 +106,7 @@ import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; import com.android.wm.shell.shared.annotations.ShellBackgroundThread; import com.android.wm.shell.shared.desktopmode.DesktopModeFlags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.shared.split.SplitScreenConstants.SplitPosition; import com.android.wm.shell.splitscreen.SplitScreen; import com.android.wm.shell.splitscreen.SplitScreen.StageType; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 8e87d0ff33c6..2bec3fa6418d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -26,7 +26,7 @@ import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; import static com.android.launcher3.icons.BaseIconFactory.MODE_DEFAULT; -import static com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON; +import static com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.windowdecor.DragResizeWindowGeometry.getFineResizeCornerSize; import static com.android.wm.shell.windowdecor.DragResizeWindowGeometry.getLargeResizeCornerSize; @@ -79,10 +79,10 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.MultiInstanceHelper; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.shared.annotations.ShellBackgroundThread; import com.android.wm.shell.shared.desktopmode.DesktopModeFlags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; import com.android.wm.shell.windowdecor.viewholder.AppHandleViewHolder; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypesTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypesTest.kt index 518c00d377ad..db4e93de9541 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypesTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTransitionTypesTest.kt @@ -18,11 +18,6 @@ package com.android.wm.shell.desktopmode import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.APP_FROM_OVERVIEW -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.KEYBOARD_SHORTCUT -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.TASK_DRAG -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.UNKNOWN import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_HANDLE_MENU_BUTTON import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG @@ -33,6 +28,11 @@ import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_UNKNOWN import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.getEnterTransitionType import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.getExitTransitionType +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.APP_FROM_OVERVIEW +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.KEYBOARD_SHORTCUT +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.TASK_DRAG +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.UNKNOWN import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index 058a26a06f59..d2487209dcef 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -83,7 +83,6 @@ import com.android.wm.shell.common.LaunchAdjacentController import com.android.wm.shell.common.MultiInstanceHelper import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource.UNKNOWN import com.android.wm.shell.desktopmode.DesktopTasksController.SnapPosition import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask @@ -94,6 +93,7 @@ import com.android.wm.shell.recents.RecentTasksController import com.android.wm.shell.recents.RecentsTransitionHandler import com.android.wm.shell.recents.RecentsTransitionStateListener import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.UNKNOWN import com.android.wm.shell.shared.split.SplitScreenConstants import com.android.wm.shell.splitscreen.SplitScreenController import com.android.wm.shell.sysui.ShellCommandHandler diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java index e5157c974e2d..e0463b41ad20 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandlerTest.java @@ -48,7 +48,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.jank.InteractionJankMonitor; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.ShellExecutor; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.transition.Transitions; import org.junit.Before; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/GroupedRecentTaskInfoTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/GroupedRecentTaskInfoTest.kt index 6736593bba5b..0c3f98a324cd 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/GroupedRecentTaskInfoTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/GroupedRecentTaskInfoTest.kt @@ -24,13 +24,13 @@ import android.window.IWindowContainerToken import android.window.WindowContainerToken import androidx.test.filters.SmallTest import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.shared.GroupedRecentTaskInfo +import com.android.wm.shell.shared.GroupedRecentTaskInfo.CREATOR +import com.android.wm.shell.shared.GroupedRecentTaskInfo.TYPE_FREEFORM +import com.android.wm.shell.shared.GroupedRecentTaskInfo.TYPE_SINGLE +import com.android.wm.shell.shared.GroupedRecentTaskInfo.TYPE_SPLIT +import com.android.wm.shell.shared.split.SplitBounds import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_50_50 -import com.android.wm.shell.util.GroupedRecentTaskInfo -import com.android.wm.shell.util.GroupedRecentTaskInfo.CREATOR -import com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM -import com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_SINGLE -import com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_SPLIT -import com.android.wm.shell.util.SplitBounds import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertThrows diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java index e1fe4e9054c0..a8d40db096dd 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java @@ -68,13 +68,13 @@ import com.android.wm.shell.TestShellExecutor; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; +import com.android.wm.shell.shared.GroupedRecentTaskInfo; import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; +import com.android.wm.shell.shared.split.SplitBounds; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; -import com.android.wm.shell.util.GroupedRecentTaskInfo; -import com.android.wm.shell.util.SplitBounds; import org.junit.After; import org.junit.Before; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/SplitBoundsTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/SplitBoundsTest.java index bfb760b6fc8c..248393cef9ae 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/SplitBoundsTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/SplitBoundsTest.java @@ -12,7 +12,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.wm.shell.ShellTestCase; -import com.android.wm.shell.util.SplitBounds; +import com.android.wm.shell.shared.split.SplitBounds; import org.junit.Before; import org.junit.Test; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt index f7ac3e416938..da0aca7b3b0f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt @@ -79,12 +79,12 @@ import com.android.wm.shell.common.DisplayLayout import com.android.wm.shell.common.MultiInstanceHelper import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.desktopmode.DesktopTasksController import com.android.wm.shell.desktopmode.DesktopTasksController.SnapPosition import com.android.wm.shell.desktopmode.DesktopTasksLimiter import com.android.wm.shell.freeform.FreeformTaskTransitionStarter import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.splitscreen.SplitScreenController import com.android.wm.shell.sysui.ShellCommandHandler import com.android.wm.shell.sysui.ShellController diff --git a/libs/hwui/FeatureFlags.h b/libs/hwui/FeatureFlags.h index ac75c077b58f..c1c30f5379ab 100644 --- a/libs/hwui/FeatureFlags.h +++ b/libs/hwui/FeatureFlags.h @@ -49,6 +49,15 @@ inline bool letter_spacing_justification() { #endif // __ANDROID__ } +inline bool typeface_redesign() { +#ifdef __ANDROID__ + static bool flag = com_android_text_flags_typeface_redesign(); + return flag; +#else + return true; +#endif // __ANDROID__ +} + } // namespace text_feature } // namespace android diff --git a/libs/hwui/hwui/MinikinUtils.h b/libs/hwui/hwui/MinikinUtils.h index f8574ee50525..1510ce1378d8 100644 --- a/libs/hwui/hwui/MinikinUtils.h +++ b/libs/hwui/hwui/MinikinUtils.h @@ -27,6 +27,8 @@ #include <cutils/compiler.h> #include <log/log.h> #include <minikin/Layout.h> + +#include "FeatureFlags.h" #include "MinikinSkia.h" #include "Paint.h" #include "Typeface.h" @@ -71,27 +73,42 @@ public: static void forFontRun(const minikin::Layout& layout, Paint* paint, F& f) { float saveSkewX = paint->getSkFont().getSkewX(); bool savefakeBold = paint->getSkFont().isEmbolden(); - const minikin::MinikinFont* curFont = nullptr; - size_t start = 0; - size_t nGlyphs = layout.nGlyphs(); - for (size_t i = 0; i < nGlyphs; i++) { - const minikin::MinikinFont* nextFont = layout.typeface(i).get(); - if (i > 0 && nextFont != curFont) { + if (text_feature::typeface_redesign()) { + for (uint32_t runIdx = 0; runIdx < layout.getFontRunCount(); ++runIdx) { + uint32_t start = layout.getFontRunStart(runIdx); + uint32_t end = layout.getFontRunEnd(runIdx); + const minikin::FakedFont& fakedFont = layout.getFontRunFont(runIdx); + + std::shared_ptr<minikin::MinikinFont> font = fakedFont.typeface(); + SkFont* skfont = &paint->getSkFont(); + MinikinFontSkia::populateSkFont(skfont, font.get(), fakedFont.fakery); + f(start, end); + skfont->setSkewX(saveSkewX); + skfont->setEmbolden(savefakeBold); + } + } else { + const minikin::MinikinFont* curFont = nullptr; + size_t start = 0; + size_t nGlyphs = layout.nGlyphs(); + for (size_t i = 0; i < nGlyphs; i++) { + const minikin::MinikinFont* nextFont = layout.typeface(i).get(); + if (i > 0 && nextFont != curFont) { + SkFont* skfont = &paint->getSkFont(); + MinikinFontSkia::populateSkFont(skfont, curFont, layout.getFakery(start)); + f(start, i); + skfont->setSkewX(saveSkewX); + skfont->setEmbolden(savefakeBold); + start = i; + } + curFont = nextFont; + } + if (nGlyphs > start) { SkFont* skfont = &paint->getSkFont(); MinikinFontSkia::populateSkFont(skfont, curFont, layout.getFakery(start)); - f(start, i); + f(start, nGlyphs); skfont->setSkewX(saveSkewX); skfont->setEmbolden(savefakeBold); - start = i; } - curFont = nextFont; - } - if (nGlyphs > start) { - SkFont* skfont = &paint->getSkFont(); - MinikinFontSkia::populateSkFont(skfont, curFont, layout.getFakery(start)); - f(start, nGlyphs); - skfont->setSkewX(saveSkewX); - skfont->setEmbolden(savefakeBold); } } }; diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index a0b34690696f..08155dd3e09a 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -133,7 +133,8 @@ <LinearLayout android:id="@+id/negative_multiple_devices_layout" android:layout_width="wrap_content" - android:layout_height="48dp" + android:layout_height="match_parent" + android:padding="6dp" android:gravity="center" android:visibility="gone"> diff --git a/packages/CompanionDeviceManager/res/values/styles.xml b/packages/CompanionDeviceManager/res/values/styles.xml index e8e24f492005..fe7cfc64603a 100644 --- a/packages/CompanionDeviceManager/res/values/styles.xml +++ b/packages/CompanionDeviceManager/res/values/styles.xml @@ -103,11 +103,10 @@ <style name="NegativeButtonMultipleDevices" parent="@android:style/Widget.Material.Button.Colored"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">36dp</item> + <item name="android:layout_height">match_parent</item> + <item name="android:minHeight">36dp</item>> <item name="android:textAllCaps">false</item> <item name="android:textSize">14sp</item> - <item name="android:paddingLeft">6dp</item> - <item name="android:paddingRight">6dp</item> <item name="android:background">@drawable/btn_negative_multiple_devices</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item> </style> diff --git a/packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java b/packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java index ac47fbda09c6..391b16d38f0f 100644 --- a/packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java +++ b/packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java @@ -23,7 +23,6 @@ import static android.view.MotionEvent.ACTION_UP; import android.app.Activity; import android.content.res.Configuration; -import android.graphics.Bitmap; import android.graphics.Color; import android.os.Bundle; import android.view.MotionEvent; @@ -38,9 +37,7 @@ import android.widget.Magnifier; import com.android.egg.R; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.stream.IntStream; public class PaintActivity extends Activity { @@ -60,31 +57,28 @@ public class PaintActivity extends Activity { private View.OnClickListener buttonHandler = new View.OnClickListener() { @Override public void onClick(View view) { - switch (view.getId()) { - case R.id.btnBrush: - view.setSelected(true); - hideToolbar(colors); - toggleToolbar(brushes); - break; - case R.id.btnColor: - view.setSelected(true); - hideToolbar(brushes); - toggleToolbar(colors); - break; - case R.id.btnClear: - painting.clear(); - break; - case R.id.btnSample: - sampling = true; - view.setSelected(true); - break; - case R.id.btnZen: - painting.setZenMode(!painting.getZenMode()); - view.animate() - .setStartDelay(200) - .setInterpolator(new OvershootInterpolator()) - .rotation(painting.getZenMode() ? 0f : 90f); - break; + // With non final fields in the R class we can't switch on the + // id since the case values are no longer constants. + int viewId = view.getId(); + if (viewId == R.id.btnBrush) { + view.setSelected(true); + hideToolbar(colors); + toggleToolbar(brushes); + } else if (viewId == R.id.btnColor) { + view.setSelected(true); + hideToolbar(brushes); + toggleToolbar(colors); + } else if (viewId == R.id.btnClear) { + painting.clear(); + } else if (viewId == R.id.btnSample) { + sampling = true; + view.setSelected(true); + } else if (viewId == R.id.btnZen) { + painting.setZenMode(!painting.getZenMode()); + view.animate() + .setStartDelay(200) + .setInterpolator(new OvershootInterpolator()) + .rotation(painting.getZenMode() ? 0f : 90f); } } }; diff --git a/packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java b/packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java index 6198d80cefe6..d71b337228f6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java @@ -181,7 +181,7 @@ public class CreateUserDialogController { * admin status. */ public Dialog createDialog(Activity activity, - ActivityStarter activityStarter, boolean canCreateAdminUser, + @NonNull ActivityStarter activityStarter, boolean canCreateAdminUser, NewUserData successCallback, Runnable cancelCallback) { mActivity = activity; mCustomDialogHelper = new CustomDialogHelper(activity); diff --git a/packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java b/packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java index 46f229035839..c4c4ed8e7b91 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java @@ -31,6 +31,7 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.ImageView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -126,9 +127,11 @@ public class EditUserInfoController { * @param activityStarter - ActivityStarter is called with appropriate intents and request * codes to take photo/choose photo/crop photo. */ - public Dialog createDialog(Activity activity, ActivityStarter activityStarter, - @Nullable Drawable oldUserIcon, String defaultUserName, - BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) { + public @NonNull Dialog createDialog(@NonNull Activity activity, + @NonNull ActivityStarter activityStarter, @Nullable Drawable oldUserIcon, + @Nullable String defaultUserName, + @Nullable BiConsumer<String, Drawable> successCallback, + @Nullable Runnable cancelCallback) { LayoutInflater inflater = LayoutInflater.from(activity); View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig b/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig index 006e644b2ac7..62401a124ad1 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig +++ b/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig @@ -81,3 +81,13 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "sync_local_overrides_removal_new_storage" + namespace: "core_experiments_team_internal" + description: "When DeviceConfig overrides are deleted, delete new storage overrides too." + bug: "361643653" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 0b364ac4a176..a129ac170d89 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1032,6 +1032,16 @@ flag { } flag { + name: "communal_edit_widgets_activity_finish_fix" + namespace: "systemui" + description: "finish edit widgets activity when stopping" + bug: "354725145" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "app_clips_backlinks" namespace: "systemui" description: "Enables Backlinks improvement feature in App Clips" @@ -1083,6 +1093,13 @@ flag { } flag { + name: "media_controls_posts_optimization" + namespace: "systemui" + description: "Ignore duplicate media notifications posted" + bug: "358645640" +} + +flag { namespace: "systemui" name: "enable_view_capture_tracing" description: "Enables view capture tracing in System UI." @@ -1367,3 +1384,13 @@ flag { } } +flag { + name: "media_load_metadata_via_media_data_loader" + namespace: "systemui" + description: "Use MediaDataLoader for loading media metadata with better threading" + bug: "358350077" + metadata { + purpose: PURPOSE_BUGFIX + } +} + diff --git a/packages/SystemUI/animation/build.gradle b/packages/SystemUI/animation/build.gradle index 939455fa44ac..16ba42f862f7 100644 --- a/packages/SystemUI/animation/build.gradle +++ b/packages/SystemUI/animation/build.gradle @@ -10,13 +10,6 @@ android { } } - compileSdk 33 - - defaultConfig { - minSdk 33 - targetSdk 33 - } - lintOptions { abortOnError false } @@ -24,10 +17,6 @@ android { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" } - kotlinOptions { - jvmTarget = '1.8' - freeCompilerArgs = ["-Xjvm-default=all"] - } } dependencies { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 91a88bc7aa97..6f415ea334af 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -1154,7 +1154,7 @@ private fun WidgetContent( .then(selectableModifier) .thenIf(!viewModel.isEditMode && !model.inQuietMode) { Modifier.pointerInput(Unit) { - observeTaps { viewModel.onTapWidget(model.componentName, model.priority) } + observeTaps { viewModel.onTapWidget(model.componentName, model.rank) } } } .thenIf(!viewModel.isEditMode && model.inQuietMode) { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt index 38a347465318..11373577eedb 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt @@ -34,11 +34,11 @@ fun rememberContentListState( return remember(communalContent) { ContentListState( communalContent, - { componentName, user, priority -> + { componentName, user, rank -> viewModel.onAddWidget( componentName, user, - priority, + rank, widgetConfigurator, ) }, @@ -56,10 +56,9 @@ fun rememberContentListState( class ContentListState internal constructor( communalContent: List<CommunalContentModel>, - private val onAddWidget: - (componentName: ComponentName, user: UserHandle, priority: Int) -> Unit, - private val onDeleteWidget: (id: Int, componentName: ComponentName, priority: Int) -> Unit, - private val onReorderWidgets: (widgetIdToPriorityMap: Map<Int, Int>) -> Unit, + private val onAddWidget: (componentName: ComponentName, user: UserHandle, rank: Int) -> Unit, + private val onDeleteWidget: (id: Int, componentName: ComponentName, rank: Int) -> Unit, + private val onReorderWidgets: (widgetIdToRankMap: Map<Int, Int>) -> Unit, ) { var list = communalContent.toMutableStateList() private set @@ -74,7 +73,7 @@ internal constructor( if (list[indexToRemove].isWidgetContent()) { val widget = list[indexToRemove] as CommunalContentModel.WidgetContent list.apply { removeAt(indexToRemove) } - onDeleteWidget(widget.appWidgetId, widget.componentName, widget.priority) + onDeleteWidget(widget.appWidgetId, widget.componentName, widget.rank) } } @@ -94,24 +93,24 @@ internal constructor( newItemUser: UserHandle? = null, newItemIndex: Int? = null ) { - // filters placeholder, but, maintains the indices of the widgets as if the placeholder was - // in the list. When persisted in DB, this leaves space for the new item (to be added) at - // the correct priority. - val widgetIdToPriorityMap: Map<Int, Int> = + // New widget added to the grid. Other widgets are shifted as needed at the database level. + if (newItemComponentName != null && newItemUser != null && newItemIndex != null) { + onAddWidget(newItemComponentName, newItemUser, /* rank= */ newItemIndex) + return + } + + // No new widget, only reorder existing widgets. + val widgetIdToRankMap: Map<Int, Int> = list .mapIndexedNotNull { index, item -> if (item is CommunalContentModel.WidgetContent) { - item.appWidgetId to list.size - index + item.appWidgetId to index } else { null } } .toMap() - // reorder and then add the new widget - onReorderWidgets(widgetIdToPriorityMap) - if (newItemComponentName != null && newItemUser != null && newItemIndex != null) { - onAddWidget(newItemComponentName, newItemUser, /* priority= */ list.size - newItemIndex) - } + onReorderWidgets(widgetIdToRankMap) } /** Returns true if the item at given index is editable. */ diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt index 0c293948dd3c..f2f7c872b71c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt @@ -193,7 +193,7 @@ internal class DragAndDropTargetState( val widgetExtra = event.maybeWidgetExtra() ?: return false val (componentName, user) = widgetExtra if (componentName != null && user != null) { - // Placeholder isn't removed yet to allow the setting the right priority for items + // Placeholder isn't removed yet to allow the setting the right rank for items // before adding in the new item. contentListState.onSaveList( newItemComponentName = componentName, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt index a3e07016ced1..3e73057ba09b 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt @@ -76,6 +76,11 @@ constructor( viewModel .areNotificationsVisible(contentKey) .collectAsStateWithLifecycle(initialValue = false) + val isBypassEnabled by viewModel.isBypassEnabled.collectAsStateWithLifecycle() + + if (isBypassEnabled) { + with(notificationSection) { HeadsUpNotifications() } + } LockscreenLongPress( viewModel = viewModel.touchHandling, @@ -110,7 +115,7 @@ constructor( } ) } - if (isShadeLayoutWide) { + if (isShadeLayoutWide && !isBypassEnabled) { with(notificationSection) { Notifications( areNotificationsVisible = areNotificationsVisible, @@ -124,7 +129,7 @@ constructor( } } } - if (!isShadeLayoutWide) { + if (!isShadeLayoutWide && !isBypassEnabled) { with(notificationSection) { Notifications( areNotificationsVisible = areNotificationsVisible, @@ -175,7 +180,7 @@ constructor( }, modifier = Modifier.fillMaxSize(), ) { measurables, constraints -> - check(measurables.size == 6) + check(measurables.size == 6) { "Expected 6 measurables, got: ${measurables.size}" } val aboveLockIconMeasurable = measurables[0] val lockIconMeasurable = measurables[1] val belowLockIconMeasurable = measurables[2] diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt index 6801cf27a64d..5f4dc6e77c63 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt @@ -20,7 +20,6 @@ import android.view.ViewGroup import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.Dp @@ -34,6 +33,7 @@ import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters import com.android.systemui.lifecycle.rememberViewModel import com.android.systemui.notifications.ui.composable.ConstrainedNotificationStack +import com.android.systemui.notifications.ui.composable.SnoozeableHeadsUpNotificationSpace import com.android.systemui.shade.LargeScreenHeaderHelper import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView @@ -79,6 +79,14 @@ constructor( ) } + @Composable + fun SceneScope.HeadsUpNotifications() { + SnoozeableHeadsUpNotificationSpace( + stackScrollView = stackScrollView.get(), + viewModel = rememberViewModel { viewModelFactory.create() }, + ) + } + /** * @param burnInParams params to make this view adaptive to burn-in, `null` to disable burn-in * adjustment diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt index fc4a8a5ee67c..192162475c9f 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt @@ -121,6 +121,8 @@ private fun SceneScope.stateForQuickSettingsContent( ) } } + is TransitionState.Transition.OverlayTransition -> + TODO("b/359173565: Handle overlay transitions") } } @@ -212,7 +214,8 @@ private fun QuickSettingsContent( addView(view) } }, - // When the view changes (e.g. due to a theme change), this will be recomposed + // When the view changes (e.g. due to a theme change), this will be + // recomposed // if needed and the new view will be attached to the FrameLayout here. update = { qsSceneAdapter.setState(state()) diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateContent.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateContent.kt index 2bc8c87978a8..b16673702b49 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateContent.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateContent.kt @@ -26,15 +26,15 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch internal fun CoroutineScope.animateContent( + layoutState: MutableSceneTransitionLayoutStateImpl, transition: TransitionState.Transition, oneOffAnimation: OneOffAnimation, targetProgress: Float, - startTransition: () -> Unit, - finishTransition: () -> Unit, + chain: Boolean = true, ) { // Start the transition. This will compute the TransformationSpec associated to [transition], // which we need to initialize the Animatable that will actually animate it. - startTransition() + layoutState.startTransition(transition, chain) // The transition now contains the transformation spec that we should use to instantiate the // Animatable. @@ -59,7 +59,7 @@ internal fun CoroutineScope.animateContent( try { animatable.animateTo(targetProgress, animationSpec, initialVelocity) } finally { - finishTransition() + layoutState.finishTransition(transition) } } } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateOverlay.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateOverlay.kt new file mode 100644 index 000000000000..e020f14a9a02 --- /dev/null +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateOverlay.kt @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2024 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.compose.animation.scene + +import com.android.compose.animation.scene.content.state.TransitionState +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job + +/** Trigger a one-off transition to show or hide an overlay. */ +internal fun CoroutineScope.showOrHideOverlay( + layoutState: MutableSceneTransitionLayoutStateImpl, + overlay: OverlayKey, + fromOrToScene: SceneKey, + isShowing: Boolean, + transitionKey: TransitionKey?, + replacedTransition: TransitionState.Transition.ShowOrHideOverlay?, + reversed: Boolean, +): TransitionState.Transition.ShowOrHideOverlay { + val targetProgress = if (reversed) 0f else 1f + val (fromContent, toContent) = + if (isShowing xor reversed) { + fromOrToScene to overlay + } else { + overlay to fromOrToScene + } + + val oneOffAnimation = OneOffAnimation() + val transition = + OneOffShowOrHideOverlayTransition( + overlay = overlay, + fromOrToScene = fromOrToScene, + fromContent = fromContent, + toContent = toContent, + isEffectivelyShown = isShowing, + key = transitionKey, + replacedTransition = replacedTransition, + oneOffAnimation = oneOffAnimation, + ) + + animateContent( + layoutState = layoutState, + transition = transition, + oneOffAnimation = oneOffAnimation, + targetProgress = targetProgress, + ) + + return transition +} + +/** Trigger a one-off transition to replace an overlay by another one. */ +internal fun CoroutineScope.replaceOverlay( + layoutState: MutableSceneTransitionLayoutStateImpl, + fromOverlay: OverlayKey, + toOverlay: OverlayKey, + transitionKey: TransitionKey?, + replacedTransition: TransitionState.Transition.ReplaceOverlay?, + reversed: Boolean, +): TransitionState.Transition.ReplaceOverlay { + val targetProgress = if (reversed) 0f else 1f + val effectivelyShownOverlay = if (reversed) fromOverlay else toOverlay + + val oneOffAnimation = OneOffAnimation() + val transition = + OneOffOverlayReplacingTransition( + fromOverlay = fromOverlay, + toOverlay = toOverlay, + effectivelyShownOverlay = effectivelyShownOverlay, + key = transitionKey, + replacedTransition = replacedTransition, + oneOffAnimation = oneOffAnimation, + ) + + animateContent( + layoutState = layoutState, + transition = transition, + oneOffAnimation = oneOffAnimation, + targetProgress = targetProgress, + ) + + return transition +} + +private class OneOffShowOrHideOverlayTransition( + overlay: OverlayKey, + fromOrToScene: SceneKey, + fromContent: ContentKey, + toContent: ContentKey, + override val isEffectivelyShown: Boolean, + override val key: TransitionKey?, + replacedTransition: TransitionState.Transition?, + private val oneOffAnimation: OneOffAnimation, +) : + TransitionState.Transition.ShowOrHideOverlay( + overlay, + fromOrToScene, + fromContent, + toContent, + replacedTransition, + ) { + override val progress: Float + get() = oneOffAnimation.progress + + override val progressVelocity: Float + get() = oneOffAnimation.progressVelocity + + override val isInitiatedByUserInput: Boolean = false + override val isUserInputOngoing: Boolean = false + + override fun finish(): Job = oneOffAnimation.finish() +} + +private class OneOffOverlayReplacingTransition( + fromOverlay: OverlayKey, + toOverlay: OverlayKey, + override val effectivelyShownOverlay: OverlayKey, + override val key: TransitionKey?, + replacedTransition: TransitionState.Transition?, + private val oneOffAnimation: OneOffAnimation, +) : TransitionState.Transition.ReplaceOverlay(fromOverlay, toOverlay, replacedTransition) { + override val progress: Float + get() = oneOffAnimation.progress + + override val progressVelocity: Float + get() = oneOffAnimation.progressVelocity + + override val isInitiatedByUserInput: Boolean = false + override val isUserInputOngoing: Boolean = false + + override fun finish(): Job = oneOffAnimation.finish() +} diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt index ea708a5637f0..4aa50b586c1b 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt @@ -393,7 +393,8 @@ private class AnimatedStateImpl<T, Delta>( transition: TransitionState.Transition?, ): T? { if (transition == null) { - return sharedValue[layoutImpl.state.transitionState.currentScene] + return sharedValue[content] + ?: sharedValue[layoutImpl.state.transitionState.currentScene] } val fromValue = sharedValue[transition.fromContent] @@ -411,7 +412,7 @@ private class AnimatedStateImpl<T, Delta>( if (canOverflow) transition.progress else transition.progress.fastCoerceIn(0f, 1f) } - overscrollSpec.scene == transition.toContent -> 1f + overscrollSpec.content == transition.toContent -> 1f else -> 0f } @@ -424,10 +425,12 @@ private class AnimatedStateImpl<T, Delta>( val targetValues = sharedValue.targetValues val transition = if (element != null) { - layoutImpl.elements[element]?.stateByContent?.let { sceneStates -> - layoutImpl.state.currentTransitions.fastLastOrNull { transition -> - transition.fromContent in sceneStates || transition.toContent in sceneStates - } + layoutImpl.elements[element]?.let { element -> + elementState( + layoutImpl.state.transitionStates, + isInContent = { it in element.stateByContent }, + ) + as? TransitionState.Transition } } else { layoutImpl.state.currentTransitions.fastLastOrNull { transition -> diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateToScene.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateToScene.kt index f2c2a3600366..abe079a4ab64 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateToScene.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateToScene.kt @@ -43,12 +43,15 @@ internal fun CoroutineScope.animateToScene( } return when (transitionState) { - is TransitionState.Idle -> { + is TransitionState.Idle, + is TransitionState.Transition.ShowOrHideOverlay, + is TransitionState.Transition.ReplaceOverlay -> { animateToScene( layoutState, target, transitionKey, isInitiatedByUserInput = false, + fromScene = transitionState.currentScene, replacedTransition = null, ) } @@ -163,11 +166,11 @@ private fun CoroutineScope.animateToScene( } animateContent( + layoutState = layoutState, transition = transition, oneOffAnimation = oneOffAnimation, targetProgress = targetProgress, - startTransition = { layoutState.startTransition(transition, chain) }, - finishTransition = { layoutState.finishTransition(transition) }, + chain = chain, ) return transition diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt index 7dac2e4c4ada..9b1740dc700a 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.round import androidx.compose.ui.util.fastCoerceIn -import androidx.compose.ui.util.fastLastOrNull +import androidx.compose.ui.util.fastForEachReversed import androidx.compose.ui.util.lerp import com.android.compose.animation.scene.content.Content import com.android.compose.animation.scene.content.state.TransitionState @@ -145,8 +145,9 @@ internal fun Modifier.element( // layout/drawing. // TODO(b/341072461): Revert this and read the current transitions in ElementNode directly once // we can ensure that SceneTransitionLayoutImpl will compose new contents first. - val currentTransitions = layoutImpl.state.currentTransitions - return then(ElementModifier(layoutImpl, currentTransitions, content, key)).testTag(key.testTag) + val currentTransitionStates = layoutImpl.state.transitionStates + return then(ElementModifier(layoutImpl, currentTransitionStates, content, key)) + .testTag(key.testTag) } /** @@ -155,20 +156,21 @@ internal fun Modifier.element( */ private data class ElementModifier( private val layoutImpl: SceneTransitionLayoutImpl, - private val currentTransitions: List<TransitionState.Transition>, + private val currentTransitionStates: List<TransitionState>, private val content: Content, private val key: ElementKey, ) : ModifierNodeElement<ElementNode>() { - override fun create(): ElementNode = ElementNode(layoutImpl, currentTransitions, content, key) + override fun create(): ElementNode = + ElementNode(layoutImpl, currentTransitionStates, content, key) override fun update(node: ElementNode) { - node.update(layoutImpl, currentTransitions, content, key) + node.update(layoutImpl, currentTransitionStates, content, key) } } internal class ElementNode( private var layoutImpl: SceneTransitionLayoutImpl, - private var currentTransitions: List<TransitionState.Transition>, + private var currentTransitionStates: List<TransitionState>, private var content: Content, private var key: ElementKey, ) : Modifier.Node(), DrawModifierNode, ApproachLayoutModifierNode, TraversableNode { @@ -226,12 +228,12 @@ internal class ElementNode( fun update( layoutImpl: SceneTransitionLayoutImpl, - currentTransitions: List<TransitionState.Transition>, + currentTransitionStates: List<TransitionState>, content: Content, key: ElementKey, ) { check(layoutImpl == this.layoutImpl && content == this.content) - this.currentTransitions = currentTransitions + this.currentTransitionStates = currentTransitionStates removeNodeFromContentState() @@ -287,31 +289,73 @@ internal class ElementNode( measurable: Measurable, constraints: Constraints, ): MeasureResult { - val transitions = currentTransitions - val transition = elementTransition(layoutImpl, element, transitions) + val elementState = elementState(layoutImpl, element, currentTransitionStates) + if (elementState == null) { + // If the element is not part of any transition, place it normally in its idle scene. + val currentState = currentTransitionStates.last() + val placeInThisContent = + elementContentWhenIdle( + layoutImpl, + currentState.currentScene, + currentState.currentOverlays, + isInContent = { it in element.stateByContent }, + ) == content.key + + return if (placeInThisContent) { + placeNormally(measurable, constraints) + } else { + doNotPlace(measurable, constraints) + } + } + + val transition = elementState as? TransitionState.Transition // If this element is not supposed to be laid out now, either because it is not part of any // ongoing transition or the other content of its transition is overscrolling, then lay out // the element normally and don't place it. - val overscrollScene = transition?.currentOverscrollSpec?.scene + val overscrollScene = transition?.currentOverscrollSpec?.content val isOtherSceneOverscrolling = overscrollScene != null && overscrollScene != content.key - val isNotPartOfAnyOngoingTransitions = transitions.isNotEmpty() && transition == null - if (isNotPartOfAnyOngoingTransitions || isOtherSceneOverscrolling) { - recursivelyClearPlacementValues() - stateInContent.lastSize = Element.SizeUnspecified - - val placeable = measurable.measure(constraints) - return layout(placeable.width, placeable.height) { /* Do not place */ } + if (isOtherSceneOverscrolling) { + return doNotPlace(measurable, constraints) } val placeable = measure(layoutImpl, element, transition, stateInContent, measurable, constraints) stateInContent.lastSize = placeable.size() - return layout(placeable.width, placeable.height) { place(transition, placeable) } + return layout(placeable.width, placeable.height) { place(elementState, placeable) } + } + + private fun ApproachMeasureScope.doNotPlace( + measurable: Measurable, + constraints: Constraints + ): MeasureResult { + recursivelyClearPlacementValues() + stateInContent.lastSize = Element.SizeUnspecified + + val placeable = measurable.measure(constraints) + return layout(placeable.width, placeable.height) { /* Do not place */ } + } + + private fun ApproachMeasureScope.placeNormally( + measurable: Measurable, + constraints: Constraints + ): MeasureResult { + val placeable = measurable.measure(constraints) + stateInContent.lastSize = placeable.size() + return layout(placeable.width, placeable.height) { + coordinates?.let { + with(layoutImpl.lookaheadScope) { + stateInContent.lastOffset = + lookaheadScopeCoordinates.localPositionOf(it, Offset.Zero) + } + } + + placeable.place(0, 0) + } } private fun Placeable.PlacementScope.place( - transition: TransitionState.Transition?, + elementState: TransitionState, placeable: Placeable, ) { with(layoutImpl.lookaheadScope) { @@ -321,11 +365,12 @@ internal class ElementNode( coordinates ?: error("Element ${element.key} does not have any coordinates") // No need to place the element in this content if we don't want to draw it anyways. - if (!shouldPlaceElement(layoutImpl, content.key, element, transition)) { + if (!shouldPlaceElement(layoutImpl, content.key, element, elementState)) { recursivelyClearPlacementValues() return } + val transition = elementState as? TransitionState.Transition val currentOffset = lookaheadScopeCoordinates.localPositionOf(coords, Offset.Zero) val targetOffset = computeValue( @@ -391,11 +436,15 @@ internal class ElementNode( return@placeWithLayer } - val transition = elementTransition(layoutImpl, element, currentTransitions) - if (!shouldPlaceElement(layoutImpl, content.key, element, transition)) { + val elementState = elementState(layoutImpl, element, currentTransitionStates) + if ( + elementState == null || + !shouldPlaceElement(layoutImpl, content.key, element, elementState) + ) { return@placeWithLayer } + val transition = elementState as? TransitionState.Transition alpha = elementAlpha(layoutImpl, element, transition, stateInContent) compositingStrategy = CompositingStrategy.ModulateAlpha } @@ -425,7 +474,9 @@ internal class ElementNode( override fun ContentDrawScope.draw() { element.wasDrawnInAnyContent = true - val transition = elementTransition(layoutImpl, element, currentTransitions) + val transition = + elementState(layoutImpl, element, currentTransitionStates) + as? TransitionState.Transition val drawScale = getDrawScale(layoutImpl, element, transition, stateInContent) if (drawScale == Scale.Default) { drawContent() @@ -468,21 +519,15 @@ internal class ElementNode( } } -/** - * The transition that we should consider for [element]. This is the last transition where one of - * its contents contains the element. - */ -private fun elementTransition( +/** The [TransitionState] that we should consider for [element]. */ +private fun elementState( layoutImpl: SceneTransitionLayoutImpl, element: Element, - transitions: List<TransitionState.Transition>, -): TransitionState.Transition? { - val transition = - transitions.fastLastOrNull { transition -> - transition.fromContent in element.stateByContent || - transition.toContent in element.stateByContent - } + transitionStates: List<TransitionState>, +): TransitionState? { + val state = elementState(transitionStates, isInContent = { it in element.stateByContent }) + val transition = state as? TransitionState.Transition val previousTransition = element.lastTransition element.lastTransition = transition @@ -497,7 +542,66 @@ private fun elementTransition( } } - return transition + return state +} + +internal inline fun elementState( + transitionStates: List<TransitionState>, + isInContent: (ContentKey) -> Boolean, +): TransitionState? { + val lastState = transitionStates.last() + if (lastState is TransitionState.Idle) { + check(transitionStates.size == 1) + return lastState + } + + // Find the last transition with a content that contains the element. + transitionStates.fastForEachReversed { state -> + val transition = state as TransitionState.Transition + if (isInContent(transition.fromContent) || isInContent(transition.toContent)) { + return transition + } + } + + return null +} + +internal inline fun elementContentWhenIdle( + layoutImpl: SceneTransitionLayoutImpl, + idle: TransitionState.Idle, + isInContent: (ContentKey) -> Boolean, +): ContentKey { + val currentScene = idle.currentScene + val overlays = idle.currentOverlays + return elementContentWhenIdle(layoutImpl, currentScene, overlays, isInContent) +} + +private inline fun elementContentWhenIdle( + layoutImpl: SceneTransitionLayoutImpl, + currentScene: SceneKey, + overlays: Set<OverlayKey>, + isInContent: (ContentKey) -> Boolean, +): ContentKey { + if (overlays.isEmpty()) { + return currentScene + } + + // Find the overlay with highest zIndex that contains the element. + // TODO(b/353679003): Should we cache enabledOverlays into a List<> to avoid a lot of + // allocations here? + var currentOverlay: OverlayKey? = null + for (overlay in overlays) { + if ( + isInContent(overlay) && + (currentOverlay == null || + (layoutImpl.overlay(overlay).zIndex > + layoutImpl.overlay(currentOverlay).zIndex)) + ) { + currentOverlay = overlay + } + } + + return currentOverlay ?: currentScene } private fun prepareInterruption( @@ -693,12 +797,20 @@ private fun shouldPlaceElement( layoutImpl: SceneTransitionLayoutImpl, content: ContentKey, element: Element, - transition: TransitionState.Transition?, + elementState: TransitionState, ): Boolean { - // Always place the element if we are idle. - if (transition == null) { - return true - } + val transition = + when (elementState) { + is TransitionState.Idle -> { + return content == + elementContentWhenIdle( + layoutImpl, + elementState, + isInContent = { it in element.stateByContent }, + ) + } + is TransitionState.Transition -> elementState + } // Don't place the element in this content if this content is not part of the current element // transition. @@ -734,23 +846,19 @@ internal fun shouldPlaceOrComposeSharedElement( transition: TransitionState.Transition, ): Boolean { // If we are overscrolling, only place/compose the element in the overscrolling scene. - val overscrollScene = transition.currentOverscrollSpec?.scene + val overscrollScene = transition.currentOverscrollSpec?.content if (overscrollScene != null) { return content == overscrollScene } val scenePicker = element.contentPicker val pickedScene = - when (transition) { - is TransitionState.Transition.ChangeCurrentScene -> { - scenePicker.contentDuringTransition( - element = element, - transition = transition, - fromContentZIndex = layoutImpl.scene(transition.fromScene).zIndex, - toContentZIndex = layoutImpl.scene(transition.toScene).zIndex, - ) - } - } + scenePicker.contentDuringTransition( + element = element, + transition = transition, + fromContentZIndex = layoutImpl.content(transition.fromContent).zIndex, + toContentZIndex = layoutImpl.content(transition.toContent).zIndex, + ) return pickedScene == content } @@ -1077,7 +1185,7 @@ private inline fun <T> computeValue( val currentContent = currentContentState.content if (transition is TransitionState.HasOverscrollProperties) { val overscroll = transition.currentOverscrollSpec - if (overscroll?.scene == currentContent) { + if (overscroll?.content == currentContent) { val elementSpec = overscroll.transformationSpec.transformations(element.key, currentContent) val propertySpec = transformation(elementSpec) ?: return currentValue() @@ -1103,7 +1211,7 @@ private inline fun <T> computeValue( // TODO(b/290184746): Make sure that we don't overflow transformations associated to a // range. val directionSign = if (transition.isUpOrLeft) -1 else 1 - val isToContent = overscroll.scene == transition.toContent + val isToContent = overscroll.content == transition.toContent val linearProgress = transition.progress.let { if (isToContent) it - 1f else it } val progressConverter = overscroll.progressConverter diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt index acb436e4874b..3f8f5e742079 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt @@ -63,6 +63,18 @@ class SceneKey( } } +/** Key for an overlay. */ +class OverlayKey( + debugName: String, + identity: Any = Object(), +) : ContentKey(debugName, identity) { + override val testTag: String = "overlay:$debugName" + + override fun toString(): String { + return "OverlayKey(debugName=$debugName)" + } +} + /** Key for an element. */ open class ElementKey( debugName: String, diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt index 63d51f9bbcf4..715222cfd9da 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt @@ -26,7 +26,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.layout.Layout import androidx.compose.ui.unit.IntSize -import androidx.compose.ui.util.fastLastOrNull import com.android.compose.animation.scene.content.Content import com.android.compose.animation.scene.content.state.TransitionState @@ -58,6 +57,13 @@ internal fun MovableElement( modifier: Modifier, content: @Composable ElementScope<MovableElementContentScope>.() -> Unit, ) { + check(key.contentPicker.contents.contains(sceneOrOverlay.key)) { + val elementName = key.debugName + val contentName = sceneOrOverlay.key.debugName + "MovableElement $elementName was composed in content $contentName but the " + + "MovableElementKey($elementName).contentPicker.contents does not contain $contentName" + } + Box(modifier.element(layoutImpl, sceneOrOverlay, key)) { val contentScope = sceneOrOverlay.scope val boxScope = this @@ -153,13 +159,20 @@ private class MovableElementScopeImpl( // size* as its movable content, i.e. the same *size when idle*. During transitions, // this size will be used to interpolate the transition size, during the intermediate // layout pass. + // + // Important: Like in Modifier.element(), we read the transition states during + // composition then pass them to Layout to make sure that composition sees new states + // before layout and drawing. + val transitionStates = layoutImpl.state.transitionStates Layout { _, _ -> // No need to measure or place anything. val size = placeholderContentSize( - layoutImpl, - contentKey, - layoutImpl.elements.getValue(element), + layoutImpl = layoutImpl, + content = contentKey, + element = layoutImpl.elements.getValue(element), + elementKey = element, + transitionStates = transitionStates, ) layout(size.width, size.height) {} } @@ -172,28 +185,43 @@ private fun shouldComposeMovableElement( content: ContentKey, element: MovableElementKey, ): Boolean { - val transitions = layoutImpl.state.currentTransitions - if (transitions.isEmpty()) { - // If we are idle, there is only one [scene] that is composed so we can compose our - // movable content here. We still check that [scene] is equal to the current idle scene, to - // make sure we only compose it there. - return layoutImpl.state.transitionState.currentScene == content + return when ( + val elementState = movableElementState(element, layoutImpl.state.transitionStates) + ) { + null -> false + is TransitionState.Idle -> + movableElementContentWhenIdle(layoutImpl, element, elementState) == content + is TransitionState.Transition -> { + // During transitions, always compose movable elements in the scene picked by their + // content picker. + shouldPlaceOrComposeSharedElement( + layoutImpl, + content, + element, + elementState, + ) + } } +} - // The current transition for this element is the last transition in which either fromScene or - // toScene contains the element. - val contents = element.contentPicker.contents - val transition = - transitions.fastLastOrNull { transition -> - transition.fromContent in contents || transition.toContent in contents - } ?: return false +private fun movableElementState( + element: MovableElementKey, + transitionStates: List<TransitionState>, +): TransitionState? { + val content = element.contentPicker.contents + return elementState(transitionStates, isInContent = { content.contains(it) }) +} - // Always compose movable elements in the scene picked by their scene picker. - return shouldPlaceOrComposeSharedElement( +private fun movableElementContentWhenIdle( + layoutImpl: SceneTransitionLayoutImpl, + element: MovableElementKey, + elementState: TransitionState.Idle, +): ContentKey { + val contents = element.contentPicker.contents + return elementContentWhenIdle( layoutImpl, - content, - element, - transition, + elementState, + isInContent = { contents.contains(it) }, ) } @@ -205,6 +233,8 @@ private fun placeholderContentSize( layoutImpl: SceneTransitionLayoutImpl, content: ContentKey, element: Element, + elementKey: MovableElementKey, + transitionStates: List<TransitionState>, ): IntSize { // If the content of the movable element was already composed in this scene before, use that // target size. @@ -213,20 +243,21 @@ private fun placeholderContentSize( return targetValueInScene } - // This code is only run during transitions (otherwise the content would be composed and the - // placeholder would not), so it's ok to cast the state into a Transition directly. - val transition = - layoutImpl.state.transitionState as TransitionState.Transition.ChangeCurrentScene - - // If the content was already composed in the other scene, we use that target size assuming it - // doesn't change between scenes. - // TODO(b/317026105): Provide a way to give a hint size/content for cases where this is not - // true. - val otherScene = - if (transition.fromScene == content) transition.toScene else transition.fromScene - val targetValueInOtherScene = element.stateByContent[otherScene]?.targetSize - if (targetValueInOtherScene != null && targetValueInOtherScene != Element.SizeUnspecified) { - return targetValueInOtherScene + // If the element content was already composed in the other overlay/scene, we use that + // target size assuming it doesn't change between scenes. + // TODO(b/317026105): Provide a way to give a hint size/content for cases where this is + // not true. + val otherContent = + when (val state = movableElementState(elementKey, transitionStates)) { + null -> return IntSize.Zero + is TransitionState.Idle -> movableElementContentWhenIdle(layoutImpl, elementKey, state) + is TransitionState.Transition -> + if (state.fromContent == content) state.toContent else state.fromContent + } + + val targetValueInOtherContent = element.stateByContent[otherContent]?.targetSize + if (targetValueInOtherContent != null && targetValueInOtherContent != Element.SizeUnspecified) { + return targetValueInOtherContent } return IntSize.Zero diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt index 5071a7f744dc..236e202749b2 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt @@ -43,7 +43,9 @@ sealed interface ObservableTransitionState { fun currentScene(): Flow<SceneKey> { return when (this) { is Idle -> flowOf(currentScene) - is Transition -> currentScene + is Transition.ChangeCurrentScene -> currentScene + is Transition.ShowOrHideOverlay -> flowOf(currentScene) + is Transition.ReplaceOverlay -> flowOf(currentScene) } } @@ -51,10 +53,11 @@ sealed interface ObservableTransitionState { data class Idle(val currentScene: SceneKey) : ObservableTransitionState /** There is a transition animating between two scenes. */ - class Transition( - val fromScene: SceneKey, - val toScene: SceneKey, - val currentScene: Flow<SceneKey>, + sealed class Transition( + // TODO(b/353679003): Rename these to fromContent and toContent. + open val fromScene: ContentKey, + open val toScene: ContentKey, + val currentOverlays: Flow<Set<OverlayKey>>, val progress: Flow<Float>, /** @@ -76,10 +79,10 @@ sealed interface ObservableTransitionState { val isUserInputOngoing: Flow<Boolean>, /** Current progress of the preview part of the transition */ - val previewProgress: Flow<Float> = flowOf(0f), + val previewProgress: Flow<Float>, /** Whether the transition is currently in the preview stage or not */ - val isInPreviewStage: Flow<Boolean> = flowOf(false), + val isInPreviewStage: Flow<Boolean>, ) : ObservableTransitionState { override fun toString(): String = """Transition @@ -89,13 +92,109 @@ sealed interface ObservableTransitionState { | isUserInputOngoing=$isUserInputOngoing |)""" .trimMargin() + + /** A transition animating between [fromScene] and [toScene]. */ + class ChangeCurrentScene( + override val fromScene: SceneKey, + override val toScene: SceneKey, + val currentScene: Flow<SceneKey>, + currentOverlays: Flow<Set<OverlayKey>>, + progress: Flow<Float>, + isInitiatedByUserInput: Boolean, + isUserInputOngoing: Flow<Boolean>, + previewProgress: Flow<Float>, + isInPreviewStage: Flow<Boolean>, + ) : + Transition( + fromScene, + toScene, + currentOverlays, + progress, + isInitiatedByUserInput, + isUserInputOngoing, + previewProgress, + isInPreviewStage, + ) + + /** The [overlay] is either showing from [currentScene] or hiding into [currentScene]. */ + class ShowOrHideOverlay( + val overlay: OverlayKey, + fromContent: ContentKey, + toContent: ContentKey, + val currentScene: SceneKey, + currentOverlays: Flow<Set<OverlayKey>>, + progress: Flow<Float>, + isInitiatedByUserInput: Boolean, + isUserInputOngoing: Flow<Boolean>, + previewProgress: Flow<Float>, + isInPreviewStage: Flow<Boolean>, + ) : + Transition( + fromContent, + toContent, + currentOverlays, + progress, + isInitiatedByUserInput, + isUserInputOngoing, + previewProgress, + isInPreviewStage, + ) + + /** We are transitioning from [fromOverlay] to [toOverlay]. */ + class ReplaceOverlay( + val fromOverlay: OverlayKey, + val toOverlay: OverlayKey, + val currentScene: SceneKey, + currentOverlays: Flow<Set<OverlayKey>>, + progress: Flow<Float>, + isInitiatedByUserInput: Boolean, + isUserInputOngoing: Flow<Boolean>, + previewProgress: Flow<Float>, + isInPreviewStage: Flow<Boolean>, + ) : + Transition( + fromOverlay, + toOverlay, + currentOverlays, + progress, + isInitiatedByUserInput, + isUserInputOngoing, + previewProgress, + isInPreviewStage, + ) + + companion object { + operator fun invoke( + fromScene: SceneKey, + toScene: SceneKey, + currentScene: Flow<SceneKey>, + progress: Flow<Float>, + isInitiatedByUserInput: Boolean, + isUserInputOngoing: Flow<Boolean>, + previewProgress: Flow<Float> = flowOf(0f), + isInPreviewStage: Flow<Boolean> = flowOf(false), + currentOverlays: Flow<Set<OverlayKey>> = flowOf(emptySet()), + ): ChangeCurrentScene { + return ChangeCurrentScene( + fromScene, + toScene, + currentScene, + currentOverlays, + progress, + isInitiatedByUserInput, + isUserInputOngoing, + previewProgress, + isInPreviewStage, + ) + } + } } fun isIdle(scene: SceneKey?): Boolean { return this is Idle && (scene == null || this.currentScene == scene) } - fun isTransitioning(from: SceneKey? = null, to: SceneKey? = null): Boolean { + fun isTransitioning(from: ContentKey? = null, to: ContentKey? = null): Boolean { return this is Transition && (from == null || this.fromScene == from) && (to == null || this.toScene == to) @@ -112,15 +211,44 @@ fun SceneTransitionLayoutState.observableTransitionState(): Flow<ObservableTrans when (val state = transitionState) { is TransitionState.Idle -> ObservableTransitionState.Idle(state.currentScene) is TransitionState.Transition.ChangeCurrentScene -> { - ObservableTransitionState.Transition( + ObservableTransitionState.Transition.ChangeCurrentScene( fromScene = state.fromScene, toScene = state.toScene, currentScene = snapshotFlow { state.currentScene }, + currentOverlays = flowOf(state.currentOverlays), + progress = snapshotFlow { state.progress }, + isInitiatedByUserInput = state.isInitiatedByUserInput, + isUserInputOngoing = snapshotFlow { state.isUserInputOngoing }, + previewProgress = snapshotFlow { state.previewProgress }, + isInPreviewStage = snapshotFlow { state.isInPreviewStage }, + ) + } + is TransitionState.Transition.ShowOrHideOverlay -> { + check(state.fromOrToScene == state.currentScene) + ObservableTransitionState.Transition.ShowOrHideOverlay( + overlay = state.overlay, + fromContent = state.fromContent, + toContent = state.toContent, + currentScene = state.currentScene, + currentOverlays = snapshotFlow { state.currentOverlays }, + progress = snapshotFlow { state.progress }, + isInitiatedByUserInput = state.isInitiatedByUserInput, + isUserInputOngoing = snapshotFlow { state.isUserInputOngoing }, + previewProgress = snapshotFlow { state.previewProgress }, + isInPreviewStage = snapshotFlow { state.isInPreviewStage }, + ) + } + is TransitionState.Transition.ReplaceOverlay -> { + ObservableTransitionState.Transition.ReplaceOverlay( + fromOverlay = state.fromOverlay, + toOverlay = state.toOverlay, + currentScene = state.currentScene, + currentOverlays = snapshotFlow { state.currentOverlays }, progress = snapshotFlow { state.progress }, isInitiatedByUserInput = state.isInitiatedByUserInput, isUserInputOngoing = snapshotFlow { state.isUserInputOngoing }, previewProgress = snapshotFlow { state.previewProgress }, - isInPreviewStage = snapshotFlow { state.isInPreviewStage } + isInPreviewStage = snapshotFlow { state.isInPreviewStage }, ) } } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt index 65a73676d398..aaa2546b1d4b 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt @@ -49,7 +49,7 @@ import androidx.compose.ui.unit.LayoutDirection * if any. * @param transitionInterceptionThreshold used during a scene transition. For the scene to be * intercepted, the progress value must be above the threshold, and below (1 - threshold). - * @param scenes the configuration of the different scenes of this layout. + * @param builder the configuration of the different scenes and overlays of this layout. */ @Composable fun SceneTransitionLayout( @@ -58,7 +58,7 @@ fun SceneTransitionLayout( swipeSourceDetector: SwipeSourceDetector = DefaultEdgeDetector, swipeDetector: SwipeDetector = DefaultSwipeDetector, @FloatRange(from = 0.0, to = 0.5) transitionInterceptionThreshold: Float = 0.05f, - scenes: SceneTransitionLayoutScope.() -> Unit, + builder: SceneTransitionLayoutScope.() -> Unit, ) { SceneTransitionLayoutForTesting( state, @@ -67,7 +67,7 @@ fun SceneTransitionLayout( swipeDetector, transitionInterceptionThreshold, onLayoutImpl = null, - scenes, + builder, ) } @@ -86,6 +86,31 @@ interface SceneTransitionLayoutScope { userActions: Map<UserAction, UserActionResult> = emptyMap(), content: @Composable ContentScope.() -> Unit, ) + + /** + * Add an overlay to this layout, identified by [key]. + * + * Overlays are displayed above scenes and can be toggled using + * [MutableSceneTransitionLayoutState.showOverlay] and + * [MutableSceneTransitionLayoutState.hideOverlay]. + * + * Overlays will have a maximum size that is the size of the layout without overlays, i.e. an + * overlay can be fillMaxSize() to match the layout size but it won't make the layout bigger. + * + * By default overlays are centered in their layout but they can be aligned differently using + * [alignment]. + * + * Important: overlays must be defined after all scenes. Overlay order along the z-axis follows + * call order. Calling overlay(A) followed by overlay(B) will mean that overlay B renders + * after/above overlay A. + */ + // TODO(b/353679003): Allow to specify user actions. When overlays are shown, the user actions + // of the top-most overlay in currentOverlays will be used. + fun overlay( + key: OverlayKey, + alignment: Alignment = Alignment.Center, + content: @Composable ContentScope.() -> Unit, + ) } /** @@ -239,7 +264,7 @@ interface ContentScope : BaseContentScope { /** * Animate some value at the content level. * - * @param value the value of this shared value in the current scene. + * @param value the value of this shared value in the current content. * @param key the key of this shared value. * @param type the [SharedValueType] of this animated value. * @param canOverflow whether this value can overflow past the values it is interpolated @@ -292,7 +317,7 @@ interface ElementScope<ContentScope> { /** * Animate some value associated to this element. * - * @param value the value of this shared value in the current scene. + * @param value the value of this shared value in the current content. * @param key the key of this shared value. * @param type the [SharedValueType] of this animated value. * @param canOverflow whether this value can overflow past the values it is interpolated @@ -509,7 +534,7 @@ internal fun SceneTransitionLayoutForTesting( swipeDetector: SwipeDetector = DefaultSwipeDetector, transitionInterceptionThreshold: Float = 0f, onLayoutImpl: ((SceneTransitionLayoutImpl) -> Unit)? = null, - scenes: SceneTransitionLayoutScope.() -> Unit, + builder: SceneTransitionLayoutScope.() -> Unit, ) { val density = LocalDensity.current val layoutDirection = LocalLayoutDirection.current @@ -521,7 +546,7 @@ internal fun SceneTransitionLayoutForTesting( layoutDirection = layoutDirection, swipeSourceDetector = swipeSourceDetector, transitionInterceptionThreshold = transitionInterceptionThreshold, - builder = scenes, + builder = builder, coroutineScope = coroutineScope, ) .also { onLayoutImpl?.invoke(it) } @@ -529,7 +554,7 @@ internal fun SceneTransitionLayoutForTesting( // TODO(b/317014852): Move this into the SideEffect {} again once STLImpl.scenes is not a // SnapshotStateMap anymore. - layoutImpl.updateScenes(scenes, layoutDirection) + layoutImpl.updateContents(builder, layoutDirection) SideEffect { if (state != layoutImpl.state) { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt index 392ff7ebb446..5f5141e1f153 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt @@ -18,10 +18,12 @@ package com.android.compose.animation.scene import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.key import androidx.compose.runtime.snapshots.SnapshotStateMap +import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ApproachLayoutModifierNode @@ -36,7 +38,9 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastForEachReversed +import androidx.compose.ui.zIndex import com.android.compose.animation.scene.content.Content +import com.android.compose.animation.scene.content.Overlay import com.android.compose.animation.scene.content.Scene import com.android.compose.animation.scene.content.state.TransitionState import com.android.compose.ui.util.lerp @@ -60,7 +64,17 @@ internal class SceneTransitionLayoutImpl( * * TODO(b/317014852): Make this a normal MutableMap instead. */ - internal val scenes = SnapshotStateMap<SceneKey, Scene>() + private val scenes = SnapshotStateMap<SceneKey, Scene>() + + /** + * The map of [Overlays]. + * + * Note: We lazily create this map to avoid instantiation an expensive SnapshotStateMap in the + * common case where there is no overlay in this layout. + */ + private var _overlays: MutableMap<OverlayKey, Overlay>? = null + private val overlays + get() = _overlays ?: SnapshotStateMap<OverlayKey, Overlay>().also { _overlays = it } /** * The map of [Element]s. @@ -119,7 +133,7 @@ internal class SceneTransitionLayoutImpl( private set init { - updateScenes(builder, layoutDirection) + updateContents(builder, layoutDirection) // DraggableHandlerImpl must wait for the scenes to be initialized, in order to access the // current scene (required for SwipeTransition). @@ -152,22 +166,32 @@ internal class SceneTransitionLayoutImpl( return scenes[key] ?: error("Scene $key is not configured") } + internal fun sceneOrNull(key: SceneKey): Scene? = scenes[key] + + internal fun overlay(key: OverlayKey): Overlay { + return overlays[key] ?: error("Overlay $key is not configured") + } + internal fun content(key: ContentKey): Content { return when (key) { is SceneKey -> scene(key) + is OverlayKey -> overlay(key) } } - internal fun updateScenes( + internal fun updateContents( builder: SceneTransitionLayoutScope.() -> Unit, layoutDirection: LayoutDirection, ) { - // Keep a reference of the current scenes. After processing [builder], the scenes that were - // not configured will be removed. + // Keep a reference of the current contents. After processing [builder], the contents that + // were not configured will be removed. val scenesToRemove = scenes.keys.toMutableSet() + val overlaysToRemove = + if (_overlays == null) mutableSetOf() else overlays.keys.toMutableSet() // The incrementing zIndex of each scene. var zIndex = 0f + var overlaysDefined = false object : SceneTransitionLayoutScope { override fun scene( @@ -175,6 +199,8 @@ internal class SceneTransitionLayoutImpl( userActions: Map<UserAction, UserActionResult>, content: @Composable ContentScope.() -> Unit, ) { + require(!overlaysDefined) { "all scenes must be defined before overlays" } + scenesToRemove.remove(key) val resolvedUserActions = @@ -199,10 +225,42 @@ internal class SceneTransitionLayoutImpl( zIndex++ } + + override fun overlay( + key: OverlayKey, + alignment: Alignment, + content: @Composable (ContentScope.() -> Unit) + ) { + overlaysDefined = true + overlaysToRemove.remove(key) + + val overlay = overlays[key] + if (overlay != null) { + // Update an existing overlay. + overlay.content = content + overlay.zIndex = zIndex + overlay.alignment = alignment + } else { + // New overlay. + overlays[key] = + Overlay( + key, + this@SceneTransitionLayoutImpl, + content, + // TODO(b/353679003): Allow to specify user actions + actions = emptyMap(), + zIndex, + alignment, + ) + } + + zIndex++ + } } .builder() scenesToRemove.forEach { scenes.remove(it) } + overlaysToRemove.forEach { overlays.remove(it) } } @Composable @@ -220,8 +278,8 @@ internal class SceneTransitionLayoutImpl( lookaheadScope = this BackHandler() - - scenesToCompose().fastForEach { scene -> key(scene.key) { scene.Content() } } + Scenes() + Overlays() } } } @@ -233,6 +291,11 @@ internal class SceneTransitionLayoutImpl( PredictiveBackHandler(state, coroutineScope, targetSceneForBack) } + @Composable + private fun Scenes() { + scenesToCompose().fastForEach { scene -> key(scene.key) { scene.Content() } } + } + private fun scenesToCompose(): List<Scene> { val transitions = state.currentTransitions return if (transitions.isEmpty()) { @@ -253,15 +316,74 @@ internal class SceneTransitionLayoutImpl( maybeAdd(transition.toScene) maybeAdd(transition.fromScene) } + is TransitionState.Transition.ShowOrHideOverlay -> + maybeAdd(transition.fromOrToScene) + is TransitionState.Transition.ReplaceOverlay -> {} } } + + // Make sure that the current scene is always composed. + maybeAdd(transitions.last().currentScene) + } + } + } + + @Composable + private fun BoxScope.Overlays() { + val overlaysOrderedByZIndex = overlaysToComposeOrderedByZIndex() + if (overlaysOrderedByZIndex.isEmpty()) { + return + } + + // We put the overlays inside a Box that is matching the layout size so that overlays are + // measured after all scenes and that their max size is the size of the layout without the + // overlays. + Box(Modifier.matchParentSize().zIndex(overlaysOrderedByZIndex.first().zIndex)) { + overlaysOrderedByZIndex.fastForEach { overlay -> + key(overlay.key) { overlay.Content(Modifier.align(overlay.alignment)) } } } } + private fun overlaysToComposeOrderedByZIndex(): List<Overlay> { + if (_overlays == null) return emptyList() + + val transitions = state.currentTransitions + return if (transitions.isEmpty()) { + state.transitionState.currentOverlays.map { overlay(it) } + } else { + buildList { + val visited = mutableSetOf<OverlayKey>() + fun maybeAdd(key: OverlayKey) { + if (visited.add(key)) { + add(overlay(key)) + } + } + + transitions.fastForEach { transition -> + when (transition) { + is TransitionState.Transition.ChangeCurrentScene -> {} + is TransitionState.Transition.ShowOrHideOverlay -> + maybeAdd(transition.overlay) + is TransitionState.Transition.ReplaceOverlay -> { + maybeAdd(transition.fromOverlay) + maybeAdd(transition.toOverlay) + } + } + } + + // Make sure that all current overlays are composed. + transitions.last().currentOverlays.forEach { maybeAdd(it) } + } + } + .sortedBy { it.zIndex } + } + internal fun setScenesTargetSizeForTest(size: IntSize) { scenes.values.forEach { it.targetSize = size } } + + internal fun overlaysOrNullForTest(): Map<OverlayKey, Overlay>? = _overlays } private data class LayoutElement(private val layoutImpl: SceneTransitionLayoutImpl) : @@ -310,7 +432,7 @@ private class LayoutNode(var layoutImpl: SceneTransitionLayoutImpl) : val progress = when { overscrollSpec == null -> transition.progress - overscrollSpec.scene == transition.toScene -> 1f + overscrollSpec.content == transition.toScene -> 1f else -> 0f } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt index f37ded0547ea..0ac69124f7bc 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt @@ -39,6 +39,21 @@ import kotlinx.coroutines.CoroutineScope @Stable sealed interface SceneTransitionLayoutState { /** + * The current effective scene. If a new transition is triggered, it will start from this scene. + */ + val currentScene: SceneKey + + /** + * The current set of overlays. This represents the set of overlays that will be visible on + * screen once all [currentTransitions] are finished. + * + * @see MutableSceneTransitionLayoutState.showOverlay + * @see MutableSceneTransitionLayoutState.hideOverlay + * @see MutableSceneTransitionLayoutState.replaceOverlay + */ + val currentOverlays: Set<OverlayKey> + + /** * The current [TransitionState]. All values read here are backed by the Snapshot system. * * To observe those values outside of Compose/the Snapshot system, use @@ -66,12 +81,15 @@ sealed interface SceneTransitionLayoutState { /** * Whether we are transitioning. If [from] or [to] is empty, we will also check that they match - * the scenes we are animating from and/or to. + * the contents we are animating from and/or to. */ - fun isTransitioning(from: SceneKey? = null, to: SceneKey? = null): Boolean + fun isTransitioning(from: ContentKey? = null, to: ContentKey? = null): Boolean + + /** Whether we are transitioning from [content] to [other], or from [other] to [content]. */ + fun isTransitioningBetween(content: ContentKey, other: ContentKey): Boolean - /** Whether we are transitioning from [scene] to [other], or from [other] to [scene]. */ - fun isTransitioningBetween(scene: SceneKey, other: SceneKey): Boolean + /** Whether we are transitioning from or to [content]. */ + fun isTransitioningFromOrTo(content: ContentKey): Boolean } /** A [SceneTransitionLayoutState] whose target scene can be imperatively set. */ @@ -110,7 +128,50 @@ sealed interface MutableSceneTransitionLayoutState : SceneTransitionLayoutState ): TransitionState.Transition? /** Immediately snap to the given [scene]. */ - fun snapToScene(scene: SceneKey) + fun snapToScene( + scene: SceneKey, + currentOverlays: Set<OverlayKey> = transitionState.currentOverlays, + ) + + /** + * Request to show [overlay] so that it animates in from [currentScene] and ends up being + * visible on screen. + * + * After this returns, this overlay will be included in [currentOverlays]. This does nothing if + * [overlay] is already in [currentOverlays]. + */ + fun showOverlay( + overlay: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? = null, + ) + + /** + * Request to hide [overlay] so that it animates out to [currentScene] and ends up *not* being + * visible on screen. + * + * After this returns, this overlay will not be included in [currentOverlays]. This does nothing + * if [overlay] is not in [currentOverlays]. + */ + fun hideOverlay( + overlay: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? = null, + ) + + /** + * Replace [from] by [to] so that [from] ends up not being visible on screen and [to] ends up + * being visible. + * + * This throws if [from] is not currently in [currentOverlays] or if [to] is already in + * [currentOverlays]. + */ + fun replaceOverlay( + from: OverlayKey, + to: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? = null, + ) } /** @@ -128,6 +189,7 @@ sealed interface MutableSceneTransitionLayoutState : SceneTransitionLayoutState fun MutableSceneTransitionLayoutState( initialScene: SceneKey, transitions: SceneTransitions = SceneTransitions.Empty, + initialOverlays: Set<OverlayKey> = emptySet(), canChangeScene: (SceneKey) -> Boolean = { true }, stateLinks: List<StateLink> = emptyList(), enableInterruptions: Boolean = DEFAULT_INTERRUPTIONS_ENABLED, @@ -135,6 +197,7 @@ fun MutableSceneTransitionLayoutState( return MutableSceneTransitionLayoutStateImpl( initialScene, transitions, + initialOverlays, canChangeScene, stateLinks, enableInterruptions, @@ -145,6 +208,7 @@ fun MutableSceneTransitionLayoutState( internal class MutableSceneTransitionLayoutStateImpl( initialScene: SceneKey, override var transitions: SceneTransitions = transitions {}, + initialOverlays: Set<OverlayKey> = emptySet(), internal val canChangeScene: (SceneKey) -> Boolean = { true }, private val stateLinks: List<StateLink> = emptyList(), @@ -158,13 +222,18 @@ internal class MutableSceneTransitionLayoutStateImpl( * 1. A list with a single [TransitionState.Idle] element, when we are idle. * 2. A list with one or more [TransitionState.Transition], when we are transitioning. */ - @VisibleForTesting internal var transitionStates: List<TransitionState> by - mutableStateOf(listOf(TransitionState.Idle(initialScene))) + mutableStateOf(listOf(TransitionState.Idle(initialScene, initialOverlays))) private set + override val currentScene: SceneKey + get() = transitionState.currentScene + + override val currentOverlays: Set<OverlayKey> + get() = transitionState.currentOverlays + override val transitionState: TransitionState - get() = transitionStates.last() + get() = transitionStates[transitionStates.lastIndex] override val currentTransitions: List<TransitionState.Transition> get() { @@ -194,14 +263,19 @@ internal class MutableSceneTransitionLayoutStateImpl( } } - override fun isTransitioning(from: SceneKey?, to: SceneKey?): Boolean { + override fun isTransitioning(from: ContentKey?, to: ContentKey?): Boolean { val transition = currentTransition ?: return false return transition.isTransitioning(from, to) } - override fun isTransitioningBetween(scene: SceneKey, other: SceneKey): Boolean { + override fun isTransitioningBetween(content: ContentKey, other: ContentKey): Boolean { + val transition = currentTransition ?: return false + return transition.isTransitioningBetween(content, other) + } + + override fun isTransitioningFromOrTo(content: ContentKey): Boolean { val transition = currentTransition ?: return false - return transition.isTransitioningBetween(scene, other) + return transition.isTransitioningFromOrTo(content) } override fun setTargetScene( @@ -227,30 +301,32 @@ internal class MutableSceneTransitionLayoutStateImpl( * * Important: you *must* call [finishTransition] once the transition is finished. */ - internal fun startTransition( - transition: TransitionState.Transition.ChangeCurrentScene, - chain: Boolean = true, - ) { + internal fun startTransition(transition: TransitionState.Transition, chain: Boolean = true) { checkThread() + // Set the current scene and overlays on the transition. + val currentState = transitionState + transition.currentSceneWhenTransitionStarted = currentState.currentScene + transition.currentOverlaysWhenTransitionStarted = currentState.currentOverlays + // Compute the [TransformationSpec] when the transition starts. - val fromScene = transition.fromScene - val toScene = transition.toScene + val fromContent = transition.fromContent + val toContent = transition.toContent val orientation = (transition as? TransitionState.HasOverscrollProperties)?.orientation // Update the transition specs. transition.transformationSpec = transitions - .transitionSpec(fromScene, toScene, key = transition.key) + .transitionSpec(fromContent, toContent, key = transition.key) .transformationSpec() transition.previewTransformationSpec = transitions - .transitionSpec(fromScene, toScene, key = transition.key) + .transitionSpec(fromContent, toContent, key = transition.key) .previewTransformationSpec() if (orientation != null) { transition.updateOverscrollSpecs( - fromSpec = transitions.overscrollSpec(fromScene, orientation), - toSpec = transitions.overscrollSpec(toScene, orientation), + fromSpec = transitions.overscrollSpec(fromContent, orientation), + toSpec = transitions.overscrollSpec(toContent, orientation), ) } else { transition.updateOverscrollSpecs(fromSpec = null, toSpec = null) @@ -331,31 +407,27 @@ internal class MutableSceneTransitionLayoutStateImpl( } private fun setupTransitionLinks(transition: TransitionState.Transition) { - when (transition) { - is TransitionState.Transition.ChangeCurrentScene -> { - stateLinks.fastForEach { stateLink -> - val matchingLinks = - stateLink.transitionLinks.fastFilter { it.isMatchingLink(transition) } - if (matchingLinks.isEmpty()) return@fastForEach - if (matchingLinks.size > 1) error("More than one link matched.") - - val targetCurrentScene = stateLink.target.transitionState.currentScene - val matchingLink = matchingLinks[0] - - if (!matchingLink.targetIsInValidState(targetCurrentScene)) return@fastForEach - - val linkedTransition = - LinkedTransition( - originalTransition = transition, - fromScene = targetCurrentScene, - toScene = matchingLink.targetTo, - key = matchingLink.targetTransitionKey, - ) - - stateLink.target.startTransition(linkedTransition) - transition.activeTransitionLinks[stateLink] = linkedTransition - } - } + stateLinks.fastForEach { stateLink -> + val matchingLinks = + stateLink.transitionLinks.fastFilter { it.isMatchingLink(transition) } + if (matchingLinks.isEmpty()) return@fastForEach + if (matchingLinks.size > 1) error("More than one link matched.") + + val targetCurrentScene = stateLink.target.transitionState.currentScene + val matchingLink = matchingLinks[0] + + if (!matchingLink.targetIsInValidState(targetCurrentScene)) return@fastForEach + + val linkedTransition = + LinkedTransition( + originalTransition = transition, + fromScene = targetCurrentScene, + toScene = matchingLink.targetTo, + key = matchingLink.targetTransitionKey, + ) + + stateLink.target.startTransition(linkedTransition) + transition.activeTransitionLinks[stateLink] = linkedTransition } } @@ -408,23 +480,28 @@ internal class MutableSceneTransitionLayoutStateImpl( // If all transitions are finished, we are idle. if (i == nStates) { check(finishedTransitions.isEmpty()) - this.transitionStates = listOf(TransitionState.Idle(lastTransition.currentScene)) + this.transitionStates = + listOf( + TransitionState.Idle( + lastTransition.currentScene, + lastTransition.currentOverlays, + ) + ) } else if (i > 0) { this.transitionStates = transitionStates.subList(fromIndex = i, toIndex = nStates) } } - override fun snapToScene(scene: SceneKey) { + override fun snapToScene(scene: SceneKey, currentOverlays: Set<OverlayKey>) { checkThread() // Force finish all transitions. while (currentTransitions.isNotEmpty()) { - val transition = transitionStates[0] as TransitionState.Transition - finishTransition(transition) + finishTransition(transitionStates[0] as TransitionState.Transition) } check(transitionStates.size == 1) - transitionStates = listOf(TransitionState.Idle(scene)) + transitionStates = listOf(TransitionState.Idle(scene, currentOverlays)) } private fun finishActiveTransitionLinks(transition: TransitionState.Transition) { @@ -466,6 +543,137 @@ internal class MutableSceneTransitionLayoutStateImpl( false } } + + override fun showOverlay( + overlay: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? + ) { + checkThread() + + // Overlay is already shown, do nothing. + val currentState = transitionState + if (overlay in currentState.currentOverlays) { + return + } + + val fromScene = currentState.currentScene + fun animate( + replacedTransition: TransitionState.Transition.ShowOrHideOverlay? = null, + reversed: Boolean = false, + ) { + animationScope.showOrHideOverlay( + layoutState = this@MutableSceneTransitionLayoutStateImpl, + overlay = overlay, + fromOrToScene = fromScene, + isShowing = true, + transitionKey = transitionKey, + replacedTransition = replacedTransition, + reversed = reversed, + ) + } + + if ( + currentState is TransitionState.Transition.ShowOrHideOverlay && + currentState.overlay == overlay && + currentState.fromOrToScene == fromScene + ) { + animate( + replacedTransition = currentState, + reversed = overlay == currentState.fromContent + ) + } else { + animate() + } + } + + override fun hideOverlay( + overlay: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? + ) { + checkThread() + + // Overlay is not shown, do nothing. + val currentState = transitionState + if (!currentState.currentOverlays.contains(overlay)) { + return + } + + val toScene = currentState.currentScene + fun animate( + replacedTransition: TransitionState.Transition.ShowOrHideOverlay? = null, + reversed: Boolean = false, + ) { + animationScope.showOrHideOverlay( + layoutState = this@MutableSceneTransitionLayoutStateImpl, + overlay = overlay, + fromOrToScene = toScene, + isShowing = false, + transitionKey = transitionKey, + replacedTransition = replacedTransition, + reversed = reversed, + ) + } + + if ( + currentState is TransitionState.Transition.ShowOrHideOverlay && + currentState.overlay == overlay && + currentState.fromOrToScene == toScene + ) { + animate(replacedTransition = currentState, reversed = overlay == currentState.toContent) + } else { + animate() + } + } + + override fun replaceOverlay( + from: OverlayKey, + to: OverlayKey, + animationScope: CoroutineScope, + transitionKey: TransitionKey? + ) { + checkThread() + + val currentState = transitionState + require(from != to) { + "replaceOverlay must be called with different overlays (from = to = ${from.debugName})" + } + require(from in currentState.currentOverlays) { + "Overlay ${from.debugName} is not shown so it can't be replaced by ${to.debugName}" + } + require(to !in currentState.currentOverlays) { + "Overlay ${to.debugName} is already shown so it can't replace ${from.debugName}" + } + + fun animate( + replacedTransition: TransitionState.Transition.ReplaceOverlay? = null, + reversed: Boolean = false, + ) { + animationScope.replaceOverlay( + layoutState = this@MutableSceneTransitionLayoutStateImpl, + fromOverlay = if (reversed) to else from, + toOverlay = if (reversed) from else to, + transitionKey = transitionKey, + replacedTransition = replacedTransition, + reversed = reversed, + ) + } + + if (currentState is TransitionState.Transition.ReplaceOverlay) { + if (currentState.fromOverlay == from && currentState.toOverlay == to) { + animate(replacedTransition = currentState, reversed = false) + return + } + + if (currentState.fromOverlay == to && currentState.toOverlay == from) { + animate(replacedTransition = currentState, reversed = true) + return + } + } + + animate() + } } private const val TAG = "SceneTransitionLayoutState" diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt index d35d95685d22..cefcff75f13a 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt @@ -49,16 +49,16 @@ internal constructor( ) { private val transitionCache = mutableMapOf< - SceneKey, - MutableMap<SceneKey, MutableMap<TransitionKey?, TransitionSpecImpl>> + ContentKey, + MutableMap<ContentKey, MutableMap<TransitionKey?, TransitionSpecImpl>> >() private val overscrollCache = - mutableMapOf<SceneKey, MutableMap<Orientation, OverscrollSpecImpl?>>() + mutableMapOf<ContentKey, MutableMap<Orientation, OverscrollSpecImpl?>>() internal fun transitionSpec( - from: SceneKey, - to: SceneKey, + from: ContentKey, + to: ContentKey, key: TransitionKey?, ): TransitionSpecImpl { return transitionCache @@ -67,7 +67,11 @@ internal constructor( .getOrPut(key) { findSpec(from, to, key) } } - private fun findSpec(from: SceneKey, to: SceneKey, key: TransitionKey?): TransitionSpecImpl { + private fun findSpec( + from: ContentKey, + to: ContentKey, + key: TransitionKey? + ): TransitionSpecImpl { val spec = transition(from, to, key) { it.from == from && it.to == to } if (spec != null) { return spec @@ -93,8 +97,8 @@ internal constructor( } private fun transition( - from: SceneKey, - to: SceneKey, + from: ContentKey, + to: ContentKey, key: TransitionKey?, filter: (TransitionSpecImpl) -> Boolean, ): TransitionSpecImpl? { @@ -110,16 +114,16 @@ internal constructor( return match } - private fun defaultTransition(from: SceneKey, to: SceneKey) = + private fun defaultTransition(from: ContentKey, to: ContentKey) = TransitionSpecImpl(key = null, from, to, null, null, TransformationSpec.EmptyProvider) - internal fun overscrollSpec(scene: SceneKey, orientation: Orientation): OverscrollSpecImpl? = + internal fun overscrollSpec(scene: ContentKey, orientation: Orientation): OverscrollSpecImpl? = overscrollCache .getOrPut(scene) { mutableMapOf() } - .getOrPut(orientation) { overscroll(scene, orientation) { it.scene == scene } } + .getOrPut(orientation) { overscroll(scene, orientation) { it.content == scene } } private fun overscroll( - scene: SceneKey, + scene: ContentKey, orientation: Orientation, filter: (OverscrollSpecImpl) -> Boolean, ): OverscrollSpecImpl? { @@ -264,10 +268,10 @@ internal class TransitionSpecImpl( previewTransformationSpec?.invoke() } -/** The definition of the overscroll behavior of the [scene]. */ +/** The definition of the overscroll behavior of the [content]. */ interface OverscrollSpec { /** The scene we are over scrolling. */ - val scene: SceneKey + val content: ContentKey /** The orientation of this [OverscrollSpec]. */ val orientation: Orientation @@ -288,7 +292,7 @@ interface OverscrollSpec { } internal class OverscrollSpecImpl( - override val scene: SceneKey, + override val content: ContentKey, override val orientation: Orientation, override val transformationSpec: TransformationSpecImpl, override val progressConverter: ProgressConverter?, diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt index 523e5bdd7203..18e356f71768 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt @@ -107,7 +107,7 @@ private class SceneTransitionsBuilderImpl : SceneTransitionsBuilder { ): OverscrollSpec { val spec = OverscrollSpecImpl( - scene = scene, + content = scene, orientation = orientation, transformationSpec = TransformationSpecImpl( diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt index 0f668044112e..9851b32c42c4 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt @@ -35,7 +35,7 @@ internal class ElementStateScopeImpl( } override fun SceneKey.targetSize(): IntSize? { - return layoutImpl.scenes[this]?.targetSize.takeIf { it != IntSize.Zero } + return layoutImpl.sceneOrNull(this)?.targetSize.takeIf { it != IntSize.Zero } } } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt index 6f608cbc1d7f..6bc1754150fe 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt @@ -96,6 +96,8 @@ internal sealed class Content( .approachLayout( isMeasurementApproachInProgress = { layoutImpl.state.isTransitioning() } ) { measurable, constraints -> + // TODO(b/353679003): Use the ModifierNode API to set this *before* the approach + // pass is started. targetSize = lookaheadSize val placeable = measurable.measure(constraints) layout(placeable.width, placeable.height) { placeable.place(0, 0) } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Overlay.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Overlay.kt new file mode 100644 index 000000000000..ccec9e834385 --- /dev/null +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Overlay.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 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.compose.animation.scene.content + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Stable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import com.android.compose.animation.scene.ContentScope +import com.android.compose.animation.scene.OverlayKey +import com.android.compose.animation.scene.SceneTransitionLayoutImpl +import com.android.compose.animation.scene.UserAction +import com.android.compose.animation.scene.UserActionResult + +/** An overlay defined in a [SceneTransitionLayout]. */ +@Stable +internal class Overlay( + override val key: OverlayKey, + layoutImpl: SceneTransitionLayoutImpl, + content: @Composable ContentScope.() -> Unit, + actions: Map<UserAction.Resolved, UserActionResult>, + zIndex: Float, + alignment: Alignment, +) : Content(key, layoutImpl, content, actions, zIndex) { + var alignment by mutableStateOf(alignment) + + override fun toString(): String { + return "Overlay(key=$key)" + } +} diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt index 22df34b34b97..fdb019f5a604 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt @@ -21,7 +21,11 @@ import androidx.compose.animation.core.AnimationVector1D import androidx.compose.animation.core.spring import androidx.compose.foundation.gestures.Orientation import androidx.compose.runtime.Stable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue import com.android.compose.animation.scene.ContentKey +import com.android.compose.animation.scene.MutableSceneTransitionLayoutState +import com.android.compose.animation.scene.OverlayKey import com.android.compose.animation.scene.OverscrollScope import com.android.compose.animation.scene.OverscrollSpecImpl import com.android.compose.animation.scene.ProgressVisibilityThreshold @@ -49,9 +53,20 @@ sealed interface TransitionState { */ val currentScene: SceneKey + /** + * The current set of overlays. This represents the set of overlays that will be visible on + * screen once all transitions are finished. + * + * @see MutableSceneTransitionLayoutState.showOverlay + * @see MutableSceneTransitionLayoutState.hideOverlay + * @see MutableSceneTransitionLayoutState.replaceOverlay + */ + val currentOverlays: Set<OverlayKey> + /** The scene [currentScene] is idle. */ data class Idle( override val currentScene: SceneKey, + override val currentOverlays: Set<OverlayKey> = emptySet(), ) : TransitionState sealed class Transition( @@ -69,7 +84,125 @@ sealed interface TransitionState { /** The transition that `this` transition is replacing, if any. */ replacedTransition: Transition? = null, - ) : Transition(fromScene, toScene, replacedTransition) + ) : Transition(fromScene, toScene, replacedTransition) { + final override val currentOverlays: Set<OverlayKey> + get() { + // The set of overlays does not change in a [ChangeCurrentScene] transition. + return currentOverlaysWhenTransitionStarted + } + } + + /** + * A transition that is animating one or more overlays and for which [currentOverlays] will + * change over the course of the transition. + */ + sealed class OverlayTransition( + fromContent: ContentKey, + toContent: ContentKey, + replacedTransition: Transition?, + ) : Transition(fromContent, toContent, replacedTransition) { + final override val currentScene: SceneKey + get() { + // The current scene does not change during overlay transitions. + return currentSceneWhenTransitionStarted + } + + // Note: We use deriveStateOf() so that the computed set is cached and reused when the + // inputs of the computations don't change, to avoid recomputing and allocating a new + // set every time currentOverlays is called (which is every frame and for each element). + final override val currentOverlays: Set<OverlayKey> by derivedStateOf { + computeCurrentOverlays() + } + + protected abstract fun computeCurrentOverlays(): Set<OverlayKey> + } + + /** The [overlay] is either showing from [fromOrToScene] or hiding into [fromOrToScene]. */ + abstract class ShowOrHideOverlay( + val overlay: OverlayKey, + val fromOrToScene: SceneKey, + fromContent: ContentKey, + toContent: ContentKey, + replacedTransition: Transition? = null, + ) : OverlayTransition(fromContent, toContent, replacedTransition) { + /** + * Whether [overlay] is effectively shown. For instance, this will be `false` when + * starting a swipe transition to show [overlay] and will be `true` only once the swipe + * transition is committed. + */ + protected abstract val isEffectivelyShown: Boolean + + init { + check( + (fromContent == fromOrToScene && toContent == overlay) || + (fromContent == overlay && toContent == fromOrToScene) + ) + } + + final override fun computeCurrentOverlays(): Set<OverlayKey> { + return if (isEffectivelyShown) { + currentOverlaysWhenTransitionStarted + overlay + } else { + currentOverlaysWhenTransitionStarted - overlay + } + } + } + + /** We are transitioning from [fromOverlay] to [toOverlay]. */ + abstract class ReplaceOverlay( + val fromOverlay: OverlayKey, + val toOverlay: OverlayKey, + replacedTransition: Transition? = null, + ) : + OverlayTransition( + fromContent = fromOverlay, + toContent = toOverlay, + replacedTransition, + ) { + /** + * The current effective overlay, either [fromOverlay] or [toOverlay]. For instance, + * this will be [fromOverlay] when starting a swipe transition that replaces + * [fromOverlay] by [toOverlay] and will [toOverlay] once the swipe transition is + * committed. + */ + protected abstract val effectivelyShownOverlay: OverlayKey + + init { + check(fromOverlay != toOverlay) + } + + final override fun computeCurrentOverlays(): Set<OverlayKey> { + return when (effectivelyShownOverlay) { + fromOverlay -> + computeCurrentOverlays(include = fromOverlay, exclude = toOverlay) + toOverlay -> computeCurrentOverlays(include = toOverlay, exclude = fromOverlay) + else -> + error( + "effectivelyShownOverlay=$effectivelyShownOverlay, should be " + + "equal to fromOverlay=$fromOverlay or toOverlay=$toOverlay" + ) + } + } + + private fun computeCurrentOverlays( + include: OverlayKey, + exclude: OverlayKey + ): Set<OverlayKey> { + return buildSet { + addAll(currentOverlaysWhenTransitionStarted) + remove(exclude) + add(include) + } + } + } + + /** + * The current scene and overlays observed right when this transition started. These are set + * when this transition is started in + * [com.android.compose.animation.scene.MutableSceneTransitionLayoutStateImpl.startTransition]. + */ + internal lateinit var currentSceneWhenTransitionStarted: SceneKey + internal lateinit var currentOverlaysWhenTransitionStarted: Set<OverlayKey> /** * The key of this transition. This should usually be null, but it can be specified to use a @@ -163,6 +296,11 @@ sealed interface TransitionState { isTransitioning(from = other, to = content) } + /** Whether we are transitioning from or to [content]. */ + fun isTransitioningFromOrTo(content: ContentKey): Boolean { + return fromContent == content || toContent == content + } + /** * Force this transition to finish and animate to an [Idle] state. * diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/LinkedTransition.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/LinkedTransition.kt index 89b004046475..59ddb1354073 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/LinkedTransition.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/LinkedTransition.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.Job /** A linked transition which is driven by a [originalTransition]. */ internal class LinkedTransition( - private val originalTransition: TransitionState.Transition.ChangeCurrentScene, + private val originalTransition: TransitionState.Transition, fromScene: SceneKey, toScene: SceneKey, override val key: TransitionKey? = null, @@ -32,8 +32,8 @@ internal class LinkedTransition( override val currentScene: SceneKey get() { return when (originalTransition.currentScene) { - originalTransition.fromScene -> fromScene - originalTransition.toScene -> toScene + originalTransition.fromContent -> fromScene + originalTransition.toContent -> toScene else -> error("Original currentScene is neither FromScene nor ToScene") } } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt index c29bf212ec9c..c830ca4fa7c0 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt @@ -16,6 +16,7 @@ package com.android.compose.animation.scene.transition.link +import com.android.compose.animation.scene.ContentKey import com.android.compose.animation.scene.MutableSceneTransitionLayoutStateImpl import com.android.compose.animation.scene.SceneKey import com.android.compose.animation.scene.SceneTransitionLayoutState @@ -35,8 +36,8 @@ class StateLink(target: SceneTransitionLayoutState, val transitionLinks: List<Tr * target to `SceneA` from any current scene. */ class TransitionLink( - val sourceFrom: SceneKey?, - val sourceTo: SceneKey?, + val sourceFrom: ContentKey?, + val sourceTo: ContentKey?, val targetFrom: SceneKey?, val targetTo: SceneKey, val targetTransitionKey: TransitionKey? = null, @@ -50,15 +51,15 @@ class StateLink(target: SceneTransitionLayoutState, val transitionLinks: List<Tr } internal fun isMatchingLink( - transition: TransitionState.Transition.ChangeCurrentScene, + transition: TransitionState.Transition, ): Boolean { - return (sourceFrom == null || sourceFrom == transition.fromScene) && - (sourceTo == null || sourceTo == transition.toScene) + return (sourceFrom == null || sourceFrom == transition.fromContent) && + (sourceTo == null || sourceTo == transition.toContent) } - internal fun targetIsInValidState(targetCurrentScene: SceneKey): Boolean { - return (targetFrom == null || targetFrom == targetCurrentScene) && - targetTo != targetCurrentScene + internal fun targetIsInValidState(targetCurrentContent: ContentKey): Boolean { + return (targetFrom == null || targetFrom == targetCurrentContent) && + targetTo != targetCurrentContent } } } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/AnimatedSharedAsStateTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/AnimatedSharedAsStateTest.kt index 01895c91a399..8ebb42aa24f8 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/AnimatedSharedAsStateTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/AnimatedSharedAsStateTest.kt @@ -168,10 +168,7 @@ class AnimatedSharedAsStateTest { assertThat(lastValueInTo).isEqualTo(expectedValues) } - after { - assertThat(lastValueInFrom).isEqualTo(toValues) - assertThat(lastValueInTo).isEqualTo(toValues) - } + after { assertThat(lastValueInTo).isEqualTo(toValues) } } } @@ -229,10 +226,7 @@ class AnimatedSharedAsStateTest { assertThat(lastValueInTo).isEqualTo(lerp(fromValues, toValues, fraction = 0.75f)) } - after { - assertThat(lastValueInFrom).isEqualTo(toValues) - assertThat(lastValueInTo).isEqualTo(toValues) - } + after { assertThat(lastValueInTo).isEqualTo(toValues) } } } @@ -288,10 +282,7 @@ class AnimatedSharedAsStateTest { assertThat(lastValueInTo).isEqualTo(expectedValues) } - after { - assertThat(lastValueInFrom).isEqualTo(toValues) - assertThat(lastValueInTo).isEqualTo(toValues) - } + after { assertThat(lastValueInTo).isEqualTo(toValues) } } } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt index 72a16b7fbd6f..7d8e898e9ab2 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt @@ -65,19 +65,19 @@ class DraggableHandlerTest { var layoutDirection = LayoutDirection.Rtl set(value) { field = value - layoutImpl.updateScenes(scenesBuilder, layoutDirection) + layoutImpl.updateContents(scenesBuilder, layoutDirection) } var mutableUserActionsA = mapOf(Swipe.Up to SceneB, Swipe.Down to SceneC) set(value) { field = value - layoutImpl.updateScenes(scenesBuilder, layoutDirection) + layoutImpl.updateContents(scenesBuilder, layoutDirection) } var mutableUserActionsB = mapOf(Swipe.Up to SceneC, Swipe.Down to SceneA) set(value) { field = value - layoutImpl.updateScenes(scenesBuilder, layoutDirection) + layoutImpl.updateContents(scenesBuilder, layoutDirection) } private val scenesBuilder: SceneTransitionLayoutScope.() -> Unit = { @@ -1020,7 +1020,7 @@ class DraggableHandlerTest { // We scrolled down, under scene C there is nothing, so we can use the overscroll spec assertThat(layoutState.currentTransition?.currentOverscrollSpec).isNotNull() - assertThat(layoutState.currentTransition?.currentOverscrollSpec?.scene).isEqualTo(SceneC) + assertThat(layoutState.currentTransition?.currentOverscrollSpec?.content).isEqualTo(SceneC) val transition = layoutState.currentTransition assertThat(transition).isNotNull() assertThat(transition!!.progress).isEqualTo(-0.1f) diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt index b7f50fd8d685..a549d0355a26 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt @@ -106,7 +106,7 @@ class MovableElementTest { rule .onNode( hasText("count: 3") and - hasParent(isElement(TestElements.Foo, scene = SceneA)) + hasParent(isElement(TestElements.Foo, content = SceneA)) ) .assertExists() .assertIsNotDisplayed() @@ -114,7 +114,7 @@ class MovableElementTest { rule .onNode( hasText("count: 0") and - hasParent(isElement(TestElements.Foo, scene = SceneB)) + hasParent(isElement(TestElements.Foo, content = SceneB)) ) .assertIsDisplayed() .assertSizeIsEqualTo(75.dp, 75.dp) @@ -213,7 +213,7 @@ class MovableElementTest { rule .onNode( hasText("count: 3") and - hasParent(isElement(TestElements.Foo, scene = SceneA)) + hasParent(isElement(TestElements.Foo, content = SceneA)) ) .assertIsDisplayed() .assertSizeIsEqualTo(75.dp, 75.dp) @@ -234,7 +234,7 @@ class MovableElementTest { rule .onNode( hasText("count: 3") and - hasParent(isElement(TestElements.Foo, scene = SceneB)) + hasParent(isElement(TestElements.Foo, content = SceneB)) ) .assertIsDisplayed() @@ -324,7 +324,7 @@ class MovableElementTest { fun movableElementScopeExtendsBoxScope() { val key = MovableElementKey("Foo", contents = setOf(SceneA)) rule.setContent { - TestContentScope { + TestContentScope(currentScene = SceneA) { MovableElement(key, Modifier.size(200.dp)) { content { Box(Modifier.testTag("bottomEnd").align(Alignment.BottomEnd)) diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/OverlayTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/OverlayTest.kt new file mode 100644 index 000000000000..85db418f6020 --- /dev/null +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/OverlayTest.kt @@ -0,0 +1,527 @@ +/* + * Copyright (C) 2024 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.compose.animation.scene + +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsNotDisplayed +import androidx.compose.ui.test.assertPositionInRootIsEqualTo +import androidx.compose.ui.test.hasTestTag +import androidx.compose.ui.test.junit4.createComposeRule +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.compose.animation.scene.TestOverlays.OverlayA +import com.android.compose.animation.scene.TestOverlays.OverlayB +import com.android.compose.animation.scene.TestScenes.SceneA +import com.android.compose.test.assertSizeIsEqualTo +import kotlinx.coroutines.CoroutineScope +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class OverlayTest { + @get:Rule val rule = createComposeRule() + + @Composable + private fun ContentScope.Foo(width: Dp = 100.dp, height: Dp = 100.dp) { + Box(Modifier.element(TestElements.Foo).size(width, height)) + } + + @Test + fun showThenHideOverlay() { + val state = rule.runOnUiThread { MutableSceneTransitionLayoutState(SceneA) } + lateinit var coroutineScope: CoroutineScope + rule.setContent { + coroutineScope = rememberCoroutineScope() + SceneTransitionLayout(state, Modifier.size(200.dp)) { + scene(SceneA) { Box(Modifier.fillMaxSize()) { Foo() } } + overlay(OverlayA) { Foo() } + } + } + + // Initial state: overlay A is not shown, so Foo is displayed at the top left in scene A. + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + + // Show overlay A: Foo is now centered on screen and placed in overlay A. It is not placed + // in scene A. + rule.runOnUiThread { state.showOverlay(OverlayA, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // Hide overlay A: back to initial state, top-left in scene A. + rule.runOnUiThread { state.hideOverlay(OverlayA, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + } + + @Test + fun multipleOverlays() { + val state = rule.runOnUiThread { MutableSceneTransitionLayoutState(SceneA) } + lateinit var coroutineScope: CoroutineScope + rule.setContent { + coroutineScope = rememberCoroutineScope() + SceneTransitionLayout(state, Modifier.size(200.dp)) { + scene(SceneA) { Box(Modifier.fillMaxSize()) { Foo() } } + overlay(OverlayA) { Foo() } + overlay(OverlayB) { Foo() } + } + } + + // Initial state. + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + rule.onNode(isElement(TestElements.Foo, content = OverlayB)).assertDoesNotExist() + + // Show overlay A. + rule.runOnUiThread { state.showOverlay(OverlayA, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayB)).assertDoesNotExist() + + // Replace overlay A by overlay B. + rule.runOnUiThread { state.replaceOverlay(OverlayA, OverlayB, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // Show overlay A: Foo is still placed in B because it has a higher zIndex, but it now + // exists in A as well. + rule.runOnUiThread { state.showOverlay(OverlayA, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // Hide overlay B. + rule.runOnUiThread { state.hideOverlay(OverlayB, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayB)).assertDoesNotExist() + + // Hide overlay A. + rule.runOnUiThread { state.hideOverlay(OverlayA, coroutineScope) } + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + rule.onNode(isElement(TestElements.Foo, content = OverlayB)).assertDoesNotExist() + } + + @Test + fun movableElement() { + val key = MovableElementKey("MovableBar", contents = setOf(SceneA, OverlayA, OverlayB)) + val elementChildTag = "elementChildTag" + + fun elementChild(content: ContentKey) = hasTestTag(elementChildTag) and inContent(content) + + @Composable + fun ContentScope.MovableBar() { + MovableElement(key, Modifier) { + content { Box(Modifier.testTag(elementChildTag).size(100.dp)) } + } + } + + val state = rule.runOnUiThread { MutableSceneTransitionLayoutState(SceneA) } + lateinit var coroutineScope: CoroutineScope + rule.setContent { + coroutineScope = rememberCoroutineScope() + SceneTransitionLayout(state, Modifier.size(200.dp)) { + scene(SceneA) { Box(Modifier.fillMaxSize()) { MovableBar() } } + overlay(OverlayA) { MovableBar() } + overlay(OverlayB) { MovableBar() } + } + } + + // Initial state. + rule + .onNode(elementChild(content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(elementChild(content = OverlayA)).assertDoesNotExist() + rule.onNode(elementChild(content = OverlayB)).assertDoesNotExist() + + // Show overlay A: movable element child only exists (is only composed) in overlay A. + rule.runOnUiThread { state.showOverlay(OverlayA, coroutineScope) } + rule.onNode(elementChild(content = SceneA)).assertDoesNotExist() + rule + .onNode(elementChild(content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + rule.onNode(elementChild(content = OverlayB)).assertDoesNotExist() + + // Replace overlay A by overlay B: element child is only in overlay B. + rule.runOnUiThread { state.replaceOverlay(OverlayA, OverlayB, coroutineScope) } + rule.onNode(elementChild(content = SceneA)).assertDoesNotExist() + rule.onNode(elementChild(content = OverlayA)).assertDoesNotExist() + rule + .onNode(elementChild(content = OverlayB)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // Show overlay A: element child still only exists in overlay B because it has a higher + // zIndex. + rule.runOnUiThread { state.showOverlay(OverlayA, coroutineScope) } + rule.onNode(elementChild(content = SceneA)).assertDoesNotExist() + rule.onNode(elementChild(content = OverlayA)).assertDoesNotExist() + rule + .onNode(elementChild(content = OverlayB)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // Hide overlay B: element child is in overlay A. + rule.runOnUiThread { state.hideOverlay(OverlayB, coroutineScope) } + rule.onNode(elementChild(content = SceneA)).assertDoesNotExist() + rule + .onNode(elementChild(content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + rule.onNode(elementChild(content = OverlayB)).assertDoesNotExist() + + // Hide overlay A: element child is in scene A. + rule.runOnUiThread { state.hideOverlay(OverlayA, coroutineScope) } + rule + .onNode(elementChild(content = SceneA)) + .assertIsDisplayed() + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(elementChild(content = OverlayA)).assertDoesNotExist() + rule.onNode(elementChild(content = OverlayB)).assertDoesNotExist() + } + + @Test + fun overlayAlignment() { + val state = + rule.runOnUiThread { + MutableSceneTransitionLayoutState(SceneA, initialOverlays = setOf(OverlayA)) + } + var alignment by mutableStateOf(Alignment.Center) + rule.setContent { + SceneTransitionLayout(state, Modifier.size(200.dp)) { + scene(SceneA) { Box(Modifier.fillMaxSize()) { Foo() } } + overlay(OverlayA, alignment) { Foo() } + } + } + + // Initial state: 100x100dp centered in 200x200dp layout. + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(50.dp, 50.dp) + + // BottomStart. + alignment = Alignment.BottomStart + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(0.dp, 100.dp) + + // TopEnd. + alignment = Alignment.TopEnd + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp) + .assertPositionInRootIsEqualTo(100.dp, 0.dp) + } + + @Test + fun overlayMaxSizeIsCurrentSceneSize() { + val state = + rule.runOnUiThread { + MutableSceneTransitionLayoutState(SceneA, initialOverlays = setOf(OverlayA)) + } + + val contentTag = "overlayContent" + rule.setContent { + SceneTransitionLayout(state) { + scene(SceneA) { Box(Modifier.size(100.dp)) { Foo() } } + overlay(OverlayA) { Box(Modifier.testTag(contentTag).fillMaxSize()) } + } + } + + // Max overlay size is the size of the layout without overlays, not the (max) possible size + // of the layout. + rule.onNodeWithTag(contentTag).assertSizeIsEqualTo(100.dp) + } + + @Test + fun showAnimation() { + rule.testShowOverlayTransition( + fromSceneContent = { + Box(Modifier.size(width = 180.dp, height = 120.dp)) { + Foo(width = 60.dp, height = 40.dp) + } + }, + overlayContent = { Foo(width = 100.dp, height = 80.dp) }, + transition = { + // 4 frames of animation + spec = tween(4 * 16, easing = LinearEasing) + }, + ) { + // Foo moves from (0,0) with a size of 60x40dp to centered (in a 180x120dp Box) with a + // size of 100x80dp, so at (40,20). + before { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertSizeIsEqualTo(60.dp, 40.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + } + + at(16) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(70.dp, 50.dp) + .assertPositionInRootIsEqualTo(10.dp, 5.dp) + } + + at(32) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(80.dp, 60.dp) + .assertPositionInRootIsEqualTo(20.dp, 10.dp) + } + + at(48) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(90.dp, 70.dp) + .assertPositionInRootIsEqualTo(30.dp, 15.dp) + } + + after { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp, 80.dp) + .assertPositionInRootIsEqualTo(40.dp, 20.dp) + } + } + } + + @Test + fun hideAnimation() { + rule.testHideOverlayTransition( + toSceneContent = { + Box(Modifier.size(width = 180.dp, height = 120.dp)) { + Foo(width = 60.dp, height = 40.dp) + } + }, + overlayContent = { Foo(width = 100.dp, height = 80.dp) }, + transition = { + // 4 frames of animation + spec = tween(4 * 16, easing = LinearEasing) + }, + ) { + // Foo moves from centered (in a 180x120dp Box) with a size of 100x80dp, so at (40,20), + // to (0,0) with a size of 60x40dp. + before { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(100.dp, 80.dp) + .assertPositionInRootIsEqualTo(40.dp, 20.dp) + } + + at(16) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(90.dp, 70.dp) + .assertPositionInRootIsEqualTo(30.dp, 15.dp) + } + + at(32) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(80.dp, 60.dp) + .assertPositionInRootIsEqualTo(20.dp, 10.dp) + } + + at(48) { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(70.dp, 50.dp) + .assertPositionInRootIsEqualTo(10.dp, 5.dp) + } + + after { + rule + .onNode(isElement(TestElements.Foo, content = SceneA)) + .assertSizeIsEqualTo(60.dp, 40.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + } + } + } + + @Test + fun replaceAnimation() { + rule.testReplaceOverlayTransition( + currentSceneContent = { Box(Modifier.size(width = 180.dp, height = 120.dp)) }, + fromContent = { Foo(width = 60.dp, height = 40.dp) }, + fromAlignment = Alignment.TopStart, + toContent = { Foo(width = 100.dp, height = 80.dp) }, + transition = { + // 4 frames of animation + spec = tween(4 * 16, easing = LinearEasing) + }, + ) { + // Foo moves from (0,0) with a size of 60x40dp to centered (in a 180x120dp Box) with a + // size of 100x80dp, so at (40,20). + before { + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertSizeIsEqualTo(60.dp, 40.dp) + .assertPositionInRootIsEqualTo(0.dp, 0.dp) + rule.onNode(isElement(TestElements.Foo, content = OverlayB)).assertDoesNotExist() + } + + at(16) { + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(70.dp, 50.dp) + .assertPositionInRootIsEqualTo(10.dp, 5.dp) + } + + at(32) { + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(80.dp, 60.dp) + .assertPositionInRootIsEqualTo(20.dp, 10.dp) + } + + at(48) { + rule + .onNode(isElement(TestElements.Foo, content = OverlayA)) + .assertExists() + .assertIsNotDisplayed() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(90.dp, 70.dp) + .assertPositionInRootIsEqualTo(30.dp, 15.dp) + } + + after { + rule.onNode(isElement(TestElements.Foo, content = OverlayA)).assertDoesNotExist() + rule + .onNode(isElement(TestElements.Foo, content = OverlayB)) + .assertSizeIsEqualTo(100.dp, 80.dp) + .assertPositionInRootIsEqualTo(40.dp, 20.dp) + } + } + } +} diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutStateTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutStateTest.kt index 3422a8e47a3d..69f2cbace276 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutStateTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutStateTest.kt @@ -495,7 +495,7 @@ class SceneTransitionLayoutStateTest { // overscroll for SceneB is defined progress.value = 1.1f val overscrollSpec = assertThat(transition).hasOverscrollSpec() - assertThat(overscrollSpec.scene).isEqualTo(SceneB) + assertThat(overscrollSpec.content).isEqualTo(SceneB) } @Test @@ -516,7 +516,7 @@ class SceneTransitionLayoutStateTest { // overscroll for SceneA is defined progress.value = -0.1f val overscrollSpec = assertThat(transition).hasOverscrollSpec() - assertThat(overscrollSpec.scene).isEqualTo(SceneA) + assertThat(overscrollSpec.content).isEqualTo(SceneA) // scroll from SceneA to SceneB progress.value = 0.5f diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt index e97c27e5a034..b8e13dab913b 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt @@ -500,4 +500,19 @@ class SceneTransitionLayoutTest { assertThat(keyInB).isEqualTo(SceneB) assertThat(keyInC).isEqualTo(SceneC) } + + @Test + fun overlaysMapIsNotAllocatedWhenNoOverlayIsDefined() { + lateinit var layoutImpl: SceneTransitionLayoutImpl + rule.setContent { + SceneTransitionLayoutForTesting( + remember { MutableSceneTransitionLayoutState(SceneA) }, + onLayoutImpl = { layoutImpl = it }, + ) { + scene(SceneA) { Box(Modifier.fillMaxSize()) } + } + } + + assertThat(layoutImpl.overlaysOrNullForTest()).isNull() + } } diff --git a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestContentScope.kt b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestContentScope.kt index 00adefb150c1..5cccfb1b319f 100644 --- a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestContentScope.kt +++ b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestContentScope.kt @@ -26,9 +26,9 @@ import androidx.compose.ui.Modifier @Composable fun TestContentScope( modifier: Modifier = Modifier, + currentScene: SceneKey = remember { SceneKey("current") }, content: @Composable ContentScope.() -> Unit, ) { - val currentScene = remember { SceneKey("current") } val state = remember { MutableSceneTransitionLayoutState(currentScene) } SceneTransitionLayout(state, modifier) { scene(currentScene, content = content) } } diff --git a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestMatchers.kt b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestMatchers.kt index 6d063a0418d6..22450d32ea62 100644 --- a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestMatchers.kt +++ b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestMatchers.kt @@ -20,11 +20,16 @@ import androidx.compose.ui.test.SemanticsMatcher import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasTestTag -/** A [SemanticsMatcher] that matches [element], optionally restricted to scene [scene]. */ -fun isElement(element: ElementKey, scene: SceneKey? = null): SemanticsMatcher { - return if (scene == null) { +/** A [SemanticsMatcher] that matches [element], optionally restricted to content [content]. */ +fun isElement(element: ElementKey, content: ContentKey? = null): SemanticsMatcher { + return if (content == null) { hasTestTag(element.testTag) } else { - hasTestTag(element.testTag) and hasAnyAncestor(hasTestTag(scene.testTag)) + hasTestTag(element.testTag) and inContent(content) } } + +/** A [SemanticsMatcher] that matches anything inside [content]. */ +fun inContent(content: ContentKey): SemanticsMatcher { + return hasAnyAncestor(hasTestTag(content.testTag)) +} diff --git a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestTransition.kt b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestTransition.kt index 7f26b9855a9a..1ebd3d98471b 100644 --- a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestTransition.kt +++ b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestTransition.kt @@ -16,9 +16,12 @@ package com.android.compose.animation.scene +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.SemanticsNode import androidx.compose.ui.test.SemanticsNodeInteraction @@ -115,6 +118,97 @@ fun ComposeContentTestRule.testTransition( ) } +/** Test the transition when showing [overlay] from [fromScene]. */ +fun ComposeContentTestRule.testShowOverlayTransition( + fromSceneContent: @Composable ContentScope.() -> Unit, + overlayContent: @Composable ContentScope.() -> Unit, + transition: TransitionBuilder.() -> Unit, + fromScene: SceneKey = TestScenes.SceneA, + overlay: OverlayKey = TestOverlays.OverlayA, + builder: TransitionTestBuilder.() -> Unit, +) { + testTransition( + state = + runOnUiThread { + MutableSceneTransitionLayoutState( + fromScene, + transitions = transitions { from(fromScene, overlay, builder = transition) }, + ) + }, + transitionLayout = { state -> + SceneTransitionLayout(state) { + scene(fromScene) { fromSceneContent() } + overlay(overlay) { overlayContent() } + } + }, + changeState = { state -> state.showOverlay(overlay, animationScope = this) }, + builder = builder, + ) +} + +/** Test the transition when hiding [overlay] to [toScene]. */ +fun ComposeContentTestRule.testHideOverlayTransition( + toSceneContent: @Composable ContentScope.() -> Unit, + overlayContent: @Composable ContentScope.() -> Unit, + transition: TransitionBuilder.() -> Unit, + toScene: SceneKey = TestScenes.SceneA, + overlay: OverlayKey = TestOverlays.OverlayA, + builder: TransitionTestBuilder.() -> Unit, +) { + testTransition( + state = + runOnUiThread { + MutableSceneTransitionLayoutState( + toScene, + initialOverlays = setOf(overlay), + transitions = transitions { from(overlay, toScene, builder = transition) }, + ) + }, + transitionLayout = { state -> + SceneTransitionLayout(state) { + scene(toScene) { toSceneContent() } + overlay(overlay) { overlayContent() } + } + }, + changeState = { state -> state.hideOverlay(overlay, animationScope = this) }, + builder = builder, + ) +} + +/** Test the transition when replace [from] to [to]. */ +fun ComposeContentTestRule.testReplaceOverlayTransition( + fromContent: @Composable ContentScope.() -> Unit, + toContent: @Composable ContentScope.() -> Unit, + transition: TransitionBuilder.() -> Unit, + currentSceneContent: @Composable ContentScope.() -> Unit = { Box(Modifier.fillMaxSize()) }, + fromAlignment: Alignment = Alignment.Center, + toAlignment: Alignment = Alignment.Center, + from: OverlayKey = TestOverlays.OverlayA, + to: OverlayKey = TestOverlays.OverlayB, + currentScene: SceneKey = TestScenes.SceneA, + builder: TransitionTestBuilder.() -> Unit, +) { + testTransition( + state = + runOnUiThread { + MutableSceneTransitionLayoutState( + currentScene, + initialOverlays = setOf(from), + transitions = transitions { from(from, to, builder = transition) }, + ) + }, + transitionLayout = { state -> + SceneTransitionLayout(state) { + scene(currentScene) { currentSceneContent() } + overlay(from, fromAlignment) { fromContent() } + overlay(to, toAlignment) { toContent() } + } + }, + changeState = { state -> state.replaceOverlay(from, to, animationScope = this) }, + builder = builder, + ) +} + data class TransitionRecordingSpec( val recordBefore: Boolean = true, val recordAfter: Boolean = true, @@ -188,6 +282,21 @@ fun ComposeContentTestRule.testTransition( "(${currentScene.debugName})" } + testTransition( + state = state, + changeState = { state -> state.setTargetScene(to, coroutineScope = this) }, + transitionLayout = transitionLayout, + builder = builder, + ) +} + +/** Test the transition from [state] to [to]. */ +fun ComposeContentTestRule.testTransition( + state: MutableSceneTransitionLayoutState, + changeState: CoroutineScope.(MutableSceneTransitionLayoutState) -> Unit, + transitionLayout: @Composable (state: MutableSceneTransitionLayoutState) -> Unit, + builder: TransitionTestBuilder.() -> Unit, +) { val test = transitionTest(builder) val assertionScope = object : TransitionTestAssertionScope { @@ -213,7 +322,7 @@ fun ComposeContentTestRule.testTransition( mainClock.autoAdvance = false // Change the current scene. - runOnUiThread { state.setTargetScene(to, coroutineScope) } + runOnUiThread { coroutineScope.changeState(state) } waitForIdle() mainClock.advanceTimeByFrame() waitForIdle() diff --git a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestValues.kt b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestValues.kt index b83705aa64fc..f39dd676fb6e 100644 --- a/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestValues.kt +++ b/packages/SystemUI/compose/scene/tests/utils/src/com/android/compose/animation/scene/TestValues.kt @@ -21,7 +21,7 @@ import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.snap import androidx.compose.animation.core.tween -/** Scenes keys that can be reused by tests. */ +/** Scene keys that can be reused by tests. */ object TestScenes { val SceneA = SceneKey("SceneA") val SceneB = SceneKey("SceneB") @@ -29,6 +29,12 @@ object TestScenes { val SceneD = SceneKey("SceneD") } +/** Overlay keys that can be reused by tests. */ +object TestOverlays { + val OverlayA = OverlayKey("OverlayA") + val OverlayB = OverlayKey("OverlayB") +} + /** Element keys that can be reused by tests. */ object TestElements { val Foo = ElementKey("Foo") diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java index 201ed00acae3..43db5a70849f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java @@ -148,6 +148,7 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { mKosmos.getWifiInteractor(), mKosmos.getCommunalSceneInteractor(), mLogBuffer); + mController.onInit(); } @Test @@ -517,6 +518,15 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { verify(mDreamOverlayStateController).setDreamOverlayStatusBarVisible(false); } + @Test + public void testStatusBarWindowStateControllerListenerLifecycle() { + ArgumentCaptor<StatusBarWindowStateListener> listenerCaptor = + ArgumentCaptor.forClass(StatusBarWindowStateListener.class); + verify(mStatusBarWindowStateController).addListener(listenerCaptor.capture()); + mController.destroy(); + verify(mStatusBarWindowStateController).removeListener(eq(listenerCaptor.getValue())); + } + private StatusBarWindowStateListener updateStatusBarWindowState(boolean show) { when(mStatusBarWindowStateController.windowIsShowing()).thenReturn(show); final ArgumentCaptor<StatusBarWindowStateListener> diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt index 15a4a40c99ac..65c9b72a3665 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt @@ -39,7 +39,6 @@ import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepositor import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.coroutines.collectLastValue import com.android.systemui.deviceentry.domain.interactor.deviceEntryBiometricsAllowedInteractor -import com.android.systemui.deviceentry.domain.interactor.deviceEntryFingerprintAuthInteractor import com.android.systemui.flags.SystemPropertiesHelper import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository @@ -114,8 +113,6 @@ class BouncerMessageInteractorTest : SysuiTestCase() { systemPropertiesHelper = systemPropertiesHelper, primaryBouncerInteractor = kosmos.primaryBouncerInteractor, facePropertyRepository = kosmos.fakeFacePropertyRepository, - deviceEntryFingerprintAuthInteractor = kosmos.deviceEntryFingerprintAuthInteractor, - faceAuthRepository = kosmos.fakeDeviceEntryFaceAuthRepository, securityModel = securityModel, deviceEntryBiometricsAllowedInteractor = kosmos.deviceEntryBiometricsAllowedInteractor, @@ -217,7 +214,7 @@ class BouncerMessageInteractorTest : SysuiTestCase() { fun resetMessageBackToDefault_faceAuthRestarts() = testScope.runTest { init() - verify(updateMonitor).registerCallback(keyguardUpdateMonitorCaptor.capture()) + captureKeyguardUpdateMonitorCallback() val bouncerMessage by collectLastValue(underTest.bouncerMessage) underTest.setFaceAcquisitionMessage("not empty") @@ -240,7 +237,7 @@ class BouncerMessageInteractorTest : SysuiTestCase() { fun faceRestartDoesNotResetFingerprintMessage() = testScope.runTest { init() - verify(updateMonitor).registerCallback(keyguardUpdateMonitorCaptor.capture()) + captureKeyguardUpdateMonitorCallback() val bouncerMessage by collectLastValue(underTest.bouncerMessage) underTest.setFingerprintAcquisitionMessage("not empty") @@ -337,6 +334,32 @@ class BouncerMessageInteractorTest : SysuiTestCase() { } @Test + fun faceLockoutThenFaceFailure_doesNotUpdateMessage() = + testScope.runTest { + init() + captureKeyguardUpdateMonitorCallback() + val bouncerMessage by collectLastValue(underTest.bouncerMessage) + + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(true) + runCurrent() + + assertThat(primaryResMessage(bouncerMessage)) + .isEqualTo("Unlock with PIN or fingerprint") + assertThat(secondaryResMessage(bouncerMessage)) + .isEqualTo("Can’t unlock with face. Too many attempts.") + + // WHEN face failure comes in during lockout + keyguardUpdateMonitorCaptor.value.onBiometricAuthFailed(BiometricSourceType.FACE) + + // THEN lockout message does NOT update to face failure message + assertThat(primaryResMessage(bouncerMessage)) + .isEqualTo("Unlock with PIN or fingerprint") + assertThat(secondaryResMessage(bouncerMessage)) + .isEqualTo("Can’t unlock with face. Too many attempts.") + } + + @Test fun onFaceLockoutStateChange_whenFaceIsNotEnrolled_isANoop() = testScope.runTest { init() @@ -629,6 +652,10 @@ class BouncerMessageInteractorTest : SysuiTestCase() { } } + private fun captureKeyguardUpdateMonitorCallback() { + verify(updateMonitor).registerCallback(keyguardUpdateMonitorCaptor.capture()) + } + companion object { private const val PRIMARY_USER_ID = 0 private val PRIMARY_USER = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt index ad2c42fd1f09..eba395bdb5a3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt @@ -115,21 +115,21 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { .addWidget( widgetId = 0, componentName = defaultWidgets[0], - priority = 3, + rank = 0, userSerialNumber = 0, ) verify(communalWidgetDao) .addWidget( widgetId = 1, componentName = defaultWidgets[1], - priority = 2, + rank = 1, userSerialNumber = 0, ) verify(communalWidgetDao) .addWidget( widgetId = 2, componentName = defaultWidgets[2], - priority = 1, + rank = 2, userSerialNumber = 0, ) } @@ -150,7 +150,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { .addWidget( widgetId = anyInt(), componentName = any(), - priority = anyInt(), + rank = anyInt(), userSerialNumber = anyInt(), ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryImplTest.kt index ca81838bcdaa..980a5ec8c494 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryImplTest.kt @@ -154,7 +154,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { CommunalWidgetContentModel.Available( appWidgetId = communalWidgetItemEntry.widgetId, providerInfo = providerInfoA, - priority = communalItemRankEntry.rank, + rank = communalItemRankEntry.rank, ) ) @@ -190,12 +190,12 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { CommunalWidgetContentModel.Available( appWidgetId = 1, providerInfo = providerInfoA, - priority = 1, + rank = 1, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, - priority = 2, + rank = 2, ), ) } @@ -225,12 +225,12 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { CommunalWidgetContentModel.Available( appWidgetId = 1, providerInfo = providerInfoA, - priority = 1, + rank = 1, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, - priority = 2, + rank = 2, ), ) @@ -248,12 +248,12 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { appWidgetId = 1, // Verify that provider info updated providerInfo = providerInfoC, - priority = 1, + rank = 1, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, - priority = 2, + rank = 2, ), ) } @@ -263,7 +263,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { testScope.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 - val priority = 1 + val rank = 1 whenever(communalWidgetHost.getAppWidgetInfo(id)) .thenReturn(PROVIDER_INFO_REQUIRES_CONFIGURATION) whenever( @@ -273,12 +273,11 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { ) ) .thenReturn(id) - underTest.addWidget(provider, mainUser, priority, kosmos.widgetConfiguratorSuccess) + underTest.addWidget(provider, mainUser, rank, kosmos.widgetConfiguratorSuccess) runCurrent() verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) - verify(communalWidgetDao) - .addWidget(id, provider, priority, testUserSerialNumber(mainUser)) + verify(communalWidgetDao).addWidget(id, provider, rank, testUserSerialNumber(mainUser)) // Verify backup requested verify(backupManager).dataChanged() @@ -289,7 +288,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { testScope.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 - val priority = 1 + val rank = 1 whenever(communalWidgetHost.getAppWidgetInfo(id)) .thenReturn(PROVIDER_INFO_REQUIRES_CONFIGURATION) whenever( @@ -299,7 +298,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { ) ) .thenReturn(id) - underTest.addWidget(provider, mainUser, priority, kosmos.widgetConfiguratorFail) + underTest.addWidget(provider, mainUser, rank, kosmos.widgetConfiguratorFail) runCurrent() verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) @@ -316,7 +315,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { testScope.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 - val priority = 1 + val rank = 1 whenever(communalWidgetHost.getAppWidgetInfo(id)) .thenReturn(PROVIDER_INFO_REQUIRES_CONFIGURATION) whenever( @@ -326,7 +325,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { ) ) .thenReturn(id) - underTest.addWidget(provider, mainUser, priority) { + underTest.addWidget(provider, mainUser, rank) { throw IllegalStateException("some error") } runCurrent() @@ -345,7 +344,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { testScope.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 - val priority = 1 + val rank = 1 whenever(communalWidgetHost.getAppWidgetInfo(id)) .thenReturn(PROVIDER_INFO_CONFIGURATION_OPTIONAL) whenever( @@ -355,12 +354,11 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { ) ) .thenReturn(id) - underTest.addWidget(provider, mainUser, priority, kosmos.widgetConfiguratorFail) + underTest.addWidget(provider, mainUser, rank, kosmos.widgetConfiguratorFail) runCurrent() verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) - verify(communalWidgetDao) - .addWidget(id, provider, priority, testUserSerialNumber(mainUser)) + verify(communalWidgetDao).addWidget(id, provider, rank, testUserSerialNumber(mainUser)) // Verify backup requested verify(backupManager).dataChanged() @@ -399,11 +397,11 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { @Test fun reorderWidgets_queryDb() = testScope.runTest { - val widgetIdToPriorityMap = mapOf(104 to 1, 103 to 2, 101 to 3) - underTest.updateWidgetOrder(widgetIdToPriorityMap) + val widgetIdToRankMap = mapOf(104 to 1, 103 to 2, 101 to 3) + underTest.updateWidgetOrder(widgetIdToRankMap) runCurrent() - verify(communalWidgetDao).updateWidgetOrder(widgetIdToPriorityMap) + verify(communalWidgetDao).updateWidgetOrder(widgetIdToRankMap) // Verify backup requested verify(backupManager).dataChanged() @@ -691,11 +689,11 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { CommunalWidgetContentModel.Available( appWidgetId = 1, providerInfo = providerInfoA, - priority = 1, + rank = 1, ), CommunalWidgetContentModel.Pending( appWidgetId = 2, - priority = 2, + rank = 2, componentName = ComponentName("pk_2", "cls_2"), icon = fakeIcon, user = mainUser, @@ -730,7 +728,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { .containsExactly( CommunalWidgetContentModel.Pending( appWidgetId = 1, - priority = 1, + rank = 1, componentName = ComponentName("pk_1", "cls_1"), icon = fakeIcon, user = mainUser, @@ -750,7 +748,7 @@ class CommunalWidgetRepositoryImplTest : SysuiTestCase() { CommunalWidgetContentModel.Available( appWidgetId = 1, providerInfo = providerInfoA, - priority = 1, + rank = 1, ), ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt index 57ce9de2d057..82181788e1be 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt @@ -150,8 +150,8 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { tutorialRepository.setTutorialSettingState(Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED) // Widgets available. - widgetRepository.addWidget(appWidgetId = 0, priority = 30) - widgetRepository.addWidget(appWidgetId = 1, priority = 20) + widgetRepository.addWidget(appWidgetId = 0, rank = 30) + widgetRepository.addWidget(appWidgetId = 1, rank = 20) // Smartspace available. smartspaceRepository.setTimers( @@ -212,8 +212,8 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { tutorialRepository.setTutorialSettingState(Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED) // Widgets available. - widgetRepository.addWidget(appWidgetId = 0, priority = 30) - widgetRepository.addWidget(appWidgetId = 1, priority = 20) + widgetRepository.addWidget(appWidgetId = 0, rank = 30) + widgetRepository.addWidget(appWidgetId = 1, rank = 20) val communalContent by collectLastValue(underTest.communalContent) @@ -227,7 +227,7 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { underTest.onDeleteWidget( id = 0, componentName = ComponentName("test_package", "test_class"), - priority = 30, + rank = 30, ) // Only one widget and CTA tile remain. diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt index cc945d63e15f..fb151a8c0ff7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt @@ -101,7 +101,6 @@ import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.never import org.mockito.kotlin.spy -import org.mockito.kotlin.times import org.mockito.kotlin.whenever import platform.test.runner.parameterized.ParameterizedAndroidJunit4 import platform.test.runner.parameterized.Parameters @@ -213,8 +212,8 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { tutorialRepository.setTutorialSettingState(Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED) // Widgets available. - widgetRepository.addWidget(appWidgetId = 0, priority = 30) - widgetRepository.addWidget(appWidgetId = 1, priority = 20) + widgetRepository.addWidget(appWidgetId = 0, rank = 30) + widgetRepository.addWidget(appWidgetId = 1, rank = 20) // Smartspace available. smartspaceRepository.setTimers( @@ -303,7 +302,7 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { testScope.runTest { tutorialRepository.setTutorialSettingState(Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED) - widgetRepository.addWidget(appWidgetId = 1, priority = 1) + widgetRepository.addWidget(appWidgetId = 1, rank = 1) mediaRepository.mediaInactive() smartspaceRepository.setTimers(emptyList()) @@ -660,8 +659,8 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { ) // Widgets available - widgetRepository.addWidget(appWidgetId = 0, priority = 30) - widgetRepository.addWidget(appWidgetId = 1, priority = 20) + widgetRepository.addWidget(appWidgetId = 0, rank = 30) + widgetRepository.addWidget(appWidgetId = 1, rank = 20) // Then hub shows widgets and the CTA tile assertThat(communalContent).hasSize(3) @@ -716,8 +715,8 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { ) // And widgets available - widgetRepository.addWidget(appWidgetId = 0, priority = 30) - widgetRepository.addWidget(appWidgetId = 1, priority = 20) + widgetRepository.addWidget(appWidgetId = 0, rank = 30) + widgetRepository.addWidget(appWidgetId = 1, rank = 20) // Then emits widgets and the CTA tile assertThat(communalContent).hasSize(3) @@ -770,7 +769,7 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { @Test fun onTapWidget_logEvent() { - underTest.onTapWidget(ComponentName("test_pkg", "test_cls"), priority = 10) + underTest.onTapWidget(ComponentName("test_pkg", "test_cls"), rank = 10) verify(metricsLogger).logTapWidget("test_pkg/test_cls", rank = 10) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/widgets/EditWidgetsActivityControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/widgets/EditWidgetsActivityControllerTest.kt new file mode 100644 index 000000000000..3ba86254d2f4 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/widgets/EditWidgetsActivityControllerTest.kt @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2024 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.communal.widgets + +import android.app.Activity +import android.app.Application.ActivityLifecycleCallbacks +import android.os.Bundle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import kotlinx.coroutines.ExperimentalCoroutinesApi +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@ExperimentalCoroutinesApi +@SmallTest +@RunWith(AndroidJUnit4::class) +class EditWidgetsActivityControllerTest : SysuiTestCase() { + @Test + fun activityLifecycle_finishedWhenNotWaitingForResult() { + val activity = mock<Activity>() + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.setActivityFullyVisible(true) + callbackCapture.lastValue.onActivityStopped(activity) + + verify(activity).finish() + } + + @Test + fun activityLifecycle_notFinishedWhenOnStartCalledAfterOnStop() { + val activity = mock<Activity>() + + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.setActivityFullyVisible(false) + callbackCapture.lastValue.onActivityStopped(activity) + callbackCapture.lastValue.onActivityStarted(activity) + + verify(activity, never()).finish() + } + + @Test + fun activityLifecycle_notFinishedDuringConfigurationChange() { + val activity = mock<Activity>() + + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.setActivityFullyVisible(true) + whenever(activity.isChangingConfigurations).thenReturn(true) + callbackCapture.lastValue.onActivityStopped(activity) + callbackCapture.lastValue.onActivityStarted(activity) + + verify(activity, never()).finish() + } + + @Test + fun activityLifecycle_notFinishedWhenWaitingForResult() { + val activity = mock<Activity>() + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.onWaitingForResult(true) + callbackCapture.lastValue.onActivityStopped(activity) + + verify(activity, never()).finish() + } + + @Test + fun activityLifecycle_finishedAfterResultReturned() { + val activity = mock<Activity>() + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.onWaitingForResult(true) + controller.onWaitingForResult(false) + controller.setActivityFullyVisible(true) + callbackCapture.lastValue.onActivityStopped(activity) + + verify(activity).finish() + } + + @Test + fun activityLifecycle_statePreservedThroughInstanceSave() { + val activity = mock<Activity>() + val bundle = Bundle(1) + + run { + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + controller.onWaitingForResult(true) + callbackCapture.lastValue.onActivitySaveInstanceState(activity, bundle) + } + + clearInvocations(activity) + + run { + val controller = EditWidgetsActivity.ActivityControllerImpl(activity) + val callbackCapture = argumentCaptor<ActivityLifecycleCallbacks>() + verify(activity).registerActivityLifecycleCallbacks(callbackCapture.capture()) + + callbackCapture.lastValue.onActivityCreated(activity, bundle) + callbackCapture.lastValue.onActivityStopped(activity) + + verify(activity, never()).finish() + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt index 91259a65eff9..3e75cebb1c7d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt @@ -34,6 +34,7 @@ import android.hardware.face.FaceSensorPropertiesInternal import android.os.CancellationSignal import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.compose.animation.scene.ObservableTransitionState import com.android.internal.logging.InstanceId.fakeInstanceId import com.android.internal.logging.UiEventLogger import com.android.systemui.Flags as AConfigFlags @@ -55,6 +56,7 @@ import com.android.systemui.deviceentry.shared.model.FaceDetectionStatus import com.android.systemui.deviceentry.shared.model.SuccessFaceAuthenticationStatus import com.android.systemui.display.data.repository.displayRepository import com.android.systemui.dump.DumpManager +import com.android.systemui.flags.EnableSceneContainer import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.keyguard.data.repository.BiometricType import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository @@ -77,6 +79,9 @@ import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest import com.android.systemui.power.domain.interactor.powerInteractor +import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.testKosmos import com.android.systemui.user.data.model.SelectionStatus @@ -90,6 +95,7 @@ import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.runCurrent @@ -136,12 +142,12 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { @Captor private lateinit var faceLockoutResetCallback: ArgumentCaptor<FaceManager.LockoutResetCallback> - private val testDispatcher = kosmos.testDispatcher + private val testDispatcher by lazy { kosmos.testDispatcher } - private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository - private val testScope = kosmos.testScope - private val fakeUserRepository = kosmos.fakeUserRepository - private val fakeExecutor = kosmos.fakeExecutor + private val keyguardTransitionRepository by lazy { kosmos.fakeKeyguardTransitionRepository } + private val testScope by lazy { kosmos.testScope } + private val fakeUserRepository by lazy { kosmos.fakeUserRepository } + private val fakeExecutor by lazy { kosmos.fakeExecutor } private lateinit var authStatus: FlowValue<FaceAuthenticationStatus?> private lateinit var detectStatus: FlowValue<FaceDetectionStatus?> private lateinit var authRunning: FlowValue<Boolean?> @@ -149,18 +155,19 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { private lateinit var lockedOut: FlowValue<Boolean?> private lateinit var canFaceAuthRun: FlowValue<Boolean?> private lateinit var authenticated: FlowValue<Boolean?> - private val biometricSettingsRepository = kosmos.fakeBiometricSettingsRepository - private val deviceEntryFingerprintAuthRepository = + private val biometricSettingsRepository by lazy { kosmos.fakeBiometricSettingsRepository } + private val deviceEntryFingerprintAuthRepository by lazy { kosmos.fakeDeviceEntryFingerprintAuthRepository - private val trustRepository = kosmos.fakeTrustRepository - private val keyguardRepository = kosmos.fakeKeyguardRepository - private val powerInteractor = kosmos.powerInteractor - private val keyguardInteractor = kosmos.keyguardInteractor - private val alternateBouncerInteractor = kosmos.alternateBouncerInteractor - private val displayStateInteractor = kosmos.displayStateInteractor - private val bouncerRepository = kosmos.fakeKeyguardBouncerRepository - private val displayRepository = kosmos.displayRepository - private val keyguardTransitionInteractor = kosmos.keyguardTransitionInteractor + } + private val trustRepository by lazy { kosmos.fakeTrustRepository } + private val keyguardRepository by lazy { kosmos.fakeKeyguardRepository } + private val powerInteractor by lazy { kosmos.powerInteractor } + private val keyguardInteractor by lazy { kosmos.keyguardInteractor } + private val alternateBouncerInteractor by lazy { kosmos.alternateBouncerInteractor } + private val displayStateInteractor by lazy { kosmos.displayStateInteractor } + private val bouncerRepository by lazy { kosmos.fakeKeyguardBouncerRepository } + private val displayRepository by lazy { kosmos.displayRepository } + private val keyguardTransitionInteractor by lazy { kosmos.keyguardTransitionInteractor } private lateinit var featureFlags: FakeFeatureFlags private var wasAuthCancelled = false @@ -180,9 +187,11 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { whenever(bypassController.bypassEnabled).thenReturn(true) underTest = createDeviceEntryFaceAuthRepositoryImpl(faceManager, bypassController) - mSetFlagsRule.disableFlags( - AConfigFlags.FLAG_KEYGUARD_WM_STATE_REFACTOR, - ) + if (!SceneContainerFlag.isEnabled) { + mSetFlagsRule.disableFlags( + AConfigFlags.FLAG_KEYGUARD_WM_STATE_REFACTOR, + ) + } } private fun createDeviceEntryFaceAuthRepositoryImpl( @@ -227,6 +236,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { powerInteractor, keyguardInteractor, alternateBouncerInteractor, + { kosmos.sceneInteractor }, faceDetectBuffer, faceAuthBuffer, keyguardTransitionInteractor, @@ -547,6 +557,24 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { } @Test + @EnableSceneContainer + fun withSceneContainerEnabled_authenticateDoesNotRunWhenKeyguardIsGoingAway() = + testScope.runTest { + testGatingCheckForFaceAuth(sceneContainerEnabled = true) { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep( + KeyguardState.LOCKSCREEN, + KeyguardState.UNDEFINED, + value = 0.5f, + transitionState = TransitionState.RUNNING + ), + validateStep = false + ) + runCurrent() + } + } + + @Test fun authenticateDoesNotRunWhenDeviceIsGoingToSleep() = testScope.runTest { testGatingCheckForFaceAuth { @@ -595,6 +623,31 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { } @Test + @EnableSceneContainer + fun withSceneContainer_authenticateRunsWhenSecureCameraIsActiveIfBouncerIsShowing() = + testScope.runTest { + initCollectors() + allPreconditionsToRunFaceAuthAreTrue(sceneContainerEnabled = true) + bouncerRepository.setAlternateVisible(false) + + // launch secure camera + keyguardInteractor.onCameraLaunchDetected(CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) + keyguardRepository.setKeyguardOccluded(true) + kosmos.sceneInteractor.snapToScene(Scenes.Lockscreen, "for-test") + runCurrent() + assertThat(canFaceAuthRun()).isFalse() + + // but bouncer is shown after that. + kosmos.sceneInteractor.changeScene(Scenes.Bouncer, "for-test") + kosmos.sceneInteractor.setTransitionState( + MutableStateFlow(ObservableTransitionState.Idle(Scenes.Bouncer)) + ) + runCurrent() + + assertThat(canFaceAuthRun()).isTrue() + } + + @Test fun authenticateDoesNotRunOnUnsupportedPosture() = testScope.runTest { testGatingCheckForFaceAuth { @@ -841,6 +894,24 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { } @Test + @EnableSceneContainer + fun withSceneContainer_faceDetectDoesNotRunWhenKeyguardGoingAway() = + testScope.runTest { + testGatingCheckForDetect(sceneContainerEnabled = true) { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep( + KeyguardState.LOCKSCREEN, + KeyguardState.UNDEFINED, + value = 0.5f, + transitionState = TransitionState.RUNNING + ), + validateStep = false + ) + runCurrent() + } + } + + @Test fun detectDoesNotRunWhenDeviceSleepingStartingToSleep() = testScope.runTest { testGatingCheckForDetect { @@ -1052,10 +1123,11 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { } private suspend fun TestScope.testGatingCheckForFaceAuth( + sceneContainerEnabled: Boolean = false, gatingCheckModifier: suspend () -> Unit ) { initCollectors() - allPreconditionsToRunFaceAuthAreTrue() + allPreconditionsToRunFaceAuthAreTrue(sceneContainerEnabled) gatingCheckModifier() runCurrent() @@ -1069,7 +1141,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { faceAuthenticateIsNotCalled() // flip the gating check back on. - allPreconditionsToRunFaceAuthAreTrue() + allPreconditionsToRunFaceAuthAreTrue(sceneContainerEnabled) assertThat(underTest.canRunFaceAuth.value).isTrue() faceAuthenticateIsCalled() @@ -1094,10 +1166,11 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { } private suspend fun TestScope.testGatingCheckForDetect( + sceneContainerEnabled: Boolean = false, gatingCheckModifier: suspend () -> Unit ) { initCollectors() - allPreconditionsToRunFaceAuthAreTrue() + allPreconditionsToRunFaceAuthAreTrue(sceneContainerEnabled) // This will stop face auth from running but is required to be false for detect. biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(false) @@ -1145,12 +1218,22 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { cancellationSignal.value.setOnCancelListener { wasAuthCancelled = true } } - private suspend fun TestScope.allPreconditionsToRunFaceAuthAreTrue() { + private suspend fun TestScope.allPreconditionsToRunFaceAuthAreTrue( + sceneContainerEnabled: Boolean = false + ) { fakeExecutor.runAllReady() verify(faceManager, atLeastOnce()) .addLockoutResetCallback(faceLockoutResetCallback.capture()) trustRepository.setCurrentUserTrusted(false) - keyguardRepository.setKeyguardGoingAway(false) + if (sceneContainerEnabled) { + // Keyguard is not going away + kosmos.fakeKeyguardTransitionRepository.sendTransitionStep( + TransitionStep(KeyguardState.OFF, KeyguardState.LOCKSCREEN, value = 1.0f), + validateStep = false + ) + } else { + keyguardRepository.setKeyguardGoingAway(false) + } powerInteractor.setAwakeForTest() biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) biometricSettingsRepository.setIsFaceAuthSupportedInCurrentPosture(true) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index 6412276ba34b..3895595aaea6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -62,6 +62,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -324,4 +325,13 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { // enabled. mController.onViewAttached(); } + + @Test + public void destroy_cleansUpState() { + mController.destroy(); + verify(mStateController).removeCallback(any()); + verify(mAmbientStatusBarViewController).destroy(); + verify(mComplicationHostViewController).destroy(); + verify(mLowLightTransitionCoordinator).setLowLightEnterListener(ArgumentMatchers.isNull()); + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt index 89ec3cfe41c5..29aa89c603f4 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt @@ -68,7 +68,6 @@ import com.android.systemui.navigationbar.gestural.domain.GestureInteractor import com.android.systemui.testKosmos import com.android.systemui.touch.TouchInsetManager import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -89,7 +88,9 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.any import org.mockito.kotlin.argumentCaptor import org.mockito.kotlin.eq +import org.mockito.kotlin.mock import org.mockito.kotlin.spy +import org.mockito.kotlin.whenever @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @@ -115,8 +116,6 @@ class DreamOverlayServiceTest : SysuiTestCase() { @Mock lateinit var mComplicationComponentFactory: ComplicationComponent.Factory - @Mock lateinit var mComplicationComponent: ComplicationComponent - @Mock lateinit var mComplicationHostViewController: ComplicationHostViewController @Mock lateinit var mComplicationVisibilityController: ComplicationLayoutEngine @@ -125,20 +124,12 @@ class DreamOverlayServiceTest : SysuiTestCase() { lateinit var mDreamComplicationComponentFactory: com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory - @Mock - lateinit var mDreamComplicationComponent: - com.android.systemui.dreams.complication.dagger.ComplicationComponent - @Mock lateinit var mHideComplicationTouchHandler: HideComplicationTouchHandler @Mock lateinit var mDreamOverlayComponentFactory: DreamOverlayComponent.Factory - @Mock lateinit var mDreamOverlayComponent: DreamOverlayComponent - @Mock lateinit var mAmbientTouchComponentFactory: AmbientTouchComponent.Factory - @Mock lateinit var mAmbientTouchComponent: AmbientTouchComponent - @Mock lateinit var mDreamOverlayContainerView: DreamOverlayContainerView @Mock lateinit var mDreamOverlayContainerViewController: DreamOverlayContainerViewController @@ -170,40 +161,100 @@ class DreamOverlayServiceTest : SysuiTestCase() { private lateinit var communalRepository: FakeCommunalSceneRepository private var viewCaptureSpy = spy(ViewCaptureFactory.getInstance(context)) private lateinit var gestureInteractor: GestureInteractor + private lateinit var environmentComponents: EnvironmentComponents @Captor var mViewCaptor: ArgumentCaptor<View>? = null private lateinit var mService: DreamOverlayService - @Before - fun setup() { - MockitoAnnotations.initMocks(this) + private class EnvironmentComponents( + val dreamsComplicationComponent: + com.android.systemui.dreams.complication.dagger.ComplicationComponent, + val dreamOverlayComponent: DreamOverlayComponent, + val complicationComponent: ComplicationComponent, + val ambientTouchComponent: AmbientTouchComponent, + ) { + fun clearInvocations() { + clearInvocations( + dreamsComplicationComponent, + dreamOverlayComponent, + complicationComponent, + ambientTouchComponent + ) + } - lifecycleRegistry = FakeLifecycleRegistry(mLifecycleOwner) - bouncerRepository = kosmos.fakeKeyguardBouncerRepository - communalRepository = kosmos.fakeCommunalSceneRepository - gestureInteractor = spy(kosmos.gestureInteractor) + fun verifyNoMoreInteractions() { + Mockito.verifyNoMoreInteractions( + dreamsComplicationComponent, + dreamOverlayComponent, + complicationComponent, + ambientTouchComponent + ) + } + } - whenever(mDreamOverlayComponent.getDreamOverlayContainerViewController()) + private fun setupComponentFactories( + dreamComplicationComponentFactory: + com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory, + dreamOverlayComponentFactory: DreamOverlayComponent.Factory, + complicationComponentFactory: ComplicationComponent.Factory, + ambientTouchComponentFactory: AmbientTouchComponent.Factory + ): EnvironmentComponents { + val dreamOverlayComponent = mock<DreamOverlayComponent>() + whenever(dreamOverlayComponent.getDreamOverlayContainerViewController()) .thenReturn(mDreamOverlayContainerViewController) - whenever(mComplicationComponent.getComplicationHostViewController()) + + val complicationComponent = mock<ComplicationComponent>() + whenever(complicationComponent.getComplicationHostViewController()) .thenReturn(mComplicationHostViewController) whenever(mLifecycleOwner.registry).thenReturn(lifecycleRegistry) mCommunalInteractor = Mockito.spy(kosmos.communalInteractor) - whenever(mComplicationComponentFactory.create(any(), any(), any(), any())) - .thenReturn(mComplicationComponent) - whenever(mComplicationComponent.getVisibilityController()) + whenever(complicationComponentFactory.create(any(), any(), any(), any())) + .thenReturn(complicationComponent) + whenever(complicationComponent.getVisibilityController()) .thenReturn(mComplicationVisibilityController) - whenever(mDreamComplicationComponent.getHideComplicationTouchHandler()) + + val dreamComplicationComponent = + mock<com.android.systemui.dreams.complication.dagger.ComplicationComponent>() + whenever(dreamComplicationComponent.getHideComplicationTouchHandler()) .thenReturn(mHideComplicationTouchHandler) - whenever(mDreamComplicationComponentFactory.create(any(), any())) - .thenReturn(mDreamComplicationComponent) - whenever(mDreamOverlayComponentFactory.create(any(), any(), any())) - .thenReturn(mDreamOverlayComponent) - whenever(mAmbientTouchComponentFactory.create(any(), any())) - .thenReturn(mAmbientTouchComponent) - whenever(mAmbientTouchComponent.getTouchMonitor()).thenReturn(mTouchMonitor) + whenever(dreamComplicationComponentFactory.create(any(), any())) + .thenReturn(dreamComplicationComponent) + + whenever(dreamOverlayComponentFactory.create(any(), any(), any())) + .thenReturn(dreamOverlayComponent) + + val ambientTouchComponent = mock<AmbientTouchComponent>() + whenever(ambientTouchComponentFactory.create(any(), any())) + .thenReturn(ambientTouchComponent) + whenever(ambientTouchComponent.getTouchMonitor()).thenReturn(mTouchMonitor) + + return EnvironmentComponents( + dreamComplicationComponent, + dreamOverlayComponent, + complicationComponent, + ambientTouchComponent + ) + } + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + + lifecycleRegistry = FakeLifecycleRegistry(mLifecycleOwner) + bouncerRepository = kosmos.fakeKeyguardBouncerRepository + communalRepository = kosmos.fakeCommunalSceneRepository + gestureInteractor = spy(kosmos.gestureInteractor) + + environmentComponents = + setupComponentFactories( + mDreamComplicationComponentFactory, + mDreamOverlayComponentFactory, + mComplicationComponentFactory, + mAmbientTouchComponentFactory + ) + whenever(mDreamOverlayContainerViewController.containerView) .thenReturn(mDreamOverlayContainerView) whenever(mScrimManager.getCurrentController()).thenReturn(mScrimController) @@ -570,9 +621,8 @@ class DreamOverlayServiceTest : SysuiTestCase() { // Assert that the overlay is not showing complications. assertThat(mService.shouldShowComplications()).isFalse() - Mockito.clearInvocations(mDreamOverlayComponent) - Mockito.clearInvocations(mAmbientTouchComponent) - Mockito.clearInvocations(mWindowManager) + environmentComponents.clearInvocations() + clearInvocations(mWindowManager) // New dream starting with dream complications showing. Note that when a new dream is // binding to the dream overlay service, it receives the same instance of IBinder as the @@ -594,8 +644,11 @@ class DreamOverlayServiceTest : SysuiTestCase() { // Verify that new instances of overlay container view controller and overlay touch monitor // are created. - verify(mDreamOverlayComponent).getDreamOverlayContainerViewController() - verify(mAmbientTouchComponent).getTouchMonitor() + verify(environmentComponents.dreamOverlayComponent).getDreamOverlayContainerViewController() + verify(environmentComponents.ambientTouchComponent).getTouchMonitor() + + // Verify DreamOverlayContainerViewController is destroyed. + verify(mDreamOverlayContainerViewController).destroy() } @Test @@ -1002,6 +1055,34 @@ class DreamOverlayServiceTest : SysuiTestCase() { .isEqualTo(ComponentName.unflattenFromString(DREAM_COMPONENT)?.packageName) } + @Test + fun testComponentsRecreatedBetweenDreams() { + clearInvocations( + mDreamComplicationComponentFactory, + mDreamOverlayComponentFactory, + mComplicationComponentFactory, + mAmbientTouchComponentFactory + ) + + mService.onEndDream() + + setupComponentFactories( + mDreamComplicationComponentFactory, + mDreamOverlayComponentFactory, + mComplicationComponentFactory, + mAmbientTouchComponentFactory + ) + + client.startDream( + mWindowParams, + mDreamOverlayCallback, + DREAM_COMPONENT, + false /*shouldShowComplication*/ + ) + mMainExecutor.runAllReady() + environmentComponents.verifyNoMoreInteractions() + } + internal class FakeLifecycleRegistry(provider: LifecycleOwner) : LifecycleRegistry(provider) { val mLifecycles: MutableList<State> = ArrayList() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/data/repository/ContextualEducationRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/data/repository/ContextualEducationRepositoryTest.kt index f82beff11d8f..50b727c3fed9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/data/repository/ContextualEducationRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/data/repository/ContextualEducationRepositoryTest.kt @@ -23,6 +23,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestableContext import com.android.systemui.contextualeducation.GestureType.BACK import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.education.data.model.EduDeviceConnectionTime import com.android.systemui.education.data.model.GestureEduModel import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testDispatcher @@ -105,6 +106,19 @@ class ContextualEducationRepositoryTest : SysuiTestCase() { assertThat(model).isEqualTo(newModel) } + @Test + fun eduDeviceConnectionTimeDataChangedOnUpdate() = + testScope.runTest { + val newModel = + EduDeviceConnectionTime( + keyboardFirstConnectionTime = kosmos.fakeEduClock.instant(), + touchpadFirstConnectionTime = kosmos.fakeEduClock.instant(), + ) + underTest.updateEduDeviceConnectionTime { newModel } + val model by collectLastValue(underTest.readEduDeviceConnectionTime()) + assertThat(model).isEqualTo(newModel) + } + /** Test context which allows overriding getFilesDir path */ private class TestContext(context: Context, private val folder: File) : SysuiTestableContext(context) { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt index 23f923a6fb09..3aed79f5915f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt @@ -16,6 +16,7 @@ package com.android.systemui.education.domain.interactor +import android.content.pm.UserInfo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase @@ -26,10 +27,15 @@ import com.android.systemui.education.data.model.GestureEduModel import com.android.systemui.education.data.repository.contextualEducationRepository import com.android.systemui.education.data.repository.fakeEduClock import com.android.systemui.education.shared.model.EducationUiType +import com.android.systemui.keyboard.data.repository.keyboardRepository import com.android.systemui.kosmos.testScope import com.android.systemui.testKosmos +import com.android.systemui.touchpad.data.repository.touchpadRepository +import com.android.systemui.user.data.repository.fakeUserRepository import com.google.common.truth.Truth.assertThat +import kotlin.time.Duration.Companion.hours import kotlin.time.Duration.Companion.seconds +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -38,16 +44,23 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) +@kotlinx.coroutines.ExperimentalCoroutinesApi class KeyboardTouchpadEduInteractorTest : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope private val contextualEduInteractor = kosmos.contextualEducationInteractor + private val touchpadRepository = kosmos.touchpadRepository + private val keyboardRepository = kosmos.keyboardRepository + private val userRepository = kosmos.fakeUserRepository + private val underTest: KeyboardTouchpadEduInteractor = kosmos.keyboardTouchpadEduInteractor private val eduClock = kosmos.fakeEduClock @Before fun setup() { underTest.start() + contextualEduInteractor.start() + userRepository.setUserInfos(USER_INFOS) } @Test @@ -67,7 +80,6 @@ class KeyboardTouchpadEduInteractorTest : SysuiTestCase() { } @Test - @kotlinx.coroutines.ExperimentalCoroutinesApi fun newEducationNotificationOn2ndEducation() = testScope.runTest { val model by collectLastValue(underTest.educationTriggered) @@ -115,10 +127,103 @@ class KeyboardTouchpadEduInteractorTest : SysuiTestCase() { ) } + @Test + fun newTouchpadConnectionTimeOnFirstTouchpadConnected() = + testScope.runTest { + setIsAnyTouchpadConnected(true) + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.touchpadFirstConnectionTime).isEqualTo(eduClock.instant()) + } + + @Test + fun unchangedTouchpadConnectionTimeOnSecondConnection() = + testScope.runTest { + val firstConnectionTime = eduClock.instant() + setIsAnyTouchpadConnected(true) + setIsAnyTouchpadConnected(false) + + eduClock.offset(1.hours) + setIsAnyTouchpadConnected(true) + + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.touchpadFirstConnectionTime).isEqualTo(firstConnectionTime) + } + + @Test + fun newTouchpadConnectionTimeOnUserChanged() = + testScope.runTest { + // Touchpad connected for user 0 + setIsAnyTouchpadConnected(true) + + // Change user + eduClock.offset(1.hours) + val newUserFirstConnectionTime = eduClock.instant() + userRepository.setSelectedUserInfo(USER_INFOS[0]) + runCurrent() + + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.touchpadFirstConnectionTime).isEqualTo(newUserFirstConnectionTime) + } + + @Test + fun newKeyboardConnectionTimeOnKeyboardConnected() = + testScope.runTest { + setIsAnyKeyboardConnected(true) + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.keyboardFirstConnectionTime).isEqualTo(eduClock.instant()) + } + + @Test + fun unchangedKeyboardConnectionTimeOnSecondConnection() = + testScope.runTest { + val firstConnectionTime = eduClock.instant() + setIsAnyKeyboardConnected(true) + setIsAnyKeyboardConnected(false) + + eduClock.offset(1.hours) + setIsAnyKeyboardConnected(true) + + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.keyboardFirstConnectionTime).isEqualTo(firstConnectionTime) + } + + @Test + fun newKeyboardConnectionTimeOnUserChanged() = + testScope.runTest { + // Keyboard connected for user 0 + setIsAnyKeyboardConnected(true) + + // Change user + eduClock.offset(1.hours) + val newUserFirstConnectionTime = eduClock.instant() + userRepository.setSelectedUserInfo(USER_INFOS[0]) + runCurrent() + + val model = contextualEduInteractor.getEduDeviceConnectionTime() + assertThat(model.keyboardFirstConnectionTime).isEqualTo(newUserFirstConnectionTime) + } + private suspend fun triggerMaxEducationSignals(gestureType: GestureType) { // Increment max number of signal to try triggering education for (i in 1..KeyboardTouchpadEduInteractor.MAX_SIGNAL_COUNT) { contextualEduInteractor.incrementSignalCount(gestureType) } } + + private fun TestScope.setIsAnyTouchpadConnected(isConnected: Boolean) { + touchpadRepository.setIsAnyTouchpadConnected(isConnected) + runCurrent() + } + + private fun TestScope.setIsAnyKeyboardConnected(isConnected: Boolean) { + keyboardRepository.setIsAnyKeyboardConnected(isConnected) + runCurrent() + } + + companion object { + private val USER_INFOS = + listOf( + UserInfo(101, "Second User", 0), + ) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt index 3a28471b5f9a..9bcc19defbd5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt @@ -369,4 +369,18 @@ class DeviceEntryFingerprintAuthRepositoryTest : SysuiTestCase() { invokeOnCallback { it.onStrongAuthStateChanged(0) } assertThat(shouldUpdateIndicatorVisibility).isTrue() } + + @Test + fun isLockedOut_initialStateFalse() = + testScope.runTest { + whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(false) + assertThat(underTest.isLockedOut.value).isEqualTo(false) + } + + @Test + fun isLockedOut_initialStateTrue() = + testScope.runTest { + whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(true) + assertThat(underTest.isLockedOut.value).isEqualTo(true) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt index 783e3b5ba810..ee4a0d2d4e75 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt @@ -150,13 +150,13 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT @Test @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR) @DisableFlags(FLAG_COMMUNAL_SCENE_KTF_REFACTOR) - fun testTransitionToLockscreen_onPowerButtonPress_canDream_glanceableHubAvailable() = + fun testTransitionToLockscreen_onWake_canDream_glanceableHubAvailable() = testScope.runTest { whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) kosmos.setCommunalAvailable(true) runCurrent() - powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_POWER_BUTTON) + powerInteractor.setAwakeForTest() runCurrent() // If dreaming is possible and communal is available, then we should transition to @@ -170,14 +170,14 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT @Test @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR, FLAG_COMMUNAL_SCENE_KTF_REFACTOR) - fun testTransitionToLockscreen_onPowerButtonPress_canDream_ktfRefactor() = + fun testTransitionToLockscreen_onWake_canDream_ktfRefactor() = testScope.runTest { whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) kosmos.setCommunalAvailable(true) runCurrent() clearInvocations(kosmos.fakeCommunalSceneRepository) - powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_POWER_BUTTON) + powerInteractor.setAwakeForTest() runCurrent() // If dreaming is possible and communal is available, then we should transition to @@ -188,13 +188,13 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT @Test @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR) - fun testTransitionToLockscreen_onPowerButtonPress_canNotDream_glanceableHubAvailable() = + fun testTransitionToLockscreen_onWake_canNotDream_glanceableHubAvailable() = testScope.runTest { whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(false) kosmos.setCommunalAvailable(true) runCurrent() - powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_POWER_BUTTON) + powerInteractor.setAwakeForTest() runCurrent() // If dreaming is NOT possible but communal is available, then we should transition to @@ -208,13 +208,13 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT @Test @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR) - fun testTransitionToLockscreen_onPowerButtonPress_canNDream_glanceableHubNotAvailable() = + fun testTransitionToLockscreen_onWake_canNDream_glanceableHubNotAvailable() = testScope.runTest { whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) kosmos.setCommunalAvailable(false) runCurrent() - powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_POWER_BUTTON) + powerInteractor.setAwakeForTest() runCurrent() // If dreaming is possible but communal is NOT available, then we should transition to diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt index 2b2c121fb79a..aee72de22a24 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt @@ -25,8 +25,11 @@ import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.logging.uiEventLogger import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFaceAuthInteractor +import com.android.systemui.deviceentry.shared.FaceAuthUiEvent import com.android.systemui.flags.Flags import com.android.systemui.flags.fakeFeatureFlagsClassic +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState @@ -260,6 +263,23 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() { } @Test + fun triggersFaceAuthWhenLockscreenIsClicked() = + testScope.runTest { + collectLastValue(underTest.isMenuVisible) + runCurrent() + kosmos.fakeDeviceEntryFaceAuthRepository.canRunFaceAuth.value = true + + underTest.onClick(100.0f, 100.0f) + runCurrent() + + val runningAuthRequest = + kosmos.fakeDeviceEntryFaceAuthRepository.runningAuthRequest.value + assertThat(runningAuthRequest?.first) + .isEqualTo(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_NOTIFICATION_PANEL_CLICKED) + assertThat(runningAuthRequest?.second).isEqualTo(true) + } + + @Test fun showMenu_leaveLockscreen_returnToLockscreen_menuNotVisible() = testScope.runTest { val isMenuVisible by collectLastValue(underTest.isMenuVisible) @@ -302,6 +322,7 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() { broadcastDispatcher = fakeBroadcastDispatcher, accessibilityManager = kosmos.accessibilityManagerWrapper, pulsingGestureListener = kosmos.pulsingGestureListener, + faceAuthInteractor = kosmos.deviceEntryFaceAuthInteractor, ) setUpState() } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt index a40746859a9a..3e1f4f6da5e4 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt @@ -504,6 +504,45 @@ class KeyguardRootViewModelTest(flags: FlagsParameterization) : SysuiTestCase() } @Test + @DisableSceneContainer + fun alphaFromShadeExpansion_doesNotEmitWhenLockscreenToDreamTransitionRunning() = + testScope.runTest { + keyguardTransitionRepository.sendTransitionSteps( + from = KeyguardState.AOD, + to = KeyguardState.LOCKSCREEN, + testScope, + ) + + val alpha by collectLastValue(underTest.alpha(viewState)) + shadeTestUtil.setQsExpansion(0f) + + assertThat(alpha).isEqualTo(1f) + + keyguardTransitionRepository.sendTransitionSteps( + listOf( + TransitionStep( + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.DREAMING, + transitionState = TransitionState.STARTED, + value = 0f, + ), + TransitionStep( + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.DREAMING, + transitionState = TransitionState.RUNNING, + value = 0.1f, + ), + ), + testScope, + ) + + val alphaBeforeExpansion = alpha + shadeTestUtil.setQsExpansion(0.5f) + // Alpha should remain unchanged instead of being affected by expansion. + assertThat(alpha).isEqualTo(alphaBeforeExpansion) + } + + @Test fun alpha_shadeClosedOverLockscreen_isOne() = testScope.runTest { val alpha by collectLastValue(underTest.alpha(viewState)) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt new file mode 100644 index 000000000000..22e589637432 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderTest.kt @@ -0,0 +1,399 @@ +/** + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.Notification +import android.app.Notification.MediaStyle +import android.app.PendingIntent +import android.app.statusBarManager +import android.content.Intent +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.media.AudioAttributes +import android.media.MediaDescription +import android.media.MediaMetadata +import android.media.session.MediaController +import android.media.session.MediaSession +import android.media.session.PlaybackState +import android.os.Bundle +import android.service.notification.StatusBarNotification +import androidx.media.utils.MediaConstants +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.Flags.MEDIA_RESUME_PROGRESS +import com.android.systemui.flags.Flags.MEDIA_SESSION_ACTIONS +import com.android.systemui.flags.fakeFeatureFlagsClassic +import com.android.systemui.graphics.imageLoader +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.util.fakeMediaControllerFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.plugins.activityStarter +import com.android.systemui.res.R +import com.android.systemui.statusbar.SbnBuilder +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +private const val KEY = "KEY" +private const val PACKAGE_NAME = "com.example.app" +private const val SYSTEM_PACKAGE_NAME = "com.android.systemui" +private const val APP_NAME = "SystemUI" +private const val SESSION_ARTIST = "artist" +private const val SESSION_TITLE = "title" +private const val SESSION_EMPTY_TITLE = "" + +@SmallTest +@RunWith(AndroidJUnit4::class) +class MediaDataLoaderTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val testDispatcher = kosmos.testDispatcher + private val statusBarManager = kosmos.statusBarManager + private val mediaController = mock<MediaController>() + private val fakeFeatureFlags = kosmos.fakeFeatureFlagsClassic + private val mediaFlags = kosmos.mediaFlags + private val mediaControllerFactory = kosmos.fakeMediaControllerFactory + private val session = MediaSession(context, "MediaDataLoaderTestSession") + private val metadataBuilder = + MediaMetadata.Builder().apply { + putString(MediaMetadata.METADATA_KEY_ARTIST, SESSION_ARTIST) + putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_TITLE) + } + + private val underTest: MediaDataLoader = + MediaDataLoader( + context, + testDispatcher, + testScope, + kosmos.activityStarter, + mediaControllerFactory, + mediaFlags, + kosmos.imageLoader, + statusBarManager + ) + + @Before + fun setUp() { + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) + mediaControllerFactory.setControllerForToken(session.sessionToken, mediaController) + } + + @Test + fun loadMediaData_returnsMediaData() = + testScope.runTest { + val song = "THIS_IS_A_SONG" + val artist = "THIS_IS_AN_ARTIST" + val albumArt = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888) + + whenever(mediaController.playbackState) + .thenReturn( + PlaybackState.Builder().setState(PlaybackState.STATE_PLAYING, 12, 1.0f).build() + ) + whenever(mediaController.playbackInfo) + .thenReturn( + MediaController.PlaybackInfo( + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL, + 0, + 0, + 0, + AudioAttributes.Builder().build(), + null + ) + ) + whenever(mediaController.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE, song) + .putString(MediaMetadata.METADATA_KEY_ARTIST, artist) + .putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, albumArt) + .putLong( + MediaConstants.METADATA_KEY_IS_EXPLICIT, + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + ) + .build() + ) + + val result = underTest.loadMediaData(KEY, createMediaNotification()) + assertThat(result).isNotNull() + assertThat(result?.appIcon).isNotNull() + assertThat(result?.appIcon?.resId).isEqualTo(android.R.drawable.ic_media_pause) + assertThat(result?.artist).isEqualTo(artist) + assertThat(result?.song).isEqualTo(song) + assertThat(result?.artworkIcon).isNotNull() + assertThat(result?.artworkIcon?.bitmap?.width).isEqualTo(albumArt.width) + assertThat(result?.artworkIcon?.bitmap?.height).isEqualTo(albumArt.height) + assertThat(result?.token).isEqualTo(session.sessionToken) + assertThat(result?.device).isNull() + assertThat(result?.playbackLocation).isEqualTo(MediaData.PLAYBACK_LOCAL) + assertThat(result?.isPlaying).isTrue() + assertThat(result?.isExplicit).isTrue() + assertThat(result?.resumeAction).isNull() + assertThat(result?.resumeProgress).isNull() + } + + @Test + fun loadMediaDataForResumption_returnsMediaData() = + testScope.runTest { + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) + + val song = "THIS_IS_A_SONG" + val artist = "THIS_IS_AN_ARTIST" + val albumArt = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888) + + val extras = Bundle() + extras.putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED + ) + extras.putDouble(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE, 0.3) + extras.putLong( + MediaConstants.METADATA_KEY_IS_EXPLICIT, + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + ) + + val description = + MediaDescription.Builder() + .setTitle(song) + .setSubtitle(artist) + .setIconBitmap(albumArt) + .setExtras(extras) + .build() + + val intent = + PendingIntent.getActivity(context, 0, Intent(), PendingIntent.FLAG_IMMUTABLE) + + val result = + underTest.loadMediaDataForResumption( + 0, + description, + Runnable {}, + null, + session.sessionToken, + APP_NAME, + intent, + PACKAGE_NAME + ) + assertThat(result).isNotNull() + assertThat(result?.appName).isEqualTo(APP_NAME) + assertThat(result?.song).isEqualTo(song) + assertThat(result?.artist).isEqualTo(artist) + assertThat(result?.artworkIcon).isNotNull() + assertThat(result?.artworkIcon?.bitmap?.width).isEqualTo(100) + assertThat(result?.artworkIcon?.bitmap?.height).isEqualTo(100) + assertThat(result?.token).isEqualTo(session.sessionToken) + assertThat(result?.clickIntent).isEqualTo(intent) + assertThat(result?.isExplicit).isTrue() + assertThat(result?.resumeProgress).isEqualTo(0.3) + } + + @Test + fun loadMediaData_songNameFallbacks() = + testScope.runTest { + // Check ordering of Song resolution: + // DISPLAY_TITLE > TITLE > notification TITLE > notification TITLE_BIG + + // DISPLAY_TITLE + whenever(mediaController.metadata) + .thenReturn( + MediaMetadata.Builder() + .putString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE, "title1") + .putString(MediaMetadata.METADATA_KEY_TITLE, "title2") + .build() + ) + val result1 = underTest.loadMediaData(KEY, createMediaNotification()) + assertThat(result1?.song).isEqualTo("title1") + + // TITLE + whenever(mediaController.metadata) + .thenReturn( + MediaMetadata.Builder() + .putString(MediaMetadata.METADATA_KEY_TITLE, "title2") + .build() + ) + val result2 = underTest.loadMediaData(KEY, createMediaNotification()) + assertThat(result2?.song).isEqualTo("title2") + + // notification TITLE + val notif = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.setContentTitle("notiftitle") + } + build() + } + whenever(mediaController.metadata).thenReturn(MediaMetadata.Builder().build()) + val result3 = underTest.loadMediaData(KEY, notif) + assertThat(result3?.song).isEqualTo("notiftitle") + + // Final fallback + whenever(mediaController.metadata).thenReturn(MediaMetadata.Builder().build()) + val result4 = underTest.loadMediaData(KEY, createMediaNotification()) + assertThat(result4?.song) + .isEqualTo(context.getString(R.string.controls_media_empty_title, result4?.appName)) + } + + @Test + fun loadMediaData_emptyTitle_hasPlaceholder() = + testScope.runTest { + val packageManager = mock<PackageManager>() + context.setMockPackageManager(packageManager) + whenever(packageManager.getApplicationLabel(any())).thenReturn(APP_NAME) + whenever(mediaController.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_EMPTY_TITLE) + .build() + ) + + val result = underTest.loadMediaData(KEY, createMediaNotification()) + + val placeholderTitle = context.getString(R.string.controls_media_empty_title, APP_NAME) + assertThat(result).isNotNull() + assertThat(result?.song).isEqualTo(placeholderTitle) + } + + @Test + fun loadMediaData_emptyMetadata_usesNotificationTitle() = + testScope.runTest { + val packageManager = mock<PackageManager>() + context.setMockPackageManager(packageManager) + whenever(packageManager.getApplicationLabel(any())).thenReturn(APP_NAME) + whenever(mediaController.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_EMPTY_TITLE) + .putString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE, SESSION_EMPTY_TITLE) + .build() + ) + val mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setContentTitle(SESSION_TITLE) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + } + build() + } + + val result = underTest.loadMediaData(KEY, mediaNotification) + + assertThat(result).isNotNull() + assertThat(result?.song).isEqualTo(SESSION_TITLE) + } + + @Test + fun loadMediaData_badArtwork_isNotUsed() = + testScope.runTest { + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.setLargeIcon(artwork) + } + build() + } + + val result = underTest.loadMediaData(KEY, mediaNotification) + + assertThat(result).isNotNull() + } + + @Test + fun loadMediaData_invalidTokenNoCrash() = + testScope.runTest { + val bundle = Bundle() + // wrong data type + bundle.putParcelable(Notification.EXTRA_MEDIA_SESSION, Bundle()) + val rcn = + SbnBuilder().run { + setPkg(SYSTEM_PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.addExtras(bundle) + it.setStyle( + MediaStyle().apply { setRemotePlaybackInfo("Remote device", 0, null) } + ) + } + build() + } + + val result = underTest.loadMediaData(KEY, rcn) + assertThat(result).isNull() + } + + @Test + fun testLoadMediaDataInBg_invalidMediaRemoteIntentNoCrash() = + testScope.runTest { + val bundle = Bundle() + // wrong data type + bundle.putParcelable(Notification.EXTRA_MEDIA_REMOTE_INTENT, Bundle()) + val rcn = + SbnBuilder().run { + setPkg(SYSTEM_PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.addExtras(bundle) + it.setStyle( + MediaStyle().apply { + setMediaSession(session.sessionToken) + setRemotePlaybackInfo("Remote device", 0, null) + } + ) + } + build() + } + + val result = underTest.loadMediaData(KEY, rcn) + assertThat(result).isNotNull() + } + + private fun createMediaNotification( + mediaSession: MediaSession? = session, + applicationInfo: ApplicationInfo? = null + ): StatusBarNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(mediaSession?.sessionToken) }) + if (applicationInfo != null) { + val bundle = Bundle() + bundle.putParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO, + applicationInfo + ) + it.addExtras(bundle) + } + } + build() + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt index 163b9b0959a8..c63381687f18 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt @@ -495,7 +495,9 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { private fun getCurrentSceneInUi(): SceneKey { return when (val state = transitionState.value) { is ObservableTransitionState.Idle -> state.currentScene - is ObservableTransitionState.Transition -> state.fromScene + is ObservableTransitionState.Transition.ChangeCurrentScene -> state.fromScene + is ObservableTransitionState.Transition.ShowOrHideOverlay -> state.currentScene + is ObservableTransitionState.Transition.ReplaceOverlay -> state.currentScene } } diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 18b70731700a..fd943d0a5414 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1869,6 +1869,8 @@ <!-- Text displayed indicating that the user is connected to a satellite signal. --> <string name="satellite_connected_carrier_text">Satellite SOS</string> + <!-- Text displayed indicating that the user might be able to use satellite SOS. --> + <string name="satellite_emergency_only_carrier_text">Emergency calls or SOS</string> <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] --> <string name="accessibility_managed_profile">Work profile</string> diff --git a/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/3.json b/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/3.json new file mode 100644 index 000000000000..fe996b7d4b64 --- /dev/null +++ b/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/3.json @@ -0,0 +1,81 @@ +{ + "formatVersion": 1, + "database": { + "version": 3, + "identityHash": "02e2da2d36e6955200edd5fb49e63c72", + "entities": [ + { + "tableName": "communal_widget_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `widget_id` INTEGER NOT NULL, `component_name` TEXT NOT NULL, `item_id` INTEGER NOT NULL, `user_serial_number` INTEGER NOT NULL DEFAULT -1)", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "widgetId", + "columnName": "widget_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "componentName", + "columnName": "component_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "itemId", + "columnName": "item_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "userSerialNumber", + "columnName": "user_serial_number", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "-1" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + } + }, + { + "tableName": "communal_item_rank_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `rank` INTEGER NOT NULL DEFAULT 0)", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "rank", + "columnName": "rank", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '02e2da2d36e6955200edd5fb49e63c72')" + ] + } +}
\ No newline at end of file diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp index fbe139930e11..02d39a475ca9 100644 --- a/packages/SystemUI/shared/Android.bp +++ b/packages/SystemUI/shared/Android.bp @@ -48,6 +48,7 @@ android_library { "src/**/*.kt", "src/**/*.aidl", ":wm_shell-aidls", + ":wm_shell-shared-aidls", ":wm_shell_util-sources", ], static_libs: [ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index bf905dbe5543..7efe2dde1320 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -344,7 +344,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout { R.dimen.keyguard_security_container_padding_top), getPaddingRight(), getPaddingBottom()); setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(), - com.android.internal.R.attr.materialColorSurface)); + com.android.internal.R.attr.materialColorSurfaceDim)); } void onResume(SecurityMode securityMode, boolean faceAuthEnabled) { @@ -808,7 +808,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout { void reloadColors() { mViewMode.reloadColors(); setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(), - com.android.internal.R.attr.materialColorSurface)); + com.android.internal.R.attr.materialColorSurfaceDim)); } /** Handles density or font scale changes. */ diff --git a/packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java index abdc3338b7f2..04595a2a698e 100644 --- a/packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java @@ -48,6 +48,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController; import com.android.systemui.statusbar.policy.NextAlarmController; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.statusbar.window.StatusBarWindowStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateListener; import com.android.systemui.util.ViewController; import com.android.systemui.util.time.DateFormatUtil; @@ -127,6 +128,9 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus private final DreamOverlayStatusBarItemsProvider.Callback mStatusBarItemsProviderCallback = this::onStatusBarItemsChanged; + private final StatusBarWindowStateListener mStatusBarWindowStateListener = + this::onSystemStatusBarStateChanged; + @Inject public AmbientStatusBarViewController( AmbientStatusBarView view, @@ -161,10 +165,22 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus mWifiInteractor = wifiInteractor; mCommunalSceneInteractor = communalSceneInteractor; mLogger = new DreamLogger(logBuffer, TAG); + } + + @Override + protected void onInit() { + super.onInit(); // Register to receive show/hide updates for the system status bar. Our custom status bar // needs to hide when the system status bar is showing to ovoid overlapping status bars. - statusBarWindowStateController.addListener(this::onSystemStatusBarStateChanged); + mStatusBarWindowStateController.addListener(mStatusBarWindowStateListener); + } + + @Override + public void destroy() { + mStatusBarWindowStateController.removeListener(mStatusBarWindowStateListener); + + super.destroy(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchHandler.java b/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchHandler.java index 190bc1587525..d27e72a9c185 100644 --- a/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchHandler.java @@ -122,4 +122,9 @@ public interface TouchHandler { * @param session */ void onSessionStart(TouchSession session); + + /** + * Called when the handler is being torn down. + */ + default void onDestroy() {} } diff --git a/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchMonitor.java b/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchMonitor.java index efa55e90081e..1be6f9e7ca4f 100644 --- a/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchMonitor.java +++ b/packages/SystemUI/src/com/android/systemui/ambient/touch/TouchMonitor.java @@ -581,6 +581,10 @@ public class TouchMonitor { mBoundsFlow.cancel(new CancellationException()); } + for (TouchHandler handler : mHandlers) { + handler.onDestroy(); + } + mInitialized = false; } diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt index 85fffbf610fc..d125c36cd8db 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt @@ -33,9 +33,7 @@ import com.android.systemui.bouncer.shared.model.BouncerMessageStrings import com.android.systemui.bouncer.shared.model.Message import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.deviceentry.data.repository.DeviceEntryFaceAuthRepository import com.android.systemui.deviceentry.domain.interactor.DeviceEntryBiometricsAllowedInteractor -import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFingerprintAuthInteractor import com.android.systemui.flags.SystemPropertiesHelper import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.TrustRepository @@ -75,8 +73,6 @@ constructor( primaryBouncerInteractor: PrimaryBouncerInteractor, @Application private val applicationScope: CoroutineScope, private val facePropertyRepository: FacePropertyRepository, - private val deviceEntryFingerprintAuthInteractor: DeviceEntryFingerprintAuthInteractor, - faceAuthRepository: DeviceEntryFaceAuthRepository, private val securityModel: KeyguardSecurityModel, deviceEntryBiometricsAllowedInteractor: DeviceEntryBiometricsAllowedInteractor, ) { @@ -97,6 +93,17 @@ constructor( private val kumCallback = object : KeyguardUpdateMonitorCallback() { override fun onBiometricAuthFailed(biometricSourceType: BiometricSourceType?) { + // Only show the biometric failure messages if the biometric is NOT locked out. + // If the biometric is locked out, rely on the lock out message to show + // the lockout message & don't override it with the failure message. + if ( + (biometricSourceType == BiometricSourceType.FACE && + deviceEntryBiometricsAllowedInteractor.isFaceLockedOut.value) || + (biometricSourceType == BiometricSourceType.FINGERPRINT && + deviceEntryBiometricsAllowedInteractor.isFingerprintLockedOut.value) + ) { + return + } repository.setMessage( when (biometricSourceType) { BiometricSourceType.FINGERPRINT -> @@ -159,8 +166,8 @@ constructor( biometricSettingsRepository.authenticationFlags, trustRepository.isCurrentUserTrustManaged, isAnyBiometricsEnabledAndEnrolled, - deviceEntryFingerprintAuthInteractor.isLockedOut, - faceAuthRepository.isLockedOut, + deviceEntryBiometricsAllowedInteractor.isFingerprintLockedOut, + deviceEntryBiometricsAllowedInteractor.isFaceLockedOut, isFingerprintAuthCurrentlyAllowedOnBouncer, ::Septuple ) diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt index dff63527ba05..8f1854f93fe4 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt @@ -26,7 +26,7 @@ import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase import com.android.systemui.res.R -@Database(entities = [CommunalWidgetItem::class, CommunalItemRank::class], version = 2) +@Database(entities = [CommunalWidgetItem::class, CommunalItemRank::class], version = 3) abstract class CommunalDatabase : RoomDatabase() { abstract fun communalWidgetDao(): CommunalWidgetDao @@ -55,7 +55,7 @@ abstract class CommunalDatabase : RoomDatabase() { context.resources.getString(R.string.config_communalDatabase) ) .also { builder -> - builder.addMigrations(MIGRATION_1_2) + builder.addMigrations(MIGRATION_1_2, MIGRATION_2_3) builder.fallbackToDestructiveMigration(dropAllTables = true) callback?.let { callback -> builder.addCallback(callback) } } @@ -87,5 +87,21 @@ abstract class CommunalDatabase : RoomDatabase() { ) } } + + /** + * This migration reverses the ranks. For example, if the ranks are 2, 1, 0, then after the + * migration they will be 0, 1, 2. + */ + @VisibleForTesting + val MIGRATION_2_3 = + object : Migration(2, 3) { + override fun migrate(db: SupportSQLiteDatabase) { + Log.i(TAG, "Migrating from version 2 to 3") + db.execSQL( + "UPDATE communal_item_rank_table " + + "SET rank = (SELECT MAX(rank) FROM communal_item_rank_table) - rank" + ) + } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt index 933a25a21578..93b86bd10133 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt @@ -97,7 +97,7 @@ constructor( .addWidget( widgetId = id, componentName = name, - priority = defaultWidgets.size - index, + rank = index, userSerialNumber = userSerialNumber, ) } @@ -132,10 +132,17 @@ interface CommunalWidgetDao { @Query( "SELECT * FROM communal_widget_table JOIN communal_item_rank_table " + "ON communal_item_rank_table.uid = communal_widget_table.item_id " + - "ORDER BY communal_item_rank_table.rank DESC" + "ORDER BY communal_item_rank_table.rank ASC" ) fun getWidgets(): Flow<Map<CommunalItemRank, CommunalWidgetItem>> + @Query( + "SELECT * FROM communal_widget_table JOIN communal_item_rank_table " + + "ON communal_item_rank_table.uid = communal_widget_table.item_id " + + "ORDER BY communal_item_rank_table.rank ASC" + ) + fun getWidgetsNow(): Map<CommunalItemRank, CommunalWidgetItem> + @Query("SELECT * FROM communal_widget_table WHERE widget_id = :id") fun getWidgetByIdNow(id: Int): CommunalWidgetItem? @@ -167,11 +174,11 @@ interface CommunalWidgetDao { @Query("DELETE FROM communal_item_rank_table") fun clearCommunalItemRankTable() @Transaction - fun updateWidgetOrder(widgetIdToPriorityMap: Map<Int, Int>) { - widgetIdToPriorityMap.forEach { (id, priority) -> + fun updateWidgetOrder(widgetIdToRankMap: Map<Int, Int>) { + widgetIdToRankMap.forEach { (id, rank) -> val widget = getWidgetByIdNow(id) if (widget != null) { - updateItemRank(widget.itemId, priority) + updateItemRank(widget.itemId, rank) } } } @@ -180,13 +187,13 @@ interface CommunalWidgetDao { fun addWidget( widgetId: Int, provider: ComponentName, - priority: Int, + rank: Int? = null, userSerialNumber: Int, ): Long { return addWidget( widgetId = widgetId, componentName = provider.flattenToString(), - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) } @@ -195,13 +202,27 @@ interface CommunalWidgetDao { fun addWidget( widgetId: Int, componentName: String, - priority: Int, + rank: Int? = null, userSerialNumber: Int, ): Long { + val widgets = getWidgetsNow() + + // If rank is not specified, rank it last by finding the current maximum rank and increment + // by 1. If the new widget is the first widget, set the rank to 0. + val newRank = rank ?: widgets.keys.maxOfOrNull { it.rank + 1 } ?: 0 + + // Shift widgets after [rank], unless widget is added at the end. + if (rank != null) { + widgets.forEach { (rankEntry, widgetEntry) -> + if (rankEntry.rank < newRank) return@forEach + updateItemRank(widgetEntry.itemId, rankEntry.rank + 1) + } + } + return insertWidget( widgetId = widgetId, componentName = componentName, - itemId = insertItemRank(priority), + itemId = insertItemRank(newRank), userSerialNumber = userSerialNumber, ) } diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt index ad0bfc76ebbf..6cdd9fffe077 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt @@ -57,12 +57,17 @@ interface CommunalWidgetRepository { /** A flow of information about active communal widgets stored in database. */ val communalWidgets: Flow<List<CommunalWidgetContentModel>> - /** Add a widget at the specified position in the app widget service and the database. */ + /** + * Add a widget in the app widget service and the database. + * + * @param rank The rank of the widget determines its position in the grid. 0 is first place, 1 + * is second, etc. If rank is not specified, widget is added at the end. + */ fun addWidget( provider: ComponentName, user: UserHandle, - priority: Int, - configurator: WidgetConfigurator? = null + rank: Int?, + configurator: WidgetConfigurator? = null, ) {} /** @@ -75,9 +80,9 @@ interface CommunalWidgetRepository { /** * Update the order of widgets in the database. * - * @param widgetIdToPriorityMap mapping of the widget ids to the priority of the widget. + * @param widgetIdToRankMap mapping of the widget ids to the rank of the widget. */ - fun updateWidgetOrder(widgetIdToPriorityMap: Map<Int, Int>) {} + fun updateWidgetOrder(widgetIdToRankMap: Map<Int, Int>) {} /** * Restores the database by reading a state file from disk and updating the widget ids according @@ -121,7 +126,7 @@ constructor( CommunalWidgetEntry( appWidgetId = widget.widgetId, componentName = widget.componentName, - priority = rank.rank, + rank = rank.rank, providerInfo = providers[widget.widgetId] ) } @@ -151,8 +156,8 @@ constructor( override fun addWidget( provider: ComponentName, user: UserHandle, - priority: Int, - configurator: WidgetConfigurator? + rank: Int?, + configurator: WidgetConfigurator?, ) { bgScope.launch { val id = communalWidgetHost.allocateIdAndBindWidget(provider, user) @@ -190,14 +195,14 @@ constructor( communalWidgetDao.addWidget( widgetId = id, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userManager.getUserSerialNumber(user.identifier), ) backupManager.dataChanged() } else { appWidgetHost.deleteAppWidgetId(id) } - logger.i("Added widget ${provider.flattenToString()} at position $priority.") + logger.i("Added widget ${provider.flattenToString()} at position $rank.") } } @@ -211,11 +216,11 @@ constructor( } } - override fun updateWidgetOrder(widgetIdToPriorityMap: Map<Int, Int>) { + override fun updateWidgetOrder(widgetIdToRankMap: Map<Int, Int>) { bgScope.launch { - communalWidgetDao.updateWidgetOrder(widgetIdToPriorityMap) + communalWidgetDao.updateWidgetOrder(widgetIdToRankMap) logger.i({ "Updated the order of widget list with ids: $str1." }) { - str1 = widgetIdToPriorityMap.toString() + str1 = widgetIdToRankMap.toString() } backupManager.dataChanged() } @@ -342,7 +347,7 @@ constructor( addWidget( provider = ComponentName.unflattenFromString(widget.componentName)!!, user = newUser, - priority = widget.rank, + rank = widget.rank, ) } @@ -377,7 +382,7 @@ constructor( return CommunalWidgetContentModel.Available( appWidgetId = entry.appWidgetId, providerInfo = entry.providerInfo!!, - priority = entry.priority, + rank = entry.rank, ) } @@ -394,7 +399,7 @@ constructor( return CommunalWidgetContentModel.Available( appWidgetId = entry.appWidgetId, providerInfo = entry.providerInfo!!, - priority = entry.priority, + rank = entry.rank, ) } @@ -403,7 +408,7 @@ constructor( return if (componentName != null && session != null) { CommunalWidgetContentModel.Pending( appWidgetId = entry.appWidgetId, - priority = entry.priority, + rank = entry.rank, componentName = componentName, icon = session.icon, user = session.user, @@ -416,7 +421,7 @@ constructor( private data class CommunalWidgetEntry( val appWidgetId: Int, val componentName: String, - val priority: Int, + val rank: Int, var providerInfo: AppWidgetProviderInfo? = null, ) } diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt index 7181b15138b9..2aa6c1947c6d 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt @@ -367,13 +367,16 @@ constructor( /** Dismiss the CTA tile from the hub in view mode. */ suspend fun dismissCtaTile() = communalPrefsInteractor.setCtaDismissed() - /** Add a widget at the specified position. */ + /** + * Add a widget at the specified rank. If rank is not provided, the widget will be added at the + * end. + */ fun addWidget( componentName: ComponentName, user: UserHandle, - priority: Int, + rank: Int? = null, configurator: WidgetConfigurator?, - ) = widgetRepository.addWidget(componentName, user, priority, configurator) + ) = widgetRepository.addWidget(componentName, user, rank, configurator) /** * Delete a widget by id. Called when user deletes a widget from the hub or a widget is @@ -384,10 +387,10 @@ constructor( /** * Reorder the widgets. * - * @param widgetIdToPriorityMap mapping of the widget ids to their new priorities. + * @param widgetIdToRankMap mapping of the widget ids to their new priorities. */ - fun updateWidgetOrder(widgetIdToPriorityMap: Map<Int, Int>) = - widgetRepository.updateWidgetOrder(widgetIdToPriorityMap) + fun updateWidgetOrder(widgetIdToRankMap: Map<Int, Int>) = + widgetRepository.updateWidgetOrder(widgetIdToRankMap) /** Request to unpause work profile that is currently in quiet mode. */ fun unpauseWorkProfile() { @@ -440,7 +443,7 @@ constructor( is CommunalWidgetContentModel.Available -> { WidgetContent.Widget( appWidgetId = widget.appWidgetId, - priority = widget.priority, + rank = widget.rank, providerInfo = widget.providerInfo, appWidgetHost = appWidgetHost, inQuietMode = isQuietModeEnabled(widget.providerInfo.profile) @@ -449,7 +452,7 @@ constructor( is CommunalWidgetContentModel.Pending -> { WidgetContent.PendingWidget( appWidgetId = widget.appWidgetId, - priority = widget.priority, + rank = widget.rank, componentName = widget.componentName, icon = widget.icon, ) diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt index 73c6ce30b202..4c821d482eef 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt @@ -47,12 +47,12 @@ sealed interface CommunalContentModel { sealed interface WidgetContent : CommunalContentModel { val appWidgetId: Int - val priority: Int + val rank: Int val componentName: ComponentName data class Widget( override val appWidgetId: Int, - override val priority: Int, + override val rank: Int, val providerInfo: AppWidgetProviderInfo, val appWidgetHost: CommunalAppWidgetHost, val inQuietMode: Boolean, @@ -71,7 +71,7 @@ sealed interface CommunalContentModel { data class DisabledWidget( override val appWidgetId: Int, - override val priority: Int, + override val rank: Int, val providerInfo: AppWidgetProviderInfo ) : WidgetContent { override val key = KEY.disabledWidget(appWidgetId) @@ -85,7 +85,7 @@ sealed interface CommunalContentModel { data class PendingWidget( override val appWidgetId: Int, - override val priority: Int, + override val rank: Int, override val componentName: ComponentName, val icon: Bitmap? = null, ) : WidgetContent { diff --git a/packages/SystemUI/src/com/android/systemui/communal/shared/log/CommunalMetricsLogger.kt b/packages/SystemUI/src/com/android/systemui/communal/shared/log/CommunalMetricsLogger.kt index 9ce8cf72983a..7cfad60b84cd 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/shared/log/CommunalMetricsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/shared/log/CommunalMetricsLogger.kt @@ -31,7 +31,7 @@ constructor( private val statsLogProxy: StatsLogProxy, ) { /** Logs an add widget event for metrics. No-op if widget is not loggable. */ - fun logAddWidget(componentName: String, rank: Int) { + fun logAddWidget(componentName: String, rank: Int?) { if (!componentName.isLoggable()) { return } @@ -39,7 +39,7 @@ constructor( statsLogProxy.writeCommunalHubWidgetEventReported( SysUiStatsLog.COMMUNAL_HUB_WIDGET_EVENT_REPORTED__ACTION__ADD, componentName, - rank, + rank ?: -1, ) } diff --git a/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalWidgetContentModel.kt b/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalWidgetContentModel.kt index 7cddb7226601..63b1a14b3135 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalWidgetContentModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalWidgetContentModel.kt @@ -24,19 +24,19 @@ import android.os.UserHandle /** Encapsulates data for a communal widget. */ sealed interface CommunalWidgetContentModel { val appWidgetId: Int - val priority: Int + val rank: Int /** Widget is ready to display */ data class Available( override val appWidgetId: Int, val providerInfo: AppWidgetProviderInfo, - override val priority: Int, + override val rank: Int, ) : CommunalWidgetContentModel /** Widget is pending installation */ data class Pending( override val appWidgetId: Int, - override val priority: Int, + override val rank: Int, val componentName: ComponentName, val icon: Bitmap?, val user: UserHandle, diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt index b8221332eadf..6be94a7cdf82 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/BaseCommunalViewModel.kt @@ -153,7 +153,7 @@ abstract class BaseCommunalViewModel( open fun onAddWidget( componentName: ComponentName, user: UserHandle, - priority: Int, + rank: Int? = null, configurator: WidgetConfigurator? = null, ) {} @@ -161,23 +161,23 @@ abstract class BaseCommunalViewModel( open fun onDeleteWidget( id: Int, componentName: ComponentName, - priority: Int, + rank: Int, ) {} /** Called as the UI detects a tap event on the widget. */ open fun onTapWidget( componentName: ComponentName, - priority: Int, + rank: Int, ) {} /** * Called as the UI requests reordering widgets. * - * @param widgetIdToPriorityMap mapping of the widget ids to its priority. When re-ordering to - * add a new item in the middle, provide the priorities of existing widgets as if the new item - * existed, and then, call [onAddWidget] to add the new item at intended order. + * @param widgetIdToRankMap mapping of the widget ids to its rank. When re-ordering to add a new + * item in the middle, provide the priorities of existing widgets as if the new item existed, + * and then, call [onAddWidget] to add the new item at intended order. */ - open fun onReorderWidgets(widgetIdToPriorityMap: Map<Int, Int>) {} + open fun onReorderWidgets(widgetIdToRankMap: Map<Int, Int>) {} /** Called as the UI requests opening the widget editor with an optional preselected widget. */ open fun onOpenWidgetEditor( diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt index 1a86c717b962..16788d15b269 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt @@ -125,24 +125,24 @@ constructor( override fun onAddWidget( componentName: ComponentName, user: UserHandle, - priority: Int, + rank: Int?, configurator: WidgetConfigurator? ) { - communalInteractor.addWidget(componentName, user, priority, configurator) - metricsLogger.logAddWidget(componentName.flattenToString(), priority) + communalInteractor.addWidget(componentName, user, rank, configurator) + metricsLogger.logAddWidget(componentName.flattenToString(), rank) } override fun onDeleteWidget( id: Int, componentName: ComponentName, - priority: Int, + rank: Int, ) { communalInteractor.deleteWidget(id) - metricsLogger.logRemoveWidget(componentName.flattenToString(), priority) + metricsLogger.logRemoveWidget(componentName.flattenToString(), rank) } - override fun onReorderWidgets(widgetIdToPriorityMap: Map<Int, Int>) = - communalInteractor.updateWidgetOrder(widgetIdToPriorityMap) + override fun onReorderWidgets(widgetIdToRankMap: Map<Int, Int>) = + communalInteractor.updateWidgetOrder(widgetIdToRankMap) override fun onReorderWidgetStart() { // Clear selection status diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt index c0a18f29149d..4c762dccab97 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt @@ -272,8 +272,8 @@ constructor( } } - override fun onTapWidget(componentName: ComponentName, priority: Int) { - metricsLogger.logTapWidget(componentName.flattenToString(), priority) + override fun onTapWidget(componentName: ComponentName, rank: Int) { + metricsLogger.logTapWidget(componentName.flattenToString(), rank) } fun onClick() { diff --git a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt index b421e5932352..93c3a639b868 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt @@ -16,7 +16,10 @@ package com.android.systemui.communal.widgets +import android.app.Activity +import android.app.Application.ActivityLifecycleCallbacks import android.content.Intent +import android.content.IntentSender import android.os.Bundle import android.os.RemoteException import android.util.Log @@ -34,6 +37,7 @@ import androidx.lifecycle.lifecycleScope import com.android.compose.theme.LocalAndroidColorScheme import com.android.compose.theme.PlatformTheme import com.android.internal.logging.UiEventLogger +import com.android.systemui.Flags.communalEditWidgetsActivityFinishFix import com.android.systemui.communal.shared.log.CommunalUiEvent import com.android.systemui.communal.shared.model.CommunalScenes import com.android.systemui.communal.shared.model.CommunalTransitionKeys @@ -68,12 +72,106 @@ constructor( const val EXTRA_OPEN_WIDGET_PICKER_ON_START = "open_widget_picker_on_start" } + /** + * [ActivityController] handles closing the activity in the case it is backgrounded without + * waiting for an activity result + */ + interface ActivityController { + /** + * Invoked when waiting for an activity result changes, either initiating such wait or + * finishing due to the return of a result. + */ + fun onWaitingForResult(waitingForResult: Boolean) {} + + /** Set the visibility of the activity under control. */ + fun setActivityFullyVisible(fullyVisible: Boolean) {} + } + + /** + * A nop ActivityController to be use when the communalEditWidgetsActivityFinishFix flag is + * false. + */ + class NopActivityController : ActivityController + + /** + * A functional ActivityController to be used when the communalEditWidgetsActivityFinishFix flag + * is true. + */ + class ActivityControllerImpl(activity: Activity) : ActivityController { + companion object { + private const val STATE_EXTRA_IS_WAITING_FOR_RESULT = "extra_is_waiting_for_result" + } + + private var waitingForResult = false + private var activityFullyVisible = false + + init { + activity.registerActivityLifecycleCallbacks( + object : ActivityLifecycleCallbacks { + override fun onActivityCreated( + activity: Activity, + savedInstanceState: Bundle? + ) { + waitingForResult = + savedInstanceState?.getBoolean(STATE_EXTRA_IS_WAITING_FOR_RESULT) + ?: false + } + + override fun onActivityStarted(activity: Activity) { + // Nothing to implement. + } + + override fun onActivityResumed(activity: Activity) { + // Nothing to implement. + } + + override fun onActivityPaused(activity: Activity) { + // Nothing to implement. + } + + override fun onActivityStopped(activity: Activity) { + // If we're not backgrounded due to waiting for a result (either widget + // selection or configuration), and we are fully visible, then finish the + // activity. + if ( + !waitingForResult && + activityFullyVisible && + !activity.isChangingConfigurations + ) { + activity.finish() + } + } + + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { + outState.putBoolean(STATE_EXTRA_IS_WAITING_FOR_RESULT, waitingForResult) + } + + override fun onActivityDestroyed(activity: Activity) { + // Nothing to implement. + } + } + ) + } + + override fun onWaitingForResult(waitingForResult: Boolean) { + this.waitingForResult = waitingForResult + } + + override fun setActivityFullyVisible(fullyVisible: Boolean) { + activityFullyVisible = fullyVisible + } + } + private val logger = Logger(logBuffer, "EditWidgetsActivity") private val widgetConfigurator by lazy { widgetConfiguratorFactory.create(this) } private var shouldOpenWidgetPickerOnStart = false + private val activityController: ActivityController = + if (communalEditWidgetsActivityFinishFix()) ActivityControllerImpl(this) + else NopActivityController() + private val addWidgetActivityLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(StartActivityForResult()) { result -> when (result.resultCode) { @@ -89,11 +187,11 @@ constructor( if (!isPendingWidgetDrag) { val (componentName, user) = getWidgetExtraFromIntent(intent) if (componentName != null && user != null) { + // Add widget at the end. communalViewModel.onAddWidget( componentName, user, - 0, - widgetConfigurator + configurator = widgetConfigurator, ) } else { run { Log.w(TAG, "No AppWidgetProviderInfo found in result.") } @@ -111,8 +209,10 @@ constructor( override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + listenForTransitionAndChangeScene() + activityController.setActivityFullyVisible(false) communalViewModel.setEditModeOpen(true) val windowInsetsController = window.decorView.windowInsetsController @@ -159,6 +259,9 @@ constructor( communalViewModel.currentScene.first { it == CommunalScenes.Blank } communalViewModel.setEditModeState(EditModeState.SHOWING) + // Inform the ActivityController that we are now fully visible. + activityController.setActivityFullyVisible(true) + // Show the widget picker, if necessary, after the edit activity has animated in. // Waiting until after the activity has appeared avoids transitions issues. if (shouldOpenWidgetPickerOnStart) { @@ -198,7 +301,34 @@ constructor( } } + override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { + activityController.onWaitingForResult(true) + super.startActivityForResult(intent, requestCode, options) + } + + override fun startIntentSenderForResult( + intent: IntentSender, + requestCode: Int, + fillInIntent: Intent?, + flagsMask: Int, + flagsValues: Int, + extraFlags: Int, + options: Bundle? + ) { + activityController.onWaitingForResult(true) + super.startIntentSenderForResult( + intent, + requestCode, + fillInIntent, + flagsMask, + flagsValues, + extraFlags, + options + ) + } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + activityController.onWaitingForResult(false) super.onActivityResult(requestCode, resultCode, data) if (requestCode == WidgetConfigurationController.REQUEST_CODE) { widgetConfigurator.setConfigurationResult(resultCode) diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt index 9460eaf8abca..d288ccee2ae8 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt @@ -57,7 +57,10 @@ import com.android.systemui.log.FaceAuthenticationLogger import com.android.systemui.log.SessionTracker import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.power.domain.interactor.PowerInteractor +import com.android.systemui.scene.domain.interactor.SceneInteractor +import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes +import com.android.systemui.scene.shared.model.Scenes.Bouncer import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.user.data.model.SelectionStatus import com.android.systemui.user.data.repository.UserRepository @@ -159,6 +162,7 @@ constructor( private val powerInteractor: PowerInteractor, private val keyguardInteractor: KeyguardInteractor, private val alternateBouncerInteractor: AlternateBouncerInteractor, + private val sceneInteractor: dagger.Lazy<SceneInteractor>, @FaceDetectTableLog private val faceDetectLog: TableLogBuffer, @FaceAuthTableLog private val faceAuthLog: TableLogBuffer, private val keyguardTransitionInteractor: KeyguardTransitionInteractor, @@ -385,7 +389,16 @@ constructor( biometricSettingsRepository.isFaceAuthEnrolledAndEnabled, "isFaceAuthEnrolledAndEnabled" ), - Pair(keyguardRepository.isKeyguardGoingAway.isFalse(), "keyguardNotGoingAway"), + Pair( + if (SceneContainerFlag.isEnabled) { + keyguardTransitionInteractor + .isInTransitionWhere(toStatePredicate = { it == KeyguardState.UNDEFINED }) + .isFalse() + } else { + keyguardRepository.isKeyguardGoingAway.isFalse() + }, + "keyguardNotGoingAway" + ), Pair( keyguardTransitionInteractor .isInTransitionWhere(toStatePredicate = KeyguardState::deviceIsAsleepInState) @@ -397,7 +410,11 @@ constructor( .isFalse() .or( alternateBouncerInteractor.isVisible.or( - keyguardInteractor.primaryBouncerShowing + if (SceneContainerFlag.isEnabled) { + sceneInteractor.get().transitionState.map { it.isIdle(Bouncer) } + } else { + keyguardInteractor.primaryBouncerShowing + } ) ), "secureCameraNotActiveOrAnyBouncerIsShowing" diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricsAllowedInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricsAllowedInteractor.kt index 79b176c8af01..7aee12f70f41 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricsAllowedInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricsAllowedInteractor.kt @@ -22,6 +22,7 @@ import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf @@ -44,18 +45,30 @@ constructor( biometricSettingsInteractor: DeviceEntryBiometricSettingsInteractor, facePropertyRepository: FacePropertyRepository, ) { + /** + * Whether face is locked out due to too many failed face attempts. This currently includes + * whether face is not allowed based on other biometric lockouts; however does not include if + * face isn't allowed due to other strong or primary authentication requirements. + */ + val isFaceLockedOut: StateFlow<Boolean> = deviceEntryFaceAuthInteractor.isLockedOut private val isStrongFaceAuth: Flow<Boolean> = facePropertyRepository.sensorInfo.map { it?.strength == SensorStrength.STRONG } private val isStrongFaceAuthLockedOut: Flow<Boolean> = - combine(isStrongFaceAuth, deviceEntryFaceAuthInteractor.isLockedOut) { - isStrongFaceAuth, - isFaceAuthLockedOut -> + combine(isStrongFaceAuth, isFaceLockedOut) { isStrongFaceAuth, isFaceAuthLockedOut -> isStrongFaceAuth && isFaceAuthLockedOut } /** + * Whether fingerprint is locked out due to too many failed fingerprint attempts. This does NOT + * include whether fingerprint is not allowed based on other biometric lockouts nor if + * fingerprint isn't allowed due to other strong or primary authentication requirements. + */ + val isFingerprintLockedOut: StateFlow<Boolean> = + deviceEntryFingerprintAuthInteractor.isLockedOut + + /** * Whether fingerprint authentication is currently allowed for the user. This is true if the * user has fingerprint auth enabled, enrolled, it is not disabled by any security timeouts by * [com.android.systemui.keyguard.shared.model.AuthenticationFlags], not locked out due to too @@ -64,7 +77,7 @@ constructor( */ val isFingerprintAuthCurrentlyAllowed: Flow<Boolean> = combine( - deviceEntryFingerprintAuthInteractor.isLockedOut, + isFingerprintLockedOut, biometricSettingsInteractor.fingerprintAuthCurrentlyAllowed, isStrongFaceAuthLockedOut, ) { fpLockedOut, fpAllowedBySettings, strongAuthFaceAuthLockedOut -> diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt index 969f53f23f5d..5c058fe92ccb 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt @@ -54,7 +54,7 @@ constructor( val authenticationStatus: Flow<FingerprintAuthenticationStatus> = repository.authenticationStatus - val isLockedOut: Flow<Boolean> = repository.isLockedOut + val isLockedOut: StateFlow<Boolean> = repository.isLockedOut val fingerprintFailure: Flow<FailFingerprintAuthenticationStatus> = repository.authenticationStatus.filterIsInstance<FailFingerprintAuthenticationStatus>() diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt index c536d6b4f6f8..183e0e96e765 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt @@ -46,6 +46,9 @@ import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.log.FaceAuthenticationLogger import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.res.R +import com.android.systemui.scene.domain.interactor.SceneInteractor +import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.user.data.model.SelectionStatus import com.android.systemui.user.data.repository.UserRepository import com.android.systemui.util.kotlin.pairwise @@ -90,6 +93,7 @@ constructor( private val powerInteractor: PowerInteractor, private val biometricSettingsRepository: BiometricSettingsRepository, private val trustManager: TrustManager, + private val sceneInteractor: Lazy<SceneInteractor>, deviceEntryFaceAuthStatusInteractor: DeviceEntryFaceAuthStatusInteractor, ) : DeviceEntryFaceAuthInteractor { @@ -103,9 +107,7 @@ constructor( keyguardUpdateMonitor.setFaceAuthInteractor(this) observeFaceAuthStateUpdates() faceAuthenticationLogger.interactorStarted() - primaryBouncerInteractor - .get() - .isShowing + isBouncerVisible .whenItFlipsToTrue() .onEach { faceAuthenticationLogger.bouncerVisibilityChanged() @@ -181,19 +183,23 @@ constructor( // auth so that the switched user can unlock the device with face auth. userRepository.selectedUser .pairwise() - .onEach { (previous, curr) -> + .filter { (previous, curr) -> val wasSwitching = previous.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS val isSwitching = curr.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS - if (wasSwitching && !isSwitching) { - resetLockedOutState(curr.userInfo.id) - yield() - runFaceAuth( - FaceAuthUiEvent.FACE_AUTH_UPDATED_USER_SWITCHING, - // Fallback to detection if bouncer is not showing so that we can detect a - // face and then show the bouncer to the user if face auth can't run - fallbackToDetect = !primaryBouncerInteractor.get().isBouncerShowing() - ) - } + // User switching was in progress and is complete now. + wasSwitching && !isSwitching + } + .map { (_, curr) -> curr.userInfo.id } + .sample(isBouncerVisible, ::Pair) + .onEach { (userId, isBouncerCurrentlyVisible) -> + resetLockedOutState(userId) + yield() + runFaceAuth( + FaceAuthUiEvent.FACE_AUTH_UPDATED_USER_SWITCHING, + // Fallback to detection if bouncer is not showing so that we can detect a + // face and then show the bouncer to the user if face auth can't run + fallbackToDetect = !isBouncerCurrentlyVisible + ) } .launchIn(applicationScope) @@ -210,6 +216,14 @@ constructor( .launchIn(applicationScope) } + private val isBouncerVisible: Flow<Boolean> by lazy { + if (SceneContainerFlag.isEnabled) { + sceneInteractor.get().transitionState.map { it.isIdle(Scenes.Bouncer) } + } else { + primaryBouncerInteractor.get().isShowing + } + } + private suspend fun resetLockedOutState(currentUserId: Int) { val lockoutMode = facePropertyRepository.getLockoutMode(currentUserId) repository.setLockedOut( diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt index b45ebd865c55..24ac542c6266 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt @@ -44,6 +44,7 @@ import com.android.systemui.statusbar.BlurUtils import com.android.systemui.statusbar.CrossFadeHelper import javax.inject.Inject import javax.inject.Named +import kotlinx.coroutines.DisposableHandle import kotlinx.coroutines.launch /** Controller for dream overlay animations. */ @@ -84,51 +85,62 @@ constructor( private var mCurrentBlurRadius: Float = 0f + private var mLifecycleFlowHandle: DisposableHandle? = null + fun init(view: View) { this.view = view - view.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.CREATED) { - launch { - dreamViewModel.dreamOverlayTranslationY.collect { px -> - ComplicationLayoutParams.iteratePositions( - { position: Int -> setElementsTranslationYAtPosition(px, position) }, - POSITION_TOP or POSITION_BOTTOM - ) + mLifecycleFlowHandle = + view.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.CREATED) { + launch { + dreamViewModel.dreamOverlayTranslationY.collect { px -> + ComplicationLayoutParams.iteratePositions( + { position: Int -> + setElementsTranslationYAtPosition(px, position) + }, + POSITION_TOP or POSITION_BOTTOM + ) + } } - } - launch { - dreamViewModel.dreamOverlayTranslationX.collect { px -> - ComplicationLayoutParams.iteratePositions( - { position: Int -> setElementsTranslationXAtPosition(px, position) }, - POSITION_TOP or POSITION_BOTTOM - ) + launch { + dreamViewModel.dreamOverlayTranslationX.collect { px -> + ComplicationLayoutParams.iteratePositions( + { position: Int -> + setElementsTranslationXAtPosition(px, position) + }, + POSITION_TOP or POSITION_BOTTOM + ) + } } - } - launch { - dreamViewModel.dreamOverlayAlpha.collect { alpha -> - ComplicationLayoutParams.iteratePositions( - { position: Int -> - setElementsAlphaAtPosition( - alpha = alpha, - position = position, - fadingOut = true, - ) - }, - POSITION_TOP or POSITION_BOTTOM - ) + launch { + dreamViewModel.dreamOverlayAlpha.collect { alpha -> + ComplicationLayoutParams.iteratePositions( + { position: Int -> + setElementsAlphaAtPosition( + alpha = alpha, + position = position, + fadingOut = true, + ) + }, + POSITION_TOP or POSITION_BOTTOM + ) + } } - } - launch { - dreamViewModel.transitionEnded.collect { _ -> - mOverlayStateController.setExitAnimationsRunning(false) + launch { + dreamViewModel.transitionEnded.collect { _ -> + mOverlayStateController.setExitAnimationsRunning(false) + } } } } - } + } + + fun destroy() { + mLifecycleFlowHandle?.dispose() } /** diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index 76c7d2383751..bf6d266ac42f 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -59,6 +59,7 @@ import com.android.systemui.touch.TouchInsetManager; import com.android.systemui.util.ViewController; import kotlinx.coroutines.CoroutineDispatcher; +import kotlinx.coroutines.DisposableHandle; import kotlinx.coroutines.flow.FlowKt; import java.util.Arrays; @@ -185,6 +186,8 @@ public class DreamOverlayContainerViewController extends } }; + private DisposableHandle mFlowHandle; + @Inject public DreamOverlayContainerViewController( DreamOverlayContainerView containerView, @@ -252,6 +255,17 @@ public class DreamOverlayContainerViewController extends } @Override + public void destroy() { + mStateController.removeCallback(mDreamOverlayStateCallback); + mStatusBarViewController.destroy(); + mComplicationHostViewController.destroy(); + mDreamOverlayAnimationsController.destroy(); + mLowLightTransitionCoordinator.setLowLightEnterListener(null); + + super.destroy(); + } + + @Override protected void onViewAttached() { mWakingUpFromSwipe = false; mJitterStartTimeMillis = System.currentTimeMillis(); @@ -263,7 +277,7 @@ public class DreamOverlayContainerViewController extends emptyRegion.recycle(); if (dreamHandlesBeingObscured()) { - collectFlow( + mFlowHandle = collectFlow( mView, FlowKt.distinctUntilChanged(combineFlows( mKeyguardTransitionInteractor.isFinishedIn( @@ -295,6 +309,10 @@ public class DreamOverlayContainerViewController extends @Override protected void onViewDetached() { + if (mFlowHandle != null) { + mFlowHandle.dispose(); + mFlowHandle = null; + } mHandler.removeCallbacksAndMessages(null); mPrimaryBouncerCallbackInteractor.removeBouncerExpansionCallback(mBouncerExpansionCallback); mBouncerlessScrimController.removeCallback(mBouncerlessExpansionCallback); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index 7a9537ba4227..4c2276389af8 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -60,7 +60,6 @@ import com.android.systemui.ambient.touch.scrim.ScrimManager; import com.android.systemui.communal.domain.interactor.CommunalInteractor; import com.android.systemui.communal.shared.log.CommunalUiEvent; import com.android.systemui.communal.shared.model.CommunalScenes; -import com.android.systemui.complication.Complication; import com.android.systemui.complication.dagger.ComplicationComponent; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.dagger.DreamOverlayComponent; @@ -70,8 +69,12 @@ import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.touch.TouchInsetManager; import com.android.systemui.util.concurrency.DelayableExecutor; +import kotlinx.coroutines.Job; + +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.concurrent.CancellationException; import java.util.function.Consumer; import javax.inject.Inject; @@ -129,17 +132,21 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ */ private boolean mBouncerShowing = false; - private final ComplicationComponent mComplicationComponent; + private final com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory + mDreamComplicationComponentFactory; + private final ComplicationComponent.Factory mComplicationComponentFactory; + private final DreamOverlayComponent.Factory mDreamOverlayComponentFactory; + private final AmbientTouchComponent.Factory mAmbientTouchComponentFactory; - private final AmbientTouchComponent mAmbientTouchComponent; + private final TouchInsetManager mTouchInsetManager; + private final LifecycleOwner mLifecycleOwner; - private final com.android.systemui.dreams.complication.dagger.ComplicationComponent - mDreamComplicationComponent; - private final DreamOverlayComponent mDreamOverlayComponent; private ComponentName mCurrentBlockedGestureDreamActivityComponent; + private final ArrayList<Job> mFlows = new ArrayList<>(); + /** * This {@link LifecycleRegistry} controls when dream overlay functionality, like touch * handling, should be active. It will automatically be paused when the dream overlay is hidden @@ -285,36 +292,27 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ mKeyguardUpdateMonitor.registerCallback(mKeyguardCallback); mStateController = stateController; mUiEventLogger = uiEventLogger; + mComplicationComponentFactory = complicationComponentFactory; + mDreamComplicationComponentFactory = dreamComplicationComponentFactory; mDreamOverlayCallbackController = dreamOverlayCallbackController; mWindowTitle = windowTitle; mCommunalInteractor = communalInteractor; mSystemDialogsCloser = systemDialogsCloser; mGestureInteractor = gestureInteractor; - - final ViewModelStore viewModelStore = new ViewModelStore(); - final Complication.Host host = - () -> mExecutor.execute(DreamOverlayService.this::requestExit); - - mComplicationComponent = complicationComponentFactory.create(lifecycleOwner, host, - viewModelStore, touchInsetManager); - mDreamComplicationComponent = dreamComplicationComponentFactory.create( - mComplicationComponent.getVisibilityController(), touchInsetManager); - mDreamOverlayComponent = dreamOverlayComponentFactory.create(lifecycleOwner, - mComplicationComponent.getComplicationHostViewController(), touchInsetManager); - mAmbientTouchComponent = ambientTouchComponentFactory.create(lifecycleOwner, - new HashSet<>(Arrays.asList( - mDreamComplicationComponent.getHideComplicationTouchHandler(), - mDreamOverlayComponent.getCommunalTouchHandler()))); + mDreamOverlayComponentFactory = dreamOverlayComponentFactory; + mAmbientTouchComponentFactory = ambientTouchComponentFactory; + mTouchInsetManager = touchInsetManager; + mLifecycleOwner = lifecycleOwner; mLifecycleRegistry = lifecycleOwner.getRegistry(); mExecutor.execute(() -> setLifecycleStateLocked(Lifecycle.State.CREATED)); - collectFlow(getLifecycle(), mCommunalInteractor.isCommunalAvailable(), - mIsCommunalAvailableCallback); - collectFlow(getLifecycle(), communalInteractor.isCommunalVisible(), - mCommunalVisibleConsumer); - collectFlow(getLifecycle(), keyguardInteractor.primaryBouncerShowing, - mBouncerShowingConsumer); + mFlows.add(collectFlow(getLifecycle(), mCommunalInteractor.isCommunalAvailable(), + mIsCommunalAvailableCallback)); + mFlows.add(collectFlow(getLifecycle(), communalInteractor.isCommunalVisible(), + mCommunalVisibleConsumer)); + mFlows.add(collectFlow(getLifecycle(), keyguardInteractor.primaryBouncerShowing, + mBouncerShowingConsumer)); } @NonNull @@ -339,6 +337,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ public void onDestroy() { mKeyguardUpdateMonitor.removeCallback(mKeyguardCallback); + for (Job job : mFlows) { + job.cancel(new CancellationException()); + } + mFlows.clear(); + mExecutor.execute(() -> { setLifecycleStateLocked(Lifecycle.State.DESTROYED); @@ -353,6 +356,23 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ @Override public void onStartDream(@NonNull WindowManager.LayoutParams layoutParams) { + final ComplicationComponent complicationComponent = mComplicationComponentFactory.create( + mLifecycleOwner, + () -> mExecutor.execute(DreamOverlayService.this::requestExit), + new ViewModelStore(), mTouchInsetManager); + final com.android.systemui.dreams.complication.dagger.ComplicationComponent + dreamComplicationComponent = mDreamComplicationComponentFactory.create( + complicationComponent.getVisibilityController(), mTouchInsetManager); + + final DreamOverlayComponent dreamOverlayComponent = mDreamOverlayComponentFactory.create( + mLifecycleOwner, complicationComponent.getComplicationHostViewController(), + mTouchInsetManager); + final AmbientTouchComponent ambientTouchComponent = mAmbientTouchComponentFactory.create( + mLifecycleOwner, + new HashSet<>(Arrays.asList( + dreamComplicationComponent.getHideComplicationTouchHandler(), + dreamOverlayComponent.getCommunalTouchHandler()))); + setLifecycleStateLocked(Lifecycle.State.STARTED); mUiEventLogger.log(DreamOverlayEvent.DREAM_OVERLAY_ENTER_START); @@ -371,8 +391,8 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ } mDreamOverlayContainerViewController = - mDreamOverlayComponent.getDreamOverlayContainerViewController(); - mTouchMonitor = mAmbientTouchComponent.getTouchMonitor(); + dreamOverlayComponent.getDreamOverlayContainerViewController(); + mTouchMonitor = ambientTouchComponent.getTouchMonitor(); mTouchMonitor.init(); mStateController.setShouldShowComplications(shouldShowComplications()); @@ -541,6 +561,10 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ } private void removeContainerViewFromParentLocked() { + if (mDreamOverlayContainerViewController == null) { + return; + } + View containerView = mDreamOverlayContainerViewController.getContainerView(); if (containerView == null) { return; @@ -559,8 +583,13 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ return; } + // This ensures the container view of the current dream is removed before + // the controller is potentially reset. + removeContainerViewFromParentLocked(); + if (mStarted && mWindow != null) { try { + mWindow.clearContentView(); mWindowManager.removeView(mWindow.getDecorView()); } catch (IllegalArgumentException e) { Log.e(TAG, "Error removing decor view when resetting overlay", e); @@ -571,7 +600,10 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ mStateController.setLowLightActive(false); mStateController.setEntryAnimationsFinished(false); - mDreamOverlayContainerViewController = null; + if (mDreamOverlayContainerViewController != null) { + mDreamOverlayContainerViewController.destroy(); + mDreamOverlayContainerViewController = null; + } if (mTouchMonitor != null) { mTouchMonitor.destroy(); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/CommunalTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/CommunalTouchHandler.java index ee7b6f52ac55..5ba780f9c99d 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/CommunalTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/CommunalTouchHandler.java @@ -33,7 +33,11 @@ import com.android.systemui.communal.domain.interactor.CommunalInteractor; import com.android.systemui.dreams.touch.dagger.CommunalTouchModule; import com.android.systemui.statusbar.phone.CentralSurfaces; +import kotlinx.coroutines.Job; + +import java.util.ArrayList; import java.util.Optional; +import java.util.concurrent.CancellationException; import java.util.function.Consumer; import javax.inject.Inject; @@ -49,6 +53,8 @@ public class CommunalTouchHandler implements TouchHandler { private final ConfigurationInteractor mConfigurationInteractor; private Boolean mIsEnabled = false; + private ArrayList<Job> mFlows = new ArrayList<>(); + private int mLayoutDirection = LayoutDirection.LTR; @VisibleForTesting @@ -70,17 +76,17 @@ public class CommunalTouchHandler implements TouchHandler { mCommunalInteractor = communalInteractor; mConfigurationInteractor = configurationInteractor; - collectFlow( + mFlows.add(collectFlow( mLifecycle, mCommunalInteractor.isCommunalAvailable(), mIsCommunalAvailableCallback - ); + )); - collectFlow( + mFlows.add(collectFlow( mLifecycle, mConfigurationInteractor.getLayoutDirection(), mLayoutDirectionCallback - ); + )); } @Override @@ -140,4 +146,13 @@ public class CommunalTouchHandler implements TouchHandler { } }); } + + @Override + public void onDestroy() { + for (Job job : mFlows) { + job.cancel(new CancellationException()); + } + mFlows.clear(); + TouchHandler.super.onDestroy(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/education/data/model/EduDeviceConnectionTime.kt b/packages/SystemUI/src/com/android/systemui/education/data/model/EduDeviceConnectionTime.kt new file mode 100644 index 000000000000..8682848eeea1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/education/data/model/EduDeviceConnectionTime.kt @@ -0,0 +1,24 @@ +/* + * Copyright 2024 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.education.data.model + +import java.time.Instant + +data class EduDeviceConnectionTime( + val keyboardFirstConnectionTime: Instant? = null, + val touchpadFirstConnectionTime: Instant? = null +) diff --git a/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt b/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt index 4fd79d764cdd..01f838ff1ea7 100644 --- a/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt @@ -29,6 +29,7 @@ import com.android.systemui.contextualeducation.GestureType import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.education.dagger.ContextualEducationModule.EduDataStoreScope +import com.android.systemui.education.data.model.EduDeviceConnectionTime import com.android.systemui.education.data.model.GestureEduModel import java.time.Instant import javax.inject.Inject @@ -53,10 +54,16 @@ interface ContextualEducationRepository { fun readGestureEduModelFlow(gestureType: GestureType): Flow<GestureEduModel> + fun readEduDeviceConnectionTime(): Flow<EduDeviceConnectionTime> + suspend fun updateGestureEduModel( gestureType: GestureType, transform: (GestureEduModel) -> GestureEduModel ) + + suspend fun updateEduDeviceConnectionTime( + transform: (EduDeviceConnectionTime) -> EduDeviceConnectionTime + ) } /** @@ -76,6 +83,8 @@ constructor( const val LAST_SHORTCUT_TRIGGERED_TIME_SUFFIX = "_LAST_SHORTCUT_TRIGGERED_TIME" const val USAGE_SESSION_START_TIME_SUFFIX = "_USAGE_SESSION_START_TIME" const val LAST_EDUCATION_TIME_SUFFIX = "_LAST_EDUCATION_TIME" + const val KEYBOARD_FIRST_CONNECTION_TIME = "KEYBOARD_FIRST_CONNECTION_TIME" + const val TOUCHPAD_FIRST_CONNECTION_TIME = "TOUCHPAD_FIRST_CONNECTION_TIME" const val DATASTORE_DIR = "education/USER%s_ContextualEducation" } @@ -158,6 +167,37 @@ constructor( } } + override fun readEduDeviceConnectionTime(): Flow<EduDeviceConnectionTime> = + prefData.map { preferences -> getEduDeviceConnectionTime(preferences) } + + override suspend fun updateEduDeviceConnectionTime( + transform: (EduDeviceConnectionTime) -> EduDeviceConnectionTime + ) { + datastore.filterNotNull().first().edit { preferences -> + val currentModel = getEduDeviceConnectionTime(preferences) + val updatedModel = transform(currentModel) + setInstant( + preferences, + updatedModel.keyboardFirstConnectionTime, + getKeyboardFirstConnectionTimeKey() + ) + setInstant( + preferences, + updatedModel.touchpadFirstConnectionTime, + getTouchpadFirstConnectionTimeKey() + ) + } + } + + private fun getEduDeviceConnectionTime(preferences: Preferences): EduDeviceConnectionTime { + return EduDeviceConnectionTime( + keyboardFirstConnectionTime = + preferences[getKeyboardFirstConnectionTimeKey()]?.let { Instant.ofEpochSecond(it) }, + touchpadFirstConnectionTime = + preferences[getTouchpadFirstConnectionTimeKey()]?.let { Instant.ofEpochSecond(it) } + ) + } + private fun getSignalCountKey(gestureType: GestureType): Preferences.Key<Int> = intPreferencesKey(gestureType.name + SIGNAL_COUNT_SUFFIX) @@ -173,6 +213,12 @@ constructor( private fun getLastEducationTimeKey(gestureType: GestureType): Preferences.Key<Long> = longPreferencesKey(gestureType.name + LAST_EDUCATION_TIME_SUFFIX) + private fun getKeyboardFirstConnectionTimeKey(): Preferences.Key<Long> = + longPreferencesKey(KEYBOARD_FIRST_CONNECTION_TIME) + + private fun getTouchpadFirstConnectionTimeKey(): Preferences.Key<Long> = + longPreferencesKey(TOUCHPAD_FIRST_CONNECTION_TIME) + private fun setInstant( preferences: MutablePreferences, instant: Instant?, diff --git a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/ContextualEducationInteractor.kt b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/ContextualEducationInteractor.kt index db5c386a6c65..10be26e1ce0f 100644 --- a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/ContextualEducationInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/ContextualEducationInteractor.kt @@ -22,6 +22,7 @@ import com.android.systemui.contextualeducation.GestureType.BACK import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.education.dagger.ContextualEducationModule.EduClock +import com.android.systemui.education.data.model.EduDeviceConnectionTime import com.android.systemui.education.data.model.GestureEduModel import com.android.systemui.education.data.repository.ContextualEducationRepository import com.android.systemui.user.domain.interactor.SelectedUserInteractor @@ -32,6 +33,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.launch @@ -67,6 +69,10 @@ constructor( .flowOn(backgroundDispatcher) } + suspend fun getEduDeviceConnectionTime(): EduDeviceConnectionTime { + return repository.readEduDeviceConnectionTime().first() + } + suspend fun incrementSignalCount(gestureType: GestureType) { repository.updateGestureEduModel(gestureType) { it.copy( @@ -100,4 +106,16 @@ constructor( it.copy(usageSessionStartTime = clock.instant(), signalCount = 1) } } + + suspend fun updateKeyboardFirstConnectionTime() { + repository.updateEduDeviceConnectionTime { + it.copy(keyboardFirstConnectionTime = clock.instant()) + } + } + + suspend fun updateTouchpadFirstConnectionTime() { + repository.updateEduDeviceConnectionTime { + it.copy(touchpadFirstConnectionTime = clock.instant()) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt index ad3335b7cdeb..e88349b2b664 100644 --- a/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractor.kt @@ -24,6 +24,7 @@ import com.android.systemui.education.dagger.ContextualEducationModule.EduClock import com.android.systemui.education.data.model.GestureEduModel import com.android.systemui.education.shared.model.EducationInfo import com.android.systemui.education.shared.model.EducationUiType +import com.android.systemui.inputdevice.data.repository.UserInputDeviceRepository import java.time.Clock import javax.inject.Inject import kotlin.time.Duration.Companion.hours @@ -39,6 +40,7 @@ class KeyboardTouchpadEduInteractor constructor( @Background private val backgroundScope: CoroutineScope, private val contextualEducationInteractor: ContextualEducationInteractor, + private val userInputDeviceRepository: UserInputDeviceRepository, @EduClock private val clock: Clock, ) : CoreStartable { @@ -61,6 +63,32 @@ constructor( } } } + + backgroundScope.launch { + userInputDeviceRepository.isAnyTouchpadConnectedForUser.collect { + if ( + it.isConnected && + contextualEducationInteractor + .getEduDeviceConnectionTime() + .touchpadFirstConnectionTime == null + ) { + contextualEducationInteractor.updateTouchpadFirstConnectionTime() + } + } + } + + backgroundScope.launch { + userInputDeviceRepository.isAnyKeyboardConnectedForUser.collect { + if ( + it.isConnected && + contextualEducationInteractor + .getEduDeviceConnectionTime() + .keyboardFirstConnectionTime == null + ) { + contextualEducationInteractor.updateKeyboardFirstConnectionTime() + } + } + } } private fun isEducationNeeded(model: GestureEduModel): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/graphics/ImageLoader.kt b/packages/SystemUI/src/com/android/systemui/graphics/ImageLoader.kt index 567bf70be3e1..ca43871415e6 100644 --- a/packages/SystemUI/src/com/android/systemui/graphics/ImageLoader.kt +++ b/packages/SystemUI/src/com/android/systemui/graphics/ImageLoader.kt @@ -35,6 +35,7 @@ import android.graphics.drawable.Icon import android.util.Log import android.util.Size import androidx.core.content.res.ResourcesCompat +import com.android.app.tracing.traceSection import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background @@ -162,20 +163,21 @@ constructor( @Px maxWidth: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, @Px maxHeight: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, allocator: Int = ImageDecoder.ALLOCATOR_DEFAULT - ): Bitmap? { - return try { - ImageDecoder.decodeBitmap(source) { decoder, info, _ -> - configureDecoderForMaximumSize(decoder, info.size, maxWidth, maxHeight) - decoder.allocator = allocator + ): Bitmap? = + traceSection("ImageLoader#loadBitmap") { + return try { + ImageDecoder.decodeBitmap(source) { decoder, info, _ -> + configureDecoderForMaximumSize(decoder, info.size, maxWidth, maxHeight) + decoder.allocator = allocator + } + } catch (e: IOException) { + Log.w(TAG, "Failed to load source $source", e) + return null + } catch (e: DecodeException) { + Log.w(TAG, "Failed to decode source $source", e) + return null } - } catch (e: IOException) { - Log.w(TAG, "Failed to load source $source", e) - return null - } catch (e: DecodeException) { - Log.w(TAG, "Failed to decode source $source", e) - return null } - } /** * Loads passed [Source] on a background thread and returns the [Drawable]. @@ -253,28 +255,31 @@ constructor( @Px maxWidth: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, @Px maxHeight: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, allocator: Int = ImageDecoder.ALLOCATOR_DEFAULT - ): Drawable? { - return try { - loadDrawableSync( - toImageDecoderSource(source, defaultContext), - maxWidth, - maxHeight, - allocator - ) - ?: - // If we have a resource, retry fallback using the "normal" Resource loading system. - // This will come into effect in cases like trying to load AnimatedVectorDrawable. - if (source is Res) { - val context = source.context ?: defaultContext - ResourcesCompat.getDrawable(context.resources, source.resId, context.theme) - } else { - null - } - } catch (e: NotFoundException) { - Log.w(TAG, "Couldn't load resource $source", e) - null + ): Drawable? = + traceSection("ImageLoader#loadDrawable") { + return try { + loadDrawableSync( + toImageDecoderSource(source, defaultContext), + maxWidth, + maxHeight, + allocator + ) + ?: + // If we have a resource, retry fallback using the "normal" Resource loading + // system. + // This will come into effect in cases like trying to load + // AnimatedVectorDrawable. + if (source is Res) { + val context = source.context ?: defaultContext + ResourcesCompat.getDrawable(context.resources, source.resId, context.theme) + } else { + null + } + } catch (e: NotFoundException) { + Log.w(TAG, "Couldn't load resource $source", e) + null + } } - } /** * Loads passed [ImageDecoder.Source] synchronously and returns the drawable. @@ -297,20 +302,21 @@ constructor( @Px maxWidth: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, @Px maxHeight: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, allocator: Int = ImageDecoder.ALLOCATOR_DEFAULT - ): Drawable? { - return try { - ImageDecoder.decodeDrawable(source) { decoder, info, _ -> - configureDecoderForMaximumSize(decoder, info.size, maxWidth, maxHeight) - decoder.allocator = allocator + ): Drawable? = + traceSection("ImageLoader#loadDrawable") { + return try { + ImageDecoder.decodeDrawable(source) { decoder, info, _ -> + configureDecoderForMaximumSize(decoder, info.size, maxWidth, maxHeight) + decoder.allocator = allocator + } + } catch (e: IOException) { + Log.w(TAG, "Failed to load source $source", e) + return null + } catch (e: DecodeException) { + Log.w(TAG, "Failed to decode source $source", e) + return null } - } catch (e: IOException) { - Log.w(TAG, "Failed to load source $source", e) - return null - } catch (e: DecodeException) { - Log.w(TAG, "Failed to decode source $source", e) - return null } - } /** Loads icon drawable while attempting to size restrict the drawable. */ @WorkerThread @@ -320,55 +326,59 @@ constructor( @Px maxWidth: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, @Px maxHeight: Int = DEFAULT_MAX_SAFE_BITMAP_SIZE_PX, allocator: Int = ImageDecoder.ALLOCATOR_DEFAULT - ): Drawable? { - return when (icon.type) { - Icon.TYPE_URI, - Icon.TYPE_URI_ADAPTIVE_BITMAP -> { - val source = ImageDecoder.createSource(context.contentResolver, icon.uri) - loadDrawableSync(source, maxWidth, maxHeight, allocator) - } - Icon.TYPE_RESOURCE -> { - val resources = resolveResourcesForIcon(context, icon) - resources?.let { + ): Drawable? = + traceSection("ImageLoader#loadDrawable") { + return when (icon.type) { + Icon.TYPE_URI, + Icon.TYPE_URI_ADAPTIVE_BITMAP -> { + val source = ImageDecoder.createSource(context.contentResolver, icon.uri) + loadDrawableSync(source, maxWidth, maxHeight, allocator) + } + Icon.TYPE_RESOURCE -> { + val resources = resolveResourcesForIcon(context, icon) + resources?.let { + loadDrawableSync( + ImageDecoder.createSource(it, icon.resId), + maxWidth, + maxHeight, + allocator + ) + } + // Fallback to non-ImageDecoder load if the attempt failed (e.g. the + // resource + // is a Vector drawable which ImageDecoder doesn't support.) + ?: loadIconDrawable(icon, context) + } + Icon.TYPE_BITMAP -> { + BitmapDrawable(context.resources, icon.bitmap) + } + Icon.TYPE_ADAPTIVE_BITMAP -> { + AdaptiveIconDrawable(null, BitmapDrawable(context.resources, icon.bitmap)) + } + Icon.TYPE_DATA -> { loadDrawableSync( - ImageDecoder.createSource(it, icon.resId), + ImageDecoder.createSource(icon.dataBytes, icon.dataOffset, icon.dataLength), maxWidth, maxHeight, allocator ) } - // Fallback to non-ImageDecoder load if the attempt failed (e.g. the resource - // is a Vector drawable which ImageDecoder doesn't support.) - ?: loadIconDrawable(icon, context) - } - Icon.TYPE_BITMAP -> { - BitmapDrawable(context.resources, icon.bitmap) - } - Icon.TYPE_ADAPTIVE_BITMAP -> { - AdaptiveIconDrawable(null, BitmapDrawable(context.resources, icon.bitmap)) - } - Icon.TYPE_DATA -> { - loadDrawableSync( - ImageDecoder.createSource(icon.dataBytes, icon.dataOffset, icon.dataLength), - maxWidth, - maxHeight, - allocator - ) - } - else -> { - // We don't recognize this icon, just fallback. - loadIconDrawable(icon, context) + else -> { + // We don't recognize this icon, just fallback. + loadIconDrawable(icon, context) + } + }?.let { drawable -> + // Icons carry tint which we need to propagate down to a Drawable. + tintDrawable(icon, drawable) + drawable } - }?.let { drawable -> - // Icons carry tint which we need to propagate down to a Drawable. - tintDrawable(icon, drawable) - drawable } - } @WorkerThread fun loadIconDrawable(icon: Icon, context: Context): Drawable? { - icon.loadDrawable(context)?.let { return it } + icon.loadDrawable(context)?.let { + return it + } Log.w(TAG, "Failed to load drawable for $icon") return null diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt index b1589dadb300..e68d79937063 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt @@ -39,7 +39,7 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.SharingStarted.Companion.Eagerly import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.buffer @@ -53,7 +53,7 @@ import kotlinx.coroutines.flow.stateIn /** Encapsulates state about device entry fingerprint auth mechanism. */ interface DeviceEntryFingerprintAuthRepository { /** Whether the device entry fingerprint auth is locked out. */ - val isLockedOut: Flow<Boolean> + val isLockedOut: StateFlow<Boolean> /** * Whether the fingerprint sensor is currently listening, this doesn't mean that the user is @@ -127,7 +127,7 @@ constructor( else if (authController.isRearFpsSupported) BiometricType.REAR_FINGERPRINT else null } - override val isLockedOut: Flow<Boolean> = + override val isLockedOut: StateFlow<Boolean> by lazy { conflatedCallbackFlow { val sendLockoutUpdate = fun() { @@ -151,7 +151,12 @@ constructor( sendLockoutUpdate() awaitClose { keyguardUpdateMonitor.removeCallback(callback) } } - .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) + .stateIn( + scope, + started = Eagerly, + initialValue = keyguardUpdateMonitor.isFingerprintLockedOut + ) + } override val isRunning: Flow<Boolean> get() = @@ -309,6 +314,7 @@ constructor( ) { sendShouldUpdateIndicatorVisibility(true) } + override fun onStrongAuthStateChanged(userId: Int) { sendShouldUpdateIndicatorVisibility(true) } @@ -318,7 +324,7 @@ constructor( awaitClose { keyguardUpdateMonitor.removeCallback(callback) } } .flowOn(mainDispatcher) - .shareIn(scope, started = SharingStarted.WhileSubscribed(), replay = 1) + .shareIn(scope, started = WhileSubscribed(), replay = 1) companion object { const val TAG = "DeviceEntryFingerprintAuthRepositoryImpl" diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt index 49e4c707af18..80a0cee4f319 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt @@ -34,7 +34,6 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor import com.android.systemui.keyguard.shared.model.BiometricUnlockMode.Companion.isWakeAndUnlock import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.power.shared.model.WakeSleepReason import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.util.kotlin.Utils.Companion.sample import com.android.systemui.util.kotlin.sample @@ -155,12 +154,7 @@ constructor( if (!SceneContainerFlag.isEnabled) { startTransitionTo(KeyguardState.GLANCEABLE_HUB) } - } else if ( - powerInteractor.detailedWakefulness.value.lastWakeReason == - WakeSleepReason.POWER_BUTTON && - isCommunalAvailable && - dreamManager.canStartDreaming(true) - ) { + } else if (isCommunalAvailable && dreamManager.canStartDreaming(true)) { // This case handles tapping the power button to transition through // dream -> off -> hub. if (!SceneContainerFlag.isEnabled) { @@ -226,14 +220,7 @@ constructor( ownerReason = "waking from dozing" ) } - } else if ( - powerInteractor.detailedWakefulness.value.lastWakeReason == - WakeSleepReason.POWER_BUTTON && - isCommunalAvailable && - dreamManager.canStartDreaming(true) - ) { - // This case handles tapping the power button to transition through - // dream -> off -> hub. + } else if (isCommunalAvailable && dreamManager.canStartDreaming(true)) { if (!SceneContainerFlag.isEnabled) { transitionToGlanceableHub() } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt index 4cab2bb5dba8..a96d7a8f0997 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.domain.interactor import android.app.StatusBarManager import android.graphics.Point +import android.util.Log import android.util.MathUtils import com.android.app.animation.Interpolators import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository @@ -38,6 +39,7 @@ import com.android.systemui.keyguard.shared.model.Edge import com.android.systemui.keyguard.shared.model.KeyguardState.AOD import com.android.systemui.keyguard.shared.model.KeyguardState.GONE import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN +import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED import com.android.systemui.keyguard.shared.model.StatusBarState import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.res.R @@ -87,6 +89,7 @@ constructor( sceneInteractorProvider: Provider<SceneInteractor>, private val fromGoneTransitionInteractor: Provider<FromGoneTransitionInteractor>, private val fromLockscreenTransitionInteractor: Provider<FromLockscreenTransitionInteractor>, + private val fromOccludedTransitionInteractor: Provider<FromOccludedTransitionInteractor>, sharedNotificationContainerInteractor: Provider<SharedNotificationContainerInteractor>, @Application applicationScope: CoroutineScope, ) { @@ -484,7 +487,11 @@ constructor( /** Temporary shim, until [KeyguardWmStateRefactor] is enabled */ fun dismissKeyguard() { - fromLockscreenTransitionInteractor.get().dismissKeyguard() + when (keyguardTransitionInteractor.transitionState.value.to) { + LOCKSCREEN -> fromLockscreenTransitionInteractor.get().dismissKeyguard() + OCCLUDED -> fromOccludedTransitionInteractor.get().dismissFromOccluded() + else -> Log.v(TAG, "Keyguard was dismissed, no direct transition call needed") + } } fun onCameraLaunchDetected(source: Int) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt index cd49c6a4d2e0..4a8ada7f1184 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt @@ -27,6 +27,7 @@ import com.android.internal.logging.UiEventLogger import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.data.repository.KeyguardRepository @@ -67,6 +68,7 @@ constructor( broadcastDispatcher: BroadcastDispatcher, private val accessibilityManager: AccessibilityManagerWrapper, private val pulsingGestureListener: PulsingGestureListener, + private val faceAuthInteractor: DeviceEntryFaceAuthInteractor, ) { /** Whether the long-press handling feature should be enabled. */ val isLongPressHandlingEnabled: StateFlow<Boolean> = @@ -129,7 +131,8 @@ constructor( } } - /** Notifies that the user has long-pressed on the lock screen. + /** + * Notifies that the user has long-pressed on the lock screen. * * @param isA11yAction: Whether the action was performed as an a11y action */ @@ -174,6 +177,7 @@ constructor( /** Notifies that the lockscreen has been clicked at position [x], [y]. */ fun onClick(x: Float, y: Float) { pulsingGestureListener.onSingleTapUp(x, y) + faceAuthInteractor.onNotificationPanelClicked() } /** Notifies that the lockscreen has been double clicked. */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt index 54964d6ec768..a96869df001a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt @@ -162,30 +162,26 @@ constructor( private val alphaOnShadeExpansion: Flow<Float> = combineTransform( - keyguardTransitionInteractor.isInTransition( - edge = Edge.create(from = LOCKSCREEN, to = Scenes.Gone), - edgeWithoutSceneContainer = Edge.create(from = LOCKSCREEN, to = GONE), - ), - keyguardTransitionInteractor.isInTransition( - edge = Edge.create(from = Scenes.Bouncer, to = LOCKSCREEN), - edgeWithoutSceneContainer = - Edge.create(from = PRIMARY_BOUNCER, to = LOCKSCREEN), + anyOf( + keyguardTransitionInteractor.isInTransition( + edge = Edge.create(from = LOCKSCREEN, to = Scenes.Gone), + edgeWithoutSceneContainer = Edge.create(from = LOCKSCREEN, to = GONE), + ), + keyguardTransitionInteractor.isInTransition( + edge = Edge.create(from = Scenes.Bouncer, to = LOCKSCREEN), + edgeWithoutSceneContainer = + Edge.create(from = PRIMARY_BOUNCER, to = LOCKSCREEN), + ), + keyguardTransitionInteractor.isInTransition( + Edge.create(from = LOCKSCREEN, to = DREAMING) + ), ), isOnLockscreen, shadeInteractor.qsExpansion, shadeInteractor.shadeExpansion, - ) { - lockscreenToGoneTransitionRunning, - primaryBouncerToLockscreenTransitionRunning, - isOnLockscreen, - qsExpansion, - shadeExpansion -> + ) { disabledTransitionRunning, isOnLockscreen, qsExpansion, shadeExpansion -> // Fade out quickly as the shade expands - if ( - isOnLockscreen && - !lockscreenToGoneTransitionRunning && - !primaryBouncerToLockscreenTransitionRunning - ) { + if (isOnLockscreen && !disabledTransitionRunning) { val alpha = 1f - MathUtils.constrainedMap( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModel.kt index 666c9f8e243b..3e6dd8e6c007 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModel.kt @@ -20,6 +20,7 @@ import android.content.res.Resources import com.android.compose.animation.scene.ContentKey import com.android.internal.annotations.VisibleForTesting import com.android.systemui.biometrics.AuthController +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardBlueprintInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor import com.android.systemui.keyguard.shared.model.ClockSize @@ -57,6 +58,7 @@ constructor( private val shadeInteractor: ShadeInteractor, private val unfoldTransitionInteractor: UnfoldTransitionInteractor, private val occlusionInteractor: SceneContainerOcclusionInteractor, + private val deviceEntryInteractor: DeviceEntryInteractor, ) : SysUiViewModel() { @VisibleForTesting val clockSize = clockInteractor.clockSize @@ -73,6 +75,10 @@ constructor( /** Whether the content of the scene UI should be shown. */ val isContentVisible: StateFlow<Boolean> = _isContentVisible.asStateFlow() + /** @see DeviceEntryInteractor.isBypassEnabled */ + val isBypassEnabled: StateFlow<Boolean> + get() = deviceEntryInteractor.isBypassEnabled + override suspend fun onActivated(): Nothing { coroutineScope { launch { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt index 143d66b69f57..24c57bea8bec 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt @@ -16,9 +16,8 @@ package com.android.systemui.media.controls.domain.pipeline +import android.annotation.MainThread import android.annotation.SuppressLint -import android.app.ActivityOptions -import android.app.BroadcastOptions import android.app.Notification import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME import android.app.PendingIntent @@ -39,7 +38,6 @@ import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.graphics.Bitmap import android.graphics.ImageDecoder -import android.graphics.drawable.Animatable import android.graphics.drawable.Icon import android.media.MediaDescription import android.media.MediaMetadata @@ -62,8 +60,10 @@ import com.android.internal.annotations.Keep import com.android.internal.logging.InstanceId import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.Dumpable +import com.android.systemui.Flags import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager @@ -86,7 +86,6 @@ import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.BcSmartspaceDataPlugin import com.android.systemui.res.R -import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState import com.android.systemui.statusbar.notification.row.HybridGroupManager import com.android.systemui.tuner.TunerService @@ -97,8 +96,13 @@ import com.android.systemui.util.concurrency.ThreadFactory import com.android.systemui.util.time.SystemClock import java.io.IOException import java.io.PrintWriter +import java.util.Collections import java.util.concurrent.Executor import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext // URI fields to try loading album art from private val ART_URIS = @@ -167,8 +171,11 @@ private fun allowMediaRecommendations(context: Context): Boolean { class LegacyMediaDataManagerImpl( private val context: Context, @Background private val backgroundExecutor: Executor, + @Background private val backgroundDispatcher: CoroutineDispatcher, @Main private val uiExecutor: Executor, @Main private val foregroundExecutor: DelayableExecutor, + @Main private val mainDispatcher: CoroutineDispatcher, + @Application private val applicationScope: CoroutineScope, private val mediaControllerFactory: MediaControllerFactory, private val broadcastDispatcher: BroadcastDispatcher, dumpManager: DumpManager, @@ -188,6 +195,7 @@ class LegacyMediaDataManagerImpl( private val logger: MediaUiEventLogger, private val smartspaceManager: SmartspaceManager?, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, + private val mediaDataLoader: dagger.Lazy<MediaDataLoader>, ) : Dumpable, BcSmartspaceDataPlugin.SmartspaceTargetListener, MediaDataManager { companion object { @@ -219,7 +227,12 @@ class LegacyMediaDataManagerImpl( // listeners are listeners that depend on MediaDataManager. // TODO(b/159539991#comment5): Move internal listeners to separate package. private val internalListeners: MutableSet<MediaDataManager.Listener> = mutableSetOf() - private val mediaEntries: LinkedHashMap<String, MediaData> = LinkedHashMap() + private val mediaEntries: MutableMap<String, MediaData> = + if (Flags.mediaLoadMetadataViaMediaDataLoader()) { + Collections.synchronizedMap(LinkedHashMap()) + } else { + LinkedHashMap() + } // There should ONLY be at most one Smartspace media recommendation. var smartspaceMediaData: SmartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA @Keep private var smartspaceSession: SmartspaceSession? = null @@ -245,8 +258,11 @@ class LegacyMediaDataManagerImpl( constructor( context: Context, threadFactory: ThreadFactory, + @Background backgroundDispatcher: CoroutineDispatcher, @Main uiExecutor: Executor, @Main foregroundExecutor: DelayableExecutor, + @Main mainDispatcher: CoroutineDispatcher, + @Application applicationScope: CoroutineScope, mediaControllerFactory: MediaControllerFactory, dumpManager: DumpManager, broadcastDispatcher: BroadcastDispatcher, @@ -264,13 +280,17 @@ class LegacyMediaDataManagerImpl( logger: MediaUiEventLogger, smartspaceManager: SmartspaceManager?, keyguardUpdateMonitor: KeyguardUpdateMonitor, + mediaDataLoader: dagger.Lazy<MediaDataLoader>, ) : this( context, // Loading bitmap for UMO background can take longer time, so it cannot run on the default // background thread. Use a custom thread for media. threadFactory.buildExecutorOnNewThread(TAG), + backgroundDispatcher, uiExecutor, foregroundExecutor, + mainDispatcher, + applicationScope, mediaControllerFactory, broadcastDispatcher, dumpManager, @@ -290,6 +310,7 @@ class LegacyMediaDataManagerImpl( logger, smartspaceManager, keyguardUpdateMonitor, + mediaDataLoader, ) private val appChangeReceiver = @@ -464,16 +485,31 @@ class LegacyMediaDataManagerImpl( logSingleVsMultipleMediaAdded(appUid, packageName, instanceId) logger.logResumeMediaAdded(appUid, packageName, instanceId) } - backgroundExecutor.execute { - loadMediaDataInBgForResumption( - userId, - desc, - action, - token, - appName, - appIntent, - packageName - ) + + if (Flags.mediaLoadMetadataViaMediaDataLoader()) { + applicationScope.launch { + loadMediaDataForResumption( + userId, + desc, + action, + token, + appName, + appIntent, + packageName + ) + } + } else { + backgroundExecutor.execute { + loadMediaDataInBgForResumption( + userId, + desc, + action, + token, + appName, + appIntent, + packageName + ) + } } } @@ -498,9 +534,90 @@ class LegacyMediaDataManagerImpl( oldKey: String?, isNewlyActiveEntry: Boolean = false, ) { - backgroundExecutor.execute { loadMediaDataInBg(key, sbn, oldKey, isNewlyActiveEntry) } + if (Flags.mediaLoadMetadataViaMediaDataLoader()) { + applicationScope.launch { + loadMediaDataWithLoader(key, sbn, oldKey, isNewlyActiveEntry) + } + } else { + backgroundExecutor.execute { loadMediaDataInBg(key, sbn, oldKey, isNewlyActiveEntry) } + } } + private suspend fun loadMediaDataWithLoader( + key: String, + sbn: StatusBarNotification, + oldKey: String?, + isNewlyActiveEntry: Boolean = false, + ) = + withContext(backgroundDispatcher) { + val lastActive = systemClock.elapsedRealtime() + val result = mediaDataLoader.get().loadMediaData(key, sbn) + if (result == null) { + Log.d(TAG, "No result from loadMediaData") + return@withContext + } + + val currentEntry = mediaEntries[key] + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + val resumeAction: Runnable? = currentEntry?.resumeAction + val hasCheckedForResume = currentEntry?.hasCheckedForResume == true + val active = currentEntry?.active ?: true + + // We need to log the correct media added. + if (isNewlyActiveEntry) { + logSingleVsMultipleMediaAdded(result.appUid, sbn.packageName, instanceId) + logger.logActiveMediaAdded( + result.appUid, + sbn.packageName, + instanceId, + result.playbackLocation + ) + } else if (result.playbackLocation != currentEntry?.playbackLocation) { + logger.logPlaybackLocationChange( + result.appUid, + sbn.packageName, + instanceId, + result.playbackLocation + ) + } + + withContext(mainDispatcher) { + onMediaDataLoaded( + key, + oldKey, + MediaData( + userId = sbn.normalizedUserId, + initialized = true, + app = result.appName, + appIcon = result.appIcon, + artist = result.artist, + song = result.song, + artwork = result.artworkIcon, + actions = result.actionIcons, + actionsToShowInCompact = result.actionsToShowInCompact, + semanticActions = result.semanticActions, + packageName = sbn.packageName, + token = result.token, + clickIntent = result.clickIntent, + device = result.device, + active = active, + resumeAction = resumeAction, + playbackLocation = result.playbackLocation, + notificationKey = key, + hasCheckedForResume = hasCheckedForResume, + isPlaying = result.isPlaying, + isClearable = !sbn.isOngoing, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = result.appUid, + isExplicit = result.isExplicit, + ) + ) + } + } + /** Add a listener for changes in this class */ override fun addListener(listener: MediaDataManager.Listener) { // mediaDataFilter is the current end of the internal pipeline. Register external @@ -697,6 +814,75 @@ class LegacyMediaDataManagerImpl( notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) } + private suspend fun loadMediaDataForResumption( + userId: Int, + desc: MediaDescription, + resumeAction: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) = + withContext(backgroundDispatcher) { + val lastActive = systemClock.elapsedRealtime() + val currentEntry = mediaEntries[packageName] + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + val result = + mediaDataLoader + .get() + .loadMediaDataForResumption( + userId, + desc, + resumeAction, + currentEntry, + token, + appName, + appIntent, + packageName + ) + if (result == null || desc.title.isNullOrBlank()) { + Log.d(TAG, "No MediaData result for resumption") + mediaEntries.remove(packageName) + return@withContext + } + + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + withContext(mainDispatcher) { + onMediaDataLoaded( + packageName, + null, + MediaData( + userId = userId, + initialized = true, + app = result.appName, + appIcon = null, + artist = result.artist, + song = result.song, + artwork = result.artworkIcon, + actions = result.actionIcons, + actionsToShowInCompact = result.actionsToShowInCompact, + semanticActions = result.semanticActions, + packageName = packageName, + token = result.token, + clickIntent = result.clickIntent, + device = result.device, + active = false, + resumeAction = resumeAction, + resumption = true, + notificationKey = packageName, + hasCheckedForResume = true, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = result.appUid, + isExplicit = result.isExplicit, + resumeProgress = result.resumeProgress, + ) + ) + } + } + + @Deprecated("Cleanup when media_load_metadata_via_media_data_loader is cleaned up") private fun loadMediaDataInBgForResumption( userId: Int, desc: MediaDescription, @@ -780,6 +966,7 @@ class LegacyMediaDataManagerImpl( } } + @Deprecated("Cleanup when media_load_metadata_via_media_data_loader is cleaned up") fun loadMediaDataInBg( key: String, sbn: StatusBarNotification, @@ -802,8 +989,7 @@ class LegacyMediaDataManagerImpl( notif.extras.getParcelable( Notification.EXTRA_BUILDER_APPLICATION_INFO, ApplicationInfo::class.java - ) - ?: getAppInfoFromPackage(sbn.packageName) + ) ?: getAppInfoFromPackage(sbn.packageName) // App name val appName = getAppName(sbn, appInfo) @@ -894,7 +1080,7 @@ class LegacyMediaDataManagerImpl( var actionsToShowCollapsed: List<Int> = emptyList() val semanticActions = createActionsFromState(sbn.packageName, mediaController, sbn.user) if (semanticActions == null) { - val actions = createActionsFromNotification(sbn) + val actions = createActionsFromNotification(context, activityStarter, sbn) actionIcons = actions.first actionsToShowCollapsed = actions.second } @@ -975,6 +1161,7 @@ class LegacyMediaDataManagerImpl( } } + @Deprecated("Cleanup when media_load_metadata_via_media_data_loader is cleaned up") private fun getAppInfoFromPackage(packageName: String): ApplicationInfo? { try { return context.packageManager.getApplicationInfo(packageName, 0) @@ -984,6 +1171,7 @@ class LegacyMediaDataManagerImpl( return null } + @Deprecated("Cleanup when media_load_metadata_via_media_data_loader is cleaned up") private fun getAppName(sbn: StatusBarNotification, appInfo: ApplicationInfo?): String { val name = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME) if (name != null) { @@ -997,264 +1185,19 @@ class LegacyMediaDataManagerImpl( } } - /** Generate action buttons based on notification actions */ - private fun createActionsFromNotification( - sbn: StatusBarNotification - ): Pair<List<MediaAction>, List<Int>> { - val notif = sbn.notification - val actionIcons: MutableList<MediaAction> = ArrayList() - val actions = notif.actions - var actionsToShowCollapsed = - notif.extras.getIntArray(Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() - ?: mutableListOf() - if (actionsToShowCollapsed.size > MAX_COMPACT_ACTIONS) { - Log.e( - TAG, - "Too many compact actions for ${sbn.key}," + - "limiting to first $MAX_COMPACT_ACTIONS" - ) - actionsToShowCollapsed = actionsToShowCollapsed.subList(0, MAX_COMPACT_ACTIONS) - } - - if (actions != null) { - for ((index, action) in actions.withIndex()) { - if (index == MAX_NOTIFICATION_ACTIONS) { - Log.w( - TAG, - "Too many notification actions for ${sbn.key}," + - " limiting to first $MAX_NOTIFICATION_ACTIONS" - ) - break - } - if (action.getIcon() == null) { - if (DEBUG) Log.i(TAG, "No icon for action $index ${action.title}") - actionsToShowCollapsed.remove(index) - continue - } - val runnable = - if (action.actionIntent != null) { - Runnable { - if (action.actionIntent.isActivity) { - activityStarter.startPendingIntentDismissingKeyguard( - action.actionIntent - ) - } else if (action.isAuthenticationRequired()) { - activityStarter.dismissKeyguardThenExecute( - { - var result = sendPendingIntent(action.actionIntent) - result - }, - {}, - true - ) - } else { - sendPendingIntent(action.actionIntent) - } - } - } else { - null - } - val mediaActionIcon = - if (action.getIcon()?.getType() == Icon.TYPE_RESOURCE) { - Icon.createWithResource(sbn.packageName, action.getIcon()!!.getResId()) - } else { - action.getIcon() - } - .setTint(themeText) - .loadDrawable(context) - val mediaAction = MediaAction(mediaActionIcon, runnable, action.title, null) - actionIcons.add(mediaAction) - } - } - return Pair(actionIcons, actionsToShowCollapsed) - } - - /** - * Generates action button info for this media session based on the PlaybackState - * - * @param packageName Package name for the media app - * @param controller MediaController for the current session - * @return a Pair consisting of a list of media actions, and a list of ints representing which - * - * ``` - * of those actions should be shown in the compact player - * ``` - */ private fun createActionsFromState( packageName: String, controller: MediaController, user: UserHandle ): MediaButton? { - val state = controller.playbackState - if (state == null || !mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { - return null - } - - // First, check for standard actions - val playOrPause = - if (isConnectingState(state.state)) { - // Spinner needs to be animating to render anything. Start it here. - val drawable = - context.getDrawable(com.android.internal.R.drawable.progress_small_material) - (drawable as Animatable).start() - MediaAction( - drawable, - null, // no action to perform when clicked - context.getString(R.string.controls_media_button_connecting), - context.getDrawable(R.drawable.ic_media_connecting_container), - // Specify a rebind id to prevent the spinner from restarting on later binds. - com.android.internal.R.drawable.progress_small_material - ) - } else if (isPlayingState(state.state)) { - getStandardAction(controller, state.actions, PlaybackState.ACTION_PAUSE) - } else { - getStandardAction(controller, state.actions, PlaybackState.ACTION_PLAY) - } - val prevButton = - getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_PREVIOUS) - val nextButton = - getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_NEXT) - - // Then, create a way to build any custom actions that will be needed - val customActions = - state.customActions - .asSequence() - .filterNotNull() - .map { getCustomAction(state, packageName, controller, it) } - .iterator() - fun nextCustomAction() = if (customActions.hasNext()) customActions.next() else null - - // Finally, assign the remaining button slots: play/pause A B C D - // A = previous, else custom action (if not reserved) - // B = next, else custom action (if not reserved) - // C and D are always custom actions - val reservePrev = - controller.extras?.getBoolean( - MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV - ) == true - val reserveNext = - controller.extras?.getBoolean( - MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT - ) == true - - val prevOrCustom = - if (prevButton != null) { - prevButton - } else if (!reservePrev) { - nextCustomAction() - } else { - null - } - - val nextOrCustom = - if (nextButton != null) { - nextButton - } else if (!reserveNext) { - nextCustomAction() - } else { - null - } - - return MediaButton( - playOrPause, - nextOrCustom, - prevOrCustom, - nextCustomAction(), - nextCustomAction(), - reserveNext, - reservePrev - ) - } - - /** - * Create a [MediaAction] for a given action and media session - * - * @param controller MediaController for the session - * @param stateActions The actions included with the session's [PlaybackState] - * @param action A [PlaybackState.Actions] value representing what action to generate. One of: - * ``` - * [PlaybackState.ACTION_PLAY] - * [PlaybackState.ACTION_PAUSE] - * [PlaybackState.ACTION_SKIP_TO_PREVIOUS] - * [PlaybackState.ACTION_SKIP_TO_NEXT] - * @return - * ``` - * - * A [MediaAction] with correct values set, or null if the state doesn't support it - */ - private fun getStandardAction( - controller: MediaController, - stateActions: Long, - @PlaybackState.Actions action: Long - ): MediaAction? { - if (!includesAction(stateActions, action)) { + if (!mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { return null } - - return when (action) { - PlaybackState.ACTION_PLAY -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_play), - { controller.transportControls.play() }, - context.getString(R.string.controls_media_button_play), - context.getDrawable(R.drawable.ic_media_play_container) - ) - } - PlaybackState.ACTION_PAUSE -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_pause), - { controller.transportControls.pause() }, - context.getString(R.string.controls_media_button_pause), - context.getDrawable(R.drawable.ic_media_pause_container) - ) - } - PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_prev), - { controller.transportControls.skipToPrevious() }, - context.getString(R.string.controls_media_button_prev), - null - ) - } - PlaybackState.ACTION_SKIP_TO_NEXT -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_next), - { controller.transportControls.skipToNext() }, - context.getString(R.string.controls_media_button_next), - null - ) - } - else -> null - } - } - - /** Check whether the actions from a [PlaybackState] include a specific action */ - private fun includesAction(stateActions: Long, @PlaybackState.Actions action: Long): Boolean { - if ( - (action == PlaybackState.ACTION_PLAY || action == PlaybackState.ACTION_PAUSE) && - (stateActions and PlaybackState.ACTION_PLAY_PAUSE > 0L) - ) { - return true - } - return (stateActions and action != 0L) - } - - /** Get a [MediaAction] representing a [PlaybackState.CustomAction] */ - private fun getCustomAction( - state: PlaybackState, - packageName: String, - controller: MediaController, - customAction: PlaybackState.CustomAction - ): MediaAction { - return MediaAction( - Icon.createWithResource(packageName, customAction.icon).loadDrawable(context), - { controller.transportControls.sendCustomAction(customAction, customAction.extras) }, - customAction.name, - null - ) + return createActionsFromState(context, packageName, controller) } /** Load a bitmap from the various Art metadata URIs */ + @Deprecated("Cleanup when media_load_metadata_via_media_data_loader is cleaned up") private fun loadBitmapFromUri(metadata: MediaMetadata): Bitmap? { for (uri in ART_URIS) { val uriString = metadata.getString(uri) @@ -1269,21 +1212,6 @@ class LegacyMediaDataManagerImpl( return null } - private fun sendPendingIntent(intent: PendingIntent): Boolean { - return try { - val options = BroadcastOptions.makeBasic() - options.setInteractive(true) - options.setPendingIntentBackgroundActivityStartMode( - ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED - ) - intent.send(options.toBundle()) - true - } catch (e: PendingIntent.CanceledException) { - Log.d(TAG, "Intent canceled", e) - false - } - } - /** Returns a bitmap if the user can access the given URI, else null */ private fun loadBitmapFromUriForUser( uri: Uri, @@ -1364,6 +1292,7 @@ class LegacyMediaDataManagerImpl( ) } + @MainThread fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) = traceSection("MediaDataManager#onMediaDataLoaded") { Assert.isMainThread() @@ -1619,6 +1548,7 @@ class LegacyMediaDataManagerImpl( * - If resumption is disabled, we only want to show active players */ override fun hasAnyMedia() = mediaDataFilter.hasAnyMedia() + override fun isRecommendationActive() = smartspaceMediaData.isActive /** diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaActions.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaActions.kt new file mode 100644 index 000000000000..70189b79ea58 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaActions.kt @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.ActivityOptions +import android.app.BroadcastOptions +import android.app.Notification +import android.app.PendingIntent +import android.content.Context +import android.graphics.drawable.Animatable +import android.graphics.drawable.Icon +import android.media.session.MediaController +import android.media.session.PlaybackState +import android.service.notification.StatusBarNotification +import android.util.Log +import androidx.media.utils.MediaConstants +import com.android.systemui.media.controls.domain.pipeline.LegacyMediaDataManagerImpl.Companion.MAX_COMPACT_ACTIONS +import com.android.systemui.media.controls.domain.pipeline.LegacyMediaDataManagerImpl.Companion.MAX_NOTIFICATION_ACTIONS +import com.android.systemui.media.controls.shared.model.MediaAction +import com.android.systemui.media.controls.shared.model.MediaButton +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.res.R +import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState +import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState +import com.android.systemui.util.kotlin.logI + +private const val TAG = "MediaActions" + +/** + * Generates action button info for this media session based on the PlaybackState + * + * @param packageName Package name for the media app + * @param controller MediaController for the current session + * @return a Pair consisting of a list of media actions, and a list of ints representing which of + * those actions should be shown in the compact player + */ +fun createActionsFromState( + context: Context, + packageName: String, + controller: MediaController, +): MediaButton? { + val state = controller.playbackState ?: return null + // First, check for standard actions + val playOrPause = + if (isConnectingState(state.state)) { + // Spinner needs to be animating to render anything. Start it here. + val drawable = + context.getDrawable(com.android.internal.R.drawable.progress_small_material) + (drawable as Animatable).start() + MediaAction( + drawable, + null, // no action to perform when clicked + context.getString(R.string.controls_media_button_connecting), + context.getDrawable(R.drawable.ic_media_connecting_container), + // Specify a rebind id to prevent the spinner from restarting on later binds. + com.android.internal.R.drawable.progress_small_material + ) + } else if (isPlayingState(state.state)) { + getStandardAction(context, controller, state.actions, PlaybackState.ACTION_PAUSE) + } else { + getStandardAction(context, controller, state.actions, PlaybackState.ACTION_PLAY) + } + val prevButton = + getStandardAction(context, controller, state.actions, PlaybackState.ACTION_SKIP_TO_PREVIOUS) + val nextButton = + getStandardAction(context, controller, state.actions, PlaybackState.ACTION_SKIP_TO_NEXT) + + // Then, create a way to build any custom actions that will be needed + val customActions = + state.customActions + .asSequence() + .filterNotNull() + .map { getCustomAction(context, packageName, controller, it) } + .iterator() + fun nextCustomAction() = if (customActions.hasNext()) customActions.next() else null + + // Finally, assign the remaining button slots: play/pause A B C D + // A = previous, else custom action (if not reserved) + // B = next, else custom action (if not reserved) + // C and D are always custom actions + val reservePrev = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV + ) == true + val reserveNext = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT + ) == true + + val prevOrCustom = + if (prevButton != null) { + prevButton + } else if (!reservePrev) { + nextCustomAction() + } else { + null + } + + val nextOrCustom = + if (nextButton != null) { + nextButton + } else if (!reserveNext) { + nextCustomAction() + } else { + null + } + + return MediaButton( + playOrPause, + nextOrCustom, + prevOrCustom, + nextCustomAction(), + nextCustomAction(), + reserveNext, + reservePrev + ) +} + +/** + * Create a [MediaAction] for a given action and media session + * + * @param controller MediaController for the session + * @param stateActions The actions included with the session's [PlaybackState] + * @param action A [PlaybackState.Actions] value representing what action to generate. One of: + * [PlaybackState.ACTION_PLAY] [PlaybackState.ACTION_PAUSE] + * [PlaybackState.ACTION_SKIP_TO_PREVIOUS] [PlaybackState.ACTION_SKIP_TO_NEXT] + * @return A [MediaAction] with correct values set, or null if the state doesn't support it + */ +private fun getStandardAction( + context: Context, + controller: MediaController, + stateActions: Long, + @PlaybackState.Actions action: Long +): MediaAction? { + if (!includesAction(stateActions, action)) { + return null + } + + return when (action) { + PlaybackState.ACTION_PLAY -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_play), + { controller.transportControls.play() }, + context.getString(R.string.controls_media_button_play), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + PlaybackState.ACTION_PAUSE -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_pause), + { controller.transportControls.pause() }, + context.getString(R.string.controls_media_button_pause), + context.getDrawable(R.drawable.ic_media_pause_container) + ) + } + PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_prev), + { controller.transportControls.skipToPrevious() }, + context.getString(R.string.controls_media_button_prev), + null + ) + } + PlaybackState.ACTION_SKIP_TO_NEXT -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_next), + { controller.transportControls.skipToNext() }, + context.getString(R.string.controls_media_button_next), + null + ) + } + else -> null + } +} + +/** Get a [MediaAction] representing a [PlaybackState.CustomAction] */ +private fun getCustomAction( + context: Context, + packageName: String, + controller: MediaController, + customAction: PlaybackState.CustomAction +): MediaAction { + return MediaAction( + Icon.createWithResource(packageName, customAction.icon).loadDrawable(context), + { controller.transportControls.sendCustomAction(customAction, customAction.extras) }, + customAction.name, + null + ) +} + +/** Check whether the actions from a [PlaybackState] include a specific action */ +private fun includesAction(stateActions: Long, @PlaybackState.Actions action: Long): Boolean { + if ( + (action == PlaybackState.ACTION_PLAY || action == PlaybackState.ACTION_PAUSE) && + (stateActions and PlaybackState.ACTION_PLAY_PAUSE > 0L) + ) { + return true + } + return (stateActions and action != 0L) +} + +/** Generate action buttons based on notification actions */ +fun createActionsFromNotification( + context: Context, + activityStarter: ActivityStarter, + sbn: StatusBarNotification +): Pair<List<MediaAction>, List<Int>> { + val notif = sbn.notification + val actionIcons: MutableList<MediaAction> = ArrayList() + val actions = notif.actions + var actionsToShowCollapsed = + notif.extras.getIntArray(Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() + ?: mutableListOf() + if (actionsToShowCollapsed.size > MAX_COMPACT_ACTIONS) { + Log.e( + TAG, + "Too many compact actions for ${sbn.key}, limiting to first $MAX_COMPACT_ACTIONS" + ) + actionsToShowCollapsed = actionsToShowCollapsed.subList(0, MAX_COMPACT_ACTIONS) + } + + actions?.let { + if (it.size > MAX_NOTIFICATION_ACTIONS) { + Log.w( + TAG, + "Too many notification actions for ${sbn.key}, " + + "limiting to first $MAX_NOTIFICATION_ACTIONS" + ) + } + + for ((index, action) in it.take(MAX_NOTIFICATION_ACTIONS).withIndex()) { + if (action.getIcon() == null) { + logI(TAG) { "No icon for action $index ${action.title}" } + actionsToShowCollapsed.remove(index) + continue + } + + val runnable = + action.actionIntent?.let { actionIntent -> + Runnable { + when { + actionIntent.isActivity -> + activityStarter.startPendingIntentDismissingKeyguard( + action.actionIntent + ) + action.isAuthenticationRequired -> + activityStarter.dismissKeyguardThenExecute( + { sendPendingIntent(action.actionIntent) }, + {}, + true + ) + else -> sendPendingIntent(actionIntent) + } + } + } + + val themeText = + com.android.settingslib.Utils.getColorAttr( + context, + com.android.internal.R.attr.textColorPrimary + ) + .defaultColor + + val mediaActionIcon = + when (action.getIcon().type) { + Icon.TYPE_RESOURCE -> + Icon.createWithResource(sbn.packageName, action.getIcon()!!.getResId()) + else -> action.getIcon() + } + .setTint(themeText) + .loadDrawable(context) + + val mediaAction = MediaAction(mediaActionIcon, runnable, action.title, null) + actionIcons.add(mediaAction) + } + } + return Pair(actionIcons, actionsToShowCollapsed) +} + +private fun sendPendingIntent(intent: PendingIntent): Boolean { + return try { + intent.send( + BroadcastOptions.makeBasic() + .apply { + setInteractive(true) + setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED + ) + } + .toBundle() + ) + true + } catch (e: PendingIntent.CanceledException) { + Log.d(TAG, "Intent canceled", e) + false + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt new file mode 100644 index 000000000000..f9fef8eac815 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt @@ -0,0 +1,530 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.annotation.WorkerThread +import android.app.Notification +import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME +import android.app.PendingIntent +import android.app.StatusBarManager +import android.app.UriGrantsManager +import android.content.ContentProvider +import android.content.ContentResolver +import android.content.Context +import android.content.Intent +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.graphics.ImageDecoder +import android.graphics.drawable.Icon +import android.media.MediaDescription +import android.media.MediaMetadata +import android.media.session.MediaController +import android.media.session.MediaSession +import android.net.Uri +import android.os.Process +import android.os.UserHandle +import android.service.notification.StatusBarNotification +import android.support.v4.media.MediaMetadataCompat +import android.text.TextUtils +import android.util.Log +import android.util.Pair +import androidx.media.utils.MediaConstants +import com.android.app.tracing.coroutines.traceCoroutine +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.graphics.ImageLoader +import com.android.systemui.media.controls.shared.model.MediaAction +import com.android.systemui.media.controls.shared.model.MediaButton +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.MediaDeviceData +import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaDataUtils +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.res.R +import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState +import com.android.systemui.statusbar.notification.row.HybridGroupManager +import com.android.systemui.util.kotlin.logD +import java.util.concurrent.ConcurrentHashMap +import javax.inject.Inject +import kotlin.coroutines.coroutineContext +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.async +import kotlinx.coroutines.cancel +import kotlinx.coroutines.ensureActive + +/** Loads media information from media style [StatusBarNotification] classes. */ +@SysUISingleton +class MediaDataLoader +@Inject +constructor( + @Application val context: Context, + @Main val mainDispatcher: CoroutineDispatcher, + @Background val backgroundScope: CoroutineScope, + private val activityStarter: ActivityStarter, + private val mediaControllerFactory: MediaControllerFactory, + private val mediaFlags: MediaFlags, + private val imageLoader: ImageLoader, + private val statusBarManager: StatusBarManager, +) { + private val mediaProcessingJobs = ConcurrentHashMap<JobKey, Job>() + + private val artworkWidth: Int = + context.resources.getDimensionPixelSize( + com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize + ) + private val artworkHeight: Int = + context.resources.getDimensionPixelSize(R.dimen.qs_media_session_height_expanded) + + private val themeText = + com.android.settingslib.Utils.getColorAttr( + context, + com.android.internal.R.attr.textColorPrimary + ) + .defaultColor + + /** + * Loads media data for a given [StatusBarNotification]. It does the loading on the background + * thread. + * + * Returns a [MediaDataLoaderResult] if loaded data or `null` if loading failed. The method + * suspends until loading has completed or failed. + * + * If a new [loadMediaData] is issued while existing load is in progress, the existing (old) + * load will be cancelled. + */ + suspend fun loadMediaData(key: String, sbn: StatusBarNotification): MediaDataLoaderResult? { + logD(TAG) { "Loading media data for $key..." } + val jobKey = JobKey(key, sbn) + val loadMediaJob = backgroundScope.async { loadMediaDataInBackground(key, sbn) } + loadMediaJob.invokeOnCompletion { mediaProcessingJobs.remove(jobKey) } + val existingJob = mediaProcessingJobs.put(jobKey, loadMediaJob) + existingJob?.cancel("New processing job incoming.") + return loadMediaJob.await() + } + + /** Loads media data, should be called from [backgroundScope]. */ + @WorkerThread + private suspend fun loadMediaDataInBackground( + key: String, + sbn: StatusBarNotification, + ): MediaDataLoaderResult? = + traceCoroutine("MediaDataLoader#loadMediaData") { + val token = + sbn.notification.extras.getParcelable( + Notification.EXTRA_MEDIA_SESSION, + MediaSession.Token::class.java + ) + if (token == null) { + Log.i(TAG, "Token was null, not loading media info") + return null + } + val mediaController = mediaControllerFactory.create(token) + val metadata = mediaController.metadata + val notification: Notification = sbn.notification + + val appInfo = + notification.extras.getParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO, + ApplicationInfo::class.java + ) ?: getAppInfoFromPackage(sbn.packageName) + + // App name + val appName = getAppName(sbn, appInfo) + + // Song name + var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) + if (song.isNullOrBlank()) { + song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) + } + if (song.isNullOrBlank()) { + song = HybridGroupManager.resolveTitle(notification) + } + if (song.isNullOrBlank()) { + // For apps that don't include a title, log and add a placeholder + song = context.getString(R.string.controls_media_empty_title, appName) + try { + statusBarManager.logBlankMediaTitle(sbn.packageName, sbn.user.identifier) + } catch (e: RuntimeException) { + Log.e(TAG, "Error reporting blank media title for package ${sbn.packageName}") + } + } + + // Don't attempt to load bitmaps if the job was cancelled. + coroutineContext.ensureActive() + + // Album art + var artworkBitmap = metadata?.let { loadBitmapFromUri(it) } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) + } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) + } + val artworkIcon = + if (artworkBitmap == null) { + notification.getLargeIcon() + } else { + Icon.createWithBitmap(artworkBitmap) + } + + // Don't continue if we were cancelled during slow bitmap load. + coroutineContext.ensureActive() + + // App Icon + val smallIcon = sbn.notification.smallIcon + + // Explicit Indicator + val isExplicit = + MediaMetadataCompat.fromMediaMetadata(metadata) + ?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + // Artist name + var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) + if (artist.isNullOrBlank()) { + artist = HybridGroupManager.resolveText(notification) + } + + // Device name (used for remote cast notifications) + val device: MediaDeviceData? = getDeviceInfoForRemoteCast(key, sbn) + + // Control buttons + // If flag is enabled and controller has a PlaybackState, create actions from session + // info + // Otherwise, use the notification actions + var actionIcons: List<MediaAction> = emptyList() + var actionsToShowCollapsed: List<Int> = emptyList() + val semanticActions = createActionsFromState(sbn.packageName, mediaController, sbn.user) + logD(TAG) { "Semantic actions: $semanticActions" } + if (semanticActions == null) { + val actions = createActionsFromNotification(context, activityStarter, sbn) + actionIcons = actions.first + actionsToShowCollapsed = actions.second + logD(TAG) { "[!!] Semantic actions: $semanticActions" } + } + + val playbackLocation = getPlaybackLocation(sbn, mediaController) + val isPlaying = mediaController.playbackState?.let { isPlayingState(it.state) } + + val appUid = appInfo?.uid ?: Process.INVALID_UID + return MediaDataLoaderResult( + appName = appName, + appIcon = smallIcon, + artist = artist, + song = song, + artworkIcon = artworkIcon, + actionIcons = actionIcons, + actionsToShowInCompact = actionsToShowCollapsed, + semanticActions = semanticActions, + token = token, + clickIntent = notification.contentIntent, + device = device, + playbackLocation = playbackLocation, + isPlaying = isPlaying, + appUid = appUid, + isExplicit = isExplicit + ) + } + + /** + * Loads media data in background for a given set of resumption parameters. The method suspends + * until loading is complete or fails. + * + * Returns a [MediaDataLoaderResult] if loaded data or `null` if loading failed. + */ + suspend fun loadMediaDataForResumption( + userId: Int, + desc: MediaDescription, + resumeAction: Runnable, + currentEntry: MediaData?, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ): MediaDataLoaderResult? { + val mediaData = + backgroundScope.async { + loadMediaDataForResumptionInBackground( + userId, + desc, + resumeAction, + currentEntry, + token, + appName, + appIntent, + packageName + ) + } + return mediaData.await() + } + + /** Loads media data for resumption, should be called from [backgroundScope]. */ + @WorkerThread + private suspend fun loadMediaDataForResumptionInBackground( + userId: Int, + desc: MediaDescription, + resumeAction: Runnable, + currentEntry: MediaData?, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ): MediaDataLoaderResult? = + traceCoroutine("MediaDataLoader#loadMediaDataForResumption") { + if (desc.title.isNullOrBlank()) { + Log.e(TAG, "Description incomplete") + return null + } + + logD(TAG) { "adding track for $userId from browser: $desc" } + + val appUid = currentEntry?.appUid ?: Process.INVALID_UID + + // Album art + var artworkBitmap = desc.iconBitmap + if (artworkBitmap == null && desc.iconUri != null) { + artworkBitmap = + loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName) + } + val artworkIcon = + if (artworkBitmap != null) { + Icon.createWithBitmap(artworkBitmap) + } else { + null + } + + val isExplicit = + desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + val progress = + if (mediaFlags.isResumeProgressEnabled()) { + MediaDataUtils.getDescriptionProgress(desc.extras) + } else null + + val mediaAction = getResumeMediaAction(resumeAction) + return MediaDataLoaderResult( + appName = appName, + appIcon = null, + artist = desc.subtitle, + song = desc.title, + artworkIcon = artworkIcon, + actionIcons = listOf(mediaAction), + actionsToShowInCompact = listOf(0), + semanticActions = MediaButton(playOrPause = mediaAction), + token = token, + clickIntent = appIntent, + device = null, + playbackLocation = 0, + isPlaying = null, + appUid = appUid, + isExplicit = isExplicit, + resumeAction = resumeAction, + resumeProgress = progress + ) + } + + private fun createActionsFromState( + packageName: String, + controller: MediaController, + user: UserHandle + ): MediaButton? { + if (!mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { + return null + } + + return createActionsFromState(context, packageName, controller) + } + + private fun getPlaybackLocation(sbn: StatusBarNotification, mediaController: MediaController) = + when { + isRemoteCastNotification(sbn) -> MediaData.PLAYBACK_CAST_REMOTE + mediaController.playbackInfo?.playbackType == + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL -> MediaData.PLAYBACK_LOCAL + else -> MediaData.PLAYBACK_CAST_LOCAL + } + + /** + * Returns [MediaDeviceData] if the [StatusBarNotification] is a remote cast notification. + * `null` otherwise. + */ + private fun getDeviceInfoForRemoteCast( + key: String, + sbn: StatusBarNotification + ): MediaDeviceData? { + val extras = sbn.notification.extras + val deviceName = extras.getCharSequence(Notification.EXTRA_MEDIA_REMOTE_DEVICE, null) + val deviceIcon = extras.getInt(Notification.EXTRA_MEDIA_REMOTE_ICON, -1) + val deviceIntent = + extras.getParcelable(Notification.EXTRA_MEDIA_REMOTE_INTENT, PendingIntent::class.java) + logD(TAG) { "$key is RCN for $deviceName" } + + if (deviceName != null && deviceIcon > -1) { + // Name and icon must be present, but intent may be null + val enabled = deviceIntent != null && deviceIntent.isActivity + val deviceDrawable = + Icon.createWithResource(sbn.packageName, deviceIcon) + .loadDrawable(sbn.getPackageContext(context)) + return MediaDeviceData( + enabled, + deviceDrawable, + deviceName, + deviceIntent, + showBroadcastButton = false + ) + } + return null + } + + private fun getAppInfoFromPackage(packageName: String): ApplicationInfo? { + try { + return context.packageManager.getApplicationInfo(packageName, 0) + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Could not get app info for $packageName", e) + return null + } + } + + private fun getAppName(sbn: StatusBarNotification, appInfo: ApplicationInfo?): String { + val name = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME) + return when { + name != null -> name + appInfo != null -> context.packageManager.getApplicationLabel(appInfo).toString() + else -> sbn.packageName + } + } + + /** Load a bitmap from the various Art metadata URIs */ + private suspend fun loadBitmapFromUri(metadata: MediaMetadata): Bitmap? { + for (uri in ART_URIS) { + val uriString = metadata.getString(uri) + if (!TextUtils.isEmpty(uriString)) { + val albumArt = loadBitmapFromUri(Uri.parse(uriString)) + // If we got cancelled during slow album art load, cancel the rest of + // the process. + coroutineContext.ensureActive() + if (albumArt != null) { + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, "loaded art from $uri") + } + return albumArt + } + } + } + return null + } + + private suspend fun loadBitmapFromUri(uri: Uri): Bitmap? { + // ImageDecoder requires a scheme of the following types + if ( + uri.scheme !in + listOf( + ContentResolver.SCHEME_CONTENT, + ContentResolver.SCHEME_ANDROID_RESOURCE, + ContentResolver.SCHEME_FILE + ) + ) { + Log.w(TAG, "Invalid album art uri $uri") + return null + } + + val source = ImageLoader.Uri(uri) + return imageLoader.loadBitmap( + source, + artworkWidth, + artworkHeight, + allocator = ImageDecoder.ALLOCATOR_SOFTWARE + ) + } + + private suspend fun loadBitmapFromUriForUser( + uri: Uri, + userId: Int, + appUid: Int, + packageName: String + ): Bitmap? { + try { + val ugm = UriGrantsManager.getService() + ugm.checkGrantUriPermission_ignoreNonSystem( + appUid, + packageName, + ContentProvider.getUriWithoutUserId(uri), + Intent.FLAG_GRANT_READ_URI_PERMISSION, + ContentProvider.getUserIdFromUri(uri, userId) + ) + return loadBitmapFromUri(uri) + } catch (e: SecurityException) { + Log.e(TAG, "Failed to get URI permission: $e") + } + return null + } + + /** Check whether this notification is an RCN */ + private fun isRemoteCastNotification(sbn: StatusBarNotification): Boolean = + sbn.notification.extras.containsKey(Notification.EXTRA_MEDIA_REMOTE_DEVICE) + + private fun getResumeMediaAction(action: Runnable): MediaAction { + return MediaAction( + Icon.createWithResource(context, R.drawable.ic_media_play) + .setTint(themeText) + .loadDrawable(context), + action, + context.getString(R.string.controls_media_resume), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + + private data class JobKey(val key: String, val sbn: StatusBarNotification) : + Pair<String, StatusBarNotification>(key, sbn) + + companion object { + private const val TAG = "MediaDataLoader" + private val ART_URIS = + arrayOf( + MediaMetadata.METADATA_KEY_ALBUM_ART_URI, + MediaMetadata.METADATA_KEY_ART_URI, + MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI + ) + } + + /** Returned data from loader. */ + data class MediaDataLoaderResult( + val appName: String?, + val appIcon: Icon?, + val artist: CharSequence?, + val song: CharSequence?, + val artworkIcon: Icon?, + val actionIcons: List<MediaAction>, + val actionsToShowInCompact: List<Int>, + val semanticActions: MediaButton?, + val token: MediaSession.Token?, + val clickIntent: PendingIntent?, + val device: MediaDeviceData?, + val playbackLocation: Int, + val isPlaying: Boolean?, + val appUid: Int, + val isExplicit: Boolean, + val resumeAction: Runnable? = null, + val resumeProgress: Double? = null + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTask.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTask.kt index 2dbe2aa4ef2d..bf2aa7efc0c4 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTask.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTask.kt @@ -20,7 +20,7 @@ import android.annotation.ColorInt import android.annotation.UserIdInt import android.app.ActivityManager.RecentTaskInfo import android.content.ComponentName -import com.android.wm.shell.util.SplitBounds +import com.android.wm.shell.shared.split.SplitBounds data class RecentTask( val taskId: Int, diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt index 01b1be9d02b7..82e58cc7f1d9 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt @@ -23,7 +23,7 @@ import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.settings.UserTracker import com.android.systemui.util.kotlin.getOrNull import com.android.wm.shell.recents.RecentTasks -import com.android.wm.shell.util.GroupedRecentTaskInfo +import com.android.wm.shell.shared.GroupedRecentTaskInfo import java.util.Optional import java.util.concurrent.Executor import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt index dd1fa76c65c9..bb4d89457b58 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt @@ -36,10 +36,10 @@ import com.android.systemui.mediaprojection.appselector.view.RecentTasksAdapter. import com.android.systemui.mediaprojection.appselector.view.TaskPreviewSizeProvider.TaskPreviewSizeListener import com.android.systemui.res.R import com.android.systemui.util.recycler.HorizontalSpacerItemDecoration +import com.android.wm.shell.shared.split.SplitBounds import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT import com.android.wm.shell.splitscreen.SplitScreen -import com.android.wm.shell.util.SplitBounds import java.util.Optional import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index cb0bb4abb423..e44069f78ee3 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -563,10 +563,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, } @Override - public void onRecentsAnimationStateChanged(boolean running) { - } - - @Override public void onNavigationModeChanged(int mode) { mNavigationMode = mode; mEdgeBackGestureHandler.onNavigationModeChanged(mode); diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt index 6eacb2ef9f14..79c2eb90af20 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt @@ -24,6 +24,7 @@ import android.service.quicksettings.Tile.STATE_INACTIVE import android.text.TextUtils import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @@ -81,6 +82,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.Shape import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalContext @@ -132,11 +134,16 @@ fun Tile( val uiState = remember(state) { state.toUiState() } val colors = TileDefaults.getColorForState(uiState) + // TODO(b/361789146): Draw the shapes instead of clipping + val tileShape = TileDefaults.animateTileShape(uiState.state) + val iconShape = TileDefaults.animateIconShape(uiState.state) + TileContainer( colors = colors, showLabels = showLabels, label = uiState.label, iconOnly = iconOnly, + shape = if (iconOnly) iconShape else tileShape, clickEnabled = true, onClick = tile::onClick, onLongClick = tile::onLongClick, @@ -151,6 +158,7 @@ fun Tile( secondaryLabel = uiState.secondaryLabel, icon = icon, colors = colors, + iconShape = iconShape, toggleClickSupported = state.handlesSecondaryClick, onClick = { if (state.handlesSecondaryClick) { @@ -169,6 +177,7 @@ private fun TileContainer( showLabels: Boolean, label: String, iconOnly: Boolean, + shape: Shape, clickEnabled: Boolean = false, onClick: (Expandable) -> Unit = {}, onLongClick: (Expandable) -> Unit = {}, @@ -189,10 +198,8 @@ private fun TileContainer( } Expandable( color = backgroundColor, - shape = TileDefaults.TileShape, - modifier = - Modifier.height(dimensionResource(id = R.dimen.qs_tile_height)) - .clip(TileDefaults.TileShape) + shape = shape, + modifier = Modifier.height(dimensionResource(id = R.dimen.qs_tile_height)).clip(shape) ) { Box( modifier = @@ -227,6 +234,7 @@ private fun LargeTileContent( secondaryLabel: String?, icon: Icon, colors: TileColors, + iconShape: Shape, toggleClickSupported: Boolean = false, onClick: () -> Unit = {}, onLongClick: () -> Unit = {}, @@ -239,7 +247,7 @@ private fun LargeTileContent( Box( modifier = Modifier.fillMaxHeight().aspectRatio(1f).thenIf(toggleClickSupported) { - Modifier.clip(TileDefaults.TileShape) + Modifier.clip(iconShape) .background(colors.iconBackground, { 1f }) .combinedClickable(onClick = onClick, onLongClick = onLongClick) } @@ -391,7 +399,7 @@ private fun RemoveTileTarget() { horizontalArrangement = tileHorizontalArrangement(), modifier = Modifier.fillMaxHeight() - .border(1.dp, LocalContentColor.current, shape = TileDefaults.TileShape) + .border(1.dp, LocalContentColor.current, shape = CircleShape) .padding(10.dp) ) { Icon(imageVector = Icons.Default.Clear, contentDescription = null) @@ -533,7 +541,7 @@ fun LazyGridScope.editTiles( Modifier.background( color = MaterialTheme.colorScheme.secondary, alpha = { EditModeTileDefaults.PLACEHOLDER_ALPHA }, - shape = TileDefaults.TileShape + shape = RoundedCornerShape(TileDefaults.InactiveCornerRadius) ) .animateItem() ) @@ -619,6 +627,7 @@ fun EditTile( showLabels = showLabels, label = label, iconOnly = iconOnly, + shape = RoundedCornerShape(TileDefaults.InactiveCornerRadius), modifier = modifier, ) { if (iconOnly) { @@ -633,6 +642,7 @@ fun EditTile( secondaryLabel = tileViewModel.appName?.load(), icon = tileViewModel.icon, colors = colors, + iconShape = RoundedCornerShape(TileDefaults.InactiveCornerRadius), ) } } @@ -736,7 +746,9 @@ private object EditModeTileDefaults { } private object TileDefaults { - val TileShape = CircleShape + val InactiveCornerRadius = 50.dp + val ActiveIconCornerRadius = 16.dp + val ActiveTileCornerRadius = 24.dp val IconTileWithLabelHeight = 140.dp /** An active tile without dual target uses the active color as background */ @@ -795,6 +807,39 @@ private object TileDefaults { else -> unavailableTileColors() } } + + @Composable + fun animateIconShape(state: Int): Shape { + return animateShape( + state = state, + activeCornerRadius = ActiveTileCornerRadius, + label = "QSTileCornerRadius", + ) + } + + @Composable + fun animateTileShape(state: Int): Shape { + return animateShape( + state = state, + activeCornerRadius = ActiveIconCornerRadius, + label = "QSTileIconCornerRadius", + ) + } + + @Composable + fun animateShape(state: Int, activeCornerRadius: Dp, label: String): Shape { + val animatedCornerRadius by + animateDpAsState( + targetValue = + if (state == STATE_ACTIVE) { + activeCornerRadius + } else { + InactiveCornerRadius + }, + label = label + ) + return RoundedCornerShape(animatedCornerRadius) + } } private const val CURRENT_TILES_GRID_TEST_TAG = "CurrentTilesGrid" diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt index 0e127e3f6bb4..83c3335ebffb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt @@ -41,10 +41,11 @@ constructor( if (Flags.modesApi() && Flags.modesUi() && Flags.modesUiIcons() && data.icon != null) { icon = { data.icon } } else { - val defaultIconRes = + val iconRes = if (data.isActivated) R.drawable.qs_dnd_icon_on else R.drawable.qs_dnd_icon_off - iconRes = defaultIconRes - icon = { resources.getDrawable(defaultIconRes, theme).asIcon() } + val icon = resources.getDrawable(iconRes, theme).asIcon() + this.iconRes = iconRes + this.icon = { icon } } activationState = if (data.isActivated) { diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt index 863a899b6f4c..3d6d00eb3cc0 100644 --- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt +++ b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt @@ -24,6 +24,7 @@ import android.content.res.Resources import android.net.Uri import android.os.Handler import android.os.UserHandle +import android.provider.Settings import android.util.Log import com.android.internal.logging.UiEventLogger import com.android.systemui.animation.DialogTransitionAnimator @@ -90,7 +91,16 @@ constructor( // ViewCapture needs to save it's data before it is disabled, or else the data will // be lost. This is expected to change in the near future, and when that happens // this line should be removed. - bgExecutor.execute { traceurMessageSender.stopTracing() } + bgExecutor.execute { + if (issueRecordingState.traceConfig.longTrace) { + Settings.Global.putInt( + contentResolver, + NOTIFY_SESSION_ENDED_SETTING, + DISABLED + ) + } + traceurMessageSender.stopTracing() + } issueRecordingState.isRecording = false } ACTION_SHARE -> { @@ -125,6 +135,8 @@ constructor( companion object { private const val TAG = "IssueRecordingService" private const val CHANNEL_ID = "issue_record" + private const val NOTIFY_SESSION_ENDED_SETTING = "should_notify_trace_session_ended" + private const val DISABLED = 0 /** * Get an intent to stop the issue recording service. diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt index 2d510e1cb659..ea61bd32c1f2 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt @@ -118,8 +118,11 @@ constructor( get() = when (this) { is ObservableTransitionState.Idle -> currentScene.canBeOccluded - is ObservableTransitionState.Transition -> + is ObservableTransitionState.Transition.ChangeCurrentScene -> fromScene.canBeOccluded && toScene.canBeOccluded + is ObservableTransitionState.Transition.ReplaceOverlay, + is ObservableTransitionState.Transition.ShowOrHideOverlay -> + TODO("b/359173565: Handle overlay transitions") } /** diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt index 75cb017db5c1..1b9c346129c6 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt @@ -109,7 +109,15 @@ constructor( */ val transitioningTo: StateFlow<SceneKey?> = transitionState - .map { state -> (state as? ObservableTransitionState.Transition)?.toScene } + .map { state -> + when (state) { + is ObservableTransitionState.Idle -> null + is ObservableTransitionState.Transition.ChangeCurrentScene -> state.toScene + is ObservableTransitionState.Transition.ShowOrHideOverlay, + is ObservableTransitionState.Transition.ReplaceOverlay -> + TODO("b/359173565: Handle overlay transitions") + } + } .stateIn( scope = applicationScope, started = SharingStarted.WhileSubscribed(), diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt index c6f51b384a0a..ec743ba5c91e 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt @@ -112,7 +112,7 @@ constructor( // It // happens only when unlocking or when dismissing a dismissible lockscreen. val isTransitioningAwayFromKeyguard = - transitionState is ObservableTransitionState.Transition && + transitionState is ObservableTransitionState.Transition.ChangeCurrentScene && transitionState.fromScene.isKeyguard() && transitionState.toScene == Scenes.Gone @@ -120,7 +120,7 @@ constructor( val isCurrentSceneShade = currentScene.isShade() // This is true when moving into one of the shade scenes when a non-shade scene. val isTransitioningToShade = - transitionState is ObservableTransitionState.Transition && + transitionState is ObservableTransitionState.Transition.ChangeCurrentScene && !transitionState.fromScene.isShade() && transitionState.toScene.isShade() diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt index 8006e9421f5c..7d6712166a21 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractorImpl.kt @@ -64,7 +64,7 @@ constructor( 0f } ) - is ObservableTransitionState.Transition -> + is ObservableTransitionState.Transition.ChangeCurrentScene -> when { state.fromScene == Scenes.Gone -> if (state.toScene.isExpandable()) { @@ -88,6 +88,9 @@ constructor( } else -> flowOf(1f) } + is ObservableTransitionState.Transition.ShowOrHideOverlay, + is ObservableTransitionState.Transition.ReplaceOverlay -> + TODO("b/359173565: Handle overlay transitions") } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index a1477b57a22a..f88fd7d00a2b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -1174,7 +1174,7 @@ public class CommandQueue extends IStatusBar.Stub implements } } - @Override + // This was previously called from WM, but is now called from WMShell public void onRecentsAnimationStateChanged(boolean running) { synchronized (mLock) { mHandler.obtainMessage(MSG_RECENTS_ANIMATION_STATE_CHANGED, running ? 1 : 0, 0) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt index 17f401ac0dde..0efd5f15cb09 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt @@ -45,7 +45,6 @@ import android.provider.Settings.Global.HEADS_UP_OFF import android.service.notification.Flags import com.android.internal.logging.UiEvent import com.android.internal.logging.UiEventLogger -import com.android.internal.logging.UiEventLogger.UiEventEnum.RESERVE_NEW_UI_EVENT_ID import com.android.internal.messages.nano.SystemMessageProto.SystemMessage import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -279,7 +278,8 @@ class AvalancheSuppressor( private val packageManager: PackageManager, private val uiEventLogger: UiEventLogger, private val context: Context, - private val notificationManager: NotificationManager + private val notificationManager: NotificationManager, + private val logger: VisualInterruptionDecisionLogger ) : VisualInterruptionFilter( types = setOf(PEEK, PULSE), @@ -354,15 +354,18 @@ class AvalancheSuppressor( override fun shouldSuppress(entry: NotificationEntry): Boolean { if (!isCooldownEnabled()) { + logger.logAvalancheAllow("cooldown OFF") return false } val timeSinceAvalancheMs = systemClock.currentTimeMillis() - avalancheProvider.startTime val timedOut = timeSinceAvalancheMs >= avalancheProvider.timeoutMs if (timedOut) { + logger.logAvalancheAllow("timedOut! timeSinceAvalancheMs=$timeSinceAvalancheMs") return false } val state = calculateState(entry) if (state != State.SUPPRESS) { + logger.logAvalancheAllow("state=$state") return false } if (shouldShowEdu()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionLogger.kt index c204ea9097de..b83259dce298 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionLogger.kt @@ -93,6 +93,15 @@ constructor(@NotificationInterruptLog val buffer: LogBuffer) { } ) } + + fun logAvalancheAllow(info: String) { + buffer.log( + TAG, + INFO, + { str1 = info }, + { "AvalancheSuppressor: $str1" } + ) + } } private const val TAG = "VisualInterruptionDecisionProvider" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt index 8e8d9b69ac58..2f8711a586ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt @@ -194,7 +194,8 @@ constructor( packageManager, uiEventLogger, context, - notificationManager + notificationManager, + logger ) ) avalancheProvider.register() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java index 7119145a1fa8..48c974a33f12 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java @@ -117,6 +117,8 @@ public class NotificationContentView extends FrameLayout implements Notification protected HybridNotificationView mSingleLineView; @Nullable public DisposableHandle mContractedBinderHandle; + @Nullable public DisposableHandle mExpandedBinderHandle; + @Nullable public DisposableHandle mHeadsUpBinderHandle; private RemoteInputView mExpandedRemoteInput; private RemoteInputView mHeadsUpRemoteInput; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt index a5cd2a2de085..c342bcd2706b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt @@ -46,6 +46,9 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager import com.android.systemui.statusbar.notification.ConversationNotificationProcessor import com.android.systemui.statusbar.notification.InflationException import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.InflatedContentViewHolder +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.KeepExistingView +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.NullContentView import com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_CONTRACTED import com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_EXPANDED import com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP @@ -286,11 +289,15 @@ constructor( } FLAG_CONTENT_VIEW_EXPANDED -> row.privateLayout.performWhenContentInactive(VISIBLE_TYPE_EXPANDED) { + row.privateLayout.mExpandedBinderHandle?.dispose() + row.privateLayout.mExpandedBinderHandle = null row.privateLayout.setExpandedChild(null) remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED) } FLAG_CONTENT_VIEW_HEADS_UP -> row.privateLayout.performWhenContentInactive(VISIBLE_TYPE_HEADSUP) { + row.privateLayout.mHeadsUpBinderHandle?.dispose() + row.privateLayout.mHeadsUpBinderHandle = null row.privateLayout.setHeadsUpChild(null) remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP) row.privateLayout.setHeadsUpInflatedSmartReplies(null) @@ -499,17 +506,87 @@ constructor( } } - if (reInflateFlags and CONTENT_VIEWS_TO_CREATE_RICH_ONGOING != 0) { + val richOngoingContentModel = inflationProgress.contentModel.richOngoingContentModel + + if ( + richOngoingContentModel != null && + reInflateFlags and CONTENT_VIEWS_TO_CREATE_RICH_ONGOING != 0 + ) { logger.logAsyncTaskProgress(entry, "inflating RON view") - inflationProgress.richOngoingNotificationViewHolder = - inflationProgress.contentModel.richOngoingContentModel?.let { + val inflateContractedView = reInflateFlags and FLAG_CONTENT_VIEW_CONTRACTED != 0 + val inflateExpandedView = reInflateFlags and FLAG_CONTENT_VIEW_EXPANDED != 0 + val inflateHeadsUpView = reInflateFlags and FLAG_CONTENT_VIEW_HEADS_UP != 0 + + inflationProgress.contractedRichOngoingNotificationViewHolder = + if (inflateContractedView) { ronInflater.inflateView( - contentModel = it, + contentModel = richOngoingContentModel, existingView = row.privateLayout.contractedChild, entry = entry, systemUiContext = context, - parentView = row.privateLayout + parentView = row.privateLayout, + viewType = RichOngoingNotificationViewType.Contracted + ) + } else { + if ( + ronInflater.canKeepView( + contentModel = richOngoingContentModel, + existingView = row.privateLayout.contractedChild, + viewType = RichOngoingNotificationViewType.Contracted + ) + ) { + KeepExistingView + } else { + NullContentView + } + } + + inflationProgress.expandedRichOngoingNotificationViewHolder = + if (inflateExpandedView) { + ronInflater.inflateView( + contentModel = richOngoingContentModel, + existingView = row.privateLayout.expandedChild, + entry = entry, + systemUiContext = context, + parentView = row.privateLayout, + viewType = RichOngoingNotificationViewType.Expanded ) + } else { + if ( + ronInflater.canKeepView( + contentModel = richOngoingContentModel, + existingView = row.privateLayout.expandedChild, + viewType = RichOngoingNotificationViewType.Expanded + ) + ) { + KeepExistingView + } else { + NullContentView + } + } + + inflationProgress.headsUpRichOngoingNotificationViewHolder = + if (inflateHeadsUpView) { + ronInflater.inflateView( + contentModel = richOngoingContentModel, + existingView = row.privateLayout.headsUpChild, + entry = entry, + systemUiContext = context, + parentView = row.privateLayout, + viewType = RichOngoingNotificationViewType.HeadsUp + ) + } else { + if ( + ronInflater.canKeepView( + contentModel = richOngoingContentModel, + existingView = row.privateLayout.headsUpChild, + viewType = RichOngoingNotificationViewType.HeadsUp + ) + ) { + KeepExistingView + } else { + NullContentView + } } } @@ -618,7 +695,9 @@ constructor( var inflatedSmartReplyState: InflatedSmartReplyState? = null var expandedInflatedSmartReplies: InflatedSmartReplyViewHolder? = null var headsUpInflatedSmartReplies: InflatedSmartReplyViewHolder? = null - var richOngoingNotificationViewHolder: InflatedContentViewHolder? = null + var contractedRichOngoingNotificationViewHolder: ContentViewInflationResult? = null + var expandedRichOngoingNotificationViewHolder: ContentViewInflationResult? = null + var headsUpRichOngoingNotificationViewHolder: ContentViewInflationResult? = null // Inflated SingleLineView that lacks the UI State var inflatedSingleLineView: HybridNotificationView? = null @@ -1428,14 +1507,21 @@ constructor( logger.logAsyncTaskProgress(entry, "finishing") // before updating the content model, stop existing binding if necessary - val hasRichOngoingContentModel = result.contentModel.richOngoingContentModel != null - val requestedRichOngoing = reInflateFlags and CONTENT_VIEWS_TO_CREATE_RICH_ONGOING != 0 - val rejectedRichOngoing = requestedRichOngoing && !hasRichOngoingContentModel - if (result.richOngoingNotificationViewHolder != null || rejectedRichOngoing) { + if (result.contractedRichOngoingNotificationViewHolder.shouldDisposeViewBinder()) { row.privateLayout.mContractedBinderHandle?.dispose() row.privateLayout.mContractedBinderHandle = null } + if (result.expandedRichOngoingNotificationViewHolder.shouldDisposeViewBinder()) { + row.privateLayout.mExpandedBinderHandle?.dispose() + row.privateLayout.mExpandedBinderHandle = null + } + + if (result.headsUpRichOngoingNotificationViewHolder.shouldDisposeViewBinder()) { + row.privateLayout.mHeadsUpBinderHandle?.dispose() + row.privateLayout.mHeadsUpBinderHandle = null + } + // set the content model after disposal and before setting new rich ongoing view entry.setContentModel(result.contentModel) result.inflatedSmartReplyState?.let { row.privateLayout.setInflatedSmartReplyState(it) } @@ -1477,19 +1563,53 @@ constructor( } } - // after updating the content model, set the view, then start the new binder - result.richOngoingNotificationViewHolder?.let { viewHolder -> - row.privateLayout.contractedChild = viewHolder.view - row.privateLayout.expandedChild = null - row.privateLayout.headsUpChild = null - row.privateLayout.setExpandedInflatedSmartReplies(null) - row.privateLayout.setHeadsUpInflatedSmartReplies(null) - row.privateLayout.mContractedBinderHandle = - viewHolder.binder.setupContentViewBinder() - row.setExpandable(false) + val hasRichOngoingViewHolder = + result.contractedRichOngoingNotificationViewHolder != null || + result.expandedRichOngoingNotificationViewHolder != null || + result.headsUpRichOngoingNotificationViewHolder != null + + if (hasRichOngoingViewHolder) { + // after updating the content model, set the view, then start the new binder + result.contractedRichOngoingNotificationViewHolder?.let { contractedViewHolder -> + if (contractedViewHolder is InflatedContentViewHolder) { + row.privateLayout.contractedChild = contractedViewHolder.view + row.privateLayout.mContractedBinderHandle = + contractedViewHolder.binder.setupContentViewBinder() + } else if (contractedViewHolder == NullContentView) { + row.privateLayout.contractedChild = null + } + } + + result.expandedRichOngoingNotificationViewHolder?.let { expandedViewHolder -> + if (expandedViewHolder is InflatedContentViewHolder) { + row.privateLayout.expandedChild = expandedViewHolder.view + row.privateLayout.mExpandedBinderHandle = + expandedViewHolder.binder.setupContentViewBinder() + } else if (expandedViewHolder == NullContentView) { + row.privateLayout.expandedChild = null + } + } + + result.headsUpRichOngoingNotificationViewHolder?.let { headsUpViewHolder -> + if (headsUpViewHolder is InflatedContentViewHolder) { + row.privateLayout.headsUpChild = headsUpViewHolder.view + row.privateLayout.mHeadsUpBinderHandle = + headsUpViewHolder.binder.setupContentViewBinder() + } else if (headsUpViewHolder == NullContentView) { + row.privateLayout.headsUpChild = null + } + } + + // clean remoteViewCache when we don't keep existing views. remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_CONTRACTED) remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED) remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP) + + // Since RONs don't support smart reply, remove them from HUNs and Expanded. + row.privateLayout.setExpandedInflatedSmartReplies(null) + row.privateLayout.setHeadsUpInflatedSmartReplies(null) + + row.setExpandable(row.privateLayout.expandedChild != null) } Trace.endAsyncSection(APPLY_TRACE_METHOD, System.identityHashCode(row)) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RichOngoingNotificationViewInflater.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RichOngoingNotificationViewInflater.kt index e9c4960a4011..828fc219e773 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RichOngoingNotificationViewInflater.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RichOngoingNotificationViewInflater.kt @@ -24,6 +24,9 @@ import android.view.ViewGroup import com.android.systemui.dagger.SysUISingleton import com.android.systemui.res.R import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.InflatedContentViewHolder +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.KeepExistingView +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.NullContentView import com.android.systemui.statusbar.notification.row.shared.RichOngoingContentModel import com.android.systemui.statusbar.notification.row.shared.RichOngoingNotificationFlag import com.android.systemui.statusbar.notification.row.shared.StopwatchContentModel @@ -39,7 +42,35 @@ fun interface DeferredContentViewBinder { fun setupContentViewBinder(): DisposableHandle } -class InflatedContentViewHolder(val view: View, val binder: DeferredContentViewBinder) +enum class RichOngoingNotificationViewType { + Contracted, + Expanded, + HeadsUp, +} + +/** + * * Supertype of the 3 different possible result types of + * [RichOngoingNotificationViewInflater.inflateView]. + */ +sealed interface ContentViewInflationResult { + + /** Indicates that the content view should be removed if present. */ + data object NullContentView : ContentViewInflationResult + + /** + * Indicates that the content view (which *must be* present) should be unmodified during this + * inflation. + */ + data object KeepExistingView : ContentViewInflationResult + + /** + * Contains the new view and binder that should replace any existing content view for this slot. + */ + data class InflatedContentViewHolder(val view: View, val binder: DeferredContentViewBinder) : + ContentViewInflationResult +} + +fun ContentViewInflationResult?.shouldDisposeViewBinder() = this !is KeepExistingView /** * Interface which provides a [RichOngoingContentModel] for a given [Notification] when one is @@ -52,7 +83,14 @@ interface RichOngoingNotificationViewInflater { entry: NotificationEntry, systemUiContext: Context, parentView: ViewGroup, - ): InflatedContentViewHolder? + viewType: RichOngoingNotificationViewType, + ): ContentViewInflationResult + + fun canKeepView( + contentModel: RichOngoingContentModel, + existingView: View?, + viewType: RichOngoingNotificationViewType + ): Boolean } @SysUISingleton @@ -68,8 +106,9 @@ constructor( entry: NotificationEntry, systemUiContext: Context, parentView: ViewGroup, - ): InflatedContentViewHolder? { - if (RichOngoingNotificationFlag.isUnexpectedlyInLegacyMode()) return null + viewType: RichOngoingNotificationViewType, + ): ContentViewInflationResult { + if (RichOngoingNotificationFlag.isUnexpectedlyInLegacyMode()) return NullContentView val component = viewModelComponentFactory.create(entry) return when (contentModel) { is TimerContentModel -> @@ -77,28 +116,55 @@ constructor( existingView, component::createTimerViewModel, systemUiContext, - parentView + parentView, + viewType ) is StopwatchContentModel -> TODO("Not yet implemented") } } + override fun canKeepView( + contentModel: RichOngoingContentModel, + existingView: View?, + viewType: RichOngoingNotificationViewType + ): Boolean { + if (RichOngoingNotificationFlag.isUnexpectedlyInLegacyMode()) return false + return when (contentModel) { + is TimerContentModel -> canKeepTimerView(contentModel, existingView, viewType) + is StopwatchContentModel -> TODO("Not yet implemented") + } + } + private fun inflateTimerView( existingView: View?, createViewModel: () -> TimerViewModel, systemUiContext: Context, parentView: ViewGroup, - ): InflatedContentViewHolder? { - if (existingView is TimerView && !existingView.isReinflateNeeded()) return null - val newView = - LayoutInflater.from(systemUiContext) - .inflate( - R.layout.rich_ongoing_timer_notification, - parentView, - /* attachToRoot= */ false - ) as TimerView - return InflatedContentViewHolder(newView) { - TimerViewBinder.bindWhileAttached(newView, createViewModel()) + viewType: RichOngoingNotificationViewType, + ): ContentViewInflationResult { + if (existingView is TimerView && !existingView.isReinflateNeeded()) return KeepExistingView + + return when (viewType) { + RichOngoingNotificationViewType.Contracted -> { + val newView = + LayoutInflater.from(systemUiContext) + .inflate( + R.layout.rich_ongoing_timer_notification, + parentView, + /* attachToRoot= */ false + ) as TimerView + InflatedContentViewHolder(newView) { + TimerViewBinder.bindWhileAttached(newView, createViewModel()) + } + } + RichOngoingNotificationViewType.Expanded, + RichOngoingNotificationViewType.HeadsUp -> NullContentView } } + + private fun canKeepTimerView( + contentModel: TimerContentModel, + existingView: View?, + viewType: RichOngoingNotificationViewType + ): Boolean = true } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt index 399b8d0025d5..0e984cf74d9d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt @@ -74,7 +74,7 @@ constructor( } private fun expandFractionForTransition( - state: ObservableTransitionState.Transition, + state: ObservableTransitionState.Transition.ChangeCurrentScene, shadeExpansion: Float, shadeMode: ShadeMode, qsExpansion: Float, @@ -113,7 +113,7 @@ constructor( when (transitionState) { is ObservableTransitionState.Idle -> expandFractionForScene(transitionState.currentScene, shadeExpansion) - is ObservableTransitionState.Transition -> + is ObservableTransitionState.Transition.ChangeCurrentScene -> expandFractionForTransition( transitionState, shadeExpansion, @@ -121,6 +121,9 @@ constructor( qsExpansion, quickSettingsScene ) + is ObservableTransitionState.Transition.ShowOrHideOverlay, + is ObservableTransitionState.Transition.ReplaceOverlay -> + TODO("b/359173565: Handle overlay transitions") } } .distinctUntilChanged() @@ -238,7 +241,7 @@ constructor( } } -private fun ObservableTransitionState.Transition.isBetween( +private fun ObservableTransitionState.Transition.ChangeCurrentScene.isBetween( a: (SceneKey) -> Boolean, b: (SceneKey) -> Boolean ): Boolean = (a(fromScene) && b(toScene)) || (b(fromScene) && a(toScene)) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModel.kt index 199b5b672140..37f2f195ebf6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModel.kt @@ -36,14 +36,12 @@ import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn /** @@ -76,37 +74,10 @@ constructor( @DeviceBasedSatelliteInputLog logBuffer: LogBuffer, @DeviceBasedSatelliteTableLog tableLog: TableLogBuffer, ) : DeviceBasedSatelliteViewModel { - private val shouldShowIcon: Flow<Boolean> = - interactor.areAllConnectionsOutOfService - .flatMapLatest { allOos -> - if (!allOos) { - flowOf(false) - } else { - combine( - interactor.isSatelliteAllowed, - interactor.isSatelliteProvisioned, - interactor.isWifiActive, - airplaneModeRepository.isAirplaneMode - ) { isSatelliteAllowed, isSatelliteProvisioned, isWifiActive, isAirplaneMode -> - isSatelliteAllowed && - isSatelliteProvisioned && - !isWifiActive && - !isAirplaneMode - } - } - } - .distinctUntilChanged() - .logDiffsForTable( - tableLog, - columnPrefix = "vm", - columnName = COL_VISIBLE_CONDITION, - initialValue = false, - ) // This adds a 10 seconds delay before showing the icon - private val shouldActuallyShowIcon: StateFlow<Boolean> = - shouldShowIcon - .distinctUntilChanged() + private val shouldShowIconForOosAfterHysteresis: StateFlow<Boolean> = + interactor.areAllConnectionsOutOfService .flatMapLatest { shouldShow -> if (shouldShow) { logBuffer.log( @@ -125,6 +96,45 @@ constructor( .logDiffsForTable( tableLog, columnPrefix = "vm", + columnName = COL_VISIBLE_FOR_OOS, + initialValue = false, + ) + .stateIn(scope, SharingStarted.WhileSubscribed(), false) + + private val canShowIcon = + combine( + interactor.isSatelliteAllowed, + interactor.isSatelliteProvisioned, + ) { allowed, provisioned -> + allowed && provisioned + } + + private val showIcon = + canShowIcon + .flatMapLatest { canShow -> + if (!canShow) { + flowOf(false) + } else { + combine( + shouldShowIconForOosAfterHysteresis, + interactor.connectionState, + interactor.isWifiActive, + airplaneModeRepository.isAirplaneMode, + ) { showForOos, connectionState, isWifiActive, isAirplaneMode -> + if (isWifiActive || isAirplaneMode) { + false + } else { + showForOos || + connectionState == SatelliteConnectionState.On || + connectionState == SatelliteConnectionState.Connected + } + } + } + } + .distinctUntilChanged() + .logDiffsForTable( + tableLog, + columnPrefix = "vm", columnName = COL_VISIBLE, initialValue = false, ) @@ -132,7 +142,7 @@ constructor( override val icon: StateFlow<Icon?> = combine( - shouldActuallyShowIcon, + showIcon, interactor.connectionState, interactor.signalStrength, ) { shouldShow, state, signalStrength -> @@ -146,7 +156,7 @@ constructor( override val carrierText: StateFlow<String?> = combine( - shouldActuallyShowIcon, + showIcon, interactor.connectionState, ) { shouldShow, connectionState -> logBuffer.log( @@ -156,7 +166,7 @@ constructor( bool1 = shouldShow str1 = connectionState.name }, - { "Updating carrier text. shouldActuallyShow=$bool1 connectionState=$str1" } + { "Updating carrier text. shouldShow=$bool1 connectionState=$str1" } ) if (shouldShow) { when (connectionState) { @@ -165,28 +175,30 @@ constructor( context.getString(R.string.satellite_connected_carrier_text) SatelliteConnectionState.Off, SatelliteConnectionState.Unknown -> { - null + // If we're showing the satellite icon opportunistically, use the + // emergency-only version of the carrier string + context.getString(R.string.satellite_emergency_only_carrier_text) } } } else { null } } - .onEach { - logBuffer.log( - TAG, - LogLevel.INFO, - { str1 = it }, - { "Resulting carrier text = $str1" } - ) - } + .distinctUntilChanged() + .logDiffsForTable( + tableLog, + columnPrefix = "vm", + columnName = COL_CARRIER_TEXT, + initialValue = null, + ) .stateIn(scope, SharingStarted.WhileSubscribed(), null) companion object { private const val TAG = "DeviceBasedSatelliteViewModel" private val DELAY_DURATION = 10.seconds - const val COL_VISIBLE_CONDITION = "visCondition" + const val COL_VISIBLE_FOR_OOS = "visibleForOos" const val COL_VISIBLE = "visible" + const val COL_CARRIER_TEXT = "carrierText" } } diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/JavaAdapter.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/JavaAdapter.kt index 28ac2c0e8283..055671cf32ca 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/JavaAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/JavaAdapter.kt @@ -28,6 +28,7 @@ import javax.inject.Inject import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DisposableHandle import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine @@ -62,7 +63,9 @@ constructor( /** * Collect information for the given [flow], calling [consumer] for each emitted event. Defaults to * [LifeCycle.State.CREATED] to better align with legacy ViewController usage of attaching listeners - * during onViewAttached() and removing during onViewRemoved() + * during onViewAttached() and removing during onViewRemoved(). + * + * @return a disposable handle in order to cancel the flow in the future. */ @JvmOverloads fun <T> collectFlow( @@ -71,8 +74,8 @@ fun <T> collectFlow( consumer: Consumer<T>, coroutineContext: CoroutineContext = EmptyCoroutineContext, state: Lifecycle.State = Lifecycle.State.CREATED, -) { - view.repeatWhenAttached(coroutineContext) { +): DisposableHandle { + return view.repeatWhenAttached(coroutineContext) { repeatOnLifecycle(state) { flow.collect { consumer.accept(it) } } } } diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java index 50efc21f50fc..5f6ad9205ec7 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java @@ -60,7 +60,6 @@ import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.kotlin.JavaAdapter; -import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.desktopmode.DesktopMode; import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; import com.android.wm.shell.onehanded.OneHanded; @@ -70,6 +69,7 @@ import com.android.wm.shell.onehanded.OneHandedUiEventLogger; import com.android.wm.shell.pip.Pip; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.recents.RecentTasks; +import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.splitscreen.SplitScreen; import com.android.wm.shell.sysui.ShellInterface; diff --git a/packages/SystemUI/tests/src/com/android/systemui/ambient/touch/TouchMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/ambient/touch/TouchMonitorTest.java index 5600b87280ad..a18d272b8fe3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ambient/touch/TouchMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ambient/touch/TouchMonitorTest.java @@ -711,6 +711,16 @@ public class TouchMonitorTest extends SysuiTestCase { } @Test + public void testDestroy_cleansUpHandler() { + final TouchHandler touchHandler = createTouchHandler(); + + final Environment environment = new Environment(Stream.of(touchHandler) + .collect(Collectors.toCollection(HashSet::new)), mKosmos); + environment.destroyMonitor(); + verify(touchHandler).onDestroy(); + } + + @Test public void testLastSessionPop_createsNewInputSession() { final TouchHandler touchHandler = createTouchHandler(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt index e60848bb6bc3..6e9b24f1433e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt @@ -123,19 +123,19 @@ class CommunalBackupHelperTest : SysuiTestCase() { FakeWidgetMetadata( widgetId = 11, componentName = "com.android.fakePackage1/fakeWidget1", - rank = 3, + rank = 0, userSerialNumber = 0, ), FakeWidgetMetadata( widgetId = 12, componentName = "com.android.fakePackage2/fakeWidget2", - rank = 2, + rank = 1, userSerialNumber = 0, ), FakeWidgetMetadata( widgetId = 13, componentName = "com.android.fakePackage3/fakeWidget3", - rank = 1, + rank = 2, userSerialNumber = 10, ), ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt index 983a43561590..edc8c837bf78 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt @@ -69,19 +69,19 @@ class CommunalBackupUtilsTest : SysuiTestCase() { FakeWidgetMetadata( widgetId = 11, componentName = "com.android.fakePackage1/fakeWidget1", - rank = 3, + rank = 0, userSerialNumber = 0, ), FakeWidgetMetadata( widgetId = 12, componentName = "com.android.fakePackage2/fakeWidget2", - rank = 2, + rank = 1, userSerialNumber = 0, ), FakeWidgetMetadata( widgetId = 13, componentName = "com.android.fakePackage3/fakeWidget3", - rank = 1, + rank = 2, userSerialNumber = 10, ), ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt index eb0ab782ae3f..ad2550255e29 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt @@ -72,6 +72,82 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { databaseV2.verifyWidgetsV2(fakeWidgetsV1.map { it.getV2() }) } + @Test + fun migrate2To3_noGapBetweenRanks_ranksReversed() { + // Create a communal database in version 2 + val databaseV2 = migrationTestHelper.createDatabase(DATABASE_NAME, version = 2) + + // Populate some fake data + val fakeRanks = + listOf( + FakeCommunalItemRank(3), + FakeCommunalItemRank(2), + FakeCommunalItemRank(1), + FakeCommunalItemRank(0), + ) + databaseV2.insertRanks(fakeRanks) + + // Verify fake ranks populated + databaseV2.verifyRanksInOrder(fakeRanks) + + // Run migration and get database V3 + val databaseV3 = + migrationTestHelper.runMigrationsAndValidate( + name = DATABASE_NAME, + version = 3, + validateDroppedTables = false, + CommunalDatabase.MIGRATION_2_3, + ) + + // Verify ranks are reversed + databaseV3.verifyRanksInOrder( + listOf( + FakeCommunalItemRank(0), + FakeCommunalItemRank(1), + FakeCommunalItemRank(2), + FakeCommunalItemRank(3), + ) + ) + } + + @Test + fun migrate2To3_withGapBetweenRanks_ranksReversed() { + // Create a communal database in version 2 + val databaseV2 = migrationTestHelper.createDatabase(DATABASE_NAME, version = 2) + + // Populate some fake data with gaps between ranks + val fakeRanks = + listOf( + FakeCommunalItemRank(9), + FakeCommunalItemRank(7), + FakeCommunalItemRank(2), + FakeCommunalItemRank(0), + ) + databaseV2.insertRanks(fakeRanks) + + // Verify fake ranks populated + databaseV2.verifyRanksInOrder(fakeRanks) + + // Run migration and get database V3 + val databaseV3 = + migrationTestHelper.runMigrationsAndValidate( + name = DATABASE_NAME, + version = 3, + validateDroppedTables = false, + CommunalDatabase.MIGRATION_2_3, + ) + + // Verify ranks are reversed + databaseV3.verifyRanksInOrder( + listOf( + FakeCommunalItemRank(0), + FakeCommunalItemRank(2), + FakeCommunalItemRank(7), + FakeCommunalItemRank(9), + ) + ) + } + private fun SupportSQLiteDatabase.insertWidgetsV1(widgets: List<FakeCommunalWidgetItemV1>) { widgets.forEach { widget -> execSQL( @@ -117,6 +193,25 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { assertThat(cursor.isAfterLast).isTrue() } + private fun SupportSQLiteDatabase.insertRanks(ranks: List<FakeCommunalItemRank>) { + ranks.forEach { rank -> + execSQL("INSERT INTO communal_item_rank_table(rank) VALUES(${rank.rank})") + } + } + + private fun SupportSQLiteDatabase.verifyRanksInOrder(ranks: List<FakeCommunalItemRank>) { + val cursor = query("SELECT * FROM communal_item_rank_table ORDER BY uid") + assertThat(cursor.moveToFirst()).isTrue() + + ranks.forEach { rank -> + assertThat(cursor.getInt(cursor.getColumnIndex("rank"))).isEqualTo(rank.rank) + cursor.moveToNext() + } + + // Verify there is no more columns + assertThat(cursor.isAfterLast).isTrue() + } + /** * Returns the expected data after migration from V1 to V2, which is simply that the new user * serial number field is now set to [CommunalWidgetItem.USER_SERIAL_NUMBER_UNDEFINED]. @@ -143,6 +238,10 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { val userSerialNumber: Int, ) + private data class FakeCommunalItemRank( + val rank: Int, + ) + companion object { private const val DATABASE_NAME = "communal_db" } diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt index d6705085eafd..d4d966ad2ef7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt @@ -67,11 +67,11 @@ class CommunalWidgetDaoTest : SysuiTestCase() { @Test fun addWidget_readValueInDb() = testScope.runTest { - val (widgetId, provider, priority, userSerialNumber) = widgetInfo1 + val (widgetId, provider, rank, userSerialNumber) = widgetInfo1 communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) val entry = communalWidgetDao.getWidgetByIdNow(id = 1) @@ -81,11 +81,11 @@ class CommunalWidgetDaoTest : SysuiTestCase() { @Test fun deleteWidget_notInDb_returnsFalse() = testScope.runTest { - val (widgetId, provider, priority, userSerialNumber) = widgetInfo1 + val (widgetId, provider, rank, userSerialNumber) = widgetInfo1 communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) assertThat(communalWidgetDao.deleteWidgetById(widgetId = 123)).isFalse() @@ -97,11 +97,11 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgetsToAdd = listOf(widgetInfo1, widgetInfo2) val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, priority, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber ) } @@ -115,17 +115,48 @@ class CommunalWidgetDaoTest : SysuiTestCase() { } @Test + fun addWidget_rankNotSpecified_widgetAddedAtTheEnd(): Unit = + testScope.runTest { + val widgets by collectLastValue(communalWidgetDao.getWidgets()) + + // Verify database is empty + assertThat(widgets).isEmpty() + + // Add widgets one by one without specifying rank + val widgetsToAdd = listOf(widgetInfo1, widgetInfo2, widgetInfo3) + widgetsToAdd.forEach { + val (widgetId, provider, _, userSerialNumber) = it + communalWidgetDao.addWidget( + widgetId = widgetId, + provider = provider, + userSerialNumber = userSerialNumber + ) + } + + // Verify new each widget is added at the end + assertThat(widgets) + .containsExactly( + communalItemRankEntry1, + communalWidgetItemEntry1, + communalItemRankEntry2, + communalWidgetItemEntry2, + communalItemRankEntry3, + communalWidgetItemEntry3, + ) + } + + @Test fun deleteWidget_emitsActiveWidgetsInDb() = testScope.runTest { val widgetsToAdd = listOf(widgetInfo1, widgetInfo2) val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, priority, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) } @@ -148,32 +179,32 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, priority, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) } assertThat(widgets()) .containsExactly( - communalItemRankEntry2, - communalWidgetItemEntry2, communalItemRankEntry1, communalWidgetItemEntry1, + communalItemRankEntry2, + communalWidgetItemEntry2, ) .inOrder() - // swapped priorities - val widgetIdsToPriorityMap = mapOf(widgetInfo1.widgetId to 2, widgetInfo2.widgetId to 1) - communalWidgetDao.updateWidgetOrder(widgetIdsToPriorityMap) + // swapped ranks + val widgetIdsToRankMap = mapOf(widgetInfo1.widgetId to 1, widgetInfo2.widgetId to 0) + communalWidgetDao.updateWidgetOrder(widgetIdsToRankMap) assertThat(widgets()) .containsExactly( - communalItemRankEntry1.copy(rank = 2), + communalItemRankEntry2.copy(rank = 0), + communalWidgetItemEntry2, + communalItemRankEntry1.copy(rank = 1), communalWidgetItemEntry1, - communalItemRankEntry2.copy(rank = 1), - communalWidgetItemEntry2 ) .inOrder() } @@ -181,53 +212,56 @@ class CommunalWidgetDaoTest : SysuiTestCase() { @Test fun addNewWidgetWithReorder_emitsWidgetsInNewOrder() = testScope.runTest { - val existingWidgets = listOf(widgetInfo1, widgetInfo2) + val existingWidgets = listOf(widgetInfo1, widgetInfo2, widgetInfo3) val widgets = collectLastValue(communalWidgetDao.getWidgets()) existingWidgets.forEach { - val (widgetId, provider, priority, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, - priority = priority, + rank = rank, userSerialNumber = userSerialNumber, ) } assertThat(widgets()) .containsExactly( - communalItemRankEntry2, - communalWidgetItemEntry2, communalItemRankEntry1, communalWidgetItemEntry1, - ) - .inOrder() - - // map with no item in the middle at index 1 - val widgetIdsToIndexMap = mapOf(widgetInfo1.widgetId to 1, widgetInfo2.widgetId to 3) - communalWidgetDao.updateWidgetOrder(widgetIdsToIndexMap) - assertThat(widgets()) - .containsExactly( - communalItemRankEntry2.copy(rank = 3), + communalItemRankEntry2, communalWidgetItemEntry2, - communalItemRankEntry1.copy(rank = 1), - communalWidgetItemEntry1, + communalItemRankEntry3, + communalWidgetItemEntry3, ) .inOrder() - // add the new middle item that we left space for. + + // add a new widget at rank 1. communalWidgetDao.addWidget( - widgetId = widgetInfo3.widgetId, - provider = widgetInfo3.provider, - priority = 2, - userSerialNumber = widgetInfo3.userSerialNumber, + widgetId = 4, + provider = ComponentName("pk_name", "cls_name_4"), + rank = 1, + userSerialNumber = 0, ) + + val newRankEntry = CommunalItemRank(uid = 4L, rank = 1) + val newWidgetEntry = + CommunalWidgetItem( + uid = 4L, + widgetId = 4, + componentName = "pk_name/cls_name_4", + itemId = 4L, + userSerialNumber = 0, + ) assertThat(widgets()) .containsExactly( - communalItemRankEntry2.copy(rank = 3), + communalItemRankEntry1.copy(rank = 0), + communalWidgetItemEntry1, + newRankEntry, + newWidgetEntry, + communalItemRankEntry2.copy(rank = 2), communalWidgetItemEntry2, - communalItemRankEntry3.copy(rank = 2), + communalItemRankEntry3.copy(rank = 3), communalWidgetItemEntry3, - communalItemRankEntry1.copy(rank = 1), - communalWidgetItemEntry1, ) .inOrder() } @@ -261,11 +295,11 @@ class CommunalWidgetDaoTest : SysuiTestCase() { assertThat(widgets).containsExactlyEntriesIn(expected) } - private fun addWidget(metadata: FakeWidgetMetadata, priority: Int? = null) { + private fun addWidget(metadata: FakeWidgetMetadata, rank: Int? = null) { communalWidgetDao.addWidget( widgetId = metadata.widgetId, provider = metadata.provider, - priority = priority ?: metadata.priority, + rank = rank ?: metadata.rank, userSerialNumber = metadata.userSerialNumber, ) } @@ -273,7 +307,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { data class FakeWidgetMetadata( val widgetId: Int, val provider: ComponentName, - val priority: Int, + val rank: Int, val userSerialNumber: Int, ) @@ -282,26 +316,26 @@ class CommunalWidgetDaoTest : SysuiTestCase() { FakeWidgetMetadata( widgetId = 1, provider = ComponentName("pk_name", "cls_name_1"), - priority = 1, + rank = 0, userSerialNumber = 0, ) val widgetInfo2 = FakeWidgetMetadata( widgetId = 2, provider = ComponentName("pk_name", "cls_name_2"), - priority = 2, + rank = 1, userSerialNumber = 0, ) val widgetInfo3 = FakeWidgetMetadata( widgetId = 3, provider = ComponentName("pk_name", "cls_name_3"), - priority = 3, + rank = 2, userSerialNumber = 10, ) - val communalItemRankEntry1 = CommunalItemRank(uid = 1L, rank = widgetInfo1.priority) - val communalItemRankEntry2 = CommunalItemRank(uid = 2L, rank = widgetInfo2.priority) - val communalItemRankEntry3 = CommunalItemRank(uid = 3L, rank = widgetInfo3.priority) + val communalItemRankEntry1 = CommunalItemRank(uid = 1L, rank = widgetInfo1.rank) + val communalItemRankEntry2 = CommunalItemRank(uid = 2L, rank = widgetInfo2.rank) + val communalItemRankEntry3 = CommunalItemRank(uid = 3L, rank = widgetInfo3.rank) val communalWidgetItemEntry1 = CommunalWidgetItem( uid = 1L, diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt index 0b7a3ed3a7c2..6aecc0e2b8fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt @@ -22,6 +22,7 @@ import android.hardware.biometrics.BiometricSourceType import android.os.PowerManager import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.compose.animation.scene.ObservableTransitionState import com.android.keyguard.keyguardUpdateMonitor import com.android.keyguard.trustManager import com.android.systemui.SysuiTestCase @@ -37,6 +38,7 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.deviceentry.data.repository.fakeFaceWakeUpTriggersConfig import com.android.systemui.deviceentry.shared.FaceAuthUiEvent import com.android.systemui.deviceentry.shared.model.ErrorFaceAuthenticationStatus +import com.android.systemui.flags.EnableSceneContainer import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository @@ -52,12 +54,15 @@ import com.android.systemui.log.logcatLogBuffer import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.power.shared.model.WakeSleepReason +import com.android.systemui.scene.domain.interactor.sceneInteractor +import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.testKosmos import com.android.systemui.user.data.model.SelectionStatus import com.android.systemui.user.data.repository.fakeUserRepository import com.android.systemui.util.mockito.eq import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -113,6 +118,7 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { powerInteractor, fakeBiometricSettingsRepository, trustManager, + { kosmos.sceneInteractor }, deviceEntryFaceAuthStatusInteractor, ) } @@ -279,6 +285,22 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { } @Test + @EnableSceneContainer + fun withSceneContainerEnabled_faceAuthIsRequestedWhenPrimaryBouncerIsVisible() = + testScope.runTest { + underTest.start() + + kosmos.sceneInteractor.changeScene(Scenes.Bouncer, "for-test") + kosmos.sceneInteractor.setTransitionState( + MutableStateFlow(ObservableTransitionState.Idle(Scenes.Bouncer)) + ) + + runCurrent() + assertThat(faceAuthRepository.runningAuthRequest.value) + .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_UPDATED_PRIMARY_BOUNCER_SHOWN, false)) + } + + @Test fun faceAuthIsRequestedWhenAlternateBouncerIsVisible() = testScope.runTest { underTest.start() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt index fc7f69319261..d13419eed281 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt @@ -30,6 +30,7 @@ import com.android.systemui.animation.Expandable import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFaceAuthInteractor import com.android.systemui.dock.DockManagerFake import com.android.systemui.doze.util.BurnInHelperWrapper import com.android.systemui.flags.FakeFeatureFlags @@ -152,9 +153,7 @@ class KeyguardBottomAreaViewModelTest(flags: FlagsParameterization) : SysuiTestC dockManager = DockManagerFake() biometricSettingsRepository = FakeBiometricSettingsRepository() val featureFlags = - FakeFeatureFlags().apply { - set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, false) - } + FakeFeatureFlags().apply { set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, false) } val withDeps = KeyguardInteractorFactory.create(featureFlags = featureFlags) val keyguardInteractor = withDeps.keyguardInteractor @@ -223,6 +222,7 @@ class KeyguardBottomAreaViewModelTest(flags: FlagsParameterization) : SysuiTestC broadcastDispatcher = broadcastDispatcher, accessibilityManager = accessibilityManager, pulsingGestureListener = kosmos.pulsingGestureListener, + faceAuthInteractor = kosmos.deviceEntryFaceAuthInteractor, ) underTest = KeyguardBottomAreaViewModel( diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt index bdee9365d494..fd53b5baece5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt @@ -38,19 +38,28 @@ import android.media.session.MediaSession import android.media.session.PlaybackState import android.net.Uri import android.os.Bundle +import android.platform.test.flag.junit.FlagsParameterization import android.provider.Settings import android.service.notification.StatusBarNotification import android.testing.TestableLooper.RunWithLooper import androidx.media.utils.MediaConstants -import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.internal.logging.InstanceId import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.Flags import com.android.systemui.InstanceIdSequenceFake import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dump.DumpManager +import com.android.systemui.flags.Flags.MEDIA_REMOTE_RESUME +import com.android.systemui.flags.Flags.MEDIA_RESUME_PROGRESS +import com.android.systemui.flags.Flags.MEDIA_RETAIN_RECOMMENDATIONS +import com.android.systemui.flags.Flags.MEDIA_RETAIN_SESSIONS +import com.android.systemui.flags.Flags.MEDIA_SESSION_ACTIONS +import com.android.systemui.flags.fakeFeatureFlagsClassic +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope import com.android.systemui.media.controls.domain.resume.MediaResumeListener import com.android.systemui.media.controls.domain.resume.ResumeMediaBrowser import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_SOURCE @@ -58,16 +67,21 @@ import com.android.systemui.media.controls.shared.model.EXTRA_VALUE_TRIGGER_PERI import com.android.systemui.media.controls.shared.model.MediaData import com.android.systemui.media.controls.shared.model.SmartspaceMediaData import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider -import com.android.systemui.media.controls.util.MediaControllerFactory -import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger -import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.media.controls.util.fakeMediaControllerFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.plugins.activityStarter import com.android.systemui.res.R import com.android.systemui.statusbar.SbnBuilder +import com.android.systemui.testKosmos import com.android.systemui.tuner.TunerService import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Before import org.junit.Rule @@ -91,6 +105,8 @@ import org.mockito.kotlin.any import org.mockito.kotlin.capture import org.mockito.kotlin.eq import org.mockito.quality.Strictness +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters private const val KEY = "KEY" private const val KEY_2 = "KEY_2" @@ -111,13 +127,13 @@ private fun <T> anyObject(): T { return Mockito.anyObject<T>() } +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWithLooper(setAsMainLooper = true) -@RunWith(AndroidJUnit4::class) -class LegacyMediaDataManagerImplTest : SysuiTestCase() { +@RunWith(ParameterizedAndroidJunit4::class) +class LegacyMediaDataManagerImplTest(flags: FlagsParameterization) : SysuiTestCase() { @JvmField @Rule val mockito = MockitoJUnit.rule() - @Mock lateinit var mediaControllerFactory: MediaControllerFactory @Mock lateinit var controller: MediaController @Mock lateinit var transportControls: MediaController.TransportControls @Mock lateinit var playbackInfo: MediaController.PlaybackInfo @@ -136,7 +152,6 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Mock lateinit var mediaDataFilter: LegacyMediaDataFilterImpl @Mock lateinit var listener: MediaDataManager.Listener @Mock lateinit var pendingIntent: PendingIntent - @Mock lateinit var activityStarter: ActivityStarter @Mock lateinit var smartspaceManager: SmartspaceManager @Mock lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor lateinit var smartspaceMediaDataProvider: SmartspaceMediaDataProvider @@ -144,7 +159,6 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Mock private lateinit var mediaRecommendationItem: SmartspaceAction lateinit var validRecommendationList: List<SmartspaceAction> @Mock private lateinit var mediaSmartspaceBaseAction: SmartspaceAction - @Mock private lateinit var mediaFlags: MediaFlags @Mock private lateinit var logger: MediaUiEventLogger lateinit var mediaDataManager: LegacyMediaDataManagerImpl lateinit var mediaNotification: StatusBarNotification @@ -159,6 +173,26 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Mock private lateinit var ugm: IUriGrantsManager @Mock private lateinit var imageSource: ImageDecoder.Source + companion object { + @JvmStatic + @Parameters(name = "{0}") + fun getParams(): List<FlagsParameterization> { + return FlagsParameterization.progressionOf( + Flags.FLAG_MEDIA_LOAD_METADATA_VIA_MEDIA_DATA_LOADER + ) + } + } + + init { + mSetFlagsRule.setFlagsParameterization(flags) + } + + private val kosmos = testKosmos() + private val testDispatcher = kosmos.testDispatcher + private val testScope = kosmos.testScope + private val fakeFeatureFlags = kosmos.fakeFeatureFlagsClassic + private val activityStarter = kosmos.activityStarter + private val mediaControllerFactory = kosmos.fakeMediaControllerFactory private val instanceIdSequence = InstanceIdSequenceFake(1 shl 20) private val originalSmartspaceSetting = @@ -188,12 +222,16 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 1 ) + mediaDataManager = LegacyMediaDataManagerImpl( context = context, backgroundExecutor = backgroundExecutor, + backgroundDispatcher = testDispatcher, uiExecutor = uiExecutor, foregroundExecutor = foregroundExecutor, + mainDispatcher = testDispatcher, + applicationScope = testScope, mediaControllerFactory = mediaControllerFactory, broadcastDispatcher = broadcastDispatcher, dumpManager = dumpManager, @@ -209,10 +247,11 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { useQsMediaPlayer = true, systemClock = clock, tunerService = tunerService, - mediaFlags = mediaFlags, + mediaFlags = kosmos.mediaFlags, logger = logger, smartspaceManager = smartspaceManager, keyguardUpdateMonitor = keyguardUpdateMonitor, + mediaDataLoader = { kosmos.mediaDataLoader }, ) verify(tunerService) .addTunable(capture(tunableCaptor), eq(Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION)) @@ -248,7 +287,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_TITLE) } verify(smartspaceManager).createSmartspaceSession(capture(smartSpaceConfigBuilderCaptor)) - whenever(mediaControllerFactory.create(eq(session.sessionToken))).thenReturn(controller) + mediaControllerFactory.setControllerForToken(session.sessionToken, controller) whenever(controller.transportControls).thenReturn(transportControls) whenever(controller.playbackInfo).thenReturn(playbackInfo) whenever(controller.metadata).thenReturn(metadataBuilder.build()) @@ -278,10 +317,11 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { whenever(mediaSmartspaceTarget.iconGrid).thenReturn(validRecommendationList) whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(SMARTSPACE_CREATION_TIME) whenever(mediaSmartspaceTarget.expiryTimeMillis).thenReturn(SMARTSPACE_EXPIRY_TIME) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(false) - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(false) - whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) - whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(false) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, false) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, false) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, false) + fakeFeatureFlags.set(MEDIA_REMOTE_RESUME, false) + fakeFeatureFlags.set(MEDIA_RETAIN_RECOMMENDATIONS, false) whenever(logger.getNewInstanceId()).thenReturn(instanceIdSequence.newInstanceId()) whenever(keyguardUpdateMonitor.isUserInLockdown(any())).thenReturn(false) } @@ -310,49 +350,51 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { } @Test - fun testsetInactive_resume_dismissesMedia() { - // WHEN resume controls are present, and time out - val desc = - MediaDescription.Builder().run { - setTitle(SESSION_TITLE) - build() - } - mediaDataManager.addResumptionControls( - USER_ID, - desc, - Runnable {}, - session.sessionToken, - APP_NAME, - pendingIntent, - PACKAGE_NAME - ) - - backgroundExecutor.runAllReady() - foregroundExecutor.runAllReady() - verify(listener) - .onMediaDataLoaded( - eq(PACKAGE_NAME), - eq(null), - capture(mediaDataCaptor), - eq(true), - eq(0), - eq(false) + fun testsetInactive_resume_dismissesMedia() = + testScope.runTest { + // WHEN resume controls are present, and time out + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + mediaDataManager.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME ) - mediaDataManager.setInactive(PACKAGE_NAME, timedOut = true) - verify(logger) - .logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(mediaDataCaptor.value.instanceId)) + runCurrent() + backgroundExecutor.runAllReady() + foregroundExecutor.runAllReady() + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) - // THEN it is removed and listeners are informed - foregroundExecutor.advanceClockToLast() - foregroundExecutor.runAllReady() - verify(listener).onMediaDataRemoved(PACKAGE_NAME, false) - } + mediaDataManager.setInactive(PACKAGE_NAME, timedOut = true) + verify(logger) + .logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(mediaDataCaptor.value.instanceId)) + + // THEN it is removed and listeners are informed + foregroundExecutor.advanceClockToLast() + foregroundExecutor.runAllReady() + verify(listener).onMediaDataRemoved(PACKAGE_NAME, false) + } @Test fun testLoadsMetadataOnBackground() { mediaDataManager.onNotificationAdded(KEY, mediaNotification) - assertThat(backgroundExecutor.numPending()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 0, background = 1) } @Test @@ -370,8 +412,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.addListener(listener) mediaDataManager.onNotificationAdded(KEY, mediaNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -389,8 +430,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.addListener(listener) mediaDataManager.onNotificationAdded(KEY, mediaNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -417,11 +457,9 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnMetaDataLoaded_conservesActiveFlag() { - whenever(mediaControllerFactory.create(anyObject())).thenReturn(controller) mediaDataManager.addListener(listener) mediaDataManager.onNotificationAdded(KEY, mediaNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -465,8 +503,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { } mediaDataManager.onNotificationAdded(KEY, notif) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -552,8 +589,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.onNotificationAdded(KEY, mediaNotification) // Then a media control is created with a placeholder title string - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -583,8 +619,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.onNotificationAdded(KEY, mediaNotification) // Then a media control is created with a placeholder title string - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -625,8 +660,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.onNotificationAdded(KEY, mediaNotification) // Then the media control is added using the notification's title - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -734,8 +768,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { // GIVEN that the manager has two notifications with resume actions mediaDataManager.onNotificationAdded(KEY, mediaNotification) mediaDataManager.onNotificationAdded(KEY_2, mediaNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(2) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(2) + testScope.assertRunAllReady(foreground = 2, background = 2) verify(listener) .onMediaDataLoaded( @@ -822,7 +855,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnNotificationRemoved_withResumption_isRemoteAndRemoteAllowed() { // With the flag enabled to allow remote media to resume - whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_REMOTE_RESUME, true) // GIVEN that the manager has a notification with a resume action, but is not local whenever(controller.metadata).thenReturn(metadataBuilder.build()) @@ -853,7 +886,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnNotificationRemoved_withResumption_isRcnAndRemoteAllowed() { // With the flag enabled to allow remote media to resume - whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_REMOTE_RESUME, true) // GIVEN that the manager has a remote cast notification addNotificationAndLoad(remoteCastNotification) @@ -972,7 +1005,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasPartialProgress() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added with partial progress val progress = 0.5 @@ -999,7 +1032,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasNotPlayedProgress() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added that have not been played val extras = @@ -1024,7 +1057,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasFullProgress() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added with progress info val extras = @@ -1050,7 +1083,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasNoExtras() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added that do not have any extras val desc = @@ -1068,7 +1101,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasEmptyTitle() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added that have empty title val desc = @@ -1087,8 +1120,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { ) // Resumption controls are not added. - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(0) + testScope.assertRunAllReady(foreground = 0, background = 1) verify(listener, never()) .onMediaDataLoaded( eq(PACKAGE_NAME), @@ -1102,7 +1134,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testAddResumptionControls_hasBlankTitle() { - whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true) // WHEN resumption controls are added that have a blank title val desc = @@ -1121,8 +1153,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { ) // Resumption controls are not added. - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(0) + testScope.assertRunAllReady(foreground = 0, background = 1) verify(listener, never()) .onMediaDataLoaded( eq(PACKAGE_NAME), @@ -1189,8 +1220,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { mediaDataManager.onNotificationAdded(KEY, notif) // THEN it still loads - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -1307,7 +1337,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_persistentEnabled_headphoneTrigger_isActive() { - whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_RECOMMENDATIONS, true) smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) val instanceId = instanceIdSequence.lastInstanceId @@ -1333,7 +1363,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_persistentEnabled_periodicTrigger_notActive() { - whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_RECOMMENDATIONS, true) val extras = Bundle().apply { putString("package_name", PACKAGE_NAME) @@ -1367,7 +1397,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_persistentEnabled_noTargets_inactive() { - whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_RECOMMENDATIONS, true) smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) val instanceId = instanceIdSequence.lastInstanceId @@ -1399,7 +1429,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testSetRecommendationInactive_notifiesListeners() { - whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_RECOMMENDATIONS, true) smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) val instanceId = instanceIdSequence.lastInstanceId @@ -1479,8 +1509,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { fun testOnMediaDataTimedOut_updatesLastActiveTime() { // GIVEN that the manager has a notification mediaDataManager.onNotificationAdded(KEY, mediaNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) // WHEN the notification times out clock.advanceTime(100) @@ -1588,8 +1617,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { // WHEN the notification is loaded mediaDataManager.onNotificationAdded(KEY, notif) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) // THEN only the first MAX_COMPACT_ACTIONS are actually set verify(listener) @@ -1624,8 +1652,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { // WHEN the notification is loaded mediaDataManager.onNotificationAdded(KEY, notif) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) // THEN only the first MAX_NOTIFICATION_ACTIONS are actually included verify(listener) @@ -1644,7 +1671,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_noState_usesNotification() { val desc = "Notification Action" - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) whenever(controller.playbackState).thenReturn(null) val notifWithAction = @@ -1659,8 +1686,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { } mediaDataManager.onNotificationAdded(KEY, notifWithAction) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -1679,7 +1705,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_hasPrevNext() { val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4") - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val stateActions = PlaybackState.ACTION_PLAY or PlaybackState.ACTION_SKIP_TO_PREVIOUS or @@ -1723,7 +1749,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_noPrevNext_usesCustom() { val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4", "custom 5") - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val stateActions = PlaybackState.ACTION_PLAY val stateBuilder = PlaybackState.Builder().setActions(stateActions) customDesc.forEach { @@ -1755,7 +1781,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_connecting() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val stateActions = PlaybackState.ACTION_PLAY val stateBuilder = PlaybackState.Builder() @@ -1776,7 +1802,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_reservedSpace() { val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4") - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val stateActions = PlaybackState.ACTION_PLAY val stateBuilder = PlaybackState.Builder().setActions(stateActions) customDesc.forEach { @@ -1814,7 +1840,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackActions_playPause_hasButton() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val stateActions = PlaybackState.ACTION_PLAY_PAUSE val stateBuilder = PlaybackState.Builder().setActions(stateActions) whenever(controller.playbackState).thenReturn(stateBuilder.build()) @@ -1851,8 +1877,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { // update to remote cast mediaDataManager.onNotificationAdded(KEY, remoteCastNotification) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(logger) .logPlaybackLocationChange( anyInt(), @@ -1914,7 +1939,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testPlaybackState_PauseWhenFlagTrue_keyExists_callsListener() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) val state = PlaybackState.Builder().setState(PlaybackState.STATE_PAUSED, 0L, 1f).build() whenever(controller.playbackState).thenReturn(state) @@ -1935,46 +1960,48 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { } @Test - fun testPlaybackState_PauseStateAfterAddingResumption_keyExists_callsListener() { - val desc = - MediaDescription.Builder().run { - setTitle(SESSION_TITLE) - build() - } - val state = - PlaybackState.Builder() - .setState(PlaybackState.STATE_PAUSED, 0L, 1f) - .setActions(PlaybackState.ACTION_PLAY_PAUSE) - .build() - - // Add resumption controls in order to have semantic actions. - // To make sure that they are not null after changing state. - mediaDataManager.addResumptionControls( - USER_ID, - desc, - Runnable {}, - session.sessionToken, - APP_NAME, - pendingIntent, - PACKAGE_NAME - ) - backgroundExecutor.runAllReady() - foregroundExecutor.runAllReady() - - stateCallbackCaptor.value.invoke(PACKAGE_NAME, state) + fun testPlaybackState_PauseStateAfterAddingResumption_keyExists_callsListener() = + testScope.runTest { + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + val state = + PlaybackState.Builder() + .setState(PlaybackState.STATE_PAUSED, 0L, 1f) + .setActions(PlaybackState.ACTION_PLAY_PAUSE) + .build() - verify(listener) - .onMediaDataLoaded( - eq(PACKAGE_NAME), - eq(PACKAGE_NAME), - capture(mediaDataCaptor), - eq(true), - eq(0), - eq(false) + // Add resumption controls in order to have semantic actions. + // To make sure that they are not null after changing state. + mediaDataManager.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME ) - assertThat(mediaDataCaptor.value.isPlaying).isFalse() - assertThat(mediaDataCaptor.value.semanticActions).isNotNull() - } + runCurrent() + backgroundExecutor.runAllReady() + foregroundExecutor.runAllReady() + + stateCallbackCaptor.value.invoke(PACKAGE_NAME, state) + + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(PACKAGE_NAME), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + assertThat(mediaDataCaptor.value.semanticActions).isNotNull() + } @Test fun testPlaybackStateNull_Pause_keyExists_callsListener() { @@ -2036,7 +2063,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_notifPlayer_notifRemoved_setToResume() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) // When a media control based on notification is added, times out, and then removed addNotificationAndLoad() @@ -2066,7 +2093,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_notifPlayer_sessionDestroyed_doesNotChange() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) // When a media control based on notification is added and times out addNotificationAndLoad() @@ -2084,7 +2111,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_notifPlayer_removeWhileActive_fullyRemoved() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) // When a media control based on notification is added and then removed, without timing out addNotificationAndLoad() @@ -2101,7 +2128,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_canResume_removeWhileActive_setToResume() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) // When a media control that supports resumption is added addNotificationAndLoad() @@ -2133,8 +2160,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_sessionPlayer_notifRemoved_doesNotChange() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control with PlaybackState actions is added, times out, @@ -2153,8 +2180,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_sessionPlayer_sessionDestroyed_setToResume() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control with PlaybackState actions is added, times out, @@ -2187,8 +2214,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_sessionPlayer_destroyedWhileActive_noResume_fullyRemoved() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control using session actions is added, and then the session is destroyed @@ -2207,8 +2234,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testRetain_sessionPlayer_canResume_destroyedWhileActive_setToResume() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control using session actions and that does allow resumption is added, @@ -2241,7 +2268,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testSessionPlayer_sessionDestroyed_noResume_fullyRemoved() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control with PlaybackState actions is added, times out, @@ -2268,7 +2295,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testSessionPlayer_destroyedWhileActive_noResume_fullyRemoved() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control using session actions is added, and then the session is destroyed @@ -2287,7 +2314,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testSessionPlayer_canResume_destroyedWhileActive_setToResume() { - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) addPlaybackStateAction() // When a media control using session actions and that does allow resumption is added, @@ -2320,8 +2347,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { @Test fun testSessionDestroyed_noNotificationKey_stillRemoved() { - whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) - whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + fakeFeatureFlags.set(MEDIA_RETAIN_SESSIONS, true) + fakeFeatureFlags.set(MEDIA_SESSION_ACTIONS, true) // When a notiifcation is added and then removed before it is fully processed mediaDataManager.onNotificationAdded(KEY, mediaNotification) @@ -2392,6 +2419,23 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { assertThat(mediaDataCaptor.value.artwork).isNull() } + private fun TestScope.assertRunAllReady(foreground: Int = 0, background: Int = 0) { + runCurrent() + if (Flags.mediaLoadMetadataViaMediaDataLoader()) { + // It doesn't make much sense to count tasks when we use coroutines in loader + // so this check is skipped in that scenario. + backgroundExecutor.runAllReady() + foregroundExecutor.runAllReady() + } else { + if (background > 0) { + assertThat(backgroundExecutor.runAllReady()).isEqualTo(background) + } + if (foreground > 0) { + assertThat(foregroundExecutor.runAllReady()).isEqualTo(foreground) + } + } + } + /** Helper function to add a basic media notification and capture the resulting MediaData */ private fun addNotificationAndLoad() { addNotificationAndLoad(mediaNotification) @@ -2400,8 +2444,7 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { /** Helper function to add the given notification and capture the resulting MediaData */ private fun addNotificationAndLoad(sbn: StatusBarNotification) { mediaDataManager.onNotificationAdded(KEY, sbn) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( eq(KEY), @@ -2435,8 +2478,8 @@ class LegacyMediaDataManagerImplTest : SysuiTestCase() { pendingIntent, packageName ) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + testScope.assertRunAllReady(foreground = 1, background = 1) verify(listener) .onMediaDataLoaded( diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt index f531a3fdd8f0..3e3aa4f079f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt @@ -16,9 +16,9 @@ import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.wm.shell.recents.RecentTasks +import com.android.wm.shell.shared.GroupedRecentTaskInfo +import com.android.wm.shell.shared.split.SplitBounds import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_50_50 -import com.android.wm.shell.util.GroupedRecentTaskInfo -import com.android.wm.shell.util.SplitBounds import com.google.common.truth.Truth.assertThat import java.util.Optional import java.util.function.Consumer diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewControllerTest.kt index 8fbd3c8b7ebf..69b7b2bfcf8c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewControllerTest.kt @@ -29,8 +29,8 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorResultHandler import com.android.systemui.mediaprojection.appselector.data.RecentTask import com.android.systemui.util.mockito.mock +import com.android.wm.shell.shared.split.SplitBounds import com.android.wm.shell.splitscreen.SplitScreen -import com.android.wm.shell.util.SplitBounds import com.google.common.truth.Expect import com.google.common.truth.Truth.assertThat import java.util.Optional diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java index 505f7997ef1c..3f6617b32131 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java @@ -197,6 +197,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { () -> sceneInteractor, () -> mKosmos.getFromGoneTransitionInteractor(), () -> mKosmos.getFromLockscreenTransitionInteractor(), + () -> mKosmos.getFromOccludedTransitionInteractor(), () -> mKosmos.getSharedNotificationContainerInteractor(), mTestScope); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt index d1b1f466ef7a..ed99705b194e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt @@ -98,16 +98,20 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro // instead of VisualInterruptionDecisionProviderTestBase // because avalanche code is based on the suppression refactor. + private fun getAvalancheSuppressor() : AvalancheSuppressor { + return AvalancheSuppressor( + avalancheProvider, systemClock, settingsInteractor, packageManager, + uiEventLogger, context, notificationManager, logger + ) + } + @Test fun testAvalancheFilter_suppress_hasNotSeenEdu_showEduHun() { setAllowedEmergencyPkg(false) whenever(avalancheProvider.timeoutMs).thenReturn(20) whenever(avalancheProvider.startTime).thenReturn(whenAgo(10)) - val avalancheSuppressor = AvalancheSuppressor( - avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager - ) + val avalancheSuppressor = getAvalancheSuppressor() avalancheSuppressor.hasSeenEdu = false withFilter(avalancheSuppressor) { @@ -128,10 +132,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro whenever(avalancheProvider.timeoutMs).thenReturn(20) whenever(avalancheProvider.startTime).thenReturn(whenAgo(10)) - val avalancheSuppressor = AvalancheSuppressor( - avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager - ) + val avalancheSuppressor = getAvalancheSuppressor() avalancheSuppressor.hasSeenEdu = true withFilter(avalancheSuppressor) { @@ -151,8 +152,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -171,8 +171,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldNotHeadsUp( @@ -191,8 +190,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -209,8 +207,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -227,8 +224,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -245,8 +241,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -263,8 +258,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -281,8 +275,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -300,8 +293,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -318,8 +310,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { assertFsiNotSuppressed() } @@ -330,8 +321,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro avalancheProvider.startTime = whenAgo(10) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( @@ -359,8 +349,7 @@ class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionPro setAllowedEmergencyPkg(true) withFilter( - AvalancheSuppressor(avalancheProvider, systemClock, settingsInteractor, packageManager, - uiEventLogger, context, notificationManager) + getAvalancheSuppressor() ) { ensurePeekState() assertShouldHeadsUp( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt index 9d3d9c156238..284efc71a96d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt @@ -139,6 +139,7 @@ abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() { protected val settingsInteractor: NotificationSettingsInteractor = mock() protected val packageManager: PackageManager = mock() protected val notificationManager: NotificationManager = mock() + protected val logger: VisualInterruptionDecisionLogger = mock() protected abstract val provider: VisualInterruptionDecisionProvider private val neverSuppresses = object : NotificationInterruptSuppressor {} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt index 491919a16a4e..30a1214d69d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt @@ -35,6 +35,9 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.res.R import com.android.systemui.statusbar.notification.ConversationNotificationProcessor import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.InflatedContentViewHolder +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.KeepExistingView +import com.android.systemui.statusbar.notification.row.ContentViewInflationResult.NullContentView import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.BindParams import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED @@ -74,6 +77,7 @@ import org.mockito.kotlin.never import org.mockito.kotlin.spy import org.mockito.kotlin.times import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyZeroInteractions import org.mockito.kotlin.whenever @SmallTest @@ -125,8 +129,10 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { ): RichOngoingContentModel? = fakeRonContentModel } - private var fakeRonViewHolder: InflatedContentViewHolder? = null - private val fakeRonViewInflater = + private var fakeContractedRonViewHolder: ContentViewInflationResult = NullContentView + private var fakeExpandedRonViewHolder: ContentViewInflationResult = NullContentView + private var fakeHeadsUpRonViewHolder: ContentViewInflationResult = NullContentView + private var fakeRonViewInflater = spy( object : RichOngoingNotificationViewInflater { override fun inflateView( @@ -134,8 +140,20 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { existingView: View?, entry: NotificationEntry, systemUiContext: Context, - parentView: ViewGroup - ): InflatedContentViewHolder? = fakeRonViewHolder + parentView: ViewGroup, + viewType: RichOngoingNotificationViewType + ): ContentViewInflationResult = + when (viewType) { + RichOngoingNotificationViewType.Contracted -> fakeContractedRonViewHolder + RichOngoingNotificationViewType.Expanded -> fakeExpandedRonViewHolder + RichOngoingNotificationViewType.HeadsUp -> fakeHeadsUpRonViewHolder + } + + override fun canKeepView( + contentModel: RichOngoingContentModel, + existingView: View?, + viewType: RichOngoingNotificationViewType + ): Boolean = false } ) @@ -149,6 +167,7 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { .setContentText("Text") .setStyle(Notification.BigTextStyle().bigText("big text")) testHelper = NotificationTestHelper(mContext, mDependency) + testHelper.setDefaultInflationFlags(FLAG_CONTENT_VIEW_ALL) row = spy(testHelper.createRow(builder.build())) notificationInflater = NotificationRowContentBinderImpl( @@ -388,15 +407,62 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { @Test fun testRonModelRequiredForRonView() { fakeRonContentModel = null + val contractedRonView = View(context) + val expandedRonView = View(context) + val headsUpRonView = View(context) + fakeContractedRonViewHolder = + InflatedContentViewHolder(view = contractedRonView, binder = mock()) + fakeExpandedRonViewHolder = + InflatedContentViewHolder(view = expandedRonView, binder = mock()) + fakeHeadsUpRonViewHolder = InflatedContentViewHolder(view = headsUpRonView, binder = mock()) + + // WHEN inflater inflates + val contentToInflate = + FLAG_CONTENT_VIEW_CONTRACTED or FLAG_CONTENT_VIEW_EXPANDED or FLAG_CONTENT_VIEW_HEADS_UP + inflateAndWait(notificationInflater, contentToInflate, row) + verifyZeroInteractions(fakeRonViewInflater) + } + + @Test + fun testRonModelCleansUpRemoteViews() { val ronView = View(context) - fakeRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mock()) + + val entry = row.entry + + fakeRonContentModel = mock<TimerContentModel>() + fakeContractedRonViewHolder = + InflatedContentViewHolder(view = ronView, binder = mock<DeferredContentViewBinder>()) + // WHEN inflater inflates inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) - verify(fakeRonViewInflater, never()).inflateView(any(), any(), any(), any(), any()) + + // VERIFY + verify(cache).removeCachedView(eq(entry), eq(FLAG_CONTENT_VIEW_CONTRACTED)) + verify(cache).removeCachedView(eq(entry), eq(FLAG_CONTENT_VIEW_EXPANDED)) + verify(cache).removeCachedView(eq(entry), eq(FLAG_CONTENT_VIEW_HEADS_UP)) } @Test - fun testRonModelTriggersInflationOfRonView() { + fun testRonModelCleansUpSmartReplies() { + val ronView = View(context) + + val privateLayout = spy(row.privateLayout) + + row.privateLayout = privateLayout + + fakeRonContentModel = mock<TimerContentModel>() + fakeContractedRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mock()) + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + + // VERIFY + verify(privateLayout).setExpandedInflatedSmartReplies(eq(null)) + verify(privateLayout).setHeadsUpInflatedSmartReplies(eq(null)) + } + + @Test + fun testRonModelTriggersInflationOfContractedRonView() { val mockRonModel = mock<TimerContentModel>() val ronView = View(context) val mockBinder = mock<DeferredContentViewBinder>() @@ -405,18 +471,229 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { val privateLayout = row.privateLayout fakeRonContentModel = mockRonModel - fakeRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + fakeContractedRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + // WHEN inflater inflates inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + // VERIFY that the inflater is invoked verify(fakeRonViewInflater) - .inflateView(eq(mockRonModel), any(), eq(entry), any(), eq(privateLayout)) + .inflateView( + eq(mockRonModel), + any(), + eq(entry), + any(), + eq(privateLayout), + eq(RichOngoingNotificationViewType.Contracted) + ) assertThat(row.privateLayout.contractedChild).isSameInstanceAs(ronView) verify(mockBinder).setupContentViewBinder() } @Test - fun ronViewAppliesElementsInOrder() { + fun testRonModelTriggersInflationOfExpandedRonView() { + val mockRonModel = mock<TimerContentModel>() + val ronView = View(context) + val mockBinder = mock<DeferredContentViewBinder>() + + val entry = row.entry + val privateLayout = row.privateLayout + + fakeRonContentModel = mockRonModel + fakeExpandedRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_EXPANDED, row) + + // VERIFY that the inflater is invoked + verify(fakeRonViewInflater) + .inflateView( + eq(mockRonModel), + any(), + eq(entry), + any(), + eq(privateLayout), + eq(RichOngoingNotificationViewType.Expanded) + ) + assertThat(row.privateLayout.expandedChild).isSameInstanceAs(ronView) + verify(mockBinder).setupContentViewBinder() + } + + @Test + fun testRonModelTriggersInflationOfHeadsUpRonView() { + val mockRonModel = mock<TimerContentModel>() + val ronView = View(context) + val mockBinder = mock<DeferredContentViewBinder>() + + val entry = row.entry + val privateLayout = row.privateLayout + + fakeRonContentModel = mockRonModel + fakeHeadsUpRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_HEADS_UP, row) + + // VERIFY that the inflater is invoked + verify(fakeRonViewInflater) + .inflateView( + eq(mockRonModel), + any(), + eq(entry), + any(), + eq(privateLayout), + eq(RichOngoingNotificationViewType.HeadsUp) + ) + assertThat(row.privateLayout.headsUpChild).isSameInstanceAs(ronView) + verify(mockBinder).setupContentViewBinder() + } + + @Test + fun keepExistingViewForContractedRonNotChangingContractedChild() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mContractedBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeContractedRonViewHolder = KeepExistingView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + + // THEN do not dispose old contracted binder handle and change contracted child + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verifyZeroInteractions(oldHandle) + verify(privateLayout, never()).setContractedChild(any()) + } + + @Test + fun keepExistingViewForExpandedRonNotChangingExpandedChild() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mExpandedBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeExpandedRonViewHolder = KeepExistingView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_EXPANDED, row) + + // THEN do not dispose old expanded binder handle and change expanded child + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verifyZeroInteractions(oldHandle) + verify(privateLayout, never()).setExpandedChild(any()) + } + + @Test + fun keepExistingViewForHeadsUpRonNotChangingHeadsUpChild() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mHeadsUpBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeHeadsUpRonViewHolder = KeepExistingView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_HEADS_UP, row) + + // THEN - do not dispose old heads up binder handle and change heads up child + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verifyZeroInteractions(oldHandle) + verify(privateLayout, never()).setHeadsUpChild(any()) + } + + @Test + fun nullContentViewForContractedRonAppliesElementsInOrder() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mContractedBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeContractedRonViewHolder = NullContentView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + + // Validate that these 4 steps happen in this precise order + inOrder(oldHandle, entry, privateLayout, cache) { + verify(oldHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verify(privateLayout).setContractedChild(eq(null)) + } + } + + @Test + fun nullContentViewForExpandedRonAppliesElementsInOrder() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mExpandedBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeExpandedRonViewHolder = NullContentView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_EXPANDED, row) + + // Validate that these 4 steps happen in this precise order + inOrder(oldHandle, entry, privateLayout, cache) { + verify(oldHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verify(privateLayout).setExpandedChild(eq(null)) + } + } + + @Test + fun nullContentViewForHeadsUpRonAppliesElementsInOrder() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + + row.privateLayout.mHeadsUpBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeHeadsUpRonViewHolder = NullContentView + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_HEADS_UP, row) + + // Validate that these 4 steps happen in this precise order + inOrder(oldHandle, entry, privateLayout, cache) { + verify(oldHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verify(privateLayout).setHeadsUpChild(eq(null)) + } + } + + @Test + fun contractedRonViewAppliesElementsInOrder() { val oldHandle = mock<DisposableHandle>() val mockRonModel = mock<TimerContentModel>() val ronView = View(context) @@ -429,7 +706,8 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { row.privateLayout = privateLayout fakeRonContentModel = mockRonModel - fakeRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + fakeContractedRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + // WHEN inflater inflates inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) @@ -443,16 +721,89 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { } @Test - fun testRonNotReinflating() { - val handle0 = mock<DisposableHandle>() - val handle1 = mock<DisposableHandle>() + fun expandedRonViewAppliesElementsInOrder() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() val ronView = View(context) + val mockBinder = mock<DeferredContentViewBinder>() + + row.privateLayout.mExpandedBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeExpandedRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_EXPANDED, row) + + // Validate that these 4 steps happen in this precise order + inOrder(oldHandle, entry, privateLayout, mockBinder) { + verify(oldHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verify(privateLayout).setExpandedChild(eq(ronView)) + verify(mockBinder).setupContentViewBinder() + } + } + + @Test + fun headsUpRonViewAppliesElementsInOrder() { + val oldHandle = mock<DisposableHandle>() + val mockRonModel = mock<TimerContentModel>() + val ronView = View(context) + val mockBinder = mock<DeferredContentViewBinder>() + + row.privateLayout.mHeadsUpBinderHandle = oldHandle + val entry = spy(row.entry) + row.entry = entry + val privateLayout = spy(row.privateLayout) + row.privateLayout = privateLayout + + fakeRonContentModel = mockRonModel + fakeHeadsUpRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder) + + // WHEN inflater inflates + inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_HEADS_UP, row) + + // Validate that these 4 steps happen in this precise order + inOrder(oldHandle, entry, privateLayout, mockBinder) { + verify(oldHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel }) + verify(privateLayout).setHeadsUpChild(eq(ronView)) + verify(mockBinder).setupContentViewBinder() + } + } + + @Test + fun testRonNotReinflating() { + val oldContractedBinderHandle = mock<DisposableHandle>() + val oldExpandedBinderHandle = mock<DisposableHandle>() + val oldHeadsUpBinderHandle = mock<DisposableHandle>() + + val contractedBinderHandle = mock<DisposableHandle>() + val expandedBinderHandle = mock<DisposableHandle>() + val headsUpBinderHandle = mock<DisposableHandle>() + + val contractedRonView = View(context) + val expandedRonView = View(context) + val headsUpRonView = View(context) + val mockRonModel1 = mock<TimerContentModel>() val mockRonModel2 = mock<TimerContentModel>() - val mockBinder1 = mock<DeferredContentViewBinder>() - doReturn(handle1).whenever(mockBinder1).setupContentViewBinder() - row.privateLayout.mContractedBinderHandle = handle0 + val mockContractedViewBinder = mock<DeferredContentViewBinder>() + val mockExpandedViewBinder = mock<DeferredContentViewBinder>() + val mockHeadsUpViewBinder = mock<DeferredContentViewBinder>() + + doReturn(contractedBinderHandle).whenever(mockContractedViewBinder).setupContentViewBinder() + doReturn(expandedBinderHandle).whenever(mockExpandedViewBinder).setupContentViewBinder() + doReturn(headsUpBinderHandle).whenever(mockHeadsUpViewBinder).setupContentViewBinder() + + row.privateLayout.mContractedBinderHandle = oldContractedBinderHandle + row.privateLayout.mExpandedBinderHandle = oldExpandedBinderHandle + row.privateLayout.mHeadsUpBinderHandle = oldHeadsUpBinderHandle val entry = spy(row.entry) row.entry = entry val privateLayout = spy(row.privateLayout) @@ -460,31 +811,87 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { // WHEN inflater inflates both a model and a view fakeRonContentModel = mockRonModel1 - fakeRonViewHolder = InflatedContentViewHolder(view = ronView, binder = mockBinder1) - inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + fakeContractedRonViewHolder = + InflatedContentViewHolder(view = contractedRonView, binder = mockContractedViewBinder) + fakeExpandedRonViewHolder = + InflatedContentViewHolder(view = expandedRonView, binder = mockExpandedViewBinder) + fakeHeadsUpRonViewHolder = + InflatedContentViewHolder(view = headsUpRonView, binder = mockHeadsUpViewBinder) + + val contentToInflate = + FLAG_CONTENT_VIEW_CONTRACTED or FLAG_CONTENT_VIEW_EXPANDED or FLAG_CONTENT_VIEW_HEADS_UP + inflateAndWait(notificationInflater, contentToInflate, row) // Validate that these 4 steps happen in this precise order - inOrder(handle0, entry, privateLayout, mockBinder1, handle1) { - verify(handle0).dispose() + inOrder( + oldContractedBinderHandle, + oldExpandedBinderHandle, + oldHeadsUpBinderHandle, + entry, + privateLayout, + mockContractedViewBinder, + mockExpandedViewBinder, + mockHeadsUpViewBinder, + contractedBinderHandle, + expandedBinderHandle, + headsUpBinderHandle + ) { + verify(oldContractedBinderHandle).dispose() + verify(oldExpandedBinderHandle).dispose() + verify(oldHeadsUpBinderHandle).dispose() + verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel1 }) - verify(privateLayout).setContractedChild(eq(ronView)) - verify(mockBinder1).setupContentViewBinder() - verify(handle1, never()).dispose() + + verify(privateLayout).setContractedChild(eq(contractedRonView)) + verify(mockContractedViewBinder).setupContentViewBinder() + + verify(privateLayout).setExpandedChild(eq(expandedRonView)) + verify(mockExpandedViewBinder).setupContentViewBinder() + + verify(privateLayout).setHeadsUpChild(eq(headsUpRonView)) + verify(mockHeadsUpViewBinder).setupContentViewBinder() + + verify(contractedBinderHandle, never()).dispose() + verify(expandedBinderHandle, never()).dispose() + verify(headsUpBinderHandle, never()).dispose() } - clearInvocations(handle0, entry, privateLayout, mockBinder1, handle1) + clearInvocations( + oldContractedBinderHandle, + oldExpandedBinderHandle, + oldHeadsUpBinderHandle, + entry, + privateLayout, + mockContractedViewBinder, + mockExpandedViewBinder, + mockHeadsUpViewBinder, + contractedBinderHandle, + expandedBinderHandle, + headsUpBinderHandle + ) // THEN when the inflater inflates just a model fakeRonContentModel = mockRonModel2 - fakeRonViewHolder = null - inflateAndWait(notificationInflater, FLAG_CONTENT_VIEW_CONTRACTED, row) + fakeContractedRonViewHolder = KeepExistingView + fakeExpandedRonViewHolder = KeepExistingView + fakeHeadsUpRonViewHolder = KeepExistingView + + inflateAndWait(notificationInflater, contentToInflate, row) // Validate that for reinflation, the only thing we do us update the model - verify(handle1, never()).dispose() + verify(contractedBinderHandle, never()).dispose() + verify(expandedBinderHandle, never()).dispose() + verify(headsUpBinderHandle, never()).dispose() verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel2 }) verify(privateLayout, never()).setContractedChild(any()) - verify(mockBinder1, never()).setupContentViewBinder() - verify(handle1, never()).dispose() + verify(privateLayout, never()).setExpandedChild(any()) + verify(privateLayout, never()).setHeadsUpChild(any()) + verify(mockContractedViewBinder, never()).setupContentViewBinder() + verify(mockExpandedViewBinder, never()).setupContentViewBinder() + verify(mockHeadsUpViewBinder, never()).setupContentViewBinder() + verify(contractedBinderHandle, never()).dispose() + verify(expandedBinderHandle, never()).dispose() + verify(headsUpBinderHandle, never()).dispose() } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModelTest.kt index c3cc33ffb81a..bf31f1e6d569 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/ui/viewmodel/DeviceBasedSatelliteViewModelTest.kt @@ -45,6 +45,7 @@ import org.junit.runner.RunWith import org.mockito.MockitoAnnotations import org.mockito.kotlin.mock +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidJUnit4::class) class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { @@ -88,7 +89,7 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { } @Test - fun icon_nullWhenShouldNotShow_satelliteNotAllowed() = + fun icon_null_satelliteNotAllowed() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -108,7 +109,30 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { } @Test - fun icon_nullWhenShouldNotShow_notAllOos() = + fun icon_null_connectedAndNotAllowed() = + testScope.runTest { + val latest by collectLastValue(underTest.icon) + + // GIVEN satellite is not allowed + repo.isSatelliteAllowedForCurrentLocation.value = false + + // GIVEN all icons are OOS + val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) + i1.isInService.value = false + i1.isEmergencyOnly.value = false + + // GIVEN satellite state is Connected. (this should not ever occur, but still) + repo.connectionState.value = SatelliteConnectionState.Connected + + // GIVEN apm is disabled + airplaneModeRepository.setIsAirplaneMode(false) + + // THEN icon is null despite the connected state + assertThat(latest).isNull() + } + + @Test + fun icon_null_notAllOos() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -127,9 +151,28 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun icon_nullWhenShouldNotShow_isEmergencyOnly() = + fun icon_null_allOosAndNotAllowed() = + testScope.runTest { + val latest by collectLastValue(underTest.icon) + + // GIVEN satellite is allowed + repo.isSatelliteAllowedForCurrentLocation.value = false + + // GIVEN all icons are OOS + val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) + i1.isInService.value = false + i1.isEmergencyOnly.value = false + + // GIVEN apm is disabled + airplaneModeRepository.setIsAirplaneMode(false) + + // THEN icon is null because it is not allowed + assertThat(latest).isNull() + } + + @Test + fun icon_null_isEmergencyOnly() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -158,7 +201,7 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { } @Test - fun icon_nullWhenShouldNotShow_apmIsEnabled() = + fun icon_null_apmIsEnabled() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -177,9 +220,8 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun icon_satelliteIsOn() = + fun icon_notNull_satelliteAllowedAndAllOos() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -201,7 +243,6 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isInstanceOf(Icon::class.java) } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun icon_hysteresisWhenEnablingIcon() = testScope.runTest { @@ -234,9 +275,56 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun icon_deviceIsProvisioned() = + fun icon_ignoresHysteresis_whenConnected() = + testScope.runTest { + val latest by collectLastValue(underTest.icon) + + // GIVEN satellite is allowed + repo.isSatelliteAllowedForCurrentLocation.value = true + + // GIVEN all icons are OOS + val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) + i1.isInService.value = false + i1.isEmergencyOnly.value = false + + // GIVEN apm is disabled + airplaneModeRepository.setIsAirplaneMode(false) + + // GIVEN satellite reports that it is Connected + repo.connectionState.value = SatelliteConnectionState.Connected + + // THEN icon is non null because we are connected, despite the normal OOS icon waiting + // 10 seconds for hysteresis + assertThat(latest).isInstanceOf(Icon::class.java) + } + + @Test + fun icon_ignoresHysteresis_whenOn() = + testScope.runTest { + val latest by collectLastValue(underTest.icon) + + // GIVEN satellite is allowed + repo.isSatelliteAllowedForCurrentLocation.value = true + + // GIVEN all icons are OOS + val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) + i1.isInService.value = false + i1.isEmergencyOnly.value = false + + // GIVEN apm is disabled + airplaneModeRepository.setIsAirplaneMode(false) + + // GIVEN satellite reports that it is Connected + repo.connectionState.value = SatelliteConnectionState.On + + // THEN icon is non null because the connection state is On, despite the normal OOS icon + // waiting 10 seconds for hysteresis + assertThat(latest).isInstanceOf(Icon::class.java) + } + + @Test + fun icon_satelliteIsProvisioned() = testScope.runTest { val latest by collectLastValue(underTest.icon) @@ -267,7 +355,6 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isInstanceOf(Icon::class.java) } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun icon_wifiIsActive() = testScope.runTest { @@ -324,13 +411,13 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { } @Test - fun carrierText_nullWhenShouldNotShow_notAllOos() = + fun carrierText_null_notAllOos() = testScope.runTest { val latest by collectLastValue(underTest.carrierText) - // GIVEN satellite is allowed + connected + // GIVEN satellite is allowed + off repo.isSatelliteAllowedForCurrentLocation.value = true - repo.connectionState.value = SatelliteConnectionState.Connected + repo.connectionState.value = SatelliteConnectionState.Off // GIVEN all icons are not OOS val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) @@ -344,9 +431,8 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun carrierText_nullWhenShouldNotShow_isEmergencyOnly() = + fun carrierText_notNull_notAllOos_butConnected() = testScope.runTest { val latest by collectLastValue(underTest.carrierText) @@ -354,25 +440,17 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { repo.isSatelliteAllowedForCurrentLocation.value = true repo.connectionState.value = SatelliteConnectionState.Connected - // GIVEN all icons are OOS + // GIVEN all icons are not OOS val i1 = mobileIconsInteractor.getMobileConnectionInteractorForSubId(1) - i1.isInService.value = false + i1.isInService.value = true i1.isEmergencyOnly.value = false // GIVEN apm is disabled airplaneModeRepository.setIsAirplaneMode(false) - // Wait for delay to be completed - advanceTimeBy(10.seconds) - - // THEN carrier text is set because we don't have service + // THEN carrier text is not null, because it is connected + // This case should never happen, but let's test it anyway assertThat(latest).isNotNull() - - // GIVEN the connection is emergency only - i1.isEmergencyOnly.value = true - - // THEN carrier text is null because we have emergency connection - assertThat(latest).isNull() } @Test @@ -396,7 +474,6 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun carrierText_satelliteIsOn() = testScope.runTest { @@ -421,9 +498,8 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNotNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun carrierText_hysteresisWhenEnablingText() = + fun carrierText_noHysteresisWhenEnablingText_connected() = testScope.runTest { val latest by collectLastValue(underTest.carrierText) @@ -439,23 +515,10 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { // GIVEN apm is disabled airplaneModeRepository.setIsAirplaneMode(false) - // THEN carrier text is null because of the hysteresis - assertThat(latest).isNull() - - // Wait for delay to be completed - advanceTimeBy(10.seconds) - - // THEN carrier text is set after the delay + // THEN carrier text is not null because we skip hysteresis when connected assertThat(latest).isNotNull() - - // GIVEN apm is enabled - airplaneModeRepository.setIsAirplaneMode(true) - - // THEN carrier text is null immediately - assertThat(latest).isNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun carrierText_deviceIsProvisioned() = testScope.runTest { @@ -489,7 +552,6 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNotNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun carrierText_wifiIsActive() = testScope.runTest { @@ -526,9 +588,8 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { assertThat(latest).isNotNull() } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun carrierText_connectionStateUnknown_null() = + fun carrierText_connectionStateUnknown_usesEmergencyOnlyText() = testScope.runTest { val latest by collectLastValue(underTest.carrierText) @@ -544,12 +605,12 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { // Wait for delay to be completed advanceTimeBy(10.seconds) - assertThat(latest).isNull() + assertThat(latest) + .isEqualTo(context.getString(R.string.satellite_emergency_only_carrier_text)) } - @OptIn(ExperimentalCoroutinesApi::class) @Test - fun carrierText_connectionStateOff_null() = + fun carrierText_connectionStateOff_usesEmergencyOnlyText() = testScope.runTest { val latest by collectLastValue(underTest.carrierText) @@ -565,10 +626,10 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { // Wait for delay to be completed advanceTimeBy(10.seconds) - assertThat(latest).isNull() + assertThat(latest) + .isEqualTo(context.getString(R.string.satellite_emergency_only_carrier_text)) } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun carrierText_connectionStateOn_notConnectedString() = testScope.runTest { @@ -590,7 +651,6 @@ class DeviceBasedSatelliteViewModelTest : SysuiTestCase() { .isEqualTo(context.getString(R.string.satellite_connected_carrier_text)) } - @OptIn(ExperimentalCoroutinesApi::class) @Test fun carrierText_connectionStateConnected_connectedString() = testScope.runTest { diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/CreateUserActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/CreateUserActivityTest.kt index 84cd79d9c8dc..25ceea951d3c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/CreateUserActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/CreateUserActivityTest.kt @@ -26,8 +26,8 @@ class CreateUserActivityTest : SysuiTestCase() { val dialog: Dialog = mock() whenever( createDialog( - /* activity = */ nullable(), - /* activityStarter = */ nullable(), + /* activity = */ any(), + /* activityStarter = */ any(), /* isMultipleAdminsEnabled = */ any(), /* successCallback = */ nullable(), /* cancelCallback = */ nullable() diff --git a/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/ParcelFileDescriptor_host.java b/packages/SystemUI/tests/utils/src/android/app/StatusBarManagerKosmos.kt index 5a3589dae43a..6251ae909fc8 100644 --- a/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/ParcelFileDescriptor_host.java +++ b/packages/SystemUI/tests/utils/src/android/app/StatusBarManagerKosmos.kt @@ -14,18 +14,9 @@ * limitations under the License. */ -package com.android.platform.test.ravenwood.nativesubstitution; +package android.app -import com.android.ravenwood.common.JvmWorkaround; +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.util.mockito.mock -import java.io.FileDescriptor; - -public class ParcelFileDescriptor_host { - public static void setFdInt(FileDescriptor fd, int fdInt) { - JvmWorkaround.getInstance().setFdInt(fd, fdInt); - } - - public static int getFdInt(FileDescriptor fd) { - return JvmWorkaround.getInstance().getFdInt(fd); - } -} +val Kosmos.statusBarManager by Kosmos.Fixture { mock<StatusBarManager>() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt index c00454f3bc48..5d7e7c726c6c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt @@ -30,7 +30,7 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : override fun addWidget( provider: ComponentName, user: UserHandle, - priority: Int, + rank: Int?, configurator: WidgetConfigurator? ) { coroutineScope.launch { @@ -38,7 +38,7 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : val providerInfo = AppWidgetProviderInfo().apply { this.provider = provider } val configured = configurator?.configureWidget(id) ?: true if (configured) { - onConfigured(id, providerInfo, priority) + onConfigured(id, providerInfo, rank ?: -1) } } } @@ -46,14 +46,14 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : fun addWidget( appWidgetId: Int, componentName: String = "pkg/cls", - priority: Int = 0, + rank: Int = 0, category: Int = AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD, userId: Int = 0, ) { fakeDatabase[appWidgetId] = CommunalWidgetContentModel.Available( appWidgetId = appWidgetId, - priority = priority, + rank = rank, providerInfo = AppWidgetProviderInfo().apply { provider = ComponentName.unflattenFromString(componentName)!! @@ -73,14 +73,14 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : fun addPendingWidget( appWidgetId: Int, componentName: String = "pkg/cls", - priority: Int = 0, + rank: Int = 0, icon: Bitmap? = null, userId: Int = 0, ) { fakeDatabase[appWidgetId] = CommunalWidgetContentModel.Pending( appWidgetId = appWidgetId, - priority = priority, + rank = rank, componentName = ComponentName.unflattenFromString(componentName)!!, icon = icon, user = UserHandle(userId), @@ -97,8 +97,8 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : override fun abortRestoreWidgets() {} - private fun onConfigured(id: Int, providerInfo: AppWidgetProviderInfo, priority: Int) { + private fun onConfigured(id: Int, providerInfo: AppWidgetProviderInfo, rank: Int) { _communalWidgets.value += - listOf(CommunalWidgetContentModel.Available(id, providerInfo, priority)) + listOf(CommunalWidgetContentModel.Available(id, providerInfo, rank)) } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorKosmos.kt index b9be04dc0a32..3dfe0eea500f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorKosmos.kt @@ -33,6 +33,7 @@ import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.kosmos.testDispatcher import com.android.systemui.log.FaceAuthenticationLogger import com.android.systemui.power.domain.interactor.powerInteractor +import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.user.data.repository.userRepository import com.android.systemui.util.mockito.mock import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -57,6 +58,7 @@ val Kosmos.deviceEntryFaceAuthInteractor by powerInteractor = powerInteractor, biometricSettingsRepository = biometricSettingsRepository, trustManager = trustManager, + sceneInteractor = { sceneInteractor }, deviceEntryFaceAuthStatusInteractor = deviceEntryFaceAuthStatusInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/education/data/repository/FakeContextualEducationRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/education/data/repository/FakeContextualEducationRepository.kt index cdfb297c27b9..fb4e2fb5fd14 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/education/data/repository/FakeContextualEducationRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/education/data/repository/FakeContextualEducationRepository.kt @@ -17,6 +17,7 @@ package com.android.systemui.education.data.repository import com.android.systemui.contextualeducation.GestureType +import com.android.systemui.education.data.model.EduDeviceConnectionTime import com.android.systemui.education.data.model.GestureEduModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow @@ -27,22 +28,34 @@ class FakeContextualEducationRepository : ContextualEducationRepository { private val userGestureMap = mutableMapOf<Int, GestureEduModel>() private val _gestureEduModels = MutableStateFlow(GestureEduModel(userId = 0)) private val gestureEduModelsFlow = _gestureEduModels.asStateFlow() + + private val userEduDeviceConnectionTimeMap = mutableMapOf<Int, EduDeviceConnectionTime>() + private val _eduDeviceConnectionTime = MutableStateFlow(EduDeviceConnectionTime()) + private val eduDeviceConnectionTime = _eduDeviceConnectionTime.asStateFlow() + private var currentUser: Int = 0 override fun setUser(userId: Int) { if (!userGestureMap.contains(userId)) { userGestureMap[userId] = GestureEduModel(userId = userId) + userEduDeviceConnectionTimeMap[userId] = EduDeviceConnectionTime() } // save data of current user to the map userGestureMap[currentUser] = _gestureEduModels.value + userEduDeviceConnectionTimeMap[currentUser] = _eduDeviceConnectionTime.value // switch to data of new user _gestureEduModels.value = userGestureMap[userId]!! + _eduDeviceConnectionTime.value = userEduDeviceConnectionTimeMap[userId]!! } override fun readGestureEduModelFlow(gestureType: GestureType): Flow<GestureEduModel> { return gestureEduModelsFlow } + override fun readEduDeviceConnectionTime(): Flow<EduDeviceConnectionTime> { + return eduDeviceConnectionTime + } + override suspend fun updateGestureEduModel( gestureType: GestureType, transform: (GestureEduModel) -> GestureEduModel @@ -50,4 +63,11 @@ class FakeContextualEducationRepository : ContextualEducationRepository { val currentModel = _gestureEduModels.value _gestureEduModels.value = transform(currentModel) } + + override suspend fun updateEduDeviceConnectionTime( + transform: (EduDeviceConnectionTime) -> EduDeviceConnectionTime + ) { + val currentModel = _eduDeviceConnectionTime.value + _eduDeviceConnectionTime.value = transform(currentModel) + } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt index 5088677161d8..88ab170d72b3 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorKosmos.kt @@ -17,14 +17,26 @@ package com.android.systemui.education.domain.interactor import com.android.systemui.education.data.repository.fakeEduClock +import com.android.systemui.inputdevice.data.repository.UserInputDeviceRepository +import com.android.systemui.keyboard.data.repository.keyboardRepository import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testDispatcher import com.android.systemui.kosmos.testScope +import com.android.systemui.touchpad.data.repository.touchpadRepository +import com.android.systemui.user.data.repository.userRepository var Kosmos.keyboardTouchpadEduInteractor by Kosmos.Fixture { KeyboardTouchpadEduInteractor( backgroundScope = testScope.backgroundScope, contextualEducationInteractor = contextualEducationInteractor, + userInputDeviceRepository = + UserInputDeviceRepository( + testDispatcher, + keyboardRepository, + touchpadRepository, + userRepository + ), clock = fakeEduClock ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt index a95609efc16f..f5232ce8a200 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt @@ -54,6 +54,7 @@ object KeyguardInteractorFactory { sceneInteractor: SceneInteractor = mock(), fromGoneTransitionInteractor: FromGoneTransitionInteractor = mock(), fromLockscreenTransitionInteractor: FromLockscreenTransitionInteractor = mock(), + fromOccludedTransitionInteractor: FromOccludedTransitionInteractor = mock(), sharedNotificationContainerInteractor: SharedNotificationContainerInteractor? = null, powerInteractor: PowerInteractor = PowerInteractorFactory.create().powerInteractor, testScope: CoroutineScope = TestScope(), @@ -100,6 +101,7 @@ object KeyguardInteractorFactory { sceneInteractorProvider = { sceneInteractor }, fromGoneTransitionInteractor = { fromGoneTransitionInteractor }, fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor }, + fromOccludedTransitionInteractor = { fromOccludedTransitionInteractor }, sharedNotificationContainerInteractor = { sncInteractor }, applicationScope = testScope, ), diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt index 5ab56e931175..e85114d04825 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt @@ -38,6 +38,7 @@ val Kosmos.keyguardInteractor: KeyguardInteractor by sceneInteractorProvider = { sceneInteractor }, fromGoneTransitionInteractor = { fromGoneTransitionInteractor }, fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor }, + fromOccludedTransitionInteractor = { fromOccludedTransitionInteractor }, sharedNotificationContainerInteractor = { sharedNotificationContainerInteractor }, applicationScope = testScope.backgroundScope, ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorKosmos.kt index 73799b63a6fc..769612c988ba 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorKosmos.kt @@ -20,6 +20,7 @@ import android.content.applicationContext import android.view.accessibility.accessibilityManagerWrapper import com.android.internal.logging.uiEventLogger import com.android.systemui.broadcast.broadcastDispatcher +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFaceAuthInteractor import com.android.systemui.flags.featureFlagsClassic import com.android.systemui.keyguard.data.repository.keyguardRepository import com.android.systemui.kosmos.Kosmos @@ -38,5 +39,6 @@ val Kosmos.keyguardTouchHandlingInteractor by broadcastDispatcher = broadcastDispatcher, accessibilityManager = accessibilityManagerWrapper, pulsingGestureListener = pulsingGestureListener, + faceAuthInteractor = deviceEntryFaceAuthInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModelKosmos.kt index 19b32bce77e7..f47b2df607c1 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenContentViewModelKosmos.kt @@ -17,6 +17,7 @@ package com.android.systemui.keyguard.ui.viewmodel import com.android.systemui.biometrics.authController +import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor import com.android.systemui.keyguard.domain.interactor.keyguardBlueprintInteractor import com.android.systemui.keyguard.domain.interactor.keyguardClockInteractor import com.android.systemui.kosmos.Kosmos @@ -34,5 +35,6 @@ val Kosmos.lockscreenContentViewModel by shadeInteractor = shadeInteractor, unfoldTransitionInteractor = unfoldTransitionInteractor, occlusionInteractor = sceneContainerOcclusionInteractor, + deviceEntryInteractor = deviceEntryInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt index 9fe66eb77feb..953363d010fe 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt @@ -42,6 +42,7 @@ import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.fromGoneTransitionInteractor import com.android.systemui.keyguard.domain.interactor.fromLockscreenTransitionInteractor +import com.android.systemui.keyguard.domain.interactor.fromOccludedTransitionInteractor import com.android.systemui.keyguard.domain.interactor.fromPrimaryBouncerTransitionInteractor import com.android.systemui.keyguard.domain.interactor.keyguardClockInteractor import com.android.systemui.keyguard.domain.interactor.keyguardInteractor @@ -128,6 +129,7 @@ class KosmosJavaAdapter() { val deviceProvisioningInteractor by lazy { kosmos.deviceProvisioningInteractor } val fakeDeviceProvisioningRepository by lazy { kosmos.fakeDeviceProvisioningRepository } val fromLockscreenTransitionInteractor by lazy { kosmos.fromLockscreenTransitionInteractor } + val fromOccludedTransitionInteractor by lazy { kosmos.fromOccludedTransitionInteractor } val fromPrimaryBouncerTransitionInteractor by lazy { kosmos.fromPrimaryBouncerTransitionInteractor } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderKosmos.kt new file mode 100644 index 000000000000..a5690a0fa560 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoaderKosmos.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.statusBarManager +import android.content.testableContext +import com.android.systemui.graphics.imageLoader +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.util.fakeMediaControllerFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.plugins.activityStarter + +val Kosmos.mediaDataLoader by + Kosmos.Fixture { + MediaDataLoader( + testableContext, + testDispatcher, + testScope, + activityStarter, + fakeMediaControllerFactory, + mediaFlags, + imageLoader, + statusBarManager + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt index cc1ad1fda6dd..2127a88e5a45 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt @@ -28,7 +28,7 @@ import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.kosmos.testDispatcher import com.android.systemui.media.controls.data.repository.mediaDataRepository import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider -import com.android.systemui.media.controls.util.mediaControllerFactory +import com.android.systemui.media.controls.util.fakeMediaControllerFactory import com.android.systemui.media.controls.util.mediaFlags import com.android.systemui.media.controls.util.mediaUiEventLogger import com.android.systemui.plugins.activityStarter @@ -46,7 +46,7 @@ val Kosmos.mediaDataProcessor by uiExecutor = fakeExecutor, foregroundExecutor = fakeExecutor, handler = fakeExecutorHandler, - mediaControllerFactory = mediaControllerFactory, + mediaControllerFactory = fakeMediaControllerFactory, broadcastDispatcher = broadcastDispatcher, dumpManager = dumpManager, activityStarter = activityStarter, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt index b98f557c0c34..c479ce676761 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt @@ -22,8 +22,8 @@ import android.os.fakeExecutorHandler import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.systemui.concurrency.fakeExecutor import com.android.systemui.kosmos.Kosmos +import com.android.systemui.media.controls.util.fakeMediaControllerFactory import com.android.systemui.media.controls.util.localMediaManagerFactory -import com.android.systemui.media.controls.util.mediaControllerFactory import com.android.systemui.media.muteawait.mediaMuteAwaitConnectionManagerFactory import com.android.systemui.statusbar.policy.configurationController @@ -31,7 +31,7 @@ val Kosmos.mediaDeviceManager by Kosmos.Fixture { MediaDeviceManager( context = applicationContext, - controllerFactory = mediaControllerFactory, + controllerFactory = fakeMediaControllerFactory, localMediaManagerFactory = localMediaManagerFactory, mr2manager = { MediaRouter2Manager.getInstance(applicationContext) }, muteAwaitConnectionManagerFactory = mediaMuteAwaitConnectionManagerFactory, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt index 6ec6378e3bc2..b7660e05ee91 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt @@ -19,7 +19,7 @@ package com.android.systemui.media.controls.domain.pipeline import com.android.systemui.concurrency.fakeExecutor import com.android.systemui.kosmos.Kosmos import com.android.systemui.log.logcatLogBuffer -import com.android.systemui.media.controls.util.mediaControllerFactory +import com.android.systemui.media.controls.util.fakeMediaControllerFactory import com.android.systemui.media.controls.util.mediaFlags import com.android.systemui.plugins.statusbar.statusBarStateController import com.android.systemui.util.time.systemClock @@ -27,7 +27,7 @@ import com.android.systemui.util.time.systemClock val Kosmos.mediaTimeoutListener by Kosmos.Fixture { MediaTimeoutListener( - mediaControllerFactory = mediaControllerFactory, + mediaControllerFactory = fakeMediaControllerFactory, mainExecutor = fakeExecutor, logger = MediaTimeoutLogger(logcatLogBuffer("MediaTimeoutLogBuffer")), statusBarStateController = statusBarStateController, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/FakeMediaControllerFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/FakeMediaControllerFactory.kt new file mode 100644 index 000000000000..7f8348e2ca6f --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/FakeMediaControllerFactory.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2024 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.media.controls.util + +import android.content.Context +import android.media.session.MediaController +import android.media.session.MediaSession +import android.media.session.MediaSession.Token + +class FakeMediaControllerFactory(context: Context) : MediaControllerFactory(context) { + + private val mediaControllersForToken = mutableMapOf<Token, MediaController>() + + override fun create(token: MediaSession.Token): android.media.session.MediaController { + if (token !in mediaControllersForToken) { + super.create(token) + } + return mediaControllersForToken[token]!! + } + + fun setControllerForToken(token: Token, mediaController: MediaController) { + mediaControllersForToken[token] = mediaController + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt index 1ce6e82f71d8..7ee58fa8a295 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt @@ -19,4 +19,5 @@ package com.android.systemui.media.controls.util import android.content.applicationContext import com.android.systemui.kosmos.Kosmos -val Kosmos.mediaControllerFactory by Kosmos.Fixture { MediaControllerFactory(applicationContext) } +val Kosmos.fakeMediaControllerFactory by + Kosmos.Fixture { FakeMediaControllerFactory(applicationContext) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SceneInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SceneInteractorKosmos.kt index ae8b411a4b95..f84c3bdfdaf1 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SceneInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SceneInteractorKosmos.kt @@ -24,7 +24,7 @@ import com.android.systemui.scene.data.repository.sceneContainerRepository import com.android.systemui.scene.domain.resolver.sceneFamilyResolvers import com.android.systemui.scene.shared.logger.sceneLogger -val Kosmos.sceneInteractor by +val Kosmos.sceneInteractor: SceneInteractor by Kosmos.Fixture { SceneInteractor( applicationScope = applicationCoroutineScope, diff --git a/ravenwood/TEST_MAPPING b/ravenwood/TEST_MAPPING index fbf27fa5bf4b..691d06e0b2bf 100644 --- a/ravenwood/TEST_MAPPING +++ b/ravenwood/TEST_MAPPING @@ -12,9 +12,6 @@ { "name": "RavenwoodBivalentTest_device" }, - { - "name": "RavenwoodResApkTest" - }, // The sysui tests should match vendor/unbundled_google/packages/SystemUIGoogle/TEST_MAPPING { "name": "SystemUIGoogleTests", @@ -59,6 +56,10 @@ "host": true }, { + "name": "RavenwoodResApkTest", + "host": true + }, + { "name": "RavenwoodBivalentTest", "host": true } diff --git a/ravenwood/runtime-helper-src/libcore-fake/android/system/Os.java b/ravenwood/runtime-helper-src/libcore-fake/android/system/Os.java index 7371d0a029b9..a5c0b54a8637 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/android/system/Os.java +++ b/ravenwood/runtime-helper-src/libcore-fake/android/system/Os.java @@ -15,8 +15,8 @@ */ package android.system; +import com.android.ravenwood.RavenwoodRuntimeNative; import com.android.ravenwood.common.JvmWorkaround; -import com.android.ravenwood.common.RavenwoodRuntimeNative; import java.io.FileDescriptor; import java.io.FileInputStream; diff --git a/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodJdkPatch.java b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodJdkPatch.java new file mode 100644 index 000000000000..96aed4b3401d --- /dev/null +++ b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodJdkPatch.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 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.ravenwood; + +import com.android.ravenwood.common.JvmWorkaround; + +import java.io.FileDescriptor; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * Class to host APIs that exist in libcore, but not in standard JRE. + */ +public class RavenwoodJdkPatch { + /** + * Implements FileDescriptor.getInt$() + */ + public static int getInt$(FileDescriptor fd) { + return JvmWorkaround.getInstance().getFdInt(fd); + } + + /** + * Implements FileDescriptor.setInt$(int) + */ + public static void setInt$(FileDescriptor fd, int rawFd) { + JvmWorkaround.getInstance().setFdInt(fd, rawFd); + } + + /** + * Implements LinkedHashMap.eldest() + */ + public static <K, V> Map.Entry<K, V> eldest(LinkedHashMap<K, V> map) { + final var it = map.entrySet().iterator(); + return it.hasNext() ? it.next() : null; + } +} diff --git a/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/common/RavenwoodRuntimeNative.java b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java index beba83391652..0d8408c12033 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/common/RavenwoodRuntimeNative.java +++ b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.ravenwood.common; +package com.android.ravenwood; import android.system.ErrnoException; import android.system.StructStat; +import com.android.ravenwood.common.JvmWorkaround; +import com.android.ravenwood.common.RavenwoodCommonUtils; + import java.io.FileDescriptor; /** diff --git a/ravenwood/runtime-helper-src/libcore-fake/dalvik/system/VMRuntime.java b/ravenwood/runtime-helper-src/libcore-fake/dalvik/system/VMRuntime.java index ed5a587cdccc..ba89f71dde8a 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/dalvik/system/VMRuntime.java +++ b/ravenwood/runtime-helper-src/libcore-fake/dalvik/system/VMRuntime.java @@ -34,11 +34,11 @@ public class VMRuntime { } public boolean is64Bit() { - return true; + return "amd64".equals(System.getProperty("os.arch")); } public static boolean is64BitAbi(String abi) { - return true; + return abi.contains("64"); } public Object newUnpaddedArray(Class<?> componentType, int minLength) { diff --git a/ravenwood/runtime-helper-src/libcore-fake/libcore/io/IoUtils.java b/ravenwood/runtime-helper-src/libcore-fake/libcore/io/IoUtils.java index 65c285e06bf8..2bd1ae89c824 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/libcore/io/IoUtils.java +++ b/ravenwood/runtime-helper-src/libcore-fake/libcore/io/IoUtils.java @@ -16,7 +16,13 @@ package libcore.io; +import android.system.ErrnoException; +import android.system.Os; + +import com.android.ravenwood.common.JvmWorkaround; + import java.io.File; +import java.io.FileDescriptor; import java.io.IOException; import java.net.Socket; @@ -47,6 +53,13 @@ public final class IoUtils { } } + public static void closeQuietly(FileDescriptor fd) { + try { + Os.close(fd); + } catch (ErrnoException ignored) { + } + } + public static void deleteContents(File dir) throws IOException { File[] files = dir.listFiles(); if (files != null) { @@ -58,4 +71,17 @@ public final class IoUtils { } } } + + /** + * FD owners currently unsupported under Ravenwood; ignored + */ + public static void setFdOwner(FileDescriptor fd, Object owner) { + } + + /** + * FD owners currently unsupported under Ravenwood; return FD directly + */ + public static int acquireRawFd(FileDescriptor fd) { + return JvmWorkaround.getInstance().getFdInt(fd); + } } diff --git a/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java b/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java index 14b5a4f0c1e0..4e7dc5d6264f 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java +++ b/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java @@ -15,7 +15,7 @@ */ package libcore.util; -import com.android.ravenwood.common.RavenwoodRuntimeNative; +import com.android.ravenwood.RavenwoodRuntimeNative; import java.lang.ref.Cleaner; import java.lang.ref.Reference; diff --git a/ravenwood/runtime-jni/ravenwood_runtime.cpp b/ravenwood/runtime-jni/ravenwood_runtime.cpp index c8049281bc53..f5cb019f4e7e 100644 --- a/ravenwood/runtime-jni/ravenwood_runtime.cpp +++ b/ravenwood/runtime-jni/ravenwood_runtime.cpp @@ -245,7 +245,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) g_StructStat = findClass(env, "android/system/StructStat"); g_StructTimespecClass = findClass(env, "android/system/StructTimespec"); - jint res = jniRegisterNativeMethods(env, "com/android/ravenwood/common/RavenwoodRuntimeNative", + jint res = jniRegisterNativeMethods(env, "com/android/ravenwood/RavenwoodRuntimeNative", sMethods, NELEM(sMethods)); if (res < 0) { return res; diff --git a/ravenwood/texts/ravenwood-framework-policies.txt b/ravenwood/texts/ravenwood-framework-policies.txt index 2d49128ae292..d962c8232bf7 100644 --- a/ravenwood/texts/ravenwood-framework-policies.txt +++ b/ravenwood/texts/ravenwood-framework-policies.txt @@ -17,6 +17,13 @@ class :r keepclass rename com/.*/nano/ devicenano/ rename android/.*/nano/ devicenano/ +# Support APIs not available in standard JRE +class java.io.FileDescriptor keep + method getInt$ ()I @com.android.ravenwood.RavenwoodJdkPatch.getInt$ + method setInt$ (I)V @com.android.ravenwood.RavenwoodJdkPatch.setInt$ +class java.util.LinkedHashMap keep + method eldest ()Ljava/util/Map$Entry; @com.android.ravenwood.RavenwoodJdkPatch.eldest + # Exported to Mainline modules; cannot use annotations class com.android.internal.util.FastXmlSerializer keepclass class com.android.internal.util.FileRotator keepclass diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 6007bfd99e7b..9a81aa6cc506 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -594,10 +594,6 @@ public class AccessibilityWindowManager { private boolean windowMattersToAccessibilityLocked(AccessibilityWindow a11yWindow, int windowId, Region regionInScreen, Region unaccountedSpace) { - if (a11yWindow.ignoreRecentsAnimationForAccessibility()) { - return false; - } - if (a11yWindow.isFocused()) { return true; } diff --git a/services/core/Android.bp b/services/core/Android.bp index 89d796177da2..1b5b7e875db8 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -233,6 +233,7 @@ java_library_static { "stats_flags_lib", "core_os_flags_lib", "connectivity_flags_lib", + "device_config_service_flags_java", "dreams_flags_lib", "aconfig_new_storage_flags_lib", "powerstats_flags_lib", diff --git a/services/core/java/com/android/server/am/AppStartInfoTracker.java b/services/core/java/com/android/server/am/AppStartInfoTracker.java index 4a7ad31cba3e..1b00cec90bc4 100644 --- a/services/core/java/com/android/server/am/AppStartInfoTracker.java +++ b/services/core/java/com/android/server/am/AppStartInfoTracker.java @@ -16,7 +16,6 @@ package com.android.server.am; -import static android.app.ApplicationStartInfo.START_TIMESTAMP_LAUNCH; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; @@ -51,6 +50,8 @@ import android.util.proto.WireTypeMismatchException; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ProcessMap; +import com.android.internal.os.Clock; +import com.android.internal.os.MonotonicClock; import com.android.server.IoThread; import com.android.server.ServiceThread; import com.android.server.SystemServiceManager; @@ -107,6 +108,16 @@ public final class AppStartInfoTracker { @VisibleForTesting boolean mEnabled = false; + /** + * Monotonic clock which does not reset on reboot. + * + * Time for offset is persisted along with records, see {@link #persistProcessStartInfo}. + * This does not follow the recommendation of {@link MonotonicClock} to persist on shutdown as + * it's ok in this case to lose any time change past the last persist as records added since + * then will be lost as well and the purpose of this clock is to keep records in order. + */ + @VisibleForTesting MonotonicClock mMonotonicClock = null; + /** Initialized in {@link #init} and read-only after that. */ @VisibleForTesting ActivityManagerService mService; @@ -203,6 +214,15 @@ public final class AppStartInfoTracker { IoThread.getHandler().post(() -> { loadExistingProcessStartInfo(); }); + + if (mMonotonicClock == null) { + // This should only happen if there are no persisted records, or if the records were + // persisted by a version without the monotonic clock. Either way, create a new clock + // with no offset. In the case of records with no monotonic time the value will default + // to 0 and all new records will correctly end up in front of them. + mMonotonicClock = new MonotonicClock(Clock.SYSTEM_CLOCK.elapsedRealtime(), + Clock.SYSTEM_CLOCK); + } } /** @@ -264,7 +284,7 @@ public final class AppStartInfoTracker { if (!mEnabled) { return; } - ApplicationStartInfo start = new ApplicationStartInfo(); + ApplicationStartInfo start = new ApplicationStartInfo(getMonotonicTime()); start.setStartupState(ApplicationStartInfo.STARTUP_STATE_STARTED); start.setIntent(intent); start.setStartType(ApplicationStartInfo.START_TYPE_UNSET); @@ -396,7 +416,7 @@ public final class AppStartInfoTracker { if (!mEnabled) { return; } - ApplicationStartInfo start = new ApplicationStartInfo(); + ApplicationStartInfo start = new ApplicationStartInfo(getMonotonicTime()); addBaseFieldsFromProcessRecord(start, app); start.setStartupState(ApplicationStartInfo.STARTUP_STATE_STARTED); start.addStartupTimestamp( @@ -422,7 +442,7 @@ public final class AppStartInfoTracker { if (!mEnabled) { return; } - ApplicationStartInfo start = new ApplicationStartInfo(); + ApplicationStartInfo start = new ApplicationStartInfo(getMonotonicTime()); addBaseFieldsFromProcessRecord(start, app); start.setStartupState(ApplicationStartInfo.STARTUP_STATE_STARTED); start.addStartupTimestamp( @@ -444,7 +464,7 @@ public final class AppStartInfoTracker { if (!mEnabled) { return; } - ApplicationStartInfo start = new ApplicationStartInfo(); + ApplicationStartInfo start = new ApplicationStartInfo(getMonotonicTime()); addBaseFieldsFromProcessRecord(start, app); start.setStartupState(ApplicationStartInfo.STARTUP_STATE_STARTED); start.addStartupTimestamp( @@ -461,7 +481,7 @@ public final class AppStartInfoTracker { if (!mEnabled) { return; } - ApplicationStartInfo start = new ApplicationStartInfo(); + ApplicationStartInfo start = new ApplicationStartInfo(getMonotonicTime()); addBaseFieldsFromProcessRecord(start, app); start.setStartupState(ApplicationStartInfo.STARTUP_STATE_STARTED); start.addStartupTimestamp( @@ -632,7 +652,8 @@ public final class AppStartInfoTracker { Collections.sort( list, (a, b) -> - Long.compare(getStartTimestamp(b), getStartTimestamp(a))); + Long.compare(b.getMonoticCreationTimeMs(), + a.getMonoticCreationTimeMs())); int size = list.size(); if (maxNum > 0) { size = Math.min(size, maxNum); @@ -898,6 +919,10 @@ public final class AppStartInfoTracker { case (int) AppsStartInfoProto.PACKAGES: loadPackagesFromProto(proto, next); break; + case (int) AppsStartInfoProto.MONOTONIC_TIME: + long monotonicTime = proto.readLong(AppsStartInfoProto.MONOTONIC_TIME); + mMonotonicClock = new MonotonicClock(monotonicTime, Clock.SYSTEM_CLOCK); + break; } } } catch (IOException | IllegalArgumentException | WireTypeMismatchException @@ -979,6 +1004,7 @@ public final class AppStartInfoTracker { mLastAppStartInfoPersistTimestamp = now; } } + proto.write(AppsStartInfoProto.MONOTONIC_TIME, getMonotonicTime()); if (succeeded) { proto.flush(); af.finishWrite(out); @@ -1099,13 +1125,12 @@ public final class AppStartInfoTracker { } } - /** Convenience method to obtain timestamp of beginning of start.*/ - private static long getStartTimestamp(ApplicationStartInfo startInfo) { - if (startInfo.getStartupTimestamps() == null - || !startInfo.getStartupTimestamps().containsKey(START_TIMESTAMP_LAUNCH)) { - return -1; + private long getMonotonicTime() { + if (mMonotonicClock == null) { + // This should never happen. Return 0 to not interfere with past or future records. + return 0; } - return startInfo.getStartupTimestamps().get(START_TIMESTAMP_LAUNCH); + return mMonotonicClock.monotonicTime(); } /** A container class of (@link android.app.ApplicationStartInfo) */ @@ -1143,7 +1168,7 @@ public final class AppStartInfoTracker { // Sort records so we can remove the least recent ones. Collections.sort(mInfos, (a, b) -> - Long.compare(getStartTimestamp(b), getStartTimestamp(a))); + Long.compare(b.getMonoticCreationTimeMs(), a.getMonoticCreationTimeMs())); // Remove records and trim list object back to size. mInfos.subList(0, mInfos.size() - getMaxCapacity()).clear(); @@ -1165,8 +1190,8 @@ public final class AppStartInfoTracker { long oldestTimeStamp = Long.MAX_VALUE; for (int i = 0; i < size; i++) { ApplicationStartInfo startInfo = mInfos.get(i); - if (getStartTimestamp(startInfo) < oldestTimeStamp) { - oldestTimeStamp = getStartTimestamp(startInfo); + if (startInfo.getMonoticCreationTimeMs() < oldestTimeStamp) { + oldestTimeStamp = startInfo.getMonoticCreationTimeMs(); oldestIndex = i; } } @@ -1176,7 +1201,7 @@ public final class AppStartInfoTracker { } mInfos.add(info); Collections.sort(mInfos, (a, b) -> - Long.compare(getStartTimestamp(b), getStartTimestamp(a))); + Long.compare(b.getMonoticCreationTimeMs(), a.getMonoticCreationTimeMs())); } /** @@ -1337,7 +1362,9 @@ public final class AppStartInfoTracker { mUid = proto.readInt(AppsStartInfoProto.Package.User.UID); break; case (int) AppsStartInfoProto.Package.User.APP_START_INFO: - ApplicationStartInfo info = new ApplicationStartInfo(); + // Create record with monotonic time 0 in case the persisted record does not + // have a create time. + ApplicationStartInfo info = new ApplicationStartInfo(0); info.readFromProto(proto, AppsStartInfoProto.Package.User.APP_START_INFO); mInfos.add(info); break; diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java index a7b2eb155558..8fe33d18152c 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java @@ -929,9 +929,9 @@ class BroadcastQueueModernImpl extends BroadcastQueue { // For ordered broadcast, check if the receivers for the new broadcast is a superset // of those for the previous one as skipping and removing only one of them could result // in an inconsistent state. - if (testRecord.ordered || testRecord.prioritized) { + if (testRecord.ordered) { return containsAllReceivers(r, testRecord, recordsLookupCache); - } else if (testRecord.resultTo != null) { + } else if (testRecord.prioritized || testRecord.resultTo != null) { return testRecord.getDeliveryState(testIndex) == DELIVERY_DEFERRED ? r.containsReceiver(testRecord.receivers.get(testIndex)) : containsAllReceivers(r, testRecord, recordsLookupCache); diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 5d48d09adfbc..29373076c3b8 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -33,6 +33,7 @@ import android.util.proto.ProtoInputStream; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; +import com.android.providers.settings.Flags; import android.aconfigd.Aconfigd.StorageRequestMessage; import android.aconfigd.Aconfigd.StorageRequestMessages; @@ -51,6 +52,7 @@ import java.util.HashMap; import java.util.Map; import java.util.List; import java.util.ArrayList; +import java.util.Set; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; /** @@ -457,6 +459,24 @@ public class SettingsToPropertiesMapper { } /** + * Send a request to aconfig storage to remove a flag local override. + * + * @param proto + * @param packageName the package of the flag + * @param flagName the name of the flag + */ + static void writeFlagOverrideRemovalRequest( + ProtoOutputStream proto, String packageName, String flagName) { + long msgsToken = proto.start(StorageRequestMessages.MSGS); + long msgToken = proto.start(StorageRequestMessage.REMOVE_LOCAL_OVERRIDE_MESSAGE); + proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.PACKAGE_NAME, packageName); + proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.FLAG_NAME, flagName); + proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.REMOVE_ALL, false); + proto.end(msgToken); + proto.end(msgsToken); + } + + /** * deserialize a flag input proto stream and log * @param proto */ @@ -501,8 +521,15 @@ public class SettingsToPropertiesMapper { ProtoOutputStream requests = new ProtoOutputStream(); for (String flagName : props.getKeyset()) { String flagValue = props.getString(flagName, null); - if (flagName == null || flagValue == null) { - continue; + + if (Flags.syncLocalOverridesRemovalNewStorage()) { + if (flagName == null) { + continue; + } + } else { + if (flagName == null || flagValue == null) { + continue; + } } int idx = flagName.indexOf(":"); @@ -519,7 +546,13 @@ public class SettingsToPropertiesMapper { } String packageName = fullFlagName.substring(0, idx); String realFlagName = fullFlagName.substring(idx+1); - writeFlagOverrideRequest(requests, packageName, realFlagName, flagValue, true); + + if (Flags.syncLocalOverridesRemovalNewStorage() && flagValue == null) { + writeFlagOverrideRemovalRequest(requests, packageName, realFlagName); + } else { + writeFlagOverrideRequest(requests, packageName, realFlagName, flagValue, true); + } + ++num_requests; } diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 8d8a54ea426d..082dca6d50ff 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -1457,7 +1457,7 @@ public class AudioDeviceInventory { private int setDevicesRoleForCapturePreset(int capturePreset, int role, @NonNull List<AudioDeviceAttributes> devices) { return setDevicesRole(mAppliedPresetRoles, (p, r, d) -> { - return mAudioSystem.addDevicesRoleForCapturePreset(p, r, d); + return mAudioSystem.setDevicesRoleForCapturePreset(p, r, d); }, (p, r, d) -> { return mAudioSystem.clearDevicesRoleForCapturePreset(p, r); }, capturePreset, role, devices); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java b/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java index d9e9e0021028..cf2cdc1500f8 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java @@ -33,6 +33,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.UserHandle; +import android.provider.Settings; import android.text.TextUtils; import android.util.Printer; import android.util.Slog; @@ -115,7 +116,11 @@ final class InputMethodMenuControllerNew { final var selectedImi = selectedIndex >= 0 ? items.get(selectedIndex).mImi : null; final var languageSettingsIntent = selectedImi != null ? selectedImi.createImeLanguageSettingsActivityIntent() : null; - final boolean hasLanguageSettingsButton = languageSettingsIntent != null; + final boolean isDeviceProvisioned = Settings.Global.getInt( + dialogWindowContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, + 0) != 0; + final boolean hasLanguageSettingsButton = languageSettingsIntent != null + && isDeviceProvisioned; if (hasLanguageSettingsButton) { final View buttonBar = contentView .requireViewById(com.android.internal.R.id.button_bar); diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index ada6659b4a94..1317866af006 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -1415,8 +1415,13 @@ final class InstallPackageHelper { + " an sdk library <" + parsedPackage.getSdkLibraryName() + ">" + " without changing the versionMajor, but the" - + " targetSdkVersion or minSdkVersion has changed." - ); + + " targetSdkVersion or minSdkVersion has changed:" + + " Old targetSdkVersion: " + oldTargetSdk + + " new targetSdkVersion: " + newTargetSdk + + " Old minSdkVersion: " + oldMinSdk + + " new minSdkVersion: " + newMinSdk + + " versionMajor: " + newVersionMajor + ); } } } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index ba3de33d865c..f96706e474be 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1076,16 +1076,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void interceptPowerKeyUp(KeyEvent event, boolean canceled) { // Inform the StatusBar; but do not allow it to consume the event. sendSystemKeyToStatusBarAsync(event); - - final boolean handled = canceled || mPowerKeyHandled; - - if (!handled) { - if ((event.getFlags() & KeyEvent.FLAG_LONG_PRESS) == 0) { - // Abort possibly stuck animations only when power key up without long press case. - mHandler.post(mWindowManagerFuncs::triggerAnimationFailsafe); - } - } - finishPowerKeyPress(); } diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 67f5f27b42eb..989c8a802b36 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -313,12 +313,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { } /** - * Hint to window manager that the user has started a navigation action that should - * abort animations that have no timeout, in case they got stuck. - */ - void triggerAnimationFailsafe(); - - /** * The keyguard showing state has changed */ void onKeyguardShowingAndNotOccludedChanged(); diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index ac56043faa7d..b35a0a772ff2 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -71,6 +71,7 @@ import static com.android.server.stats.pull.ProcfsMemoryUtil.getProcessCmdlines; import static com.android.server.stats.pull.ProcfsMemoryUtil.readCmdlineFromProcfs; import static com.android.server.stats.pull.ProcfsMemoryUtil.readMemorySnapshotFromProcfs; import static com.android.server.stats.pull.netstats.NetworkStatsUtils.fromPublicNetworkStats; +import static com.android.server.stats.pull.netstats.NetworkStatsUtils.isAddEntriesSupported; import static libcore.io.IoUtils.closeQuietly; @@ -1388,14 +1389,22 @@ public class StatsPullAtomService extends SystemService { @NonNull private static NetworkStats removeEmptyEntries(NetworkStats stats) { - NetworkStats ret = new NetworkStats(0, 1); + final ArrayList<NetworkStats.Entry> entries = new ArrayList<>(); for (NetworkStats.Entry e : stats) { if (e.getRxBytes() != 0 || e.getRxPackets() != 0 || e.getTxBytes() != 0 || e.getTxPackets() != 0 || e.getOperations() != 0) { - ret = ret.addEntry(e); + entries.add(e); } } - return ret; + if (isAddEntriesSupported()) { + return new NetworkStats(0, entries.size()).addEntries(entries); + } else { + NetworkStats outputStats = new NetworkStats(0L, 1); + for (NetworkStats.Entry e : entries) { + outputStats = outputStats.addEntry(e); + } + return outputStats; + } } private void addNetworkStats(int atomTag, @NonNull List<StatsEvent> ret, @@ -1720,11 +1729,19 @@ public class StatsPullAtomService extends SystemService { @NonNull private NetworkStats sliceNetworkStats(@NonNull NetworkStats stats, @NonNull Function<NetworkStats.Entry, NetworkStats.Entry> slicer) { - NetworkStats ret = new NetworkStats(0, 1); + final ArrayList<NetworkStats.Entry> entries = new ArrayList(); for (NetworkStats.Entry e : stats) { - ret = ret.addEntry(slicer.apply(e)); + entries.add(slicer.apply(e)); + } + if (isAddEntriesSupported()) { + return new NetworkStats(0, entries.size()).addEntries(entries); + } else { + NetworkStats outputStats = new NetworkStats(0L, 1); + for (NetworkStats.Entry e : entries) { + outputStats = outputStats.addEntry(e); + } + return outputStats; } - return ret; } private void registerWifiBytesTransferBackground() { diff --git a/services/core/java/com/android/server/stats/pull/netstats/NetworkStatsUtils.java b/services/core/java/com/android/server/stats/pull/netstats/NetworkStatsUtils.java index de5885201ea4..0318bdd61473 100644 --- a/services/core/java/com/android/server/stats/pull/netstats/NetworkStatsUtils.java +++ b/services/core/java/com/android/server/stats/pull/netstats/NetworkStatsUtils.java @@ -24,6 +24,9 @@ import static android.net.NetworkStats.SET_ALL; import android.app.usage.NetworkStats; import com.android.internal.annotations.VisibleForTesting; +import com.android.server.stats.Flags; + +import java.util.ArrayList; /** * Utility methods for accessing {@link android.net.NetworkStats}. @@ -35,12 +38,21 @@ public class NetworkStatsUtils { */ public static android.net.NetworkStats fromPublicNetworkStats( NetworkStats publiceNetworkStats) { - android.net.NetworkStats stats = new android.net.NetworkStats(0L, 0); + final ArrayList<android.net.NetworkStats.Entry> entries = new ArrayList<>(); while (publiceNetworkStats.hasNextBucket()) { NetworkStats.Bucket bucket = new NetworkStats.Bucket(); publiceNetworkStats.getNextBucket(bucket); - final android.net.NetworkStats.Entry entry = fromBucket(bucket); - stats = stats.addEntry(entry); + entries.add(fromBucket(bucket)); + } + android.net.NetworkStats stats = new android.net.NetworkStats(0L, 1); + // The new API is only supported on devices running the mainline version of `NetworkStats`. + // It should always be used when available for memory efficiency. + if (isAddEntriesSupported()) { + stats = stats.addEntries(entries); + } else { + for (android.net.NetworkStats.Entry entry : entries) { + stats = stats.addEntry(entry); + } } return stats; } @@ -106,4 +118,8 @@ public class NetworkStatsUtils { } return 0; } + + public static boolean isAddEntriesSupported() { + return Flags.netstatsUseAddEntries(); + } } diff --git a/services/core/java/com/android/server/stats/stats_flags.aconfig b/services/core/java/com/android/server/stats/stats_flags.aconfig index f360837e1d28..afea3038bcbb 100644 --- a/services/core/java/com/android/server/stats/stats_flags.aconfig +++ b/services/core/java/com/android/server/stats/stats_flags.aconfig @@ -1,6 +1,20 @@ package: "com.android.server.stats" container: "system" +# Note: To ensure compatibility across all release configurations, initiate the ramp-up process +# only after the 'com.android.net.flags.netstats_add_entries' flag has been fully deployed. +# This flag provides the necessary API from the Connectivity module. +# The flag was added because the flag 'com.android.net.flags.netstats_add_entries' for API +# is already being rolled out, and modifying behavior during an active rollout might +# lead to unwanted issues. +flag { + name: "netstats_use_add_entries" + namespace: "statsd" + description: "Use NetworkStats#addEntries to reduce memory footprint" + bug: "335680025" + is_fixed_read_only: true +} + flag { name: "add_mobile_bytes_transfer_by_proc_state_puller" namespace: "statsd" diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java index 2faa68a9948f..09d2a0263f2e 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java @@ -168,11 +168,6 @@ public interface StatusBarManagerInternal { */ void onDisplayReady(int displayId); - /** - * Notifies System UI whether the recents animation is running. - */ - void onRecentsAnimationStateChanged(boolean running); - /** @see com.android.internal.statusbar.IStatusBar#onSystemBarAttributesChanged */ void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 7d812ee8c5cd..0fd59670436e 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -699,17 +699,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D } @Override - public void onRecentsAnimationStateChanged(boolean running) { - IStatusBar bar = mBar; - if (bar != null) { - try { - bar.onRecentsAnimationStateChanged(running); - } catch (RemoteException ex) {} - } - - } - - @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, @InsetsType int requestedVisibleTypes, diff --git a/services/core/java/com/android/server/tracing/TracingServiceProxy.java b/services/core/java/com/android/server/tracing/TracingServiceProxy.java index 480db25ec606..8e24e9f8a4c0 100644 --- a/services/core/java/com/android/server/tracing/TracingServiceProxy.java +++ b/services/core/java/com/android/server/tracing/TracingServiceProxy.java @@ -38,6 +38,7 @@ import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor.AutoCloseInputStream; import android.os.ParcelFileDescriptor.AutoCloseOutputStream; import android.os.UserHandle; +import android.provider.Settings; import android.service.tracing.TraceReportService; import android.tracing.ITracingServiceProxy; import android.tracing.TraceReportParams; @@ -87,6 +88,8 @@ public class TracingServiceProxy extends SystemService { TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_PERM_MISSING; private static final int REPORT_SVC_COMM_ERROR = TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_COMM_ERROR; + private static final String NOTIFY_SESSION_ENDED_SETTING = "should_notify_trace_session_ended"; + private static final int ENABLED = 1; private final Context mContext; private final PackageManager mPackageManager; @@ -97,10 +100,22 @@ public class TracingServiceProxy extends SystemService { /** * Notifies system tracing app that a tracing session has ended. sessionStolen is ignored, * as trace sessions are no longer stolen and are always cloned instead. + * <p> + * Cases exist where user-flows besides Traceur's QS Tile may end long-trace sessions. In + * these cases, a Global int will be set to flag the upcoming notifyTraceSessionEnded call + * as purposely muted once. */ @Override public void notifyTraceSessionEnded(boolean sessionStolen /* unused */) { - TracingServiceProxy.this.notifyTraceur(); + long identity = Binder.clearCallingIdentity(); + if (Settings.Global.getInt(mContext.getContentResolver(), + NOTIFY_SESSION_ENDED_SETTING, ENABLED) == ENABLED) { + TracingServiceProxy.this.notifyTraceur(); + } else { + Settings.Global.putInt(mContext.getContentResolver(), NOTIFY_SESSION_ENDED_SETTING, + ENABLED); + } + Binder.restoreCallingIdentity(identity); } @Override diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 10ce8c273736..7cbacd6b0b82 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -1764,15 +1764,7 @@ final class AccessibilityController { IBinder topFocusedWindowToken = null; synchronized (mService.mGlobalLock) { - // If there is a recents animation running, then use the animation target as the - // top window state. Otherwise,do not send the windows if there is no top focus as - // the window manager is still looking for where to put it. We will do the work when - // we get a focus change callback. - final RecentsAnimationController controller = - mService.getRecentsAnimationController(); - final WindowState topFocusedWindowState = controller != null - ? controller.getTargetAppMainWindow() - : getTopFocusWindow(); + final WindowState topFocusedWindowState = getTopFocusWindow(); if (topFocusedWindowState == null) { if (DEBUG) { Slog.d(LOG_TAG, "top focused window is null, compute it again later"); @@ -1907,10 +1899,6 @@ final class AccessibilityController { private boolean windowMattersToAccessibility(AccessibilityWindow a11yWindow, Region regionInScreen, Region unaccountedSpace) { - if (a11yWindow.ignoreRecentsAnimationForAccessibility()) { - return false; - } - if (a11yWindow.isFocused()) { return true; } diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java index d8e7c77309cd..fd2a909f8b05 100644 --- a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -659,7 +659,6 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { private boolean mIsPIPMenu; private boolean mIsFocused; private boolean mShouldMagnify; - private boolean mIgnoreDuetoRecentsAnimation; private final Region mTouchableRegionInScreen = new Region(); private final Region mTouchableRegionInWindow = new Region(); private WindowInfo mWindowInfo; @@ -692,10 +691,6 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { instance.mIsFocused = windowState != null && windowState.isFocused(); instance.mShouldMagnify = windowState == null || windowState.shouldMagnify(); - final RecentsAnimationController controller = service.getRecentsAnimationController(); - instance.mIgnoreDuetoRecentsAnimation = windowState != null && controller != null - && controller.shouldIgnoreForAccessibility(windowState); - final Rect windowFrame = new Rect(inputWindowHandle.frame); getTouchableRegionInWindow(instance.mShouldMagnify, inputWindowHandle.touchableRegion, instance.mTouchableRegionInWindow, windowFrame, magnificationInverseMatrix, @@ -793,13 +788,6 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { } /** - * @return true if it's running the recent animation but not the target app. - */ - public boolean ignoreRecentsAnimationForAccessibility() { - return mIgnoreDuetoRecentsAnimation; - } - - /** * @return true if this window is the trusted overlay. */ public boolean isTrustedOverlay() { @@ -909,7 +897,6 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { + ", privateFlag=0x" + Integer.toHexString(mPrivateFlags) + ", focused=" + mIsFocused + ", shouldMagnify=" + mShouldMagnify - + ", ignoreDuetoRecentsAnimation=" + mIgnoreDuetoRecentsAnimation + ", isTrustedOverlay=" + isTrustedOverlay() + ", regionInScreen=" + mTouchableRegionInScreen + ", touchableRegion=" + mTouchableRegionInWindow diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index fb2bf39c0b7b..2ce1aa422601 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -1275,10 +1275,8 @@ class ActivityMetricsLogger { final ActivityRecord r = info.mLastLaunchedActivity; final long lastTopLossTime = r.topResumedStateLossTime; final WindowManagerService wm = mSupervisor.mService.mWindowManager; - final Object controller = wm.getRecentsAnimationController(); mLoggerHandler.postDelayed(() -> { - if (lastTopLossTime != r.topResumedStateLossTime - || controller != wm.getRecentsAnimationController()) { + if (lastTopLossTime != r.topResumedStateLossTime) { // Skip if the animation was finished in a short time. return; } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5ba8433146dc..2294d6599da1 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -226,7 +226,6 @@ import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_F import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE; import static com.android.server.wm.ActivityTaskManagerService.getInputDispatchingTimeoutMillisLocked; -import static com.android.server.wm.DesktopModeHelper.canEnterDesktopMode; import static com.android.server.wm.IdentifierProto.HASH_CODE; import static com.android.server.wm.IdentifierProto.TITLE; import static com.android.server.wm.IdentifierProto.USER_ID; @@ -637,12 +636,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A private SizeConfigurationBuckets mSizeConfigurations; - /** - * The precomputed display insets for resolving configuration. It will be non-null if - * {@link #shouldCreateAppCompatDisplayInsets} returns {@code true}. - */ - private AppCompatDisplayInsets mAppCompatDisplayInsets; - @VisibleForTesting final TaskFragment.ConfigOverrideHint mResolveConfigHint; @@ -792,22 +785,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @NonNull final AppCompatController mAppCompatController; - /** - * The scale to fit at least one side of the activity to its parent. If the activity uses - * 1920x1080, and the actually size on the screen is 960x540, then the scale is 0.5. - */ - private float mSizeCompatScale = 1f; - - /** - * The bounds in global coordinates for activity in size compatibility mode. - * @see ActivityRecord#hasSizeCompatBounds() - */ - private Rect mSizeCompatBounds; - - // Whether this activity is in size compatibility mode because its bounds don't fit in parent - // naturally. - private boolean mInSizeCompatModeForBounds = false; - // Whether the activity is eligible to be letterboxed for fixed orientation with respect to its // requested orientation, even when it's letterbox for another reason (e.g., size compat mode) // and therefore #isLetterboxedForFixedOrientationAndAspectRatio returns false. @@ -1257,10 +1234,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mPendingRelaunchCount != 0) { pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount); } - if (mSizeCompatScale != 1f || mSizeCompatBounds != null) { - pw.println(prefix + "mSizeCompatScale=" + mSizeCompatScale + " mSizeCompatBounds=" - + mSizeCompatBounds); - } if (mRemovingFromDisplay) { pw.println(prefix + "mRemovingFromDisplay=" + mRemovingFromDisplay); } @@ -4969,9 +4942,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A newIntents.add(intent); } - final boolean isSleeping() { - final Task rootTask = getRootTask(); - return rootTask != null ? rootTask.shouldSleepActivities() : mAtmService.isSleepingLocked(); + boolean isSleeping() { + return task != null ? task.shouldSleepActivities() : mAtmService.isSleepingLocked(); } /** @@ -4995,7 +4967,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A final ReferrerIntent rintent = new ReferrerIntent(intent, getFilteredReferrer(referrer), callerToken); boolean unsent = true; - final boolean isTopActivityWhileSleeping = isTopRunningActivity() && isSleeping(); + final boolean isTopActivityWhileSleeping = isSleeping() && isTopRunningActivity(); // We want to immediately deliver the intent to the activity if: // - It is currently resumed or paused. i.e. it is currently visible to the user and we want @@ -5862,7 +5834,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void setState(State state, String reason) { ProtoLog.v(WM_DEBUG_STATES, "State movement: %s from:%s to:%s reason:%s", - this, getState(), state, reason); + this, mState, state, reason); if (state == mState) { // No need to do anything if state doesn't change. @@ -6187,7 +6159,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Now for any activities that aren't visible to the user, make sure they no longer are // keeping the screen frozen. if (DEBUG_VISIBILITY) { - Slog.v(TAG_VISIBILITY, "Making invisible: " + this + ", state=" + getState()); + Slog.v(TAG_VISIBILITY, "Making invisible: " + this + ", state=" + mState); } try { final boolean canEnterPictureInPicture = checkEnterPictureInPictureState( @@ -6203,7 +6175,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } setVisibility(false); - switch (getState()) { + switch (mState) { case STOPPING: case STOPPED: // Reset the flag indicating that an app can enter picture-in-picture once the @@ -6439,7 +6411,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mTaskSupervisor.mStoppingActivities.remove(this); if (getDisplayArea().allResumedActivitiesComplete()) { // Construct the compat environment at a relatively stable state if needed. - updateAppCompatDisplayInsets(); + mAppCompatController.getAppCompatSizeCompatModePolicy().updateAppCompatDisplayInsets(); mRootWindowContainer.executeAppTransitionForAllDisplay(); } @@ -8072,7 +8044,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A != getRequestedConfigurationOrientation(false /*forDisplay */)) { // Do not change the requested configuration now, because this will be done when setting // the orientation below with the new mAppCompatDisplayInsets - clearSizeCompatModeAttributes(); + mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatModeAttributes(); } ProtoLog.v(WM_DEBUG_ORIENTATION, "Setting requested orientation %s for %s", @@ -8205,18 +8177,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Nullable AppCompatDisplayInsets getAppCompatDisplayInsets() { - if (mAppCompatController.getTransparentPolicy().isRunning()) { - return mAppCompatController.getTransparentPolicy().getInheritedAppCompatDisplayInsets(); - } - return mAppCompatDisplayInsets; - } - - /** - * @return The {@code true} if the current instance has {@link mAppCompatDisplayInsets} without - * considering the inheritance implemented in {@link #getAppCompatDisplayInsets()} - */ - boolean hasAppCompatDisplayInsetsWithoutInheritance() { - return mAppCompatDisplayInsets != null; + return mAppCompatController.getAppCompatSizeCompatModePolicy().getAppCompatDisplayInsets(); } /** @@ -8224,7 +8185,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * density than its parent or its bounds don't fit in parent naturally. */ boolean inSizeCompatMode() { - if (mInSizeCompatModeForBounds) { + final AppCompatSizeCompatModePolicy scmPolicy = mAppCompatController + .getAppCompatSizeCompatModePolicy(); + if (scmPolicy.isInSizeCompatModeForBounds()) { return true; } if (getAppCompatDisplayInsets() == null || !shouldCreateAppCompatDisplayInsets() @@ -8321,69 +8284,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Override boolean hasSizeCompatBounds() { - return mSizeCompatBounds != null; - } - - // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer. - private void updateAppCompatDisplayInsets() { - if (getAppCompatDisplayInsets() != null || !shouldCreateAppCompatDisplayInsets()) { - // The override configuration is set only once in size compatibility mode. - return; - } - - Configuration overrideConfig = getRequestedOverrideConfiguration(); - final Configuration fullConfig = getConfiguration(); - - // Ensure the screen related fields are set. It is used to prevent activity relaunch - // when moving between displays. For screenWidthDp and screenWidthDp, because they - // are relative to bounds and density, they will be calculated in - // {@link Task#computeConfigResourceOverrides} and the result will also be - // relatively fixed. - overrideConfig.colorMode = fullConfig.colorMode; - overrideConfig.densityDpi = fullConfig.densityDpi; - // The smallest screen width is the short side of screen bounds. Because the bounds - // and density won't be changed, smallestScreenWidthDp is also fixed. - overrideConfig.smallestScreenWidthDp = fullConfig.smallestScreenWidthDp; - if (ActivityInfo.isFixedOrientation(getOverrideOrientation())) { - // lock rotation too. When in size-compat, onConfigurationChanged will watch for and - // apply runtime rotation changes. - overrideConfig.windowConfiguration.setRotation( - fullConfig.windowConfiguration.getRotation()); - } - - final Rect letterboxedContainerBounds = mAppCompatController - .getAppCompatAspectRatioPolicy().getLetterboxedContainerBounds(); - - // The role of AppCompatDisplayInsets is like the override bounds. - mAppCompatDisplayInsets = - new AppCompatDisplayInsets( - mDisplayContent, this, letterboxedContainerBounds, - mResolveConfigHint.mUseOverrideInsetsForConfig); - } - - private void clearSizeCompatModeAttributes() { - mInSizeCompatModeForBounds = false; - final float lastSizeCompatScale = mSizeCompatScale; - mSizeCompatScale = 1f; - if (mSizeCompatScale != lastSizeCompatScale) { - forAllWindows(WindowState::updateGlobalScale, false /* traverseTopToBottom */); - } - mSizeCompatBounds = null; - mAppCompatDisplayInsets = null; - mAppCompatController.getTransparentPolicy().clearInheritedAppCompatDisplayInsets(); - } - - @VisibleForTesting - void clearSizeCompatMode() { - clearSizeCompatModeAttributes(); - // Clear config override in #updateAppCompatDisplayInsets(). - final int activityType = getActivityType(); - final Configuration overrideConfig = getRequestedOverrideConfiguration(); - overrideConfig.unset(); - // Keep the activity type which was set when attaching to a task to prevent leaving it - // undefined. - overrideConfig.windowConfiguration.setActivityType(activityType); - onRequestedOverrideConfigurationChanged(overrideConfig); + return mAppCompatController.getAppCompatSizeCompatModePolicy().hasSizeCompatBounds(); } @Override @@ -8401,7 +8302,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Override float getCompatScale() { - return hasSizeCompatBounds() ? mSizeCompatScale : super.getCompatScale(); + // We need to invoke {#getCompatScale()} only if the CompatScale is not available. + return mAppCompatController.getAppCompatSizeCompatModePolicy() + .getCompatScaleIfAvailable(ActivityRecord.super::getCompatScale); } @Override @@ -8469,8 +8372,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A resolveAspectRatioRestriction(newParentConfiguration); } final AppCompatDisplayInsets appCompatDisplayInsets = getAppCompatDisplayInsets(); + final AppCompatSizeCompatModePolicy scmPolicy = + mAppCompatController.getAppCompatSizeCompatModePolicy(); if (appCompatDisplayInsets != null) { - resolveSizeCompatModeConfiguration(newParentConfiguration, appCompatDisplayInsets); + scmPolicy.resolveSizeCompatModeConfiguration(newParentConfiguration, + appCompatDisplayInsets, mTmpBounds); } else if (inMultiWindowMode() && !isFixedOrientationLetterboxAllowed) { // We ignore activities' requested orientation in multi-window modes. They may be // taken into consideration in resolveFixedOrientationConfiguration call above. @@ -8488,13 +8394,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (!Flags.immersiveAppRepositioning() && !mAppCompatController.getAppCompatAspectRatioPolicy() .isLetterboxedForFixedOrientationAndAspectRatio() - && !mInSizeCompatModeForBounds + && !scmPolicy.isInSizeCompatModeForBounds() && !mAppCompatController.getAppCompatAspectRatioOverrides() .hasFullscreenOverride()) { resolveAspectRatioRestriction(newParentConfiguration); } - if (isFixedOrientationLetterboxAllowed || mAppCompatDisplayInsets != null + if (isFixedOrientationLetterboxAllowed + || scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance() // In fullscreen, can be letterboxed for aspect ratio. || !inMultiWindowMode()) { updateResolvedBoundsPosition(newParentConfiguration); @@ -8502,7 +8409,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A boolean isIgnoreOrientationRequest = mDisplayContent != null && mDisplayContent.getIgnoreOrientationRequest(); - if (mAppCompatDisplayInsets == null + if (!scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance() // for size compat mode set in updateAppCompatDisplayInsets // Fixed orientation letterboxing is possible on both large screen devices // with ignoreOrientationRequest enabled and on phones in split screen even with @@ -8551,7 +8458,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A info.neverSandboxDisplayApis(sConstrainDisplayApisConfig), info.alwaysSandboxDisplayApis(sConstrainDisplayApisConfig), !matchParentBounds(), - mAppCompatDisplayInsets != null, + scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance(), shouldCreateAppCompatDisplayInsets()); } resolvedConfig.windowConfiguration.setMaxBounds(mTmpBounds); @@ -8575,7 +8482,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return Rect.copyOrNull(mResolveConfigHint.mParentAppBoundsOverride); } - private void computeConfigByResolveHint(@NonNull Configuration resolvedConfig, + void computeConfigByResolveHint(@NonNull Configuration resolvedConfig, @NonNull Configuration parentConfig) { task.computeConfigResourceOverrides(resolvedConfig, parentConfig, mResolveConfigHint); // Reset the temp info which should only take effect for the specified computation. @@ -8627,7 +8534,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mAppCompatController.getTransparentPolicy().isRunning()) { return mAppCompatController.getTransparentPolicy().getInheritedAppCompatState(); } - if (mInSizeCompatModeForBounds) { + final AppCompatSizeCompatModePolicy scmPolicy = mAppCompatController + .getAppCompatSizeCompatModePolicy(); + if (scmPolicy.isInSizeCompatModeForBounds()) { return APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_SIZE_COMPAT_MODE; } // Letterbox for fixed orientation. This check returns true only when an activity is @@ -8663,8 +8572,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (resolvedBounds.isEmpty()) { return; } - final Rect screenResolvedBounds = - mSizeCompatBounds != null ? mSizeCompatBounds : resolvedBounds; + final AppCompatSizeCompatModePolicy scmPolicy = + mAppCompatController.getAppCompatSizeCompatModePolicy(); + final Rect screenResolvedBounds = scmPolicy.replaceResolvedBoundsIfNeeded(resolvedBounds); final Rect parentAppBounds = mResolveConfigHint.mParentAppBoundsOverride; final Rect parentBounds = newParentConfiguration.windowConfiguration.getBounds(); final float screenResolvedBoundsWidth = screenResolvedBounds.width(); @@ -8720,14 +8630,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A - screenResolvedBounds.top + parentAppBounds.top); } } - - if (mSizeCompatBounds != null) { - mSizeCompatBounds.offset(offsetX , offsetY); - final int dy = mSizeCompatBounds.top - resolvedBounds.top; - final int dx = mSizeCompatBounds.left - resolvedBounds.left; - offsetBounds(resolvedConfig, dx, dy); - } else { - offsetBounds(resolvedConfig, offsetX, offsetY); + // If in SCM, apply offset to resolved bounds relative to size compat bounds. If + // not, apply directly to resolved bounds. + if (!scmPolicy.applyOffsetIfNeeded(resolvedBounds, resolvedConfig, offsetX, offsetY)) { + AppCompatUtils.offsetBounds(resolvedConfig, offsetX, offsetY); } // If the top is aligned with parentAppBounds add the vertical insets back so that the app @@ -8735,9 +8641,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (resolvedConfig.windowConfiguration.getAppBounds().top == parentAppBounds.top && !isImmersiveMode) { resolvedConfig.windowConfiguration.getBounds().top = parentBounds.top; - if (mSizeCompatBounds != null) { - mSizeCompatBounds.top = parentBounds.top; - } + scmPolicy.alignToTopIfNeeded(parentBounds); } // Since bounds has changed, the configuration needs to be computed accordingly. @@ -8747,13 +8651,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // easier to resolve the relative position in parent container. However, if the activity is // scaled, the position should follow the scale because the configuration will be sent to // the client which is expected to be in a scaled environment. - if (mSizeCompatScale != 1f) { - final int screenPosX = resolvedBounds.left; - final int screenPosY = resolvedBounds.top; - final int dx = (int) (screenPosX / mSizeCompatScale + 0.5f) - screenPosX; - final int dy = (int) (screenPosY / mSizeCompatScale + 0.5f) - screenPosY; - offsetBounds(resolvedConfig, dx, dy); - } + scmPolicy.applySizeCompatScaleIfNeeded(resolvedBounds, resolvedConfig); } boolean isImmersiveMode(@NonNull Rect parentBounds) { @@ -8775,7 +8673,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @NonNull Rect getScreenResolvedBounds() { final Configuration resolvedConfig = getResolvedOverrideConfiguration(); final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds(); - return mSizeCompatBounds != null ? mSizeCompatBounds : resolvedBounds; + final AppCompatSizeCompatModePolicy scmPolicy = + mAppCompatController.getAppCompatSizeCompatModePolicy(); + return scmPolicy.replaceResolvedBoundsIfNeeded(resolvedBounds); } void recomputeConfiguration() { @@ -8927,8 +8827,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return; } final AppCompatDisplayInsets mAppCompatDisplayInsets = getAppCompatDisplayInsets(); + final AppCompatSizeCompatModePolicy scmPolicy = + mAppCompatController.getAppCompatSizeCompatModePolicy(); - if (mAppCompatDisplayInsets != null + if (scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance() && !mAppCompatDisplayInsets.mIsInFixedOrientationOrAspectRatioLetterbox) { // App prefers to keep its original size. // If the size compat is from previous fixed orientation letterboxing, we may want to @@ -8981,7 +8883,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A .applyDesiredAspectRatio(newParentConfig, parentBounds, resolvedBounds, containingBoundsWithInsets, containingBounds); - if (mAppCompatDisplayInsets != null) { + if (scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance()) { mAppCompatDisplayInsets.getBoundsByRotation(mTmpBounds, newParentConfig.windowConfiguration.getRotation()); if (resolvedBounds.width() != mTmpBounds.width() @@ -9042,246 +8944,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } } - /** - * Resolves consistent screen configuration for orientation and rotation changes without - * inheriting the parent bounds. - */ - private void resolveSizeCompatModeConfiguration(Configuration newParentConfiguration, - @NonNull AppCompatDisplayInsets appCompatDisplayInsets) { - final Configuration resolvedConfig = getResolvedOverrideConfiguration(); - final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds(); - - // When an activity needs to be letterboxed because of fixed orientation, use fixed - // orientation bounds (stored in resolved bounds) instead of parent bounds since the - // activity will be displayed within them even if it is in size compat mode. They should be - // saved here before resolved bounds are overridden below. - final boolean useResolvedBounds = Flags.immersiveAppRepositioning() - ? mAppCompatController.getAppCompatAspectRatioPolicy() - .isAspectRatioApplied() - : mAppCompatController.getAppCompatAspectRatioPolicy() - .isLetterboxedForFixedOrientationAndAspectRatio(); - final Rect containerBounds = useResolvedBounds - ? new Rect(resolvedBounds) - : newParentConfiguration.windowConfiguration.getBounds(); - final Rect containerAppBounds = useResolvedBounds - ? new Rect(resolvedConfig.windowConfiguration.getAppBounds()) - : mResolveConfigHint.mParentAppBoundsOverride; - - final int requestedOrientation = getRequestedConfigurationOrientation(); - final boolean orientationRequested = requestedOrientation != ORIENTATION_UNDEFINED; - final int parentOrientation = mResolveConfigHint.mUseOverrideInsetsForConfig - ? mResolveConfigHint.mTmpOverrideConfigOrientation - : newParentConfiguration.orientation; - final int orientation = orientationRequested - ? requestedOrientation - // We should use the original orientation of the activity when possible to avoid - // forcing the activity in the opposite orientation. - : appCompatDisplayInsets.mOriginalRequestedOrientation != ORIENTATION_UNDEFINED - ? appCompatDisplayInsets.mOriginalRequestedOrientation - : parentOrientation; - int rotation = newParentConfiguration.windowConfiguration.getRotation(); - final boolean isFixedToUserRotation = mDisplayContent == null - || mDisplayContent.getDisplayRotation().isFixedToUserRotation(); - if (!isFixedToUserRotation && !appCompatDisplayInsets.mIsFloating) { - // Use parent rotation because the original display can be rotated. - resolvedConfig.windowConfiguration.setRotation(rotation); - } else { - final int overrideRotation = resolvedConfig.windowConfiguration.getRotation(); - if (overrideRotation != ROTATION_UNDEFINED) { - rotation = overrideRotation; - } - } - - // Use compat insets to lock width and height. We should not use the parent width and height - // because apps in compat mode should have a constant width and height. The compat insets - // are locked when the app is first launched and are never changed after that, so we can - // rely on them to contain the original and unchanging width and height of the app. - final Rect containingAppBounds = new Rect(); - final Rect containingBounds = mTmpBounds; - appCompatDisplayInsets.getContainerBounds(containingAppBounds, containingBounds, rotation, - orientation, orientationRequested, isFixedToUserRotation); - resolvedBounds.set(containingBounds); - // The size of floating task is fixed (only swap), so the aspect ratio is already correct. - if (!appCompatDisplayInsets.mIsFloating) { - mAppCompatController.getAppCompatAspectRatioPolicy() - .applyAspectRatioForLetterbox(resolvedBounds, containingAppBounds, - containingBounds); - } - - // Use resolvedBounds to compute other override configurations such as appBounds. The bounds - // are calculated in compat container space. The actual position on screen will be applied - // later, so the calculation is simpler that doesn't need to involve offset from parent. - mResolveConfigHint.mTmpCompatInsets = appCompatDisplayInsets; - computeConfigByResolveHint(resolvedConfig, newParentConfiguration); - // Use current screen layout as source because the size of app is independent to parent. - resolvedConfig.screenLayout = computeScreenLayout( - getConfiguration().screenLayout, resolvedConfig.screenWidthDp, - resolvedConfig.screenHeightDp); - - // Use parent orientation if it cannot be decided by bounds, so the activity can fit inside - // the parent bounds appropriately. - if (resolvedConfig.screenWidthDp == resolvedConfig.screenHeightDp) { - resolvedConfig.orientation = parentOrientation; - } - - // Below figure is an example that puts an activity which was launched in a larger container - // into a smaller container. - // The outermost rectangle is the real display bounds. - // "@" is the container app bounds (parent bounds or fixed orientation bounds) - // "#" is the {@code resolvedBounds} that applies to application. - // "*" is the {@code mSizeCompatBounds} that used to show on screen if scaled. - // ------------------------------ - // | | - // | @@@@*********@@@@### | - // | @ * * @ # | - // | @ * * @ # | - // | @ * * @ # | - // | @@@@*********@@@@ # | - // ---------#--------------#----- - // # # - // ################ - // The application is still layouted in "#" since it was launched, and it will be visually - // scaled and positioned to "*". - - final Rect resolvedAppBounds = resolvedConfig.windowConfiguration.getAppBounds(); - - // Calculates the scale the size compatibility bounds into the region which is available - // to application. - final float lastSizeCompatScale = mSizeCompatScale; - updateSizeCompatScale(resolvedAppBounds, containerAppBounds); - - final int containerTopInset = containerAppBounds.top - containerBounds.top; - final boolean topNotAligned = - containerTopInset != resolvedAppBounds.top - resolvedBounds.top; - if (mSizeCompatScale != 1f || topNotAligned) { - if (mSizeCompatBounds == null) { - mSizeCompatBounds = new Rect(); - } - mSizeCompatBounds.set(resolvedAppBounds); - mSizeCompatBounds.offsetTo(0, 0); - mSizeCompatBounds.scale(mSizeCompatScale); - // The insets are included in height, e.g. the area of real cutout shouldn't be scaled. - mSizeCompatBounds.bottom += containerTopInset; - } else { - mSizeCompatBounds = null; - } - if (mSizeCompatScale != lastSizeCompatScale) { - forAllWindows(WindowState::updateGlobalScale, false /* traverseTopToBottom */); - } - - // The position will be later adjusted in updateResolvedBoundsPosition. - // Above coordinates are in "@" space, now place "*" and "#" to screen space. - final boolean fillContainer = resolvedBounds.equals(containingBounds); - final int screenPosX = fillContainer ? containerBounds.left : containerAppBounds.left; - final int screenPosY = fillContainer ? containerBounds.top : containerAppBounds.top; - - if (screenPosX != 0 || screenPosY != 0) { - if (mSizeCompatBounds != null) { - mSizeCompatBounds.offset(screenPosX, screenPosY); - } - // Add the global coordinates and remove the local coordinates. - final int dx = screenPosX - resolvedBounds.left; - final int dy = screenPosY - resolvedBounds.top; - offsetBounds(resolvedConfig, dx, dy); - } - - mInSizeCompatModeForBounds = - isInSizeCompatModeForBounds(resolvedAppBounds, containerAppBounds); - } - - void updateSizeCompatScale(Rect resolvedAppBounds, Rect containerAppBounds) { - mSizeCompatScale = mAppCompatController.getTransparentPolicy() - .findOpaqueNotFinishingActivityBelow() - .map(activityRecord -> activityRecord.mSizeCompatScale) - .orElseGet(() -> calculateSizeCompatScale(resolvedAppBounds, containerAppBounds)); - } - - private float calculateSizeCompatScale(Rect resolvedAppBounds, Rect containerAppBounds) { - final int contentW = resolvedAppBounds.width(); - final int contentH = resolvedAppBounds.height(); - final int viewportW = containerAppBounds.width(); - final int viewportH = containerAppBounds.height(); - // Allow an application to be up-scaled if its window is smaller than its - // original container or if it's a freeform window in desktop mode. - boolean shouldAllowUpscaling = !(contentW <= viewportW && contentH <= viewportH) - || (canEnterDesktopMode(mAtmService.mContext) - && getWindowingMode() == WINDOWING_MODE_FREEFORM); - return shouldAllowUpscaling ? Math.min( - (float) viewportW / contentW, (float) viewportH / contentH) : 1f; - } - - private boolean isInSizeCompatModeForBounds(final Rect appBounds, final Rect containerBounds) { - if (mAppCompatController.getTransparentPolicy().isRunning()) { - // To avoid wrong app behaviour, we decided to disable SCM when a translucent activity - // is letterboxed. - return false; - } - final int appWidth = appBounds.width(); - final int appHeight = appBounds.height(); - final int containerAppWidth = containerBounds.width(); - final int containerAppHeight = containerBounds.height(); - - if (containerAppWidth == appWidth && containerAppHeight == appHeight) { - // Matched the container bounds. - return false; - } - if (containerAppWidth > appWidth && containerAppHeight > appHeight) { - // Both sides are smaller than the container. - return true; - } - if (containerAppWidth < appWidth || containerAppHeight < appHeight) { - // One side is larger than the container. - return true; - } - - // The rest of the condition is that only one side is smaller than the container, but it - // still needs to exclude the cases where the size is limited by the fixed aspect ratio. - final float maxAspectRatio = getMaxAspectRatio(); - if (maxAspectRatio > 0) { - final float aspectRatio = (0.5f + Math.max(appWidth, appHeight)) - / Math.min(appWidth, appHeight); - if (aspectRatio >= maxAspectRatio) { - // The current size has reached the max aspect ratio. - return false; - } - } - final float minAspectRatio = getMinAspectRatio(); - if (minAspectRatio > 0) { - // The activity should have at least the min aspect ratio, so this checks if the - // container still has available space to provide larger aspect ratio. - final float containerAspectRatio = - (0.5f + Math.max(containerAppWidth, containerAppHeight)) - / Math.min(containerAppWidth, containerAppHeight); - if (containerAspectRatio <= minAspectRatio) { - // The long side has reached the parent. - return false; - } - } - return true; - } - - /** @return The horizontal / vertical offset of putting the content in the center of viewport.*/ - private static int getCenterOffset(int viewportDim, int contentDim) { - return (int) ((viewportDim - contentDim + 1) * 0.5f); - } - - private static void offsetBounds(Configuration inOutConfig, int offsetX, int offsetY) { - inOutConfig.windowConfiguration.getBounds().offset(offsetX, offsetY); - inOutConfig.windowConfiguration.getAppBounds().offset(offsetX, offsetY); - } - @Override public Rect getBounds() { // TODO(b/268458693): Refactor configuration inheritance in case of translucent activities final Rect superBounds = super.getBounds(); + final AppCompatSizeCompatModePolicy scmPolicy = + mAppCompatController.getAppCompatSizeCompatModePolicy(); return mAppCompatController.getTransparentPolicy().findOpaqueNotFinishingActivityBelow() .map(ActivityRecord::getBounds) - .orElseGet(() -> { - if (mSizeCompatBounds != null) { - return mSizeCompatBounds; - } - return superBounds; - }); + .orElseGet(() -> scmPolicy.getAppSizeCompatBoundsIfAvailable(superBounds)); } @Override @@ -9612,7 +9283,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mVisibleRequested) { // Calling from here rather than resolveOverrideConfiguration to ensure that this is // called after full config is updated in ConfigurationContainer#onConfigurationChanged. - updateAppCompatDisplayInsets(); + mAppCompatController.getAppCompatSizeCompatModePolicy().updateAppCompatDisplayInsets(); } // Short circuit: if the two full configurations are equal (the common case), then there is @@ -9952,7 +9623,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Reset the existing override configuration so it can be updated according to the latest // configuration. - clearSizeCompatMode(); + mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); if (!attachedToProcess()) { return; diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 2f74a9d5816b..0f108c5ed5d7 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -438,13 +438,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { /** It is set from keyguard-going-away to set-keyguard-shown. */ static final int DEMOTE_TOP_REASON_DURING_UNLOCKING = 1; - /** It is set if legacy recents animation is running. */ - static final int DEMOTE_TOP_REASON_ANIMATING_RECENTS = 1 << 1; @Retention(RetentionPolicy.SOURCE) @IntDef({ DEMOTE_TOP_REASON_DURING_UNLOCKING, - DEMOTE_TOP_REASON_ANIMATING_RECENTS, }) @interface DemoteTopReason {} @@ -1777,19 +1774,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public void preloadRecentsActivity(Intent intent) { enforceTaskPermission("preloadRecentsActivity()"); - final int callingPid = Binder.getCallingPid(); - final int callingUid = Binder.getCallingUid(); final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final ComponentName recentsComponent = mRecentTasks.getRecentsComponent(); final String recentsFeatureId = mRecentTasks.getRecentsComponentFeatureId(); final int recentsUid = mRecentTasks.getRecentsComponentUid(); - final WindowProcessController caller = getProcessController(callingPid, callingUid); - final RecentsAnimation anim = new RecentsAnimation(this, mTaskSupervisor, - getActivityStartController(), mWindowManager, intent, recentsComponent, - recentsFeatureId, recentsUid, caller); + getActivityStartController(), intent, recentsComponent, + recentsFeatureId, recentsUid); anim.preloadRecentsActivity(); } } finally { @@ -3624,6 +3617,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final long token = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { + boolean isPowerModePreApplied = false; + if (mPowerModeReasons == 0) { + startPowerMode(POWER_MODE_REASON_START_ACTIVITY); + isPowerModePreApplied = true; + } // Keyguard asked us to clear the home task snapshot before going away, so do that. if ((flags & KEYGUARD_GOING_AWAY_FLAG_TO_LAUNCHER_CLEAR_SNAPSHOT) != 0) { mActivityClientController.invalidateHomeTaskSnapshot(null /* token */); @@ -3632,9 +3630,19 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { mDemoteTopAppReasons |= DEMOTE_TOP_REASON_DURING_UNLOCKING; } - mRootWindowContainer.forAllDisplays(displayContent -> { - mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags); - }); + boolean foundResumed = false; + for (int i = mRootWindowContainer.getChildCount() - 1; i >= 0; i--) { + final DisplayContent dc = mRootWindowContainer.getChildAt(i); + final boolean wasNoResumed = dc.mFocusedApp == null + || !dc.mFocusedApp.isState(RESUMED); + mKeyguardController.keyguardGoingAway(dc.mDisplayId, flags); + if (wasNoResumed && dc.mFocusedApp != null && dc.mFocusedApp.isState(RESUMED)) { + foundResumed = true; + } + } + if (isPowerModePreApplied && !foundResumed) { + endPowerMode(POWER_MODE_REASON_START_ACTIVITY); + } } WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal(); if (wallpaperManagerInternal != null) { diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index 3c3b77374d70..173362c16728 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -46,6 +46,8 @@ class AppCompatController { private final AppCompatDeviceStateQuery mAppCompatDeviceStateQuery; @NonNull private final AppCompatLetterboxPolicy mAppCompatLetterboxPolicy; + @NonNull + private final AppCompatSizeCompatModePolicy mAppCompatSizeCompatModePolicy; AppCompatController(@NonNull WindowManagerService wmService, @NonNull ActivityRecord activityRecord) { @@ -67,6 +69,8 @@ class AppCompatController { wmService.mAppCompatConfiguration); mDesktopAppCompatAspectRatioPolicy = new DesktopAppCompatAspectRatioPolicy(activityRecord, mAppCompatOverrides, mTransparentPolicy, wmService.mAppCompatConfiguration); + mAppCompatSizeCompatModePolicy = new AppCompatSizeCompatModePolicy(mActivityRecord, + mAppCompatOverrides); } @NonNull @@ -152,9 +156,15 @@ class AppCompatController { return mAppCompatOverrides.getAppCompatLetterboxOverrides(); } + @NonNull + AppCompatSizeCompatModePolicy getAppCompatSizeCompatModePolicy() { + return mAppCompatSizeCompatModePolicy; + } + void dump(@NonNull PrintWriter pw, @NonNull String prefix) { getTransparentPolicy().dump(pw, prefix); getAppCompatLetterboxPolicy().dump(pw, prefix); + getAppCompatSizeCompatModePolicy().dump(pw, prefix); } } diff --git a/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java b/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java new file mode 100644 index 000000000000..3be266e2951b --- /dev/null +++ b/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java @@ -0,0 +1,439 @@ +/* + * Copyright (C) 2024 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.server.wm; + +import static android.app.WindowConfiguration.ROTATION_UNDEFINED; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.content.res.Configuration.ORIENTATION_UNDEFINED; + +import static com.android.server.wm.DesktopModeHelper.canEnterDesktopMode; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; +import android.graphics.Rect; + +import com.android.window.flags.Flags; + +import java.io.PrintWriter; +import java.util.function.DoubleSupplier; + +/** + * Encapsulate logic related to the SizeCompatMode. + */ +class AppCompatSizeCompatModePolicy { + + @NonNull + private final ActivityRecord mActivityRecord; + @NonNull + private final AppCompatOverrides mAppCompatOverrides; + + // Whether this activity is in size compatibility mode because its bounds don't fit in parent + // naturally. + private boolean mInSizeCompatModeForBounds = false; + /** + * The scale to fit at least one side of the activity to its parent. If the activity uses + * 1920x1080, and the actually size on the screen is 960x540, then the scale is 0.5. + */ + private float mSizeCompatScale = 1f; + + /** + * The bounds in global coordinates for activity in size compatibility mode. + * @see #hasSizeCompatBounds() + */ + private Rect mSizeCompatBounds; + + /** + * The precomputed display insets for resolving configuration. It will be non-null if + * {@link #shouldCreateAppCompatDisplayInsets} returns {@code true}. + */ + @Nullable + private AppCompatDisplayInsets mAppCompatDisplayInsets; + + AppCompatSizeCompatModePolicy(@NonNull ActivityRecord activityRecord, + @NonNull AppCompatOverrides appCompatOverrides) { + mActivityRecord = activityRecord; + mAppCompatOverrides = appCompatOverrides; + } + + boolean isInSizeCompatModeForBounds() { + return mInSizeCompatModeForBounds; + } + + void setInSizeCompatModeForBounds(boolean inSizeCompatModeForBounds) { + mInSizeCompatModeForBounds = inSizeCompatModeForBounds; + } + + boolean hasSizeCompatBounds() { + return mSizeCompatBounds != null; + } + + /** + * @return The {@code true} if the current instance has {@link mAppCompatDisplayInsets} without + * considering the inheritance implemented in {@link #getAppCompatDisplayInsets()} + */ + boolean hasAppCompatDisplayInsetsWithoutInheritance() { + return mAppCompatDisplayInsets != null; + } + + @Nullable + AppCompatDisplayInsets getAppCompatDisplayInsets() { + final TransparentPolicy transparentPolicy = mActivityRecord.mAppCompatController + .getTransparentPolicy(); + if (transparentPolicy.isRunning()) { + return transparentPolicy.getInheritedAppCompatDisplayInsets(); + } + return mAppCompatDisplayInsets; + } + + float getCompatScaleIfAvailable(@NonNull DoubleSupplier scaleWhenNotAvailable) { + return hasSizeCompatBounds() ? mSizeCompatScale + : (float) scaleWhenNotAvailable.getAsDouble(); + } + + @NonNull + Rect getAppSizeCompatBoundsIfAvailable(@NonNull Rect boundsWhenNotAvailable) { + return hasSizeCompatBounds() ? mSizeCompatBounds : boundsWhenNotAvailable; + } + + @NonNull + Rect replaceResolvedBoundsIfNeeded(@NonNull Rect resolvedBounds) { + return hasSizeCompatBounds() ? mSizeCompatBounds : resolvedBounds; + } + + boolean applyOffsetIfNeeded(@NonNull Rect resolvedBounds, + @NonNull Configuration resolvedConfig, int offsetX, int offsetY) { + if (hasSizeCompatBounds()) { + mSizeCompatBounds.offset(offsetX , offsetY); + final int dy = mSizeCompatBounds.top - resolvedBounds.top; + final int dx = mSizeCompatBounds.left - resolvedBounds.left; + AppCompatUtils.offsetBounds(resolvedConfig, dx, dy); + return true; + } + return false; + } + + void alignToTopIfNeeded(@NonNull Rect parentBounds) { + if (hasSizeCompatBounds()) { + mSizeCompatBounds.top = parentBounds.top; + } + } + + void applySizeCompatScaleIfNeeded(@NonNull Rect resolvedBounds, + @NonNull Configuration resolvedConfig) { + if (mSizeCompatScale != 1f) { + final int screenPosX = resolvedBounds.left; + final int screenPosY = resolvedBounds.top; + final int dx = (int) (screenPosX / mSizeCompatScale + 0.5f) - screenPosX; + final int dy = (int) (screenPosY / mSizeCompatScale + 0.5f) - screenPosY; + AppCompatUtils.offsetBounds(resolvedConfig, dx, dy); + } + } + + void updateSizeCompatScale(@NonNull Rect resolvedAppBounds, @NonNull Rect containerAppBounds) { + mSizeCompatScale = mActivityRecord.mAppCompatController.getTransparentPolicy() + .findOpaqueNotFinishingActivityBelow() + .map(activityRecord -> mSizeCompatScale) + .orElseGet(() -> calculateSizeCompatScale(resolvedAppBounds, containerAppBounds)); + } + + void clearSizeCompatModeAttributes() { + mInSizeCompatModeForBounds = false; + final float lastSizeCompatScale = mSizeCompatScale; + mSizeCompatScale = 1f; + if (mSizeCompatScale != lastSizeCompatScale) { + mActivityRecord.forAllWindows(WindowState::updateGlobalScale, + false /* traverseTopToBottom */); + } + mSizeCompatBounds = null; + mAppCompatDisplayInsets = null; + mActivityRecord.mAppCompatController.getTransparentPolicy() + .clearInheritedAppCompatDisplayInsets(); + } + + void clearSizeCompatMode() { + clearSizeCompatModeAttributes(); + // Clear config override in #updateAppCompatDisplayInsets(). + final int activityType = mActivityRecord.getActivityType(); + final Configuration overrideConfig = mActivityRecord.getRequestedOverrideConfiguration(); + overrideConfig.unset(); + // Keep the activity type which was set when attaching to a task to prevent leaving it + // undefined. + overrideConfig.windowConfiguration.setActivityType(activityType); + mActivityRecord.onRequestedOverrideConfigurationChanged(overrideConfig); + } + + void dump(@NonNull PrintWriter pw, @NonNull String prefix) { + if (mSizeCompatScale != 1f || hasSizeCompatBounds()) { + pw.println(prefix + "mSizeCompatScale=" + mSizeCompatScale + " mSizeCompatBounds=" + + mSizeCompatBounds); + } + } + + /** + * Resolves consistent screen configuration for orientation and rotation changes without + * inheriting the parent bounds. + */ + void resolveSizeCompatModeConfiguration(@NonNull Configuration newParentConfiguration, + @NonNull AppCompatDisplayInsets appCompatDisplayInsets, @NonNull Rect tmpBounds) { + final Configuration resolvedConfig = mActivityRecord.getResolvedOverrideConfiguration(); + final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds(); + + // When an activity needs to be letterboxed because of fixed orientation, use fixed + // orientation bounds (stored in resolved bounds) instead of parent bounds since the + // activity will be displayed within them even if it is in size compat mode. They should be + // saved here before resolved bounds are overridden below. + final AppCompatAspectRatioPolicy aspectRatioPolicy = mActivityRecord.mAppCompatController + .getAppCompatAspectRatioPolicy(); + final boolean useResolvedBounds = Flags.immersiveAppRepositioning() + ? aspectRatioPolicy.isAspectRatioApplied() + : aspectRatioPolicy.isLetterboxedForFixedOrientationAndAspectRatio(); + final Rect containerBounds = useResolvedBounds + ? new Rect(resolvedBounds) + : newParentConfiguration.windowConfiguration.getBounds(); + final Rect containerAppBounds = useResolvedBounds + ? new Rect(resolvedConfig.windowConfiguration.getAppBounds()) + : mActivityRecord.mResolveConfigHint.mParentAppBoundsOverride; + + final int requestedOrientation = mActivityRecord.getRequestedConfigurationOrientation(); + final boolean orientationRequested = requestedOrientation != ORIENTATION_UNDEFINED; + final int parentOrientation = mActivityRecord.mResolveConfigHint.mUseOverrideInsetsForConfig + ? mActivityRecord.mResolveConfigHint.mTmpOverrideConfigOrientation + : newParentConfiguration.orientation; + final int orientation = orientationRequested + ? requestedOrientation + // We should use the original orientation of the activity when possible to avoid + // forcing the activity in the opposite orientation. + : appCompatDisplayInsets.mOriginalRequestedOrientation != ORIENTATION_UNDEFINED + ? appCompatDisplayInsets.mOriginalRequestedOrientation + : parentOrientation; + int rotation = newParentConfiguration.windowConfiguration.getRotation(); + final boolean isFixedToUserRotation = mActivityRecord.mDisplayContent == null + || mActivityRecord.mDisplayContent.getDisplayRotation().isFixedToUserRotation(); + if (!isFixedToUserRotation && !appCompatDisplayInsets.mIsFloating) { + // Use parent rotation because the original display can be rotated. + resolvedConfig.windowConfiguration.setRotation(rotation); + } else { + final int overrideRotation = resolvedConfig.windowConfiguration.getRotation(); + if (overrideRotation != ROTATION_UNDEFINED) { + rotation = overrideRotation; + } + } + + // Use compat insets to lock width and height. We should not use the parent width and height + // because apps in compat mode should have a constant width and height. The compat insets + // are locked when the app is first launched and are never changed after that, so we can + // rely on them to contain the original and unchanging width and height of the app. + final Rect containingAppBounds = new Rect(); + final Rect containingBounds = tmpBounds; + appCompatDisplayInsets.getContainerBounds(containingAppBounds, containingBounds, rotation, + orientation, orientationRequested, isFixedToUserRotation); + resolvedBounds.set(containingBounds); + // The size of floating task is fixed (only swap), so the aspect ratio is already correct. + if (!appCompatDisplayInsets.mIsFloating) { + mActivityRecord.mAppCompatController.getAppCompatAspectRatioPolicy() + .applyAspectRatioForLetterbox(resolvedBounds, containingAppBounds, + containingBounds); + } + + // Use resolvedBounds to compute other override configurations such as appBounds. The bounds + // are calculated in compat container space. The actual position on screen will be applied + // later, so the calculation is simpler that doesn't need to involve offset from parent. + mActivityRecord.mResolveConfigHint.mTmpCompatInsets = appCompatDisplayInsets; + mActivityRecord.computeConfigByResolveHint(resolvedConfig, newParentConfiguration); + // Use current screen layout as source because the size of app is independent to parent. + resolvedConfig.screenLayout = ActivityRecord.computeScreenLayout( + mActivityRecord.getConfiguration().screenLayout, resolvedConfig.screenWidthDp, + resolvedConfig.screenHeightDp); + + // Use parent orientation if it cannot be decided by bounds, so the activity can fit inside + // the parent bounds appropriately. + if (resolvedConfig.screenWidthDp == resolvedConfig.screenHeightDp) { + resolvedConfig.orientation = parentOrientation; + } + + // Below figure is an example that puts an activity which was launched in a larger container + // into a smaller container. + // The outermost rectangle is the real display bounds. + // "@" is the container app bounds (parent bounds or fixed orientation bounds) + // "#" is the {@code resolvedBounds} that applies to application. + // "*" is the {@code mSizeCompatBounds} that used to show on screen if scaled. + // ------------------------------ + // | | + // | @@@@*********@@@@### | + // | @ * * @ # | + // | @ * * @ # | + // | @ * * @ # | + // | @@@@*********@@@@ # | + // ---------#--------------#----- + // # # + // ################ + // The application is still layouted in "#" since it was launched, and it will be visually + // scaled and positioned to "*". + + final Rect resolvedAppBounds = resolvedConfig.windowConfiguration.getAppBounds(); + // Calculates the scale the size compatibility bounds into the region which is available + // to application. + final float lastSizeCompatScale = mSizeCompatScale; + updateSizeCompatScale(resolvedAppBounds, containerAppBounds); + + final int containerTopInset = containerAppBounds.top - containerBounds.top; + final boolean topNotAligned = + containerTopInset != resolvedAppBounds.top - resolvedBounds.top; + if (mSizeCompatScale != 1f || topNotAligned) { + if (mSizeCompatBounds == null) { + mSizeCompatBounds = new Rect(); + } + mSizeCompatBounds.set(resolvedAppBounds); + mSizeCompatBounds.offsetTo(0, 0); + mSizeCompatBounds.scale(mSizeCompatScale); + // The insets are included in height, e.g. the area of real cutout shouldn't be scaled. + mSizeCompatBounds.bottom += containerTopInset; + } else { + mSizeCompatBounds = null; + } + if (mSizeCompatScale != lastSizeCompatScale) { + mActivityRecord.forAllWindows(WindowState::updateGlobalScale, + false /* traverseTopToBottom */); + } + + // The position will be later adjusted in updateResolvedBoundsPosition. + // Above coordinates are in "@" space, now place "*" and "#" to screen space. + final boolean fillContainer = resolvedBounds.equals(containingBounds); + final int screenPosX = fillContainer ? containerBounds.left : containerAppBounds.left; + final int screenPosY = fillContainer ? containerBounds.top : containerAppBounds.top; + + if (screenPosX != 0 || screenPosY != 0) { + if (hasSizeCompatBounds()) { + mSizeCompatBounds.offset(screenPosX, screenPosY); + } + // Add the global coordinates and remove the local coordinates. + final int dx = screenPosX - resolvedBounds.left; + final int dy = screenPosY - resolvedBounds.top; + AppCompatUtils.offsetBounds(resolvedConfig, dx, dy); + } + + mInSizeCompatModeForBounds = isInSizeCompatModeForBounds(resolvedAppBounds, + containerAppBounds); + } + + // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer. + void updateAppCompatDisplayInsets() { + if (getAppCompatDisplayInsets() != null + || !mActivityRecord.shouldCreateAppCompatDisplayInsets()) { + // The override configuration is set only once in size compatibility mode. + return; + } + + Configuration overrideConfig = mActivityRecord.getRequestedOverrideConfiguration(); + final Configuration fullConfig = mActivityRecord.getConfiguration(); + + // Ensure the screen related fields are set. It is used to prevent activity relaunch + // when moving between displays. For screenWidthDp and screenWidthDp, because they + // are relative to bounds and density, they will be calculated in + // {@link Task#computeConfigResourceOverrides} and the result will also be + // relatively fixed. + overrideConfig.colorMode = fullConfig.colorMode; + overrideConfig.densityDpi = fullConfig.densityDpi; + // The smallest screen width is the short side of screen bounds. Because the bounds + // and density won't be changed, smallestScreenWidthDp is also fixed. + overrideConfig.smallestScreenWidthDp = fullConfig.smallestScreenWidthDp; + if (ActivityInfo.isFixedOrientation(mActivityRecord.getOverrideOrientation())) { + // lock rotation too. When in size-compat, onConfigurationChanged will watch for and + // apply runtime rotation changes. + overrideConfig.windowConfiguration.setRotation( + fullConfig.windowConfiguration.getRotation()); + } + + final Rect letterboxedContainerBounds = mActivityRecord.mAppCompatController + .getAppCompatAspectRatioPolicy().getLetterboxedContainerBounds(); + + // The role of AppCompatDisplayInsets is like the override bounds. + mAppCompatDisplayInsets = + new AppCompatDisplayInsets(mActivityRecord.mDisplayContent, mActivityRecord, + letterboxedContainerBounds, mActivityRecord.mResolveConfigHint + .mUseOverrideInsetsForConfig); + } + + + private boolean isInSizeCompatModeForBounds(final @NonNull Rect appBounds, + final @NonNull Rect containerBounds) { + if (mActivityRecord.mAppCompatController.getTransparentPolicy().isRunning()) { + // To avoid wrong app behaviour, we decided to disable SCM when a translucent activity + // is letterboxed. + return false; + } + final int appWidth = appBounds.width(); + final int appHeight = appBounds.height(); + final int containerAppWidth = containerBounds.width(); + final int containerAppHeight = containerBounds.height(); + + if (containerAppWidth == appWidth && containerAppHeight == appHeight) { + // Matched the container bounds. + return false; + } + if (containerAppWidth > appWidth && containerAppHeight > appHeight) { + // Both sides are smaller than the container. + return true; + } + if (containerAppWidth < appWidth || containerAppHeight < appHeight) { + // One side is larger than the container. + return true; + } + + // The rest of the condition is that only one side is smaller than the container, but it + // still needs to exclude the cases where the size is limited by the fixed aspect ratio. + final float maxAspectRatio = mActivityRecord.getMaxAspectRatio(); + if (maxAspectRatio > 0) { + final float aspectRatio = (0.5f + Math.max(appWidth, appHeight)) + / Math.min(appWidth, appHeight); + if (aspectRatio >= maxAspectRatio) { + // The current size has reached the max aspect ratio. + return false; + } + } + final float minAspectRatio = mActivityRecord.getMinAspectRatio(); + if (minAspectRatio > 0) { + // The activity should have at least the min aspect ratio, so this checks if the + // container still has available space to provide larger aspect ratio. + final float containerAspectRatio = + (0.5f + Math.max(containerAppWidth, containerAppHeight)) + / Math.min(containerAppWidth, containerAppHeight); + if (containerAspectRatio <= minAspectRatio) { + // The long side has reached the parent. + return false; + } + } + return true; + } + + private float calculateSizeCompatScale(@NonNull Rect resolvedAppBounds, + @NonNull Rect containerAppBounds) { + final int contentW = resolvedAppBounds.width(); + final int contentH = resolvedAppBounds.height(); + final int viewportW = containerAppBounds.width(); + final int viewportH = containerAppBounds.height(); + // Allow an application to be up-scaled if its window is smaller than its + // original container or if it's a freeform window in desktop mode. + boolean shouldAllowUpscaling = !(contentW <= viewportW && contentH <= viewportH) + || (canEnterDesktopMode(mActivityRecord.mAtmService.mContext) + && mActivityRecord.getWindowingMode() == WINDOWING_MODE_FREEFORM); + return shouldAllowUpscaling ? Math.min( + (float) viewportW / contentW, (float) viewportH / contentH) : 1f; + } +} diff --git a/services/core/java/com/android/server/wm/AppCompatUtils.java b/services/core/java/com/android/server/wm/AppCompatUtils.java index e3ff85171c0e..69421d0d5c96 100644 --- a/services/core/java/com/android/server/wm/AppCompatUtils.java +++ b/services/core/java/com/android/server/wm/AppCompatUtils.java @@ -251,6 +251,11 @@ final class AppCompatUtils { } } + static void offsetBounds(@NonNull Configuration inOutConfig, int offsetX, int offsetY) { + inOutConfig.windowConfiguration.getBounds().offset(offsetX, offsetY); + inOutConfig.windowConfiguration.getAppBounds().offset(offsetX, offsetY); + } + private static void clearAppCompatTaskInfo(@NonNull AppCompatTaskInfo info) { info.topActivityLetterboxVerticalPosition = TaskInfo.PROPERTY_VALUE_UNSET; info.topActivityLetterboxHorizontalPosition = TaskInfo.PROPERTY_VALUE_UNSET; diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index bc7e84ae9f86..90d33fbef748 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -134,8 +134,8 @@ import android.view.animation.TranslateAnimation; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.TransitionAnimation; -import com.android.internal.protolog.common.LogLevel; import com.android.internal.protolog.ProtoLog; +import com.android.internal.protolog.common.LogLevel; import com.android.internal.util.DumpUtils.Dump; import com.android.internal.util.function.pooled.PooledLambda; import com.android.internal.util.function.pooled.PooledPredicate; @@ -402,8 +402,7 @@ public class AppTransition implements Dump { mRemoteAnimationController.goodToGo(transit); } else if ((isTaskOpenTransitOld(transit) || transit == TRANSIT_OLD_WALLPAPER_CLOSE) && topOpeningAnim != null) { - if (mDisplayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition() - && mService.getRecentsAnimationController() == null) { + if (mDisplayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition()) { final NavBarFadeAnimationController controller = new NavBarFadeAnimationController(mDisplayContent); // For remote animation case, the nav bar fades out and in is controlled by the @@ -471,11 +470,9 @@ public class AppTransition implements Dump { } private boolean needsBoosting() { - final boolean recentsAnimRunning = mService.getRecentsAnimationController() != null; return !mNextAppTransitionRequests.isEmpty() || mAppTransitionState == APP_STATE_READY - || mAppTransitionState == APP_STATE_RUNNING - || recentsAnimRunning; + || mAppTransitionState == APP_STATE_RUNNING; } void registerListenerLocked(AppTransitionListener listener) { diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 5a0cbf3e5f83..06bdc045b5dc 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -1032,12 +1032,8 @@ public class AppTransitionController { private void applyAnimations(ArraySet<ActivityRecord> openingApps, ArraySet<ActivityRecord> closingApps, @TransitionOldType int transit, LayoutParams animLp, boolean voiceInteraction) { - final RecentsAnimationController rac = mService.getRecentsAnimationController(); if (transit == WindowManager.TRANSIT_OLD_UNSET || (openingApps.isEmpty() && closingApps.isEmpty())) { - if (rac != null) { - rac.sendTasksAppeared(); - } return; } @@ -1075,9 +1071,6 @@ public class AppTransitionController { voiceInteraction); applyAnimations(closingWcs, closingApps, transit, false /* visible */, animLp, voiceInteraction); - if (rac != null) { - rac.sendTasksAppeared(); - } for (int i = 0; i < openingApps.size(); ++i) { openingApps.valueAtUnchecked(i).mOverrideTaskTransition = false; diff --git a/services/core/java/com/android/server/wm/AsyncRotationController.java b/services/core/java/com/android/server/wm/AsyncRotationController.java index eb85c1a73212..f0a6e9ec1d4f 100644 --- a/services/core/java/com/android/server/wm/AsyncRotationController.java +++ b/services/core/java/com/android/server/wm/AsyncRotationController.java @@ -174,11 +174,6 @@ class AsyncRotationController extends FadeAnimationController implements Consume mNavBarToken = w.mToken; // Do not animate movable navigation bar (e.g. 3-buttons mode). if (navigationBarCanMove) return; - // Or when the navigation bar is currently controlled by recents animation. - final RecentsAnimationController recents = mService.getRecentsAnimationController(); - if (recents != null && recents.isNavigationBarAttachedToApp()) { - return; - } } else if (navigationBarCanMove || mTransitionOp == OP_CHANGE_MAY_SEAMLESS || mDisplayContent.mTransitionController.mNavigationBarAttachedToApp) { action = Operation.ACTION_SEAMLESS; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 9bf255529768..0597ed7a1c41 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1936,7 +1936,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp return false; } if (mLastWallpaperVisible && r.windowsCanBeWallpaperTarget() - && mFixedRotationTransitionListener.mAnimatingRecents == null && !mTransitionController.isTransientLaunch(r)) { // Use normal rotation animation for orientation change of visible wallpaper if recents // animation is not running (it may be swiping to home). @@ -1962,9 +1961,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp /** Returns {@code true} if the top activity is transformed with the new rotation of display. */ boolean hasTopFixedRotationLaunchingApp() { - return mFixedRotationLaunchingApp != null - // Ignore animating recents because it hasn't really become the top. - && mFixedRotationLaunchingApp != mFixedRotationTransitionListener.mAnimatingRecents; + return mFixedRotationLaunchingApp != null; } /** It usually means whether the recents activity is launching with a different rotation. */ @@ -1991,8 +1988,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mWmService.mDisplayNotificationController.dispatchFixedRotationStarted(this, rotation); // Delay the hide animation to avoid blinking by clicking navigation bar that may // toggle fixed rotation in a short time. - final boolean shouldDebounce = r == mFixedRotationTransitionListener.mAnimatingRecents - || mTransitionController.isTransientLaunch(r); + final boolean shouldDebounce = mTransitionController.isTransientLaunch(r); startAsyncRotation(shouldDebounce); } else if (mFixedRotationLaunchingApp != null && r == null) { mWmService.mDisplayNotificationController.dispatchFixedRotationFinished(this); @@ -2024,12 +2020,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp // the heavy operations. This also benefits that the states of multiple activities // are handled together. r.linkFixedRotationTransform(prevRotatedLaunchingApp); - if (r != mFixedRotationTransitionListener.mAnimatingRecents) { - // Only update the record for normal activity so the display orientation can be - // updated when the transition is done if it becomes the top. And the case of - // recents can be handled when the recents animation is finished. - setFixedRotationLaunchingAppUnchecked(r, rotation); - } + // Only update the record for normal activity so the display orientation can be + // updated when the transition is done if it becomes the top. + setFixedRotationLaunchingAppUnchecked(r, rotation); return; } @@ -5899,18 +5892,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final Region local = Region.obtain(); final int[] remainingLeftRight = {mSystemGestureExclusionLimit, mSystemGestureExclusionLimit}; - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); // Traverse all windows top down to assemble the gesture exclusion rects. // For each window, we only take the rects that fall within its touchable region. forAllWindows(w -> { - final boolean ignoreRecentsAnimationTarget = recentsAnimationController != null - && recentsAnimationController.shouldApplyInputConsumer(w.getActivityRecord()); if (!w.canReceiveTouchInput() || !w.isVisible() || (w.getAttrs().flags & FLAG_NOT_TOUCHABLE) != 0 - || unhandled.isEmpty() - || ignoreRecentsAnimationTarget) { + || unhandled.isEmpty()) { return; } @@ -6122,16 +6110,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp void getKeepClearAreas(Set<Rect> outRestricted, Set<Rect> outUnrestricted) { final Matrix tmpMatrix = new Matrix(); final float[] tmpFloat9 = new float[9]; - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); forAllWindows(w -> { - // Skip the window if it is part of Recents animation - final boolean ignoreRecentsAnimationTarget = recentsAnimationController != null - && recentsAnimationController.shouldApplyInputConsumer(w.getActivityRecord()); - if (ignoreRecentsAnimationTarget) { - return false; // continue traversal - } - if (w.isVisible() && !w.inPinnedWindowingMode()) { w.getKeepClearAreas(outRestricted, outUnrestricted, tmpMatrix, tmpFloat9); @@ -6306,14 +6285,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } boolean updateDisplayOverrideConfigurationLocked() { - // Preemptively cancel the running recents animation -- SysUI can't currently handle this - // case properly since the signals it receives all happen post-change - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); - if (recentsAnimationController != null) { - recentsAnimationController.cancelAnimationForDisplayChange(); - } - Configuration values = new Configuration(); computeScreenConfiguration(values); @@ -6914,79 +6885,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp /** The entry for proceeding to handle {@link #mFixedRotationLaunchingApp}. */ class FixedRotationTransitionListener extends WindowManagerInternal.AppTransitionListener { - /** - * The animating activity which shows the recents task list. It is set between - * {@link RecentsAnimationController#initialize} and - * {@link RecentsAnimationController#cleanupAnimation}. - */ - private ActivityRecord mAnimatingRecents; - - /** Whether {@link #mAnimatingRecents} is going to be the top activity. */ - private boolean mRecentsWillBeTop; - FixedRotationTransitionListener(int displayId) { super(displayId); } /** - * If the recents activity has a fixed orientation which is different from the current top - * activity, it will be rotated before being shown so we avoid a screen rotation animation - * when showing the Recents view. - */ - void onStartRecentsAnimation(@NonNull ActivityRecord r) { - mAnimatingRecents = r; - if (r.isVisible() && mFocusedApp != null && !mFocusedApp.occludesParent()) { - // The recents activity has shown with the orientation determined by the top - // activity, keep its current orientation to avoid flicking by the configuration - // change of visible activity. - return; - } - rotateInDifferentOrientationIfNeeded(r); - if (r.hasFixedRotationTransform()) { - // Set the record so we can recognize it to continue to update display orientation - // if the recents activity becomes the top later. - setFixedRotationLaunchingApp(r, r.getWindowConfiguration().getRotation()); - } - } - - /** - * If {@link #mAnimatingRecents} still has fixed rotation, it should be moved to top so we - * don't clear {@link #mFixedRotationLaunchingApp} that will be handled by transition. - */ - void onFinishRecentsAnimation() { - final ActivityRecord animatingRecents = mAnimatingRecents; - final boolean recentsWillBeTop = mRecentsWillBeTop; - mAnimatingRecents = null; - mRecentsWillBeTop = false; - if (recentsWillBeTop) { - // The recents activity will be the top, such as staying at recents list or - // returning to home (if home and recents are the same activity). - return; - } - - if (animatingRecents != null && animatingRecents == mFixedRotationLaunchingApp - && animatingRecents.isVisible() && animatingRecents != topRunningActivity()) { - // The recents activity should be going to be invisible (switch to another app or - // return to original top). Only clear the top launching record without finishing - // the transform immediately because it won't affect display orientation. And before - // the visibility is committed, the recents activity may perform relayout which may - // cause unexpected configuration change if the rotated configuration is restored. - // The transform will be finished when the transition is done. - setFixedRotationLaunchingAppUnchecked(null); - } else { - // If there is already a launching activity that is not the recents, before its - // transition is completed, the recents animation may be started. So if the recents - // activity won't be the top, the display orientation should be updated according - // to the current top activity. - continueUpdateOrientationForDiffOrienLaunchingApp(); - } - } - - void notifyRecentsWillBeTop() { - mRecentsWillBeTop = true; - } - - /** * Returns {@code true} if the transient launch (e.g. recents animation) requested a fixed * orientation, then the rotation change should be deferred. */ @@ -6996,8 +6899,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp if (hasFixedRotationTransientLaunch()) { source = mFixedRotationLaunchingApp; } - } else if (mAnimatingRecents != null && !hasTopFixedRotationLaunchingApp()) { - source = mAnimatingRecents; } if (source == null || source.getRequestedConfigurationOrientation( true /* forDisplay */) == ORIENTATION_UNDEFINED) { @@ -7010,19 +6911,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @Override public void onAppTransitionFinishedLocked(IBinder token) { final ActivityRecord r = ActivityRecord.forTokenLocked(token); - // Ignore the animating recents so the fixed rotation transform won't be switched twice - // by finishing the recents animation and moving it to top. That also avoids flickering - // due to wait for previous activity to be paused if it supports PiP that ignores the - // effect of resume-while-pausing. - if (r == null || r == mAnimatingRecents) { - return; - } - if (mAnimatingRecents != null && mRecentsWillBeTop) { - // The activity is not the recents and it should be moved to back later, so it is - // better to keep its current appearance for the next transition. Otherwise the - // display orientation may be updated too early and the layout procedures at the - // end of finishing recents animation is skipped. That causes flickering because - // the surface of closing app hasn't updated to invisible. + if (r == null) { return; } if (mFixedRotationLaunchingApp == null) { diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index a5da5e7cc0de..5200e820fc02 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -611,16 +611,6 @@ public class DisplayRotation { mDisplayRotationCoordinator.onDefaultDisplayRotationChanged(rotation); } - // Preemptively cancel the running recents animation -- SysUI can't currently handle this - // case properly since the signals it receives all happen post-change. We do this earlier - // in the rotation flow, since DisplayContent.updateDisplayOverrideConfigurationLocked seems - // to happen too late. - final RecentsAnimationController recentsAnimationController = - mService.getRecentsAnimationController(); - if (recentsAnimationController != null) { - recentsAnimationController.cancelAnimationForDisplayChange(); - } - ProtoLog.v(WM_DEBUG_ORIENTATION, "Display id=%d rotation changed to %d from %d, lastOrientation=%d", displayId, rotation, oldRotation, lastOrientation); diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index b8869f159169..ddbfd70ea4c4 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -49,7 +49,6 @@ import static com.android.server.wm.WindowManagerService.LOGTAG_INPUT_FOCUS; import static java.lang.Integer.MAX_VALUE; import android.annotation.Nullable; -import android.graphics.Rect; import android.graphics.Region; import android.os.Handler; import android.os.IBinder; @@ -111,7 +110,7 @@ final class InputMonitor { * draw the live-tile above the recents activity, we also need to provide that activity as a * z-layering reference so that we can place the recents input consumer above it. */ - private WeakReference<ActivityRecord> mActiveRecentsActivity = null; + private WeakReference<Task> mActiveRecentsTask = null; private WeakReference<Task> mActiveRecentsLayerRef = null; private class UpdateInputWindows implements Runnable { @@ -388,13 +387,13 @@ final class InputMonitor { /** * Inform InputMonitor when recents is active so it can enable the recents input consumer. - * @param activity The active recents activity. {@code null} means recents is not active. + * @param task The active recents task. {@code null} means recents is not active. * @param layer A task whose Z-layer is used as a reference for how to sort the consumer. */ - void setActiveRecents(@Nullable ActivityRecord activity, @Nullable Task layer) { - final boolean clear = activity == null; - final boolean wasActive = mActiveRecentsActivity != null && mActiveRecentsLayerRef != null; - mActiveRecentsActivity = clear ? null : new WeakReference<>(activity); + void setActiveRecents(@Nullable Task task, @Nullable Task layer) { + final boolean clear = task == null; + final boolean wasActive = mActiveRecentsTask != null && mActiveRecentsLayerRef != null; + mActiveRecentsTask = clear ? null : new WeakReference<>(task); mActiveRecentsLayerRef = clear ? null : new WeakReference<>(layer); if (clear && wasActive) { setUpdateInputWindowsNeededLw(); @@ -413,17 +412,12 @@ final class InputMonitor { // Request focus for the recents animation input consumer if an input consumer should // be applied for the window. if (recentsAnimationInputConsumer != null && focus != null) { - final RecentsAnimationController recentsAnimationController = - mService.getRecentsAnimationController(); // Apply recents input consumer when the focusing window is in recents animation. - final boolean shouldApplyRecentsInputConsumer = (recentsAnimationController != null - && recentsAnimationController.shouldApplyInputConsumer(focus.mActivityRecord)) - // Shell transitions doesn't use RecentsAnimationController but we still - // have carryover legacy logic that relies on the consumer. - || (getWeak(mActiveRecentsActivity) != null && focus.inTransition() + final boolean shouldApplyRecentsInputConsumer = + getWeak(mActiveRecentsTask) != null && focus.inTransition() // only take focus from the recents activity to avoid intercepting // events before the gesture officially starts. - && focus.isActivityTypeHomeOrRecents()); + && focus.isActivityTypeHomeOrRecents(); if (shouldApplyRecentsInputConsumer) { if (mInputFocus != recentsAnimationInputConsumer.mWindowHandle.token) { requestFocus(recentsAnimationInputConsumer.mWindowHandle.token, @@ -569,7 +563,6 @@ final class InputMonitor { private boolean mAddRecentsAnimationInputConsumerHandle; private boolean mInDrag; - private final Rect mTmpRect = new Rect(); private void updateInputWindows(boolean inDrag) { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "updateInputWindows"); @@ -586,18 +579,15 @@ final class InputMonitor { resetInputConsumers(mInputTransaction); // Update recents input consumer layer if active - final ActivityRecord activeRecents = getWeak(mActiveRecentsActivity); + final Task activeRecents = getWeak(mActiveRecentsTask); if (mAddRecentsAnimationInputConsumerHandle && activeRecents != null && activeRecents.getSurfaceControl() != null) { WindowContainer layer = getWeak(mActiveRecentsLayerRef); layer = layer != null ? layer : activeRecents; // Handle edge-case for SUW where windows don't exist yet if (layer.getSurfaceControl() != null) { - final WindowState targetAppMainWindow = activeRecents.findMainWindow(); - if (targetAppMainWindow != null) { - targetAppMainWindow.getBounds(mTmpRect); - mRecentsAnimationInputConsumer.mWindowHandle.touchableRegion.set(mTmpRect); - } + mRecentsAnimationInputConsumer.mWindowHandle.touchableRegion.set( + activeRecents.getBounds()); mRecentsAnimationInputConsumer.show(mInputTransaction, layer); mAddRecentsAnimationInputConsumerHandle = false; } @@ -629,24 +619,6 @@ final class InputMonitor { return; } - // This only works for legacy transitions. - final RecentsAnimationController recentsAnimationController = - mService.getRecentsAnimationController(); - final boolean shouldApplyRecentsInputConsumer = recentsAnimationController != null - && recentsAnimationController.shouldApplyInputConsumer(w.mActivityRecord); - if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) { - if (recentsAnimationController.updateInputConsumerForApp( - mRecentsAnimationInputConsumer.mWindowHandle)) { - final DisplayArea targetDA = - recentsAnimationController.getTargetAppDisplayArea(); - if (targetDA != null) { - mRecentsAnimationInputConsumer.reparent(mInputTransaction, targetDA); - mRecentsAnimationInputConsumer.show(mInputTransaction, MAX_VALUE - 2); - mAddRecentsAnimationInputConsumerHandle = false; - } - } - } - if (w.inPinnedWindowingMode()) { if (mAddPipInputConsumerHandle) { final Task rootTask = w.getTask().getRootTask(); diff --git a/services/core/java/com/android/server/wm/NonAppWindowAnimationAdapter.java b/services/core/java/com/android/server/wm/NonAppWindowAnimationAdapter.java index 1a895ea22f36..403d3bd5c008 100644 --- a/services/core/java/com/android/server/wm/NonAppWindowAnimationAdapter.java +++ b/services/core/java/com/android/server/wm/NonAppWindowAnimationAdapter.java @@ -91,7 +91,6 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { return (transit == TRANSIT_OLD_TASK_OPEN || transit == TRANSIT_OLD_TASK_TO_FRONT || transit == TRANSIT_OLD_WALLPAPER_CLOSE) && displayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition() - && service.getRecentsAnimationController() == null && displayContent.getAsyncRotationController() == null; } diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java index c592caf488ad..c06efc775403 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimation.java +++ b/services/core/java/com/android/server/wm/RecentsAnimation.java @@ -17,82 +17,54 @@ package com.android.server.wm; import static android.app.ActivityManager.PROCESS_STATE_CACHED_ACTIVITY; -import static android.app.ActivityManager.START_TASK_TO_FRONT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; -import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_RECENTS_ANIMATIONS; import static com.android.server.wm.ActivityRecord.State.STOPPED; import static com.android.server.wm.ActivityRecord.State.STOPPING; -import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE; -import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION; -import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_TOP; -import static com.android.server.wm.TaskDisplayArea.getRootTaskAbove; import android.annotation.Nullable; import android.app.ActivityOptions; import android.content.ComponentName; import android.content.Intent; -import android.os.RemoteException; -import android.os.Trace; import android.util.Slog; -import android.view.IRecentsAnimationRunner; import com.android.internal.protolog.ProtoLog; import com.android.internal.util.function.pooled.PooledLambda; import com.android.internal.util.function.pooled.PooledPredicate; -import com.android.server.wm.ActivityMetricsLogger.LaunchingState; -import com.android.server.wm.RecentsAnimationController.RecentsAnimationCallbacks; -import com.android.server.wm.TaskDisplayArea.OnRootTaskOrderChangedListener; /** * Manages the recents animation, including the reordering of the root tasks for the transition and * cleanup. See {@link com.android.server.wm.RecentsAnimationController}. */ -class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChangedListener { +class RecentsAnimation { private static final String TAG = RecentsAnimation.class.getSimpleName(); - private final ActivityTaskManagerService mService; private final ActivityTaskSupervisor mTaskSupervisor; private final ActivityStartController mActivityStartController; - private final WindowManagerService mWindowManager; private final TaskDisplayArea mDefaultTaskDisplayArea; private final Intent mTargetIntent; private final ComponentName mRecentsComponent; private final @Nullable String mRecentsFeatureId; private final int mRecentsUid; - private final @Nullable WindowProcessController mCaller; private final int mUserId; private final int mTargetActivityType; - /** - * The activity which has been launched behind. We need to remember the activity because the - * target root task may have other activities, then we are able to restore the launch-behind - * state for the exact activity. - */ - private ActivityRecord mLaunchedTargetActivity; - - // The root task to restore the target root task behind when the animation is finished - private Task mRestoreTargetBehindRootTask; - RecentsAnimation(ActivityTaskManagerService atm, ActivityTaskSupervisor taskSupervisor, - ActivityStartController activityStartController, WindowManagerService wm, + ActivityStartController activityStartController, Intent targetIntent, ComponentName recentsComponent, @Nullable String recentsFeatureId, - int recentsUid, @Nullable WindowProcessController caller) { - mService = atm; + int recentsUid) { mTaskSupervisor = taskSupervisor; - mDefaultTaskDisplayArea = mService.mRootWindowContainer.getDefaultTaskDisplayArea(); + mDefaultTaskDisplayArea = atm.mRootWindowContainer.getDefaultTaskDisplayArea(); mActivityStartController = activityStartController; - mWindowManager = wm; mTargetIntent = targetIntent; mRecentsComponent = recentsComponent; mRecentsFeatureId = recentsFeatureId; mRecentsUid = recentsUid; - mCaller = caller; mUserId = atm.getCurrentUserId(); mTargetActivityType = targetIntent.getComponent() != null && recentsComponent.equals(targetIntent.getComponent()) @@ -171,310 +143,6 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan } } - void startRecentsActivity(IRecentsAnimationRunner recentsAnimationRunner, long eventTime) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "startRecentsActivity(): intent=%s", mTargetIntent); - Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "RecentsAnimation#startRecentsActivity"); - - // Cancel any existing recents animation running synchronously (do not hold the - // WM lock) before starting the newly requested recents animation as they can not coexist - if (mWindowManager.getRecentsAnimationController() != null) { - mWindowManager.getRecentsAnimationController().forceCancelAnimation( - REORDER_MOVE_TO_ORIGINAL_POSITION, "startRecentsActivity"); - } - - // If the activity is associated with the root recents task, then try and get that first - Task targetRootTask = mDefaultTaskDisplayArea.getRootTask(WINDOWING_MODE_UNDEFINED, - mTargetActivityType); - ActivityRecord targetActivity = getTargetActivity(targetRootTask); - final boolean hasExistingActivity = targetActivity != null; - if (hasExistingActivity) { - mRestoreTargetBehindRootTask = getRootTaskAbove(targetRootTask); - if (mRestoreTargetBehindRootTask == null - && targetRootTask.getTopMostTask() == targetActivity.getTask()) { - notifyAnimationCancelBeforeStart(recentsAnimationRunner); - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "No root task above target root task=%s", targetRootTask); - return; - } - } - - // Send launch hint if we are actually launching the target. If it's already visible - // (shouldn't happen in general) we don't need to send it. - if (targetActivity == null || !targetActivity.isVisibleRequested()) { - mService.mRootWindowContainer.startPowerModeLaunchIfNeeded( - true /* forceSend */, targetActivity); - } - - final LaunchingState launchingState = - mTaskSupervisor.getActivityMetricsLogger().notifyActivityLaunching(mTargetIntent); - - setProcessAnimating(true); - - mService.deferWindowLayout(); - try { - if (hasExistingActivity) { - // Move the recents activity into place for the animation if it is not top most - mDefaultTaskDisplayArea.moveRootTaskBehindBottomMostVisibleRootTask(targetRootTask); - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "Moved rootTask=%s behind rootTask=%s", - targetRootTask, getRootTaskAbove(targetRootTask)); - - // If there are multiple tasks in the target root task (ie. the root home task, - // with 3p and default launchers coexisting), then move the task to the top as a - // part of moving the root task to the front - final Task task = targetActivity.getTask(); - if (targetRootTask.getTopMostTask() != task) { - targetRootTask.positionChildAtTop(task); - } - } else { - // No recents activity, create the new recents activity bottom most - startRecentsActivityInBackground("startRecentsActivity_noTargetActivity"); - - // Move the recents activity into place for the animation - targetRootTask = mDefaultTaskDisplayArea.getRootTask(WINDOWING_MODE_UNDEFINED, - mTargetActivityType); - targetActivity = getTargetActivity(targetRootTask); - mDefaultTaskDisplayArea.moveRootTaskBehindBottomMostVisibleRootTask(targetRootTask); - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "Moved rootTask=%s behind rootTask=%s", - targetRootTask, getRootTaskAbove(targetRootTask)); - - mWindowManager.prepareAppTransitionNone(); - mWindowManager.executeAppTransition(); - - // TODO: Maybe wait for app to draw in this particular case? - - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "Started intent=%s", mTargetIntent); - } - - // Mark the target activity as launch-behind to bump its visibility for the - // duration of the gesture that is driven by the recents component - targetActivity.mLaunchTaskBehind = true; - mLaunchedTargetActivity = targetActivity; - // TODO(b/156772625): Evaluate to send new intents vs. replacing the intent extras. - targetActivity.intent.replaceExtras(mTargetIntent); - - // Fetch all the surface controls and pass them to the client to get the animation - // started - mWindowManager.initializeRecentsAnimation(mTargetActivityType, recentsAnimationRunner, - this, mDefaultTaskDisplayArea.getDisplayId(), - mTaskSupervisor.mRecentTasks.getRecentTaskIds(), targetActivity); - - // If we updated the launch-behind state, update the visibility of the activities after - // we fetch the visible tasks to be controlled by the animation - mService.mRootWindowContainer.ensureActivitiesVisible(); - - ActivityOptions options = null; - if (eventTime > 0) { - options = ActivityOptions.makeBasic(); - options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime); - } - mTaskSupervisor.getActivityMetricsLogger().notifyActivityLaunched(launchingState, - START_TASK_TO_FRONT, !hasExistingActivity, targetActivity, options); - - // Register for root task order changes - mDefaultTaskDisplayArea.registerRootTaskOrderChangedListener(this); - } catch (Exception e) { - Slog.e(TAG, "Failed to start recents activity", e); - throw e; - } finally { - mService.continueWindowLayout(); - Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); - } - } - - private void finishAnimation(@RecentsAnimationController.ReorderMode int reorderMode, - boolean sendUserLeaveHint) { - synchronized (mService.mGlobalLock) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "onAnimationFinished(): controller=%s reorderMode=%d", - mWindowManager.getRecentsAnimationController(), reorderMode); - - // Unregister for root task order changes - mDefaultTaskDisplayArea.unregisterRootTaskOrderChangedListener(this); - - final RecentsAnimationController controller = - mWindowManager.getRecentsAnimationController(); - if (controller == null) return; - - // Just to be sure end the launch hint in case the target activity was never launched. - // However, if we're keeping the activity and making it visible, we can leave it on. - if (reorderMode != REORDER_KEEP_IN_PLACE) { - mService.endPowerMode(ActivityTaskManagerService.POWER_MODE_REASON_START_ACTIVITY); - } - - // Once the target is shown, prevent spurious background app switches - if (reorderMode == REORDER_MOVE_TO_TOP) { - mService.stopAppSwitches(); - } - - inSurfaceTransaction(() -> { - Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, - "RecentsAnimation#onAnimationFinished_inSurfaceTransaction"); - mService.deferWindowLayout(); - try { - mWindowManager.cleanupRecentsAnimation(reorderMode); - - final Task targetRootTask = mDefaultTaskDisplayArea.getRootTask( - WINDOWING_MODE_UNDEFINED, mTargetActivityType); - // Prefer to use the original target activity instead of top activity because - // we may have moved another task to top (starting 3p launcher). - final ActivityRecord targetActivity = targetRootTask != null - ? targetRootTask.isInTask(mLaunchedTargetActivity) - : null; - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "onAnimationFinished(): targetRootTask=%s targetActivity=%s " - + "mRestoreTargetBehindRootTask=%s", - targetRootTask, targetActivity, mRestoreTargetBehindRootTask); - if (targetActivity == null) { - return; - } - - // Restore the launched-behind state - targetActivity.mLaunchTaskBehind = false; - - if (reorderMode == REORDER_MOVE_TO_TOP) { - // Bring the target root task to the front - mTaskSupervisor.mNoAnimActivities.add(targetActivity); - - if (sendUserLeaveHint) { - // Setting this allows the previous app to PiP. - mTaskSupervisor.mUserLeaving = true; - targetRootTask.moveTaskToFront(targetActivity.getTask(), - true /* noAnimation */, null /* activityOptions */, - targetActivity.appTimeTracker, - "RecentsAnimation.onAnimationFinished()"); - } else { - targetRootTask.moveToFront("RecentsAnimation.onAnimationFinished()"); - } - - if (WM_DEBUG_RECENTS_ANIMATIONS.isLogToAny()) { - final Task topRootTask = getTopNonAlwaysOnTopRootTask(); - if (topRootTask != targetRootTask) { - ProtoLog.w(WM_DEBUG_RECENTS_ANIMATIONS, - "Expected target rootTask=%s" - + " to be top most but found rootTask=%s", - targetRootTask, topRootTask); - } - } - } else if (reorderMode == REORDER_MOVE_TO_ORIGINAL_POSITION){ - // Restore the target root task to its previous position - final TaskDisplayArea taskDisplayArea = targetActivity.getDisplayArea(); - taskDisplayArea.moveRootTaskBehindRootTask(targetRootTask, - mRestoreTargetBehindRootTask); - if (WM_DEBUG_RECENTS_ANIMATIONS.isLogToAny()) { - final Task aboveTargetRootTask = getRootTaskAbove(targetRootTask); - if (mRestoreTargetBehindRootTask != null - && aboveTargetRootTask != mRestoreTargetBehindRootTask) { - ProtoLog.w(WM_DEBUG_RECENTS_ANIMATIONS, - "Expected target rootTask=%s to restored behind " - + "rootTask=%s but it is behind rootTask=%s", - targetRootTask, mRestoreTargetBehindRootTask, - aboveTargetRootTask); - } - } - } else { - // If there is no recents screenshot animation, we can update the visibility - // of target root task immediately because it is visually invisible and the - // launch-behind state is restored. That also prevents the next transition - // type being disturbed if the visibility is updated after setting the next - // transition (the target activity will be one of closing apps). - if (!controller.shouldDeferCancelWithScreenshot() - && !targetRootTask.isFocusedRootTaskOnDisplay()) { - targetRootTask.ensureActivitiesVisible(null /* starting */); - } - // Keep target root task in place, nothing changes, so ignore the transition - // logic below - return; - } - - mWindowManager.prepareAppTransitionNone(); - mService.mRootWindowContainer.ensureActivitiesVisible(); - mService.mRootWindowContainer.resumeFocusedTasksTopActivities(); - - // No reason to wait for the pausing activity in this case, as the hiding of - // surfaces needs to be done immediately. - mWindowManager.executeAppTransition(); - - final Task rootTask = targetRootTask.getRootTask(); - // Client state may have changed during the recents animation, so force - // send task info so the client can synchronize its state. - rootTask.dispatchTaskInfoChangedIfNeeded(true /* force */); - } catch (Exception e) { - Slog.e(TAG, "Failed to clean up recents activity", e); - throw e; - } finally { - mTaskSupervisor.mUserLeaving = false; - mService.continueWindowLayout(); - // Make sure the surfaces are updated with the latest state. Sometimes the - // surface placement may be skipped if display configuration is changed (i.e. - // {@link DisplayContent#mWaitingForConfig} is true). - if (mWindowManager.mRoot.isLayoutNeeded()) { - mWindowManager.mRoot.performSurfacePlacement(); - } - setProcessAnimating(false); - Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); - } - }); - } - } - - // No-op wrapper to keep legacy code. - private static void inSurfaceTransaction(Runnable exec) { - exec.run(); - } - - /** Gives the owner of recents animation higher priority. */ - private void setProcessAnimating(boolean animating) { - if (mCaller == null) return; - // Apply the top-app scheduling group to who runs the animation. - mCaller.setRunningRecentsAnimation(animating); - int demoteReasons = mService.mDemoteTopAppReasons; - if (animating) { - demoteReasons |= ActivityTaskManagerService.DEMOTE_TOP_REASON_ANIMATING_RECENTS; - } else { - demoteReasons &= ~ActivityTaskManagerService.DEMOTE_TOP_REASON_ANIMATING_RECENTS; - } - mService.mDemoteTopAppReasons = demoteReasons; - // Make the demotion of the real top app take effect. No need to restore top app state for - // finishing recents because addToStopping -> scheduleIdle -> activityIdleInternal -> - // trimApplications will have a full update. - if (animating && mService.mTopApp != null) { - mService.mTopApp.scheduleUpdateOomAdj(); - } - } - - @Override - public void onAnimationFinished(@RecentsAnimationController.ReorderMode int reorderMode, - boolean sendUserLeaveHint) { - finishAnimation(reorderMode, sendUserLeaveHint); - } - - @Override - public void onRootTaskOrderChanged(Task rootTask) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "onRootTaskOrderChanged(): rootTask=%s", rootTask); - if (mDefaultTaskDisplayArea.getRootTask(t -> t == rootTask) == null - || !rootTask.shouldBeVisible(null)) { - // The root task is not visible, so ignore this change - return; - } - final RecentsAnimationController controller = - mWindowManager.getRecentsAnimationController(); - if (controller == null) { - return; - } - - // We defer canceling the recents animation until the next app transition in the following - // cases: - // 1) The next launching task is not being animated by the recents animation - // 2) The next task is home activity. (i.e. pressing home key to back home in recents). - if ((!controller.isAnimatingTask(rootTask.getTopMostTask()) - || controller.isTargetApp(rootTask.getTopNonFinishingActivity())) - && controller.shouldDeferCancelUntilNextTransition()) { - // Always prepare an app transition since we rely on the transition callbacks to cleanup - mWindowManager.prepareAppTransitionNone(); - controller.setCancelOnNextTransitionStart(); - } - } - private void startRecentsActivityInBackground(String reason) { final ActivityOptions options = ActivityOptions.makeBasic(); options.setLaunchActivityType(mTargetActivityType); @@ -492,26 +160,6 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan } /** - * Called only when the animation should be canceled prior to starting. - */ - static void notifyAnimationCancelBeforeStart(IRecentsAnimationRunner recentsAnimationRunner) { - try { - recentsAnimationRunner.onAnimationCanceled(null /* taskIds */, - null /* taskSnapshots */); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to cancel recents animation before start", e); - } - } - - /** - * @return The top root task that is not always-on-top. - */ - private Task getTopNonAlwaysOnTopRootTask() { - return mDefaultTaskDisplayArea.getRootTask(task -> - !task.getWindowConfiguration().isAlwaysOnTop()); - } - - /** * @return the top activity in the {@param targetRootTask} matching the {@param component}, * or just the top activity of the top task if no task matches the component. */ diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java deleted file mode 100644 index 6f947135b789..000000000000 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ /dev/null @@ -1,1382 +0,0 @@ -/* - * 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.server.wm; - -import static android.app.ActivityTaskManager.INVALID_TASK_ID; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; -import static android.view.RemoteAnimationTarget.MODE_CLOSING; -import static android.view.RemoteAnimationTarget.MODE_OPENING; -import static android.view.WindowManager.INPUT_CONSUMER_RECENTS_ANIMATION; -import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; - -import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_RECENTS_ANIMATIONS; -import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; -import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_RECENTS_ANIM; -import static com.android.server.wm.AnimationAdapterProto.REMOTE; -import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET; -import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS; -import static com.android.server.wm.WindowManagerInternal.AppTransitionListener; - -import android.annotation.IntDef; -import android.annotation.NonNull; -import android.app.WindowConfiguration; -import android.graphics.GraphicBuffer; -import android.graphics.Point; -import android.graphics.Rect; -import android.hardware.HardwareBuffer; -import android.os.Binder; -import android.os.Bundle; -import android.os.IBinder.DeathRecipient; -import android.os.RemoteException; -import android.os.SystemClock; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.IntArray; -import android.util.Slog; -import android.util.SparseBooleanArray; -import android.util.proto.ProtoOutputStream; -import android.view.IRecentsAnimationController; -import android.view.IRecentsAnimationRunner; -import android.view.InputWindowHandle; -import android.view.RemoteAnimationTarget; -import android.view.SurfaceControl; -import android.view.SurfaceControl.Transaction; -import android.view.SurfaceSession; -import android.view.WindowInsets.Type; -import android.window.PictureInPictureSurfaceTransaction; -import android.window.TaskSnapshot; -import android.window.WindowAnimationState; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.os.IResultReceiver; -import com.android.internal.protolog.ProtoLog; -import com.android.server.LocalServices; -import com.android.server.inputmethod.InputMethodManagerInternal; -import com.android.server.statusbar.StatusBarManagerInternal; -import com.android.server.wm.SurfaceAnimator.AnimationType; -import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; -import com.android.server.wm.utils.InsetUtils; - -import com.google.android.collect.Sets; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.stream.Collectors; - -/** - * Controls a single instance of the remote driven recents animation. In particular, this allows - * the calling SystemUI to animate the visible task windows as a part of the transition. The remote - * runner is provided an animation controller which allows it to take screenshots and to notify - * window manager when the animation is completed. In addition, window manager may also notify the - * app if it requires the animation to be canceled at any time (ie. due to timeout, etc.) - */ -public class RecentsAnimationController implements DeathRecipient { - private static final String TAG = RecentsAnimationController.class.getSimpleName(); - private static final long FAILSAFE_DELAY = 1000; - - // Constant for a yet-to-be-calculated {@link RemoteAnimationTarget#Mode} state - private static final int MODE_UNKNOWN = -1; - - public static final int REORDER_KEEP_IN_PLACE = 0; - public static final int REORDER_MOVE_TO_TOP = 1; - public static final int REORDER_MOVE_TO_ORIGINAL_POSITION = 2; - - @IntDef(prefix = { "REORDER_MODE_" }, value = { - REORDER_KEEP_IN_PLACE, - REORDER_MOVE_TO_TOP, - REORDER_MOVE_TO_ORIGINAL_POSITION - }) - public @interface ReorderMode {} - - private final WindowManagerService mService; - @VisibleForTesting - final StatusBarManagerInternal mStatusBar; - private IRecentsAnimationRunner mRunner; - private final RecentsAnimationCallbacks mCallbacks; - private final ArrayList<TaskAnimationAdapter> mPendingAnimations = new ArrayList<>(); - private final IntArray mPendingNewTaskTargets = new IntArray(0); - - private final ArrayList<WallpaperAnimationAdapter> mPendingWallpaperAnimations = - new ArrayList<>(); - private final int mDisplayId; - private boolean mWillFinishToHome = false; - private final Runnable mFailsafeRunnable = this::onFailsafe; - - // The recents component app token that is shown behind the visible tasks - private ActivityRecord mTargetActivityRecord; - private DisplayContent mDisplayContent; - private int mTargetActivityType; - - // We start the RecentsAnimationController in a pending-start state since we need to wait for - // the wallpaper/activity to draw before we can give control to the handler to start animating - // the visible task surfaces - private boolean mPendingStart = true; - - // Set when the animation has been canceled - private boolean mCanceled; - - // Whether or not the input consumer is enabled. The input consumer must be both registered and - // enabled for it to start intercepting touch events. - private boolean mInputConsumerEnabled; - - private final Rect mTmpRect = new Rect(); - - private boolean mLinkedToDeathOfRunner; - - // Whether to try to defer canceling from a root task order change until the next transition - private boolean mRequestDeferCancelUntilNextTransition; - // Whether to actually defer canceling until the next transition - private boolean mCancelOnNextTransitionStart; - // Whether to take a screenshot when handling a deferred cancel - private boolean mCancelDeferredWithScreenshot; - // The reorder mode to apply after the cleanupScreenshot() callback - private int mPendingCancelWithScreenshotReorderMode = REORDER_MOVE_TO_ORIGINAL_POSITION; - - @VisibleForTesting - boolean mIsAddingTaskToTargets; - private boolean mNavigationBarAttachedToApp; - private ActivityRecord mNavBarAttachedApp; - - private final ArrayList<RemoteAnimationTarget> mPendingTaskAppears = new ArrayList<>(); - - /** - * An app transition listener to cancel the recents animation only after the app transition - * starts or is canceled. - */ - final AppTransitionListener mAppTransitionListener = new AppTransitionListener() { - @Override - public int onAppTransitionStartingLocked(long statusBarAnimationStartTime, - long statusBarAnimationDuration) { - continueDeferredCancel(); - return 0; - } - - @Override - public void onAppTransitionCancelledLocked(boolean keyguardGoingAwayCancelled) { - continueDeferredCancel(); - } - - private void continueDeferredCancel() { - mDisplayContent.mAppTransition.unregisterListener(this); - if (mCanceled) { - return; - } - - if (mCancelOnNextTransitionStart) { - mCancelOnNextTransitionStart = false; - cancelAnimationWithScreenshot(mCancelDeferredWithScreenshot); - } - } - }; - - public interface RecentsAnimationCallbacks { - /** Callback when recents animation is finished. */ - void onAnimationFinished(@ReorderMode int reorderMode, boolean sendUserLeaveHint); - } - - private final IRecentsAnimationController mController = - new IRecentsAnimationController.Stub() { - - @Override - public TaskSnapshot screenshotTask(int taskId) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "screenshotTask(%d): mCanceled=%b", taskId, mCanceled); - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - if (mCanceled) { - return null; - } - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter adapter = mPendingAnimations.get(i); - final Task task = adapter.mTask; - if (task.mTaskId == taskId) { - final TaskSnapshotController snapshotController = - mService.mTaskSnapshotController; - final ArraySet<Task> tasks = Sets.newArraySet(task); - snapshotController.snapshotTasks(tasks); - snapshotController.addSkipClosingAppSnapshotTasks(tasks); - return snapshotController.getSnapshot(taskId, task.mUserId, - false /* restoreFromDisk */, false /* isLowResolution */); - } - } - return null; - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void setFinishTaskTransaction(int taskId, - PictureInPictureSurfaceTransaction finishTransaction, - SurfaceControl overlay) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "setFinishTaskTransaction(%d): transaction=%s", taskId, finishTransaction); - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter taskAdapter = mPendingAnimations.get(i); - if (taskAdapter.mTask.mTaskId == taskId) { - taskAdapter.mFinishTransaction = finishTransaction; - taskAdapter.mFinishOverlay = overlay; - break; - } - } - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void finish(boolean moveHomeToTop, boolean sendUserLeaveHint, - IResultReceiver finishCb) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "finish(%b): mCanceled=%b", moveHomeToTop, mCanceled); - final long token = Binder.clearCallingIdentity(); - try { - // Note, the callback will handle its own synchronization, do not lock on WM lock - // prior to calling the callback - mCallbacks.onAnimationFinished(moveHomeToTop - ? REORDER_MOVE_TO_TOP - : REORDER_MOVE_TO_ORIGINAL_POSITION, sendUserLeaveHint); - } finally { - Binder.restoreCallingIdentity(token); - } - if (finishCb != null) { - try { - finishCb.send(0, new Bundle()); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to report animation finished", e); - } - } - } - - @Override - public void setAnimationTargetsBehindSystemBars(boolean behindSystemBars) - throws RemoteException { - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final Task task = mPendingAnimations.get(i).mTask; - if (task.getActivityType() != mTargetActivityType) { - task.setCanAffectSystemUiFlags(behindSystemBars); - } - } - InputMethodManagerInternal.get().maybeFinishStylusHandwriting(); - mService.mWindowPlacerLocked.requestTraversal(); - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void setInputConsumerEnabled(boolean enabled) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "setInputConsumerEnabled(%s): mCanceled=%b", enabled, mCanceled); - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - if (mCanceled) { - return; - } - mInputConsumerEnabled = enabled; - final InputMonitor inputMonitor = mDisplayContent.getInputMonitor(); - inputMonitor.updateInputWindowsLw(true /*force*/); - mService.scheduleAnimationLocked(); - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void setDeferCancelUntilNextTransition(boolean defer, boolean screenshot) { - synchronized (mService.mGlobalLock) { - setDeferredCancel(defer, screenshot); - } - } - - @Override - public void cleanupScreenshot() { - final long token = Binder.clearCallingIdentity(); - try { - // Note, the callback will handle its own synchronization, do not lock on WM lock - // prior to calling the callback - continueDeferredCancelAnimation(); - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void setWillFinishToHome(boolean willFinishToHome) { - synchronized (mService.getWindowManagerLock()) { - RecentsAnimationController.this.setWillFinishToHome(willFinishToHome); - } - } - - @Override - public boolean removeTask(int taskId) { - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - return removeTaskInternal(taskId); - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void detachNavigationBarFromApp(boolean moveHomeToTop) { - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - restoreNavigationBarFromApp( - moveHomeToTop || mIsAddingTaskToTargets /* animate */); - mService.mWindowPlacerLocked.requestTraversal(); - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void animateNavigationBarToApp(long duration) { - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mService.getWindowManagerLock()) { - animateNavigationBarForAppLaunch(duration); - } - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override - public void handOffAnimation( - RemoteAnimationTarget[] targets, WindowAnimationState[] states) { - // unused legacy implementation - } - }; - - /** - * @param remoteAnimationRunner The remote runner which should be notified when the animation is - * ready to start or has been canceled - * @param callbacks Callbacks to be made when the animation finishes - */ - RecentsAnimationController(WindowManagerService service, - IRecentsAnimationRunner remoteAnimationRunner, RecentsAnimationCallbacks callbacks, - int displayId) { - mService = service; - mRunner = remoteAnimationRunner; - mCallbacks = callbacks; - mDisplayId = displayId; - mStatusBar = LocalServices.getService(StatusBarManagerInternal.class); - mDisplayContent = service.mRoot.getDisplayContent(displayId); - } - - /** - * Initializes the recents animation controller. This is a separate call from the constructor - * because it may call cancelAnimation() which needs to properly clean up the controller - * in the window manager. - */ - public void initialize(int targetActivityType, SparseBooleanArray recentTaskIds, - ActivityRecord targetActivity) { - mTargetActivityType = targetActivityType; - mDisplayContent.mAppTransition.registerListenerLocked(mAppTransitionListener); - - // Make leashes for each of the visible/target tasks and add it to the recents animation to - // be started - // TODO(b/153090560): Support Recents on multiple task display areas - final ArrayList<Task> visibleTasks = mDisplayContent.getDefaultTaskDisplayArea() - .getVisibleTasks(); - final Task targetRootTask = mDisplayContent.getDefaultTaskDisplayArea() - .getRootTask(WINDOWING_MODE_UNDEFINED, targetActivityType); - if (targetRootTask != null) { - targetRootTask.forAllLeafTasks(t -> { - if (!visibleTasks.contains(t)) { - visibleTasks.add(t); - } - }, true /* traverseTopToBottom */); - } - - final int taskCount = visibleTasks.size(); - for (int i = taskCount - 1; i >= 0; i--) { - final Task task = visibleTasks.get(i); - if (skipAnimation(task)) { - continue; - } - addAnimation(task, !recentTaskIds.get(task.mTaskId), false /* hidden */, - (type, anim) -> task.forAllWindows(win -> { - win.onAnimationFinished(type, anim); - }, true /* traverseTopToBottom */)); - } - - // Skip the animation if there is nothing to animate - if (mPendingAnimations.isEmpty()) { - cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "initialize-noVisibleTasks"); - return; - } - - try { - linkToDeathOfRunner(); - } catch (RemoteException e) { - cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "initialize-failedToLinkToDeath"); - return; - } - - attachNavigationBarToApp(); - - // Adjust the wallpaper visibility for the showing target activity - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "setHomeApp(%s)", targetActivity.getName()); - mTargetActivityRecord = targetActivity; - if (targetActivity.windowsCanBeWallpaperTarget()) { - mDisplayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER; - mDisplayContent.setLayoutNeeded(); - } - - mService.mWindowPlacerLocked.performSurfacePlacement(); - - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(targetActivity); - - // Notify that the animation has started - if (mStatusBar != null) { - mStatusBar.onRecentsAnimationStateChanged(true /* running */); - } - } - - /** - * Return whether the given window should still be considered interesting for the all-drawn - * state. This is only interesting for the target app, which may have child windows that are - * not actually visible and should not be considered interesting and waited upon. - */ - protected boolean isInterestingForAllDrawn(WindowState window) { - if (isTargetApp(window.getActivityRecord())) { - if (window.getWindowType() != TYPE_BASE_APPLICATION - && window.getAttrs().alpha == 0f) { - // If there is a cihld window that is alpha 0, then ignore that window - return false; - } - } - // By default all windows are still interesting for all drawn purposes - return true; - } - - /** - * Whether a task should be filtered from the recents animation. This can be true for tasks - * being displayed outside of recents. - */ - private boolean skipAnimation(Task task) { - final WindowConfiguration config = task.getWindowConfiguration(); - return task.isAlwaysOnTop() || config.tasksAreFloating(); - } - - @VisibleForTesting - TaskAnimationAdapter addAnimation(Task task, boolean isRecentTaskInvisible) { - return addAnimation(task, isRecentTaskInvisible, false /* hidden */, - null /* finishedCallback */); - } - - @VisibleForTesting - TaskAnimationAdapter addAnimation(Task task, boolean isRecentTaskInvisible, boolean hidden, - OnAnimationFinishedCallback finishedCallback) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "addAnimation(%s)", task.getName()); - final TaskAnimationAdapter taskAdapter = new TaskAnimationAdapter(task, - isRecentTaskInvisible); - task.startAnimation(task.getPendingTransaction(), taskAdapter, hidden, - ANIMATION_TYPE_RECENTS, finishedCallback); - task.commitPendingTransaction(); - mPendingAnimations.add(taskAdapter); - return taskAdapter; - } - - @VisibleForTesting - void removeAnimation(TaskAnimationAdapter taskAdapter) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "removeAnimation(%d)", taskAdapter.mTask.mTaskId); - taskAdapter.onRemove(); - mPendingAnimations.remove(taskAdapter); - } - - @VisibleForTesting - void removeWallpaperAnimation(WallpaperAnimationAdapter wallpaperAdapter) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "removeWallpaperAnimation()"); - wallpaperAdapter.getLeashFinishedCallback().onAnimationFinished( - wallpaperAdapter.getLastAnimationType(), wallpaperAdapter); - mPendingWallpaperAnimations.remove(wallpaperAdapter); - } - - void startAnimation() { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "startAnimation(): mPendingStart=%b mCanceled=%b", mPendingStart, mCanceled); - if (!mPendingStart || mCanceled) { - // Skip starting if we've already started or canceled the animation - return; - } - try { - // Create the app targets - final RemoteAnimationTarget[] appTargets = createAppAnimations(); - - // Skip the animation if there is nothing to animate - if (appTargets.length == 0) { - cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "startAnimation-noAppWindows"); - return; - } - - // Create the wallpaper targets - final RemoteAnimationTarget[] wallpaperTargets = createWallpaperAnimations(); - - mPendingStart = false; - - final Rect contentInsets; - final WindowState targetAppMainWindow = getTargetAppMainWindow(); - if (targetAppMainWindow != null) { - contentInsets = targetAppMainWindow - .getInsetsStateWithVisibilityOverride() - .calculateInsets(mTargetActivityRecord.getBounds(), Type.systemBars(), - false /* ignoreVisibility */).toRect(); - } else { - // If the window for the activity had not yet been created, use the display insets. - mService.getStableInsets(mDisplayId, mTmpRect); - contentInsets = mTmpRect; - } - mRunner.onAnimationStart(mController, appTargets, wallpaperTargets, contentInsets, - null, new Bundle()); - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "startAnimation(): Notify animation start: %s", - mPendingAnimations.stream() - .map(anim->anim.mTask.mTaskId).collect(Collectors.toList())); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to start recents animation", e); - } - - if (mTargetActivityRecord != null) { - final ArrayMap<WindowContainer, Integer> reasons = new ArrayMap<>(1); - reasons.put(mTargetActivityRecord, APP_TRANSITION_RECENTS_ANIM); - mService.mAtmService.mTaskSupervisor.getActivityMetricsLogger() - .notifyTransitionStarting(reasons); - } - } - - boolean isNavigationBarAttachedToApp() { - return mNavigationBarAttachedToApp; - } - - @VisibleForTesting - WindowState getNavigationBarWindow() { - return mDisplayContent.getDisplayPolicy().getNavigationBar(); - } - - private void attachNavigationBarToApp() { - if (!mDisplayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition() - // Skip the case where the nav bar is controlled by fade rotation. - || mDisplayContent.getAsyncRotationController() != null) { - return; - } - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter adapter = mPendingAnimations.get(i); - final Task task = adapter.mTask; - if (task.isActivityTypeHomeOrRecents()) { - continue; - } - mNavBarAttachedApp = task.getTopVisibleActivity(); - break; - } - - final WindowState navWindow = getNavigationBarWindow(); - if (mNavBarAttachedApp == null || navWindow == null || navWindow.mToken == null) { - return; - } - mNavigationBarAttachedToApp = true; - navWindow.mToken.cancelAnimation(); - final SurfaceControl.Transaction t = navWindow.mToken.getPendingTransaction(); - final SurfaceControl navSurfaceControl = navWindow.mToken.getSurfaceControl(); - navWindow.setSurfaceTranslationY(-mNavBarAttachedApp.getBounds().top); - t.reparent(navSurfaceControl, mNavBarAttachedApp.getSurfaceControl()); - t.show(navSurfaceControl); - - final WindowContainer imeContainer = mDisplayContent.getImeContainer(); - if (imeContainer.isVisible()) { - t.setRelativeLayer(navSurfaceControl, imeContainer.getSurfaceControl(), 1); - } else { - // Place the nav bar on top of anything else in the top activity. - t.setLayer(navSurfaceControl, Integer.MAX_VALUE); - } - if (mStatusBar != null) { - mStatusBar.setNavigationBarLumaSamplingEnabled(mDisplayId, false); - } - } - - @VisibleForTesting - void restoreNavigationBarFromApp(boolean animate) { - if (!mNavigationBarAttachedToApp) { - return; - } - mNavigationBarAttachedToApp = false; - - if (mStatusBar != null) { - mStatusBar.setNavigationBarLumaSamplingEnabled(mDisplayId, true); - } - - final WindowState navWindow = getNavigationBarWindow(); - if (navWindow == null) { - return; - } - navWindow.setSurfaceTranslationY(0); - - final WindowToken navToken = navWindow.mToken; - if (navToken == null) { - return; - } - final SurfaceControl.Transaction t = mDisplayContent.getPendingTransaction(); - final WindowContainer parent = navToken.getParent(); - t.setLayer(navToken.getSurfaceControl(), navToken.getLastLayer()); - - if (animate) { - final NavBarFadeAnimationController controller = - new NavBarFadeAnimationController(mDisplayContent); - controller.fadeWindowToken(true); - } else { - // Reparent the SurfaceControl of nav bar token back. - t.reparent(navToken.getSurfaceControl(), parent.getSurfaceControl()); - } - } - - void animateNavigationBarForAppLaunch(long duration) { - if (!mDisplayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition() - // Skip the case where the nav bar is controlled by fade rotation. - || mDisplayContent.getAsyncRotationController() != null - || mNavigationBarAttachedToApp - || mNavBarAttachedApp == null) { - return; - } - - final NavBarFadeAnimationController controller = - new NavBarFadeAnimationController(mDisplayContent); - controller.fadeOutAndInSequentially(duration, null /* fadeOutParent */, - mNavBarAttachedApp.getSurfaceControl()); - } - - void addTaskToTargets(Task task, OnAnimationFinishedCallback finishedCallback) { - if (mRunner != null) { - mIsAddingTaskToTargets = task != null; - mNavBarAttachedApp = task == null ? null : task.getTopVisibleActivity(); - // No need to send task appeared when the task target already exists, or when the - // task is being managed as a multi-window mode outside of recents (e.g. bubbles). - if (isAnimatingTask(task) || skipAnimation(task)) { - return; - } - collectTaskRemoteAnimations(task, MODE_OPENING, finishedCallback); - } - } - - void sendTasksAppeared() { - if (mPendingTaskAppears.isEmpty() || mRunner == null) return; - try { - final RemoteAnimationTarget[] targets = mPendingTaskAppears.toArray( - new RemoteAnimationTarget[0]); - mRunner.onTasksAppeared(targets); - mPendingTaskAppears.clear(); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to report task appeared", e); - } - } - - private void collectTaskRemoteAnimations(Task task, int mode, - OnAnimationFinishedCallback finishedCallback) { - final SparseBooleanArray recentTaskIds = - mService.mAtmService.getRecentTasks().getRecentTaskIds(); - - // The target must be built off the root task (the leaf task surface would be cropped - // within the root surface). However, recents only tracks leaf task ids, so we'll traverse - // and create animation target for all visible leaf tasks. - task.forAllLeafTasks(leafTask -> { - if (!leafTask.shouldBeVisible(null /* starting */)) { - return; - } - final int taskId = leafTask.mTaskId; - TaskAnimationAdapter adapter = addAnimation(leafTask, - !recentTaskIds.get(taskId), true /* hidden */, finishedCallback); - mPendingNewTaskTargets.add(taskId); - final RemoteAnimationTarget target = - adapter.createRemoteAnimationTarget(taskId, mode); - if (target != null) { - mPendingTaskAppears.add(target); - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "collectTaskRemoteAnimations, target: %s", target); - } - }, false /* traverseTopToBottom */); - } - - private boolean removeTaskInternal(int taskId) { - boolean result = false; - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - // Only allows when task target has became visible to user, to prevent - // the flickering during remove animation and task visible. - final TaskAnimationAdapter target = mPendingAnimations.get(i); - if (target.mTask.mTaskId == taskId && target.mTask.isOnTop()) { - removeAnimation(target); - final int taskIndex = mPendingNewTaskTargets.indexOf(taskId); - if (taskIndex != -1) { - mPendingNewTaskTargets.remove(taskIndex); - } - result = true; - break; - } - } - return result; - } - - private RemoteAnimationTarget[] createAppAnimations() { - final ArrayList<RemoteAnimationTarget> targets = new ArrayList<>(); - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter taskAdapter = mPendingAnimations.get(i); - final RemoteAnimationTarget target = - taskAdapter.createRemoteAnimationTarget(INVALID_TASK_ID, MODE_UNKNOWN); - if (target != null) { - targets.add(target); - } else { - removeAnimation(taskAdapter); - } - } - return targets.toArray(new RemoteAnimationTarget[targets.size()]); - } - - private RemoteAnimationTarget[] createWallpaperAnimations() { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "createWallpaperAnimations()"); - return WallpaperAnimationAdapter.startWallpaperAnimations(mDisplayContent, 0L, 0L, - adapter -> { - synchronized (mService.mGlobalLock) { - // If the wallpaper animation is canceled, continue with the recents - // animation - mPendingWallpaperAnimations.remove(adapter); - } - }, mPendingWallpaperAnimations); - } - - void forceCancelAnimation(@ReorderMode int reorderMode, String reason) { - if (!mCanceled) { - cancelAnimation(reorderMode, reason); - } else { - continueDeferredCancelAnimation(); - } - } - - void cancelAnimation(@ReorderMode int reorderMode, String reason) { - cancelAnimation(reorderMode, false /*screenshot */, reason); - } - - void cancelAnimationWithScreenshot(boolean screenshot) { - cancelAnimation(REORDER_KEEP_IN_PLACE, screenshot, "rootTaskOrderChanged"); - } - - /** - * Cancels the running animation when starting home, providing a snapshot for the runner to - * properly handle the cancellation. This call uses the provided hint to determine how to - * finish the animation. - */ - public void cancelAnimationForHomeStart() { - final int reorderMode = mTargetActivityType == ACTIVITY_TYPE_HOME && mWillFinishToHome - ? REORDER_MOVE_TO_TOP - : REORDER_KEEP_IN_PLACE; - cancelAnimation(reorderMode, true /* screenshot */, "cancelAnimationForHomeStart"); - } - - /** - * Cancels the running animation when there is a display change, providing a snapshot for the - * runner to properly handle the cancellation. This call uses the provided hint to determine - * how to finish the animation. - */ - public void cancelAnimationForDisplayChange() { - cancelAnimation(mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_MOVE_TO_ORIGINAL_POSITION, - true /* screenshot */, "cancelAnimationForDisplayChange"); - } - - private void cancelAnimation(@ReorderMode int reorderMode, boolean screenshot, String reason) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "cancelAnimation(): reason=%s", reason); - synchronized (mService.getWindowManagerLock()) { - if (mCanceled) { - // We've already canceled the animation - return; - } - mService.mH.removeCallbacks(mFailsafeRunnable); - mCanceled = true; - - if (screenshot && !mPendingAnimations.isEmpty()) { - final ArrayMap<Task, TaskSnapshot> snapshotMap = screenshotRecentTasks(); - mPendingCancelWithScreenshotReorderMode = reorderMode; - - if (!snapshotMap.isEmpty()) { - try { - int[] taskIds = new int[snapshotMap.size()]; - TaskSnapshot[] snapshots = new TaskSnapshot[snapshotMap.size()]; - for (int i = snapshotMap.size() - 1; i >= 0; i--) { - taskIds[i] = snapshotMap.keyAt(i).mTaskId; - snapshots[i] = snapshotMap.valueAt(i); - } - mRunner.onAnimationCanceled(taskIds, snapshots); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to cancel recents animation", e); - } - // Schedule a new failsafe for if the runner doesn't clean up the screenshot - scheduleFailsafe(); - return; - } - // Fallback to a normal cancel since we couldn't screenshot - } - - // Notify the runner and clean up the animation immediately - // Note: In the fallback case, this can trigger multiple onAnimationCancel() calls - // to the runner if we this actually triggers cancel twice on the caller - try { - mRunner.onAnimationCanceled(null /* taskIds */, null /* taskSnapshots */); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to cancel recents animation", e); - } - mCallbacks.onAnimationFinished(reorderMode, false /* sendUserLeaveHint */); - } - } - - @VisibleForTesting - void continueDeferredCancelAnimation() { - mCallbacks.onAnimationFinished(mPendingCancelWithScreenshotReorderMode, - false /* sendUserLeaveHint */); - } - - @VisibleForTesting - void setWillFinishToHome(boolean willFinishToHome) { - mWillFinishToHome = willFinishToHome; - } - - /** - * Cancel recents animation when the next app transition starts. - * <p> - * When we cancel the recents animation due to a root task order change, we can't just cancel it - * immediately as it would lead to a flicker in Launcher if we just remove the task from the - * leash. Instead we screenshot the previous task and replace the child of the leash with the - * screenshot, so that Launcher can still control the leash lifecycle & make the next app - * transition animate smoothly without flickering. - */ - void setCancelOnNextTransitionStart() { - mCancelOnNextTransitionStart = true; - } - - /** - * Requests that we attempt to defer the cancel until the next app transition if we are - * canceling from a root task order change. If {@param screenshot} is specified, then the - * system will replace the contents of the leash with a screenshot, which must be cleaned up - * when the runner calls cleanUpScreenshot(). - */ - void setDeferredCancel(boolean defer, boolean screenshot) { - mRequestDeferCancelUntilNextTransition = defer; - mCancelDeferredWithScreenshot = screenshot; - } - - /** - * @return Whether we should defer the cancel from a root task order change until the next app - * transition. - */ - boolean shouldDeferCancelUntilNextTransition() { - return mRequestDeferCancelUntilNextTransition; - } - - /** - * @return Whether we should both defer the cancel from a root task order change until the next - * app transition, and also that the deferred cancel should replace the contents of the leash - * with a screenshot. - */ - boolean shouldDeferCancelWithScreenshot() { - return mRequestDeferCancelUntilNextTransition && mCancelDeferredWithScreenshot; - } - - private ArrayMap<Task, TaskSnapshot> screenshotRecentTasks() { - final TaskSnapshotController snapshotController = mService.mTaskSnapshotController; - final ArrayMap<Task, TaskSnapshot> snapshotMap = new ArrayMap<>(); - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter adapter = mPendingAnimations.get(i); - final Task task = adapter.mTask; - if (task.isActivityTypeHome()) continue; - snapshotController.recordSnapshot(task); - final TaskSnapshot snapshot = snapshotController.getSnapshot(task.mTaskId, task.mUserId, - false /* restoreFromDisk */, false /* isLowResolution */); - if (snapshot != null) { - snapshotMap.put(task, snapshot); - // Defer until the runner calls back to cleanupScreenshot() - adapter.setSnapshotOverlay(snapshot); - } - } - snapshotController.addSkipClosingAppSnapshotTasks(snapshotMap.keySet()); - return snapshotMap; - } - - void cleanupAnimation(@ReorderMode int reorderMode) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "cleanupAnimation(): Notify animation finished mPendingAnimations=%d " - + "reorderMode=%d", - mPendingAnimations.size(), reorderMode); - if (reorderMode != REORDER_MOVE_TO_ORIGINAL_POSITION - && mTargetActivityRecord != mDisplayContent.topRunningActivity()) { - // Notify the state at the beginning because the removeAnimation may notify the - // transition is finished. This is a signal that there will be a next transition. - mDisplayContent.mFixedRotationTransitionListener.notifyRecentsWillBeTop(); - } - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - final TaskAnimationAdapter taskAdapter = mPendingAnimations.get(i); - if (reorderMode == REORDER_MOVE_TO_TOP || reorderMode == REORDER_KEEP_IN_PLACE) { - taskAdapter.mTask.dontAnimateDimExit(); - } - removeAnimation(taskAdapter); - taskAdapter.onCleanup(); - } - // Should already be empty, but clean-up pending task-appears in-case they weren't sent. - mPendingNewTaskTargets.clear(); - mPendingTaskAppears.clear(); - - for (int i = mPendingWallpaperAnimations.size() - 1; i >= 0; i--) { - final WallpaperAnimationAdapter wallpaperAdapter = mPendingWallpaperAnimations.get(i); - removeWallpaperAnimation(wallpaperAdapter); - } - - restoreNavigationBarFromApp( - reorderMode == REORDER_MOVE_TO_TOP || mIsAddingTaskToTargets /* animate */); - - // Clear any pending failsafe runnables - mService.mH.removeCallbacks(mFailsafeRunnable); - mDisplayContent.mAppTransition.unregisterListener(mAppTransitionListener); - - // Clear references to the runner - unlinkToDeathOfRunner(); - mRunner = null; - mCanceled = true; - - // Restore IME icon only when moving the original app task to front from recents, in case - // IME icon may missing if the moving task has already been the current focused task. - if (reorderMode == REORDER_MOVE_TO_ORIGINAL_POSITION && !mIsAddingTaskToTargets) { - InputMethodManagerInternal.get().updateImeWindowStatus( - false /* disableImeIcon */, mDisplayId); - } - - // Update the input windows after the animation is complete - final InputMonitor inputMonitor = mDisplayContent.getInputMonitor(); - inputMonitor.updateInputWindowsLw(true /*force*/); - - // We have deferred all notifications to the target app as a part of the recents animation, - // so if we are actually transitioning there, notify again here - if (mTargetActivityRecord != null) { - if (reorderMode == REORDER_MOVE_TO_TOP || reorderMode == REORDER_KEEP_IN_PLACE) { - mDisplayContent.mAppTransition.notifyAppTransitionFinishedLocked( - mTargetActivityRecord.token); - } - } - mDisplayContent.mFixedRotationTransitionListener.onFinishRecentsAnimation(); - - // Notify that the animation has ended - if (mStatusBar != null) { - mStatusBar.onRecentsAnimationStateChanged(false /* running */); - } - } - - void scheduleFailsafe() { - mService.mH.postDelayed(mFailsafeRunnable, FAILSAFE_DELAY); - } - - void onFailsafe() { - forceCancelAnimation( - mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_MOVE_TO_ORIGINAL_POSITION, - "onFailsafe"); - } - - private void linkToDeathOfRunner() throws RemoteException { - if (!mLinkedToDeathOfRunner) { - mRunner.asBinder().linkToDeath(this, 0); - mLinkedToDeathOfRunner = true; - } - } - - private void unlinkToDeathOfRunner() { - if (mLinkedToDeathOfRunner) { - mRunner.asBinder().unlinkToDeath(this, 0); - mLinkedToDeathOfRunner = false; - } - } - - @Override - public void binderDied() { - forceCancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied"); - - synchronized (mService.getWindowManagerLock()) { - // Clear associated input consumers on runner death - final InputMonitor inputMonitor = mDisplayContent.getInputMonitor(); - final InputConsumerImpl consumer = inputMonitor.getInputConsumer( - INPUT_CONSUMER_RECENTS_ANIMATION); - if (consumer != null) { - inputMonitor.destroyInputConsumer(consumer.mToken); - } - } - } - - void checkAnimationReady(WallpaperController wallpaperController) { - if (mPendingStart) { - final boolean wallpaperReady = !isTargetOverWallpaper() - || (wallpaperController.getWallpaperTarget() != null - && wallpaperController.wallpaperTransitionReady()); - if (wallpaperReady) { - mService.getRecentsAnimationController().startAnimation(); - } - } - } - - boolean isWallpaperVisible(WindowState w) { - return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION && - ((w.mActivityRecord != null && mTargetActivityRecord == w.mActivityRecord) - || isAnimatingTask(w.getTask())) - && isTargetOverWallpaper() && w.isOnScreen(); - } - - /** - * @return Whether to use the input consumer to override app input to route home/recents. - */ - boolean shouldApplyInputConsumer(ActivityRecord activity) { - // Only apply the input consumer if it is enabled, it is not the target (home/recents) - // being revealed with the transition, and we are actively animating the app as a part of - // the animation - return mInputConsumerEnabled && activity != null - && !isTargetApp(activity) && isAnimatingApp(activity); - } - - boolean updateInputConsumerForApp(InputWindowHandle inputWindowHandle) { - // Update the input consumer touchable region to match the target app main window - final WindowState targetAppMainWindow = getTargetAppMainWindow(); - if (targetAppMainWindow != null) { - targetAppMainWindow.getBounds(mTmpRect); - inputWindowHandle.touchableRegion.set(mTmpRect); - return true; - } - return false; - } - - boolean isTargetApp(ActivityRecord activity) { - return mTargetActivityRecord != null && activity == mTargetActivityRecord; - } - - private boolean isTargetOverWallpaper() { - if (mTargetActivityRecord == null) { - return false; - } - return mTargetActivityRecord.windowsCanBeWallpaperTarget(); - } - - WindowState getTargetAppMainWindow() { - if (mTargetActivityRecord == null) { - return null; - } - return mTargetActivityRecord.findMainWindow(); - } - - DisplayArea getTargetAppDisplayArea() { - if (mTargetActivityRecord == null) { - return null; - } - return mTargetActivityRecord.getDisplayArea(); - } - - boolean isAnimatingTask(Task task) { - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - if (task == mPendingAnimations.get(i).mTask) { - return true; - } - } - return false; - } - - boolean isAnimatingWallpaper(WallpaperWindowToken token) { - for (int i = mPendingWallpaperAnimations.size() - 1; i >= 0; i--) { - if (token == mPendingWallpaperAnimations.get(i).getToken()) { - return true; - } - } - return false; - } - - private boolean isAnimatingApp(ActivityRecord activity) { - for (int i = mPendingAnimations.size() - 1; i >= 0; i--) { - if (activity.isDescendantOf(mPendingAnimations.get(i).mTask)) { - return true; - } - } - return false; - } - - boolean shouldIgnoreForAccessibility(WindowState windowState) { - final Task task = windowState.getTask(); - return task != null && isAnimatingTask(task) && !isTargetApp(windowState.mActivityRecord); - } - - /** - * If the animation target ActivityRecord has a fixed rotation ({@link - * WindowToken#hasFixedRotationTransform()}, the provided wallpaper will be rotated accordingly. - * - * This avoids any screen rotation animation when animating to the Recents view. - */ - void linkFixedRotationTransformIfNeeded(@NonNull WindowToken wallpaper) { - if (mTargetActivityRecord == null) { - return; - } - wallpaper.linkFixedRotationTransform(mTargetActivityRecord); - } - - @VisibleForTesting - class TaskAnimationAdapter implements AnimationAdapter { - - private final Task mTask; - private SurfaceControl mCapturedLeash; - private OnAnimationFinishedCallback mCapturedFinishCallback; - private @AnimationType int mLastAnimationType; - private final boolean mIsRecentTaskInvisible; - private RemoteAnimationTarget mTarget; - private final Rect mBounds = new Rect(); - // The bounds of the target relative to its parent. - private final Rect mLocalBounds = new Rect(); - // The final surface transaction when animation is finished. - private PictureInPictureSurfaceTransaction mFinishTransaction; - // An overlay used to mask the content as an app goes into PIP - private SurfaceControl mFinishOverlay; - // An overlay used for canceling the animation with a screenshot - private SurfaceControl mSnapshotOverlay; - - TaskAnimationAdapter(Task task, boolean isRecentTaskInvisible) { - mTask = task; - mIsRecentTaskInvisible = isRecentTaskInvisible; - mBounds.set(mTask.getBounds()); - - mLocalBounds.set(mBounds); - Point tmpPos = new Point(); - mTask.getRelativePosition(tmpPos); - mLocalBounds.offsetTo(tmpPos.x, tmpPos.y); - } - - /** - * @param overrideTaskId overrides the target's taskId. It may differ from mTaskId and thus - * can differ from taskInfo. This mismatch is needed, however, in - * some cases where we are animating root tasks but need need leaf - * ids for identification. If this is INVALID (-1), then mTaskId - * will be used. - * @param overrideMode overrides the target's mode. If this is -1, the mode will be - * calculated relative to going to the target activity (ie. OPENING if - * this is the target task, CLOSING otherwise). - */ - RemoteAnimationTarget createRemoteAnimationTarget(int overrideTaskId, int overrideMode) { - ActivityRecord topApp = mTask.getTopRealVisibleActivity(); - if (topApp == null) { - topApp = mTask.getTopVisibleActivity(); - } - final WindowState mainWindow = topApp != null - ? topApp.findMainWindow() - : null; - if (mainWindow == null) { - return null; - } - final Rect insets = mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets( - mBounds, Type.systemBars(), false /* ignoreVisibility */).toRect(); - InsetUtils.addInsets(insets, mainWindow.mActivityRecord.getLetterboxInsets()); - final int mode = overrideMode != MODE_UNKNOWN - ? overrideMode - : topApp.getActivityType() == mTargetActivityType - ? MODE_OPENING - : MODE_CLOSING; - if (overrideTaskId < 0) { - overrideTaskId = mTask.mTaskId; - } - mTarget = new RemoteAnimationTarget(overrideTaskId, mode, mCapturedLeash, - !topApp.fillsParent(), new Rect(), - insets, mTask.getPrefixOrderIndex(), new Point(mBounds.left, mBounds.top), - mLocalBounds, mBounds, mTask.getWindowConfiguration(), - mIsRecentTaskInvisible, null, null, mTask.getTaskInfo(), - topApp.checkEnterPictureInPictureAppOpsState()); - - final ActivityRecord topActivity = mTask.getTopNonFinishingActivity(); - if (topActivity != null && topActivity.mStartingData != null - && topActivity.mStartingData.hasImeSurface()) { - mTarget.setWillShowImeOnTarget(true); - } - return mTarget; - } - - void setSnapshotOverlay(TaskSnapshot snapshot) { - // Create a surface control for the snapshot and reparent it to the leash - final HardwareBuffer buffer = snapshot.getHardwareBuffer(); - if (buffer == null) { - return; - } - - final SurfaceSession session = new SurfaceSession(); - mSnapshotOverlay = mService.mSurfaceControlFactory.apply(session) - .setName("RecentTaskScreenshotSurface") - .setCallsite("TaskAnimationAdapter.setSnapshotOverlay") - .setFormat(buffer.getFormat()) - .setParent(mCapturedLeash) - .setBLASTLayer() - .build(); - - final float scale = 1.0f * mTask.getBounds().width() / buffer.getWidth(); - mTask.getPendingTransaction() - .setBuffer(mSnapshotOverlay, GraphicBuffer.createFromHardwareBuffer(buffer)) - .setColorSpace(mSnapshotOverlay, snapshot.getColorSpace()) - .setLayer(mSnapshotOverlay, Integer.MAX_VALUE) - .setMatrix(mSnapshotOverlay, scale, 0, 0, scale) - .show(mSnapshotOverlay) - .apply(); - } - - void onRemove() { - if (mSnapshotOverlay != null) { - // Clean up the snapshot overlay if necessary - mTask.getPendingTransaction() - .remove(mSnapshotOverlay) - .apply(); - mSnapshotOverlay = null; - } - mTask.setCanAffectSystemUiFlags(true); - mCapturedFinishCallback.onAnimationFinished(mLastAnimationType, this); - } - - void onCleanup() { - final Transaction pendingTransaction = mTask.getPendingTransaction(); - if (mFinishTransaction != null) { - // Reparent the overlay - if (mFinishOverlay != null) { - pendingTransaction.reparent(mFinishOverlay, mTask.mSurfaceControl); - } - - // Transfer the transform from the leash to the task - PictureInPictureSurfaceTransaction.apply(mFinishTransaction, - mTask.mSurfaceControl, pendingTransaction); - mTask.setLastRecentsAnimationTransaction(mFinishTransaction, mFinishOverlay); - if (mDisplayContent.isFixedRotationLaunchingApp(mTargetActivityRecord)) { - // The transaction is needed for position when rotating the display. - mDisplayContent.mPinnedTaskController.setEnterPipTransaction( - mFinishTransaction); - } - // In the case where we are transferring the transform to the task in preparation - // for entering PIP, we disable the task being able to affect sysui flags otherwise - // it may cause a flash - if (mTask.getActivityType() != mTargetActivityType - && mFinishTransaction.getShouldDisableCanAffectSystemUiFlags()) { - mTask.setCanAffectSystemUiFlags(false); - } - mFinishTransaction = null; - mFinishOverlay = null; - pendingTransaction.apply(); - } else if (!mTask.isAttached()) { - // Apply the task's pending transaction in case it is detached and its transaction - // is not reachable. - pendingTransaction.apply(); - } - } - - @VisibleForTesting - public SurfaceControl getSnapshotOverlay() { - return mSnapshotOverlay; - } - - @Override - public boolean getShowWallpaper() { - return false; - } - - @Override - public void startAnimation(SurfaceControl animationLeash, Transaction t, - @AnimationType int type, @NonNull OnAnimationFinishedCallback finishCallback) { - // Restore position and root task crop until client has a chance to modify it. - t.setPosition(animationLeash, mLocalBounds.left, mLocalBounds.top); - mTmpRect.set(mLocalBounds); - mTmpRect.offsetTo(0, 0); - t.setWindowCrop(animationLeash, mTmpRect); - mCapturedLeash = animationLeash; - mCapturedFinishCallback = finishCallback; - mLastAnimationType = type; - } - - @Override - public void onAnimationCancelled(SurfaceControl animationLeash) { - // Cancel the animation immediately if any single task animator is canceled - cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "taskAnimationAdapterCanceled"); - } - - @Override - public long getDurationHint() { - return 0; - } - - @Override - public long getStatusBarTransitionsStartTime() { - return SystemClock.uptimeMillis(); - } - - @Override - public void dump(PrintWriter pw, String prefix) { - pw.print(prefix); pw.println("task=" + mTask); - if (mTarget != null) { - pw.print(prefix); pw.println("Target:"); - mTarget.dump(pw, prefix + " "); - } else { - pw.print(prefix); pw.println("Target: null"); - } - pw.println("mIsRecentTaskInvisible=" + mIsRecentTaskInvisible); - pw.println("mLocalBounds=" + mLocalBounds); - pw.println("mFinishTransaction=" + mFinishTransaction); - pw.println("mBounds=" + mBounds); - pw.println("mIsRecentTaskInvisible=" + mIsRecentTaskInvisible); - } - - @Override - public void dumpDebug(ProtoOutputStream proto) { - final long token = proto.start(REMOTE); - if (mTarget != null) { - mTarget.dumpDebug(proto, TARGET); - } - proto.end(token); - } - } - - public void dump(PrintWriter pw, String prefix) { - final String innerPrefix = prefix + " "; - pw.print(prefix); pw.println(RecentsAnimationController.class.getSimpleName() + ":"); - pw.print(innerPrefix); pw.println("mPendingStart=" + mPendingStart); - pw.print(innerPrefix); pw.println("mPendingAnimations=" + mPendingAnimations.size()); - pw.print(innerPrefix); pw.println("mCanceled=" + mCanceled); - pw.print(innerPrefix); pw.println("mInputConsumerEnabled=" + mInputConsumerEnabled); - pw.print(innerPrefix); pw.println("mTargetActivityRecord=" + mTargetActivityRecord); - pw.print(innerPrefix); pw.println("isTargetOverWallpaper=" + isTargetOverWallpaper()); - pw.print(innerPrefix); pw.println("mRequestDeferCancelUntilNextTransition=" - + mRequestDeferCancelUntilNextTransition); - pw.print(innerPrefix); pw.println("mCancelOnNextTransitionStart=" - + mCancelOnNextTransitionStart); - pw.print(innerPrefix); pw.println("mCancelDeferredWithScreenshot=" - + mCancelDeferredWithScreenshot); - pw.print(innerPrefix); pw.println("mPendingCancelWithScreenshotReorderMode=" - + mPendingCancelWithScreenshotReorderMode); - } -} diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 862f84dbd73d..a6d965955272 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -804,12 +804,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> checkAppTransitionReady(surfacePlacer); - // Defer starting the recents animation until the wallpaper has drawn - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); - if (recentsAnimationController != null) { - recentsAnimationController.checkAnimationReady(defaultDisplay.mWallpaperController); - } mWmService.mAtmService.mBackNavigationController .checkAnimationReady(defaultDisplay.mWallpaperController); @@ -1471,9 +1465,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // Updates the extra information of the intent. if (fromHomeKey) { homeIntent.putExtra(WindowManagerPolicy.EXTRA_FROM_HOME_KEY, true); - if (mWindowManager.getRecentsAnimationController() != null) { - mWindowManager.getRecentsAnimationController().cancelAnimationForHomeStart(); - } } homeIntent.putExtra(WindowManagerPolicy.EXTRA_START_REASON, reason); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 13d6ed5e69c4..f000223ccec0 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -61,7 +61,6 @@ import static android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_LOCKTASK; -import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_RECENTS_ANIMATIONS; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_STATES; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_TASKS; import static com.android.server.wm.ActivityRecord.State.PAUSED; @@ -168,7 +167,6 @@ import android.view.InsetsState; import android.view.RemoteAnimationAdapter; import android.view.SurfaceControl; import android.view.WindowManager; -import android.view.WindowManager.TransitionOldType; import android.window.ITaskOrganizer; import android.window.PictureInPictureSurfaceTransaction; import android.window.StartingWindowInfo; @@ -2957,14 +2955,6 @@ class Task extends TaskFragment { if (isOrganized()) { return false; } - // Don't animate while the task runs recents animation but only if we are in the mode - // where we cancel with deferred screenshot, which means that the controller has - // transformed the task. - final RecentsAnimationController controller = mWmService.getRecentsAnimationController(); - if (controller != null && controller.isAnimatingTask(this) - && controller.shouldDeferCancelUntilNextTransition()) { - return false; - } return true; } @@ -3282,30 +3272,6 @@ class Task extends TaskFragment { } @Override - protected void applyAnimationUnchecked(WindowManager.LayoutParams lp, boolean enter, - @TransitionOldType int transit, boolean isVoiceInteraction, - @Nullable ArrayList<WindowContainer> sources) { - final RecentsAnimationController control = mWmService.getRecentsAnimationController(); - if (control != null) { - // We let the transition to be controlled by RecentsAnimation, and callback task's - // RemoteAnimationTarget for remote runner to animate. - if (enter && !isActivityTypeHomeOrRecents()) { - ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, - "applyAnimationUnchecked, control: %s, task: %s, transit: %s", - control, asTask(), AppTransition.appTransitionOldToString(transit)); - final int size = sources != null ? sources.size() : 0; - control.addTaskToTargets(this, (type, anim) -> { - for (int i = 0; i < size; ++i) { - sources.get(i).onAnimationFinished(type, anim); - } - }); - } - } else { - super.applyAnimationUnchecked(lp, enter, transit, isVoiceInteraction, sources); - } - } - - @Override void dump(PrintWriter pw, String prefix, boolean dumpAll) { super.dump(pw, prefix, dumpAll); mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix); @@ -6230,26 +6196,6 @@ class Task extends TaskFragment { ActivityOptions.abort(options); } - boolean shouldSleepActivities() { - final DisplayContent display = mDisplayContent; - final boolean isKeyguardGoingAway = (mDisplayContent != null) - ? mDisplayContent.isKeyguardGoingAway() - : mRootWindowContainer.getDefaultDisplay().isKeyguardGoingAway(); - - // Do not sleep activities in this root task if we're marked as focused and the keyguard - // is in the process of going away. - if (isKeyguardGoingAway && isFocusedRootTaskOnDisplay() - // Avoid resuming activities on secondary displays since we don't want bubble - // activities to be resumed while bubble is still collapsed. - // TODO(b/113840485): Having keyguard going away state for secondary displays. - && display != null - && display.isDefaultDisplay) { - return false; - } - - return display != null ? display.isSleeping() : mAtmService.isSleepingLocked(); - } - private Rect getRawBounds() { return super.getBounds(); } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 01fea479e6da..638e92f112c7 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -143,13 +143,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { * current focused root task. */ Task mLastFocusedRootTask; - /** - * All of the root tasks on this display. Order matters, topmost root task is in front of all - * other root tasks, bottommost behind. Accessed directly by ActivityManager package classes. - * Any calls changing the list should also call {@link #onRootTaskOrderChanged(Task)}. - */ - private ArrayList<OnRootTaskOrderChangedListener> mRootTaskOrderChangedCallbacks = - new ArrayList<>(); /** * The task display area is removed from the system and we are just waiting for all activities @@ -332,7 +325,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { mAtmService.mTaskSupervisor.updateTopResumedActivityIfNeeded("addChildTask"); mAtmService.updateSleepIfNeededLocked(); - onRootTaskOrderChanged(task); } @Override @@ -424,10 +416,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { // Update the top resumed activity because the preferred top focusable task may be changed. mAtmService.mTaskSupervisor.updateTopResumedActivityIfNeeded("positionChildTaskAt"); - - if (mChildren.indexOf(child) != oldPosition) { - onRootTaskOrderChanged(child); - } } void onLeafTaskRemoved(int taskId) { @@ -844,7 +832,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { mLaunchAdjacentFlagRootTask = null; } mDisplayContent.releaseSelfIfNeeded(); - onRootTaskOrderChanged(rootTask); } /** @@ -1743,35 +1730,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { return mRemoved; } - /** - * Adds a listener to be notified whenever the root task order in the display changes. Currently - * only used by the {@link RecentsAnimation} to determine whether to interrupt and cancel the - * current animation when the system state changes. - */ - void registerRootTaskOrderChangedListener(OnRootTaskOrderChangedListener listener) { - if (!mRootTaskOrderChangedCallbacks.contains(listener)) { - mRootTaskOrderChangedCallbacks.add(listener); - } - } - - /** - * Removes a previously registered root task order change listener. - */ - void unregisterRootTaskOrderChangedListener(OnRootTaskOrderChangedListener listener) { - mRootTaskOrderChangedCallbacks.remove(listener); - } - - /** - * Notifies of a root task order change - * - * @param rootTask The root task which triggered the order change - */ - void onRootTaskOrderChanged(Task rootTask) { - for (int i = mRootTaskOrderChangedCallbacks.size() - 1; i >= 0; i--) { - mRootTaskOrderChangedCallbacks.get(i).onRootTaskOrderChanged(rootTask); - } - } - @Override boolean canCreateRemoteAnimationTarget() { // In the legacy transition system, promoting animation target from TaskFragment to @@ -1786,13 +1744,6 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { return mDisplayContent.isHomeSupported() && mCanHostHomeTask; } - /** - * Callback for when the order of the root tasks in the display changes. - */ - interface OnRootTaskOrderChangedListener { - void onRootTaskOrderChanged(Task rootTask); - } - void ensureActivitiesVisible(ActivityRecord starting, boolean notifyClients) { mAtmService.mTaskSupervisor.beginActivityVisibilityUpdate(); try { diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index c8139faab4c4..f58b322cab36 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -2145,8 +2145,22 @@ class TaskFragment extends WindowContainer<WindowContainer> { } boolean shouldSleepActivities() { - final Task task = getRootTask(); - return task != null && task.shouldSleepActivities(); + final DisplayContent dc = mDisplayContent; + if (dc == null) { + return mAtmService.isSleepingLocked(); + } + if (!dc.isSleeping()) { + return false; + } + // In case the unlocking order is keyguard-going-away -> screen-turning-on (display is + // sleeping by screen-off-token which may be notified to release from power manager's + // thread), keep the activities resume-able to avoid extra activity lifecycle when + // performing keyguard-going-away. This only applies to default display because currently + // the per-display keyguard-going-away state is assigned from a global signal. + if (!dc.isDefaultDisplay || !dc.isKeyguardGoingAway()) { + return true; + } + return !shouldBeVisible(null /* starting */); } @Override diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index e76e94d58800..e25db7e2a3ec 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1453,7 +1453,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { // Clean up input monitors (for recents) final DisplayContent dc = mController.mAtm.mRootWindowContainer.getDisplayContent(mRecentsDisplayId); - dc.getInputMonitor().setActiveRecents(null /* activity */, null /* layer */); + dc.getInputMonitor().setActiveRecents(null /* task */, null /* layer */); dc.getInputMonitor().updateInputWindowsLw(false /* force */); } if (mTransientLaunches != null) { @@ -2249,7 +2249,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { // Recents has an input-consumer to grab input from the "live tile" app. Set that up here final InputConsumerImpl recentsAnimationInputConsumer = dc.getInputMonitor().getInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION); - ActivityRecord recentsActivity = null; + Task recentsTask = null; if (recentsAnimationInputConsumer != null) { // Find the top-most going-away task and the recents activity. The top-most // is used as layer reference while the recents is used for registering the consumer @@ -2264,20 +2264,20 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { final int activityType = taskInfo.topActivityType; final boolean isRecents = activityType == ACTIVITY_TYPE_HOME || activityType == ACTIVITY_TYPE_RECENTS; - if (isRecents && recentsActivity == null) { - recentsActivity = task.getTopVisibleActivity(); + if (isRecents && recentsTask == null) { + recentsTask = task; } else if (!isRecents && topNonRecentsTask == null) { topNonRecentsTask = task; } } - if (recentsActivity != null && topNonRecentsTask != null) { + if (recentsTask != null && topNonRecentsTask != null) { recentsAnimationInputConsumer.mWindowHandle.touchableRegion.set( topNonRecentsTask.getBounds()); - dc.getInputMonitor().setActiveRecents(recentsActivity, topNonRecentsTask); + dc.getInputMonitor().setActiveRecents(recentsTask, topNonRecentsTask); } } - if (recentsActivity == null) { + if (recentsTask == null) { // No recents activity on `dc`, its probably on a different display. return; } diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java index 1d2b693995c8..9bbf10243133 100644 --- a/services/core/java/com/android/server/wm/TransitionController.java +++ b/services/core/java/com/android/server/wm/TransitionController.java @@ -52,8 +52,8 @@ import android.window.WindowContainerTransaction; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.protolog.ProtoLog; import com.android.internal.protolog.ProtoLogGroup; +import com.android.internal.protolog.ProtoLog; import com.android.server.FgThread; import com.android.window.flags.Flags; diff --git a/services/core/java/com/android/server/wm/TransparentPolicy.java b/services/core/java/com/android/server/wm/TransparentPolicy.java index 016b65ed06d8..f1941afe8f58 100644 --- a/services/core/java/com/android/server/wm/TransparentPolicy.java +++ b/services/core/java/com/android/server/wm/TransparentPolicy.java @@ -201,8 +201,10 @@ class TransparentPolicy { // never has letterbox. return true; } + final AppCompatSizeCompatModePolicy scmPolicy = mActivityRecord.mAppCompatController + .getAppCompatSizeCompatModePolicy(); if (mActivityRecord.getTask() == null || mActivityRecord.fillsParent() - || mActivityRecord.hasAppCompatDisplayInsetsWithoutInheritance()) { + || scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance()) { return true; } return false; diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 4536f244215c..06010bb1642e 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -172,8 +172,8 @@ class WallpaperController { && animatingContainer.getAnimation() != null && animatingContainer.getAnimation().getShowWallpaper(); final boolean hasWallpaper = w.hasWallpaper() || animationWallpaper; - if (isRecentsTransitionTarget(w) || isBackNavigationTarget(w)) { - if (DEBUG_WALLPAPER) Slog.v(TAG, "Found recents animation wallpaper target: " + w); + if (isBackNavigationTarget(w)) { + if (DEBUG_WALLPAPER) Slog.v(TAG, "Found back animation wallpaper target: " + w); mFindResults.setWallpaperTarget(w); return true; } else if (hasWallpaper @@ -199,15 +199,6 @@ class WallpaperController { return false; }; - private boolean isRecentsTransitionTarget(WindowState w) { - if (w.mTransitionController.isShellTransitionsEnabled()) { - return false; - } - // The window is either the recents activity or is in the task animating by the recents. - final RecentsAnimationController controller = mService.getRecentsAnimationController(); - return controller != null && controller.isWallpaperVisible(w); - } - private boolean isBackNavigationTarget(WindowState w) { // The window is in animating by back navigation and set to show wallpaper. return mService.mAtmService.mBackNavigationController.isWallpaperVisible(w); @@ -928,12 +919,6 @@ class WallpaperController { Slog.v(TAG, "*** WALLPAPER DRAW TIMEOUT"); } - // If there was a pending recents animation, start the animation anyways (it's better - // to not see the wallpaper than for the animation to not start) - if (mService.getRecentsAnimationController() != null) { - mService.getRecentsAnimationController().startAnimation(); - } - // If there was a pending back navigation animation that would show wallpaper, start // the animation due to it was skipped in previous surface placement. mService.mAtmService.mBackNavigationController.startAnimation(); diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java index 384d111eb058..89ad5640ef83 100644 --- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java +++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java @@ -161,15 +161,7 @@ class WallpaperWindowToken extends WindowToken { mDisplayContent.mWallpaperController.getWallpaperTarget(); if (visible && wallpaperTarget != null) { - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); - if (recentsAnimationController != null - && recentsAnimationController.isAnimatingTask(wallpaperTarget.getTask())) { - // If the Recents animation is running, and the wallpaper target is the animating - // task we want the wallpaper to be rotated in the same orientation as the - // RecentsAnimation's target (e.g the launcher) - recentsAnimationController.linkFixedRotationTransformIfNeeded(this); - } else if ((wallpaperTarget.mActivityRecord == null + if ((wallpaperTarget.mActivityRecord == null // Ignore invisible activity because it may be moving to background. || wallpaperTarget.mActivityRecord.isVisibleRequested()) && wallpaperTarget.mToken.hasFixedRotationTransform()) { diff --git a/services/core/java/com/android/server/wm/WindowContainerThumbnail.java b/services/core/java/com/android/server/wm/WindowContainerThumbnail.java index 57fc4c7a6860..ad8806293bca 100644 --- a/services/core/java/com/android/server/wm/WindowContainerThumbnail.java +++ b/services/core/java/com/android/server/wm/WindowContainerThumbnail.java @@ -121,13 +121,6 @@ class WindowContainerThumbnail implements Animatable { ANIMATION_TYPE_RECENTS); } - /** - * Start animation with existing adapter. - */ - void startAnimation(Transaction t, AnimationAdapter anim, boolean hidden) { - mSurfaceAnimator.startAnimation(t, anim, hidden, ANIMATION_TYPE_RECENTS); - } - private void onAnimationFinished(@AnimationType int type, AnimationAdapter anim) { } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index d8df645bf076..eeda2a734aa4 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -246,7 +246,6 @@ import android.util.MergedConfiguration; import android.util.Pair; import android.util.Slog; import android.util.SparseArray; -import android.util.SparseBooleanArray; import android.util.SparseIntArray; import android.util.TimeUtils; import android.util.TypedValue; @@ -266,7 +265,6 @@ import android.view.IDisplayWindowListener; import android.view.IInputFilter; import android.view.IOnKeyguardExitResult; import android.view.IPinnedTaskListener; -import android.view.IRecentsAnimationRunner; import android.view.IRotationWatcher; import android.view.IScrollCaptureResponseListener; import android.view.ISystemGestureExclusionListener; @@ -681,7 +679,6 @@ public class WindowManagerService extends IWindowManager.Stub private final SparseIntArray mOrientationMapping = new SparseIntArray(); final AccessibilityController mAccessibilityController; - private RecentsAnimationController mRecentsAnimationController; Watermark mWatermark; StrictModeFlash mStrictModeFlash; @@ -1159,17 +1156,12 @@ public class WindowManagerService extends IWindowManager.Stub return; } - // While running a recents animation, this will get called early because we show the - // recents animation target activity immediately when the animation starts. Defer the - // mLaunchTaskBehind updates until recents animation finishes. - if (atoken.mLaunchTaskBehind && !isRecentsAnimationTarget(atoken)) { + if (atoken.mLaunchTaskBehind) { mAtmService.mTaskSupervisor.scheduleLaunchTaskBehindComplete(atoken.token); atoken.mLaunchTaskBehind = false; } else { atoken.updateReportedVisibilityLocked(); - // We should also defer sending the finished callback until the recents animation - // successfully finishes. - if (atoken.mEnteringAnimation && !isRecentsAnimationTarget(atoken)) { + if (atoken.mEnteringAnimation) { atoken.mEnteringAnimation = false; if (atoken.attachedToProcess()) { try { @@ -3168,7 +3160,7 @@ public class WindowManagerService extends IWindowManager.Stub } // TODO(multi-display): remove when no default display use case. - // (i.e. KeyguardController / RecentsAnimation) + // (i.e. KeyguardController) public void executeAppTransition() { if (!checkCallingPermission(MANAGE_APP_TOKENS, "executeAppTransition()")) { throw new SecurityException("Requires MANAGE_APP_TOKENS permission"); @@ -3176,57 +3168,6 @@ public class WindowManagerService extends IWindowManager.Stub getDefaultDisplayContentLocked().executeAppTransition(); } - void initializeRecentsAnimation(int targetActivityType, - IRecentsAnimationRunner recentsAnimationRunner, - RecentsAnimationController.RecentsAnimationCallbacks callbacks, int displayId, - SparseBooleanArray recentTaskIds, ActivityRecord targetActivity) { - mRecentsAnimationController = new RecentsAnimationController(this, recentsAnimationRunner, - callbacks, displayId); - mRoot.getDisplayContent(displayId).mAppTransition.updateBooster(); - mRecentsAnimationController.initialize(targetActivityType, recentTaskIds, targetActivity); - } - - @VisibleForTesting - void setRecentsAnimationController(RecentsAnimationController controller) { - mRecentsAnimationController = controller; - } - - RecentsAnimationController getRecentsAnimationController() { - return mRecentsAnimationController; - } - - void cancelRecentsAnimation( - @RecentsAnimationController.ReorderMode int reorderMode, String reason) { - if (mRecentsAnimationController != null) { - // This call will call through to cleanupAnimation() below after the animation is - // canceled - mRecentsAnimationController.cancelAnimation(reorderMode, reason); - } - } - - - void cleanupRecentsAnimation(@RecentsAnimationController.ReorderMode int reorderMode) { - if (mRecentsAnimationController != null) { - final RecentsAnimationController controller = mRecentsAnimationController; - mRecentsAnimationController = null; - controller.cleanupAnimation(reorderMode); - // TODO(multi-display): currently only default display support recents animation. - final DisplayContent dc = getDefaultDisplayContentLocked(); - if (dc.mAppTransition.isTransitionSet()) { - dc.mSkipAppTransitionAnimation = true; - } - dc.forAllWindowContainers((wc) -> { - if (wc.isAnimating(TRANSITION, ANIMATION_TYPE_APP_TRANSITION)) { - wc.cancelAnimation(); - } - }); - } - } - - boolean isRecentsAnimationTarget(ActivityRecord r) { - return mRecentsAnimationController != null && mRecentsAnimationController.isTargetApp(r); - } - boolean isValidPictureInPictureAspectRatio(DisplayContent displayContent, float aspectRatio) { return displayContent.getPinnedTaskController().isValidPictureInPictureAspectRatio( aspectRatio); @@ -3258,11 +3199,6 @@ public class WindowManagerService extends IWindowManager.Stub } @Override - public void triggerAnimationFailsafe() { - mH.sendEmptyMessage(H.ANIMATION_FAILSAFE); - } - - @Override public void onKeyguardShowingAndNotOccludedChanged() { mH.sendEmptyMessage(H.RECOMPUTE_FOCUS); dispatchKeyguardLockedState(); @@ -5652,7 +5588,6 @@ public class WindowManagerService extends IWindowManager.Stub public static final int UPDATE_ANIMATION_SCALE = 51; public static final int WINDOW_HIDE_TIMEOUT = 52; public static final int SET_HAS_OVERLAY_UI = 58; - public static final int ANIMATION_FAILSAFE = 60; public static final int RECOMPUTE_FOCUS = 61; public static final int ON_POINTER_DOWN_OUTSIDE_FOCUS = 62; public static final int WINDOW_STATE_BLAST_SYNC_TIMEOUT = 64; @@ -5887,14 +5822,6 @@ public class WindowManagerService extends IWindowManager.Stub mAmInternal.setHasOverlayUi(msg.arg1, msg.arg2 == 1); break; } - case ANIMATION_FAILSAFE: { - synchronized (mGlobalLock) { - if (mRecentsAnimationController != null) { - mRecentsAnimationController.scheduleFailsafe(); - } - } - break; - } case RECOMPUTE_FOCUS: { synchronized (mGlobalLock) { updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, @@ -7036,10 +6963,6 @@ public class WindowManagerService extends IWindowManager.Stub pw.print(" window="); pw.print(mWindowAnimationScaleSetting); pw.print(" transition="); pw.print(mTransitionAnimationScaleSetting); pw.print(" animator="); pw.println(mAnimatorDurationScaleSetting); - if (mRecentsAnimationController != null) { - pw.print(" mRecentsAnimationController="); pw.println(mRecentsAnimationController); - mRecentsAnimationController.dump(pw, " "); - } } } @@ -9024,6 +8947,22 @@ public class WindowManagerService extends IWindowManager.Stub // display it's on to the top since that window won't be able to get focus anyway. return; } + + final ActivityRecord touchedApp = t.getActivityRecord(); + if (touchedApp != null && touchedApp.getTask() != null) { + final ActivityRecord top = touchedApp.getTask().topRunningActivity(); + if (top != touchedApp && top.getTaskFragment().getBounds().contains( + touchedApp.getTaskFragment().getBounds())) { + // This is a special case where the pointer-down-outside focus on an Activity that's + // entirely occluded by the task top running activity, this is possible if the + // pointer-down-outside-focus event is delayed (after new activity started on top). + // In that case, drop the event to prevent changing focus to a background activity. + Slog.w(TAG, "onPointerDownOutsideFocusLocked, drop event because " + touchedApp + + " is occluded and should not be focused."); + return; + } + } + clearPointerDownOutsideFocusRunnable(); if (shouldDelayTouchOutside(t)) { @@ -9075,17 +9014,6 @@ public class WindowManagerService extends IWindowManager.Stub } clearPointerDownOutsideFocusRunnable(); - if (mRecentsAnimationController != null - && mRecentsAnimationController.getTargetAppMainWindow() == t) { - // If there is an active recents animation and touched window is the target, - // then ignore the touch. The target already handles touches using its own - // input monitor and we don't want to trigger any lifecycle changes from - // focusing another window. - // TODO(b/186770026): We should remove this once we support multiple resumed - // activities while in overview - return; - } - final WindowState w = t.getWindowState(); if (w != null) { final Task task = w.getTask(); diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index d2aebdeed99a..d96ebc6655ac 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -284,14 +284,11 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio static final int ANIMATING_REASON_REMOTE_ANIMATION = 1; /** It is set for wakefulness transition. */ static final int ANIMATING_REASON_WAKEFULNESS_CHANGE = 1 << 1; - /** Whether the legacy {@link RecentsAnimation} is running. */ - static final int ANIMATING_REASON_LEGACY_RECENT_ANIMATION = 1 << 2; @Retention(RetentionPolicy.SOURCE) @IntDef({ ANIMATING_REASON_REMOTE_ANIMATION, ANIMATING_REASON_WAKEFULNESS_CHANGE, - ANIMATING_REASON_LEGACY_RECENT_ANIMATION, }) @interface AnimatingReason {} @@ -2017,14 +2014,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio return mStoppedState == STOPPED_STATE_FIRST_LAUNCH; } - void setRunningRecentsAnimation(boolean running) { - if (running) { - addAnimatingReason(ANIMATING_REASON_LEGACY_RECENT_ANIMATION); - } else { - removeAnimatingReason(ANIMATING_REASON_LEGACY_RECENT_ANIMATION); - } - } - void setRunningRemoteAnimation(boolean running) { if (running) { addAnimatingReason(ANIMATING_REASON_REMOTE_ANIMATION); @@ -2119,9 +2108,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio if ((animatingReasons & ANIMATING_REASON_WAKEFULNESS_CHANGE) != 0) { pw.print("wakefulness|"); } - if ((animatingReasons & ANIMATING_REASON_LEGACY_RECENT_ANIMATION) != 0) { - pw.print("legacy-recents"); - } pw.println(); } if (mUseFifoUiScheduling) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index eed0cf78baf4..81bce186f99e 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1971,13 +1971,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP * it must be drawn before allDrawn can become true. */ boolean isInteresting() { - final RecentsAnimationController recentsAnimationController = - mWmService.getRecentsAnimationController(); return mActivityRecord != null && (!mActivityRecord.isFreezingScreen() || !mAppFreezing) - && mViewVisibility == View.VISIBLE - && (recentsAnimationController == null - || recentsAnimationController.isInterestingForAllDrawn(this)); + && mViewVisibility == View.VISIBLE; } /** diff --git a/services/core/java/com/android/server/wm/WindowTracingDataSource.java b/services/core/java/com/android/server/wm/WindowTracingDataSource.java index 2c5a4538863e..73ecbb47f0d2 100644 --- a/services/core/java/com/android/server/wm/WindowTracingDataSource.java +++ b/services/core/java/com/android/server/wm/WindowTracingDataSource.java @@ -35,7 +35,6 @@ import android.util.proto.ProtoInputStream; import java.io.IOException; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; public final class WindowTracingDataSource extends DataSource<WindowTracingDataSource.Instance, WindowTracingDataSource.TlsState, Void> { @@ -77,15 +76,11 @@ public final class WindowTracingDataSource extends DataSource<WindowTracingDataS private static final String TAG = "WindowTracingDataSource"; @NonNull - private final WeakReference<Consumer<Config>> mOnStartCallback; - @NonNull - private final WeakReference<Consumer<Config>> mOnStopCallback; + private final WeakReference<WindowTracingPerfetto> mWindowTracing; - public WindowTracingDataSource(@NonNull Consumer<Config> onStart, - @NonNull Consumer<Config> onStop) { + public WindowTracingDataSource(WindowTracingPerfetto windowTracing) { super(DATA_SOURCE_NAME); - mOnStartCallback = new WeakReference(onStart); - mOnStopCallback = new WeakReference(onStop); + mWindowTracing = new WeakReference<>(windowTracing); Producer.init(InitArguments.DEFAULTS); DataSourceParams params = @@ -103,17 +98,17 @@ public final class WindowTracingDataSource extends DataSource<WindowTracingDataS return new Instance(this, instanceIndex, config != null ? config : CONFIG_DEFAULT) { @Override protected void onStart(StartCallbackArguments args) { - Consumer<Config> callback = mOnStartCallback.get(); - if (callback != null) { - callback.accept(mConfig); + WindowTracingPerfetto windowTracing = mWindowTracing.get(); + if (windowTracing != null) { + windowTracing.onStart(mConfig); } } @Override protected void onStop(StopCallbackArguments args) { - Consumer<Config> callback = mOnStopCallback.get(); - if (callback != null) { - callback.accept(mConfig); + WindowTracingPerfetto windowTracing = mWindowTracing.get(); + if (windowTracing != null) { + windowTracing.onStop(mConfig); } } }; diff --git a/services/core/java/com/android/server/wm/WindowTracingPerfetto.java b/services/core/java/com/android/server/wm/WindowTracingPerfetto.java index cf948ca76f99..22d6c863fd4f 100644 --- a/services/core/java/com/android/server/wm/WindowTracingPerfetto.java +++ b/services/core/java/com/android/server/wm/WindowTracingPerfetto.java @@ -35,8 +35,7 @@ class WindowTracingPerfetto extends WindowTracing { private final AtomicInteger mCountSessionsOnFrame = new AtomicInteger(); private final AtomicInteger mCountSessionsOnTransaction = new AtomicInteger(); - private final WindowTracingDataSource mDataSource = new WindowTracingDataSource( - this::onStart, this::onStop); + private final WindowTracingDataSource mDataSource = new WindowTracingDataSource(this); WindowTracingPerfetto(WindowManagerService service, Choreographer choreographer) { this(service, choreographer, service.mGlobalLock); @@ -156,7 +155,7 @@ class WindowTracingPerfetto extends WindowTracing { return mCountSessionsOnTransaction.get() > 0; } - private void onStart(WindowTracingDataSource.Config config) { + void onStart(WindowTracingDataSource.Config config) { if (config.mLogFrequency == WindowTracingLogFrequency.FRAME) { mCountSessionsOnFrame.incrementAndGet(); } else if (config.mLogFrequency == WindowTracingLogFrequency.TRANSACTION) { @@ -168,7 +167,7 @@ class WindowTracingPerfetto extends WindowTracing { log(WHERE_START_TRACING); } - private void onStop(WindowTracingDataSource.Config config) { + void onStop(WindowTracingDataSource.Config config) { if (config.mLogFrequency == WindowTracingLogFrequency.FRAME) { mCountSessionsOnFrame.decrementAndGet(); } else if (config.mLogFrequency == WindowTracingLogFrequency.TRANSACTION) { diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java index ee96c2abbf46..3dd2f24aa4e4 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java @@ -22,6 +22,7 @@ import static com.android.server.am.ActivityManagerService.Injector; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -42,6 +43,8 @@ import android.os.Process; import android.platform.test.annotations.Presubmit; import android.text.TextUtils; +import com.android.internal.os.Clock; +import com.android.internal.os.MonotonicClock; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.appop.AppOpsService; @@ -121,11 +124,18 @@ public class ApplicationStartInfoTest { LocalServices.removeServiceForTest(PackageManagerInternal.class); LocalServices.addService(PackageManagerInternal.class, mPackageManagerInt); + mAppStartInfoTracker.mMonotonicClock = new MonotonicClock( + Clock.SYSTEM_CLOCK.elapsedRealtime(), Clock.SYSTEM_CLOCK); mAppStartInfoTracker.clearProcessStartInfo(true); mAppStartInfoTracker.mAppStartInfoLoaded.set(true); mAppStartInfoTracker.mAppStartInfoHistoryListSize = mAppStartInfoTracker.APP_START_INFO_HISTORY_LIST_SIZE; doNothing().when(mAppStartInfoTracker).schedulePersistProcessStartInfo(anyBoolean()); + + mAppStartInfoTracker.mProcStartStoreDir = new File(mContext.getFilesDir(), + AppStartInfoTracker.APP_START_STORE_DIR); + mAppStartInfoTracker.mProcStartInfoFile = new File(mAppStartInfoTracker.mProcStartStoreDir, + AppStartInfoTracker.APP_START_INFO_FILE); } @After @@ -135,11 +145,8 @@ public class ApplicationStartInfoTest { @Test public void testApplicationStartInfo() throws Exception { - mAppStartInfoTracker.mProcStartStoreDir = new File(mContext.getFilesDir(), - AppStartInfoTracker.APP_START_STORE_DIR); + // Make sure we can write to the file. assertTrue(FileUtils.createDir(mAppStartInfoTracker.mProcStartStoreDir)); - mAppStartInfoTracker.mProcStartInfoFile = new File(mAppStartInfoTracker.mProcStartStoreDir, - AppStartInfoTracker.APP_START_INFO_FILE); final long appStartTimestampIntentStarted = 1000000; final long appStartTimestampActivityLaunchFinished = 2000000; @@ -482,6 +489,79 @@ public class ApplicationStartInfoTest { verifyInProgressRecordsSize(AppStartInfoTracker.MAX_IN_PROGRESS_RECORDS); } + /** + * Test to make sure that records are returned in correct order, from most recently added at + * index 0 to least recently added at index size - 1. + */ + @Test + public void testHistoricalRecordsOrdering() throws Exception { + // Clear old records + mAppStartInfoTracker.clearProcessStartInfo(false); + + // Add some records with timestamps 0 decreasing as clock increases. + ProcessRecord app = makeProcessRecord( + APP_1_PID_1, // pid + APP_1_UID, // uid + APP_1_UID, // packageUid + null, // definingUid + APP_1_PROCESS_NAME, // processName + APP_1_PACKAGE_NAME); // packageName + + mAppStartInfoTracker.handleProcessBroadcastStart(3, app, buildIntent(COMPONENT), + false /* isAlarm */); + mAppStartInfoTracker.handleProcessBroadcastStart(2, app, buildIntent(COMPONENT), + false /* isAlarm */); + mAppStartInfoTracker.handleProcessBroadcastStart(1, app, buildIntent(COMPONENT), + false /* isAlarm */); + + // Get records + ArrayList<ApplicationStartInfo> list = new ArrayList<ApplicationStartInfo>(); + mAppStartInfoTracker.getStartInfo(null, APP_1_UID, 0, 0, list); + + // Confirm that records are in correct order, with index 0 representing the most recently + // added record and index size - 1 representing the least recently added one. + assertEquals(3, list.size()); + assertEquals(1L, list.get(0).getStartupTimestamps().get(0).longValue()); + assertEquals(2L, list.get(1).getStartupTimestamps().get(0).longValue()); + assertEquals(3L, list.get(2).getStartupTimestamps().get(0).longValue()); + } + + /** + * Test to make sure that persist and restore correctly maintains the state of the monotonic + * clock. + */ + @Test + public void testPersistAndRestoreMonotonicClock() { + // Make sure we can write to the file. + assertTrue(FileUtils.createDir(mAppStartInfoTracker.mProcStartStoreDir)); + + // No need to persist records for this test, clear any that may be there. + mAppStartInfoTracker.clearProcessStartInfo(false); + + // Set clock with an arbitrary 5 minute offset, just needs to be longer than it would take + // for code to run. + mAppStartInfoTracker.mMonotonicClock = new MonotonicClock(5 * 60 * 1000, + Clock.SYSTEM_CLOCK); + + // Record the current time. + long originalMonotonicTime = mAppStartInfoTracker.mMonotonicClock.monotonicTime(); + + // Now persist the process start info. Records were cleared above so this should just + // persist the monotonic time. + mAppStartInfoTracker.persistProcessStartInfo(); + + // Null out the clock to make sure its set on load. + mAppStartInfoTracker.mMonotonicClock = null; + assertNull(mAppStartInfoTracker.mMonotonicClock); + + // Now load from disk. + mAppStartInfoTracker.loadExistingProcessStartInfo(); + + // Confirm clock has been set and that its current time is greater than the previous one. + assertNotNull(mAppStartInfoTracker.mMonotonicClock); + assertTrue(mAppStartInfoTracker.mMonotonicClock.monotonicTime() > originalMonotonicTime); + } + private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) { try { Field field = clazz.getDeclaredField(fieldName); diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java index 0ba74c62b9fe..100b54897573 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java @@ -1176,6 +1176,17 @@ public final class BroadcastQueueModernImplTest extends BaseBroadcastQueueTest { verifyPendingRecords(greenQueue, List.of(screenOff, screenOn)); verifyPendingRecords(redQueue, List.of(screenOff)); verifyPendingRecords(blueQueue, List.of(screenOff, screenOn)); + + final BroadcastRecord screenOffRecord = makeBroadcastRecord(screenOff, screenOnOffOptions, + List.of(greenReceiver, redReceiver, blueReceiver), false); + screenOffRecord.setDeliveryState(2, BroadcastRecord.DELIVERY_DEFERRED, + "testDeliveryGroupPolicy_prioritized_diffReceivers"); + mImpl.enqueueBroadcastLocked(screenOffRecord); + mImpl.enqueueBroadcastLocked(makeBroadcastRecord(screenOn, screenOnOffOptions, + List.of(greenReceiver, blueReceiver), false)); + verifyPendingRecords(greenQueue, List.of(screenOff, screenOn)); + verifyPendingRecords(redQueue, List.of(screenOff)); + verifyPendingRecords(blueQueue, List.of(screenOn)); } /** diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerWithAccessibilityWindowTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerWithAccessibilityWindowTest.java index 9083a1e28e2c..19041451c8eb 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerWithAccessibilityWindowTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerWithAccessibilityWindowTest.java @@ -1319,7 +1319,6 @@ public class AccessibilityWindowManagerWithAccessibilityWindowTest { final AccessibilityWindow window = Mockito.mock(AccessibilityWindow.class); when(window.getWindowInfo()).thenReturn(windowInfo); - when(window.ignoreRecentsAnimationForAccessibility()).thenReturn(false); when(window.isFocused()).thenAnswer(invocation -> windowInfo.focused); when(window.isTouchable()).thenReturn(true); when(window.getType()).thenReturn(windowInfo.type); diff --git a/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java b/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java index e45ab319146c..beed0a3d413c 100644 --- a/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java +++ b/services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java @@ -111,6 +111,9 @@ public class VolumeHelperTest { private static final AudioDeviceAttributes DEVICE_SPEAKER_OUT = new AudioDeviceAttributes( AudioDeviceAttributes.ROLE_OUTPUT, AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, ""); + /** Choose a default stream volume value which does not depend on min/max. */ + private static final int DEFAULT_STREAM_VOLUME = 2; + @Rule public final MockitoRule mockito = MockitoJUnit.rule(); @@ -144,6 +147,8 @@ public class VolumeHelperTest { private TestLooper mTestLooper; + private boolean mIsAutomotive; + public static final int[] BASIC_VOLUME_BEHAVIORS = { AudioManager.DEVICE_VOLUME_BEHAVIOR_VARIABLE, AudioManager.DEVICE_VOLUME_BEHAVIOR_FULL, @@ -232,9 +237,10 @@ public class VolumeHelperTest { || packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)); final boolean isSingleVolume = mContext.getResources().getBoolean( Resources.getSystem().getIdentifier("config_single_volume", "bool", "android")); - final boolean automotiveHardened = mContext.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_AUTOMOTIVE) && autoPublicVolumeApiHardening(); - assumeFalse("Skipping test for fixed, TV, single volume and auto devices", + mIsAutomotive = mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE); + final boolean automotiveHardened = mIsAutomotive && autoPublicVolumeApiHardening(); + assumeFalse("Skipping test for fixed, TV, single volume and auto hardened devices", useFixedVolume || isTelevision || isSingleVolume || automotiveHardened); InstrumentationRegistry.getInstrumentation().getUiAutomation() @@ -249,15 +255,14 @@ public class VolumeHelperTest { {STREAM_MUSIC, STREAM_NOTIFICATION, STREAM_RING, STREAM_ALARM, STREAM_SYSTEM, STREAM_VOICE_CALL, STREAM_ACCESSIBILITY}; for (int streamType : usedStreamTypes) { - final int streamVolume = (mAm.getStreamMinVolume(streamType) + mAm.getStreamMaxVolume( - streamType)) / 2; - - mAudioService.setStreamVolume(streamType, streamVolume, /*flags=*/0, + mAudioService.setStreamVolume(streamType, DEFAULT_STREAM_VOLUME, /*flags=*/0, mContext.getOpPackageName()); } - mAudioService.setRingerModeInternal(RINGER_MODE_NORMAL, mContext.getOpPackageName()); - mAudioService.setRingerModeExternal(RINGER_MODE_NORMAL, mContext.getOpPackageName()); + if (!mIsAutomotive) { + mAudioService.setRingerModeInternal(RINGER_MODE_NORMAL, mContext.getOpPackageName()); + mAudioService.setRingerModeExternal(RINGER_MODE_NORMAL, mContext.getOpPackageName()); + } } private AudioVolumeGroup getStreamTypeVolumeGroup(int streamType) { @@ -297,6 +302,7 @@ public class VolumeHelperTest { @Test public void setStreamRingVolume0_setsRingerModeVibrate() throws Exception { + assumeFalse("Skipping ringer mode test on automotive", mIsAutomotive); mAudioService.setStreamVolume(STREAM_RING, 0, /*flags=*/0, mContext.getOpPackageName()); mTestLooper.dispatchAll(); @@ -462,6 +468,7 @@ public class VolumeHelperTest { @Test public void flagAllowRingerModes_onSystemStreams_changesMode() throws Exception { + assumeFalse("Skipping ringer mode test on automotive", mIsAutomotive); mAudioService.setStreamVolume(STREAM_SYSTEM, mAudioService.getStreamMinVolume(STREAM_SYSTEM), /*flags=*/0, mContext.getOpPackageName()); @@ -476,6 +483,7 @@ public class VolumeHelperTest { @Test public void flagAllowRingerModesAbsent_onNonSystemStreams_noModeChange() throws Exception { + assumeFalse("Skipping ringer mode test on automotive", mIsAutomotive); mAudioService.setStreamVolume(STREAM_MUSIC, mAudioService.getStreamMinVolume(STREAM_MUSIC), /*flags=*/0, mContext.getOpPackageName()); @@ -544,17 +552,23 @@ public class VolumeHelperTest { mAudioService.setDeviceVolume(volMin, usbDevice, mContext.getOpPackageName()); mTestLooper.dispatchAll(); - assertEquals(mAudioService.getDeviceVolume(volMin, usbDevice, - mContext.getOpPackageName()), volMin); + if (!mIsAutomotive) { + // there is a min/max index mismatch in automotive + assertEquals(mAudioService.getDeviceVolume(volMin, usbDevice, + mContext.getOpPackageName()), volMin); + } verify(mSpyAudioSystem, atLeast(1)).setStreamVolumeIndexAS( - STREAM_MUSIC, minIndex, AudioSystem.DEVICE_OUT_USB_DEVICE); + eq(STREAM_MUSIC), anyInt(), eq(AudioSystem.DEVICE_OUT_USB_DEVICE)); mAudioService.setDeviceVolume(volMid, usbDevice, mContext.getOpPackageName()); mTestLooper.dispatchAll(); - assertEquals(mAudioService.getDeviceVolume(volMid, usbDevice, - mContext.getOpPackageName()), volMid); + if (!mIsAutomotive) { + // there is a min/max index mismatch in automotive + assertEquals(mAudioService.getDeviceVolume(volMid, usbDevice, + mContext.getOpPackageName()), volMid); + } verify(mSpyAudioSystem, atLeast(1)).setStreamVolumeIndexAS( - STREAM_MUSIC, midIndex, AudioSystem.DEVICE_OUT_USB_DEVICE); + eq(STREAM_MUSIC), anyInt(), eq(AudioSystem.DEVICE_OUT_USB_DEVICE)); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 1423811da0c1..0d8b7208bcac 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -705,7 +705,7 @@ public class ActivityRecordTests extends WindowTestsBase { assertEquals(ORIENTATION_PORTRAIT, activity.getConfiguration().orientation); // Clear size compat. - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); activity.ensureActivityConfiguration(); mDisplayContent.sendNewConfiguration(); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java index d7cef599358a..a7a08b25fba2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java @@ -499,7 +499,7 @@ class AppCompatActivityRobot { activity.setRequestedOrientation(screenOrientation); } // Make sure to use the provided configuration to construct the size compat fields. - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); activity.ensureActivityConfiguration(); // Make sure the display configuration reflects the change of activity. if (activity.mDisplayContent.updateOrientation()) { diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 58e919dda964..f2ea1c972b90 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1732,25 +1732,6 @@ public class DisplayContentTests extends WindowTestsBase { assertFalse(mDisplayContent.hasTopFixedRotationLaunchingApp()); } - @SetupWindows(addWindows = W_ACTIVITY) - @Test - public void testRotateSeamlesslyWithFixedRotation() { - final DisplayRotation displayRotation = mDisplayContent.getDisplayRotation(); - final ActivityRecord app = mAppWindow.mActivityRecord; - mDisplayContent.setFixedRotationLaunchingAppUnchecked(app); - mAppWindow.mAttrs.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE; - - // Use seamless rotation if the top app is rotated. - assertTrue(displayRotation.shouldRotateSeamlessly(ROTATION_0 /* oldRotation */, - ROTATION_90 /* newRotation */, false /* forceUpdate */)); - - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(app); - - // Use normal rotation because animating recents is an intermediate state. - assertFalse(displayRotation.shouldRotateSeamlessly(ROTATION_0 /* oldRotation */, - ROTATION_90 /* newRotation */, false /* forceUpdate */)); - } - @Test public void testFixedRotationWithPip() { final DisplayContent displayContent = mDefaultDisplay; @@ -1828,49 +1809,6 @@ public class DisplayContentTests extends WindowTestsBase { assertFalse(mDisplayContent.hasTopFixedRotationLaunchingApp()); } - @Test - public void testRecentsNotRotatingWithFixedRotation() { - unblockDisplayRotation(mDisplayContent); - final DisplayRotation displayRotation = mDisplayContent.getDisplayRotation(); - // Skip freezing so the unrelated conditions in updateRotationUnchecked won't disturb. - doNothing().when(mWm).startFreezingDisplay(anyInt(), anyInt(), any(), anyInt()); - - final ActivityRecord activity = createActivityRecord(mDisplayContent); - final ActivityRecord recentsActivity = createActivityRecord(mDisplayContent); - recentsActivity.setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR); - doReturn(mock(RecentsAnimationController.class)).when(mWm).getRecentsAnimationController(); - - // Do not rotate if the recents animation is animating on top. - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); - displayRotation.setRotation((displayRotation.getRotation() + 1) % 4); - assertFalse(displayRotation.updateRotationUnchecked(false)); - - // Rotation can be updated if the recents animation is finished. - mDisplayContent.mFixedRotationTransitionListener.onFinishRecentsAnimation(); - assertTrue(displayRotation.updateRotationUnchecked(false)); - - // Rotation can be updated if the policy is not ok to animate (e.g. going to sleep). - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); - displayRotation.setRotation((displayRotation.getRotation() + 1) % 4); - ((TestWindowManagerPolicy) mWm.mPolicy).mOkToAnimate = false; - assertTrue(displayRotation.updateRotationUnchecked(false)); - - // Rotation can be updated if the recents animation is animating but it is not on top, e.g. - // switching activities in different orientations by quickstep gesture. - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); - mDisplayContent.setFixedRotationLaunchingAppUnchecked(activity); - displayRotation.setRotation((displayRotation.getRotation() + 1) % 4); - assertTrue(displayRotation.updateRotationUnchecked(false)); - - // The recents activity should not apply fixed rotation if the top activity is not opaque. - mDisplayContent.mFocusedApp = activity; - doReturn(false).when(mDisplayContent.mFocusedApp).occludesParent(); - doReturn(ROTATION_90).when(mDisplayContent).rotationForActivityInDifferentOrientation( - eq(recentsActivity)); - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); - assertFalse(recentsActivity.hasFixedRotationTransform()); - } - @EnableFlags(com.android.window.flags.Flags.FLAG_RESPECT_NON_TOP_VISIBLE_FIXED_ORIENTATION) @Test public void testRespectNonTopVisibleFixedOrientation() { diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java deleted file mode 100644 index 63e3e5cf865a..000000000000 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java +++ /dev/null @@ -1,834 +0,0 @@ -/* - * 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.server.wm; - -import static android.content.res.Configuration.ORIENTATION_PORTRAIT; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; -import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; -import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; - -import static com.android.dx.mockito.inline.extended.ExtendedMockito.atLeast; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.times; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoMoreInteractions; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; -import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE; -import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION; -import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_TOP; -import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS; -import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_TOKEN_TRANSFORM; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; - -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.os.Binder; -import android.os.IBinder; -import android.os.IInterface; -import android.platform.test.annotations.Presubmit; -import android.util.SparseBooleanArray; -import android.view.IRecentsAnimationRunner; -import android.view.SurfaceControl; -import android.view.WindowManager.LayoutParams; -import android.window.TaskSnapshot; - -import androidx.test.filters.SmallTest; - -import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; - -import com.google.common.truth.Truth; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.ArrayList; - -/** - * Build/Install/Run: - * atest WmTests:RecentsAnimationControllerTest - */ -@SmallTest -@Presubmit -@RunWith(WindowTestRunner.class) -public class RecentsAnimationControllerTest extends WindowTestsBase { - - @Mock SurfaceControl mMockLeash; - @Mock SurfaceControl.Transaction mMockTransaction; - @Mock OnAnimationFinishedCallback mFinishedCallback; - @Mock IRecentsAnimationRunner mMockRunner; - @Mock RecentsAnimationController.RecentsAnimationCallbacks mAnimationCallbacks; - @Mock TaskSnapshot mMockTaskSnapshot; - private RecentsAnimationController mController; - private Task mRootHomeTask; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - doNothing().when(mWm.mRoot).performSurfacePlacement(); - when(mMockRunner.asBinder()).thenReturn(new Binder()); - mController = spy(new RecentsAnimationController(mWm, mMockRunner, mAnimationCallbacks, - DEFAULT_DISPLAY)); - mRootHomeTask = mDefaultDisplay.getDefaultTaskDisplayArea().getRootHomeTask(); - assertNotNull(mRootHomeTask); - } - - @Test - public void testRemovedBeforeStarted_expectCanceled() throws Exception { - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - AnimationAdapter adapter = mController.addAnimation(activity.getTask(), - false /* isRecentTaskInvisible */); - adapter.startAnimation(mMockLeash, mMockTransaction, ANIMATION_TYPE_RECENTS, - mFinishedCallback); - - // The activity doesn't contain window so the animation target cannot be created. - mController.startAnimation(); - - // Verify that the finish callback to reparent the leash is called - verify(mFinishedCallback).onAnimationFinished(eq(ANIMATION_TYPE_RECENTS), eq(adapter)); - // Verify the animation canceled callback to the app was made - verify(mMockRunner).onAnimationCanceled(null /* taskIds */, null /* taskSnapshots */); - verifyNoMoreInteractionsExceptAsBinder(mMockRunner); - } - - @Test - public void testCancelAfterRemove_expectIgnored() { - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - AnimationAdapter adapter = mController.addAnimation(activity.getTask(), - false /* isRecentTaskInvisible */); - adapter.startAnimation(mMockLeash, mMockTransaction, ANIMATION_TYPE_RECENTS, - mFinishedCallback); - - // Remove the app window so that the animation target can not be created - activity.removeImmediately(); - mController.startAnimation(); - mController.cleanupAnimation(REORDER_KEEP_IN_PLACE); - try { - mController.cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "test"); - } catch (Exception e) { - fail("Unexpected failure when canceling animation after finishing it"); - } - } - - @Test - public void testIncludedApps_expectTargetAndVisible() { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final ActivityRecord hiddenActivity = createActivityRecord(mDefaultDisplay); - hiddenActivity.setVisible(false); - mDefaultDisplay.getConfiguration().windowConfiguration.setRotation( - mDefaultDisplay.getRotation()); - initializeRecentsAnimationController(mController, homeActivity); - - // Ensure that we are animating the target activity as well - assertTrue(mController.isAnimatingTask(homeActivity.getTask())); - assertTrue(mController.isAnimatingTask(activity.getTask())); - assertFalse(mController.isAnimatingTask(hiddenActivity.getTask())); - } - - @Test - public void testLaunchAndStartRecents_expectTargetAndVisible() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final Task task = createTask(mDefaultDisplay); - // Emulate that activity1 has just launched activity2, but app transition has not yet been - // executed. - final ActivityRecord activity1 = createActivityRecord(task); - activity1.setVisible(true); - activity1.setVisibleRequested(false); - activity1.addWindow(createWindowState(new LayoutParams(TYPE_BASE_APPLICATION), activity1)); - - final ActivityRecord activity2 = createActivityRecord(task); - activity2.setVisible(false); - activity2.setVisibleRequested(true); - - mDefaultDisplay.getConfiguration().windowConfiguration.setRotation( - mDefaultDisplay.getRotation()); - initializeRecentsAnimationController(mController, homeActivity); - mController.startAnimation(); - verify(mMockRunner, never()).onAnimationCanceled(null /* taskIds */, - null /* taskSnapshots */); - } - - @Test - public void testWallpaperIncluded_expectTarget() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm, - mock(IBinder.class), true, mDefaultDisplay, true /* ownerCanManageAppTokens */); - spyOn(mDefaultDisplay.mWallpaperController); - doReturn(true).when(mDefaultDisplay.mWallpaperController).isWallpaperVisible(); - - mDefaultDisplay.getConfiguration().windowConfiguration.setRotation( - mDefaultDisplay.getRotation()); - initializeRecentsAnimationController(mController, homeActivity); - mController.startAnimation(); - - // Ensure that we are animating the app and wallpaper target - assertTrue(mController.isAnimatingTask(activity.getTask())); - assertTrue(mController.isAnimatingWallpaper(wallpaperWindowToken)); - } - - @Test - public void testWallpaperAnimatorCanceled_expectAnimationKeepsRunning() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm, - mock(IBinder.class), true, mDefaultDisplay, true /* ownerCanManageAppTokens */); - spyOn(mDefaultDisplay.mWallpaperController); - doReturn(true).when(mDefaultDisplay.mWallpaperController).isWallpaperVisible(); - - mDefaultDisplay.getConfiguration().windowConfiguration.setRotation( - mDefaultDisplay.getRotation()); - initializeRecentsAnimationController(mController, homeActivity); - mController.startAnimation(); - - // Cancel the animation and ensure the controller is still running - wallpaperWindowToken.cancelAnimation(); - assertTrue(mController.isAnimatingTask(activity.getTask())); - assertFalse(mController.isAnimatingWallpaper(wallpaperWindowToken)); - verify(mMockRunner, never()).onAnimationCanceled(null /* taskIds */, - null /* taskSnapshots */); - } - - @Test - public void testFinish_expectTargetAndWallpaperAdaptersRemoved() { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final WindowState hwin1 = createWindow(null, TYPE_BASE_APPLICATION, homeActivity, "hwin1"); - homeActivity.addWindow(hwin1); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm, - mock(IBinder.class), true, mDefaultDisplay, true /* ownerCanManageAppTokens */); - spyOn(mDefaultDisplay.mWallpaperController); - doReturn(true).when(mDefaultDisplay.mWallpaperController).isWallpaperVisible(); - - // Start and finish the animation - initializeRecentsAnimationController(mController, homeActivity); - mController.startAnimation(); - - assertTrue(mController.isAnimatingTask(homeActivity.getTask())); - assertTrue(mController.isAnimatingTask(activity.getTask())); - - // Reset at this point since we may remove adapters that couldn't be created - clearInvocations(mController); - mController.cleanupAnimation(REORDER_MOVE_TO_TOP); - - // Ensure that we remove the task (home & app) and wallpaper adapters - verify(mController, times(2)).removeAnimation(any()); - verify(mController, times(1)).removeWallpaperAnimation(any()); - } - - @Test - public void testDeferCancelAnimation() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - assertEquals(activity.getTask().getTopVisibleActivity(), activity); - assertEquals(activity.findMainWindow(), win1); - - mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */); - assertTrue(mController.isAnimatingTask(activity.getTask())); - - mController.setDeferredCancel(true /* deferred */, false /* screenshot */); - mController.cancelAnimationWithScreenshot(false /* screenshot */); - verify(mMockRunner).onAnimationCanceled(null /* taskIds */, null /* taskSnapshots */); - - // Simulate the app transition finishing - mController.mAppTransitionListener.onAppTransitionStartingLocked(0, 0); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_KEEP_IN_PLACE, false); - } - - @Test - public void testDeferCancelAnimationWithScreenShot() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - assertEquals(activity.getTask().getTopVisibleActivity(), activity); - assertEquals(activity.findMainWindow(), win1); - - RecentsAnimationController.TaskAnimationAdapter adapter = mController.addAnimation( - activity.getTask(), false /* isRecentTaskInvisible */); - assertTrue(mController.isAnimatingTask(activity.getTask())); - - spyOn(mWm.mTaskSnapshotController); - doReturn(mMockTaskSnapshot).when(mWm.mTaskSnapshotController).getSnapshot(anyInt(), - anyInt(), eq(false) /* restoreFromDisk */, eq(false) /* isLowResolution */); - mController.setDeferredCancel(true /* deferred */, true /* screenshot */); - mController.cancelAnimationWithScreenshot(true /* screenshot */); - verify(mMockRunner).onAnimationCanceled(any(int[].class) /* taskIds */, - any(TaskSnapshot[].class) /* taskSnapshots */); - - // Continue the animation (simulating a call to cleanupScreenshot()) - mController.continueDeferredCancelAnimation(); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_KEEP_IN_PLACE, false); - } - - @Test - public void testShouldAnimateWhenNoCancelWithDeferredScreenshot() { - mWm.setRecentsAnimationController(mController); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - assertEquals(activity.getTask().getTopVisibleActivity(), activity); - assertEquals(activity.findMainWindow(), win1); - - mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */); - assertTrue(mController.isAnimatingTask(activity.getTask())); - - // Assume activity transition should animate when no - // IRecentsAnimationController#setDeferCancelUntilNextTransition called. - assertFalse(mController.shouldDeferCancelWithScreenshot()); - assertTrue(activity.shouldAnimate()); - } - - @Test - public void testBinderDiedAfterCancelWithDeferredScreenshot() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - - initializeRecentsAnimationController(mController, homeActivity); - mController.setWillFinishToHome(true); - - // Verify cancel is called with a snapshot and that we've created an overlay - spyOn(mWm.mTaskSnapshotController); - doReturn(mMockTaskSnapshot).when(mWm.mTaskSnapshotController).getSnapshot(anyInt(), - anyInt(), eq(false) /* restoreFromDisk */, eq(false) /* isLowResolution */); - mController.cancelAnimationWithScreenshot(true /* screenshot */); - verify(mMockRunner).onAnimationCanceled(any(), any()); - - // Simulate process crashing and ensure the animation is still canceled - mController.binderDied(); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_KEEP_IN_PLACE, false); - } - - @Test - public void testRecentViewInFixedPortraitWhenTopAppInLandscape() { - makeDisplayPortrait(mDefaultDisplay); - unblockDisplayRotation(mDefaultDisplay); - mWm.setRecentsAnimationController(mController); - - final ActivityRecord homeActivity = createHomeActivity(); - homeActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - - final ActivityRecord landActivity = createActivityRecord(mDefaultDisplay); - landActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, landActivity, "win1"); - landActivity.addWindow(win1); - - assertEquals(landActivity.getTask().getTopVisibleActivity(), landActivity); - assertEquals(landActivity.findMainWindow(), win1); - - // Ensure that the display is in Landscape - landActivity.onDescendantOrientationChanged(landActivity); - assertEquals(Configuration.ORIENTATION_LANDSCAPE, - mDefaultDisplay.getConfiguration().orientation); - - initializeRecentsAnimationController(mController, homeActivity); - - assertTrue(mDefaultDisplay.isFixedRotationLaunchingApp(homeActivity)); - - // Check that the home app is in portrait - assertEquals(Configuration.ORIENTATION_PORTRAIT, - homeActivity.getConfiguration().orientation); - - // Home activity won't become top (return to landActivity), so the top rotated record should - // be cleared. - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - assertFalse(mDefaultDisplay.isFixedRotationLaunchingApp(homeActivity)); - assertFalse(mDefaultDisplay.hasTopFixedRotationLaunchingApp()); - // The transform should keep until the transition is done, so the restored configuration - // won't be sent to activity and cause unnecessary configuration change. - assertTrue(homeActivity.hasFixedRotationTransform()); - - // In real case the transition will be executed from RecentsAnimation#finishAnimation. - mDefaultDisplay.mFixedRotationTransitionListener.onAppTransitionFinishedLocked( - homeActivity.token); - assertFalse(homeActivity.hasFixedRotationTransform()); - } - - private ActivityRecord prepareFixedRotationLaunchingAppWithRecentsAnim() { - final ActivityRecord homeActivity = createHomeActivity(); - homeActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - // Add a window so it can be animated by the recents. - final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, activity, "win"); - activity.addWindow(win); - // Assume an activity is launching to different rotation. - mDefaultDisplay.setFixedRotationLaunchingApp(activity, - (mDefaultDisplay.getRotation() + 1) % 4); - - assertTrue(activity.hasFixedRotationTransform()); - assertTrue(mDefaultDisplay.isFixedRotationLaunchingApp(activity)); - - // Before the transition is done, the recents animation is triggered. - initializeRecentsAnimationController(mController, homeActivity); - assertFalse(homeActivity.hasFixedRotationTransform()); - assertTrue(mController.isAnimatingTask(activity.getTask())); - - return activity; - } - - @Test - public void testClearFixedRotationLaunchingAppAfterCleanupAnimation() { - final ActivityRecord activity = prepareFixedRotationLaunchingAppWithRecentsAnim(); - - // Simulate giving up the swipe up gesture to keep the original activity as top. - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - // The rotation transform should be cleared after updating orientation with display. - assertTopFixedRotationLaunchingAppCleared(activity); - - // Simulate swiping up recents (home) in different rotation. - final ActivityRecord home = mDefaultDisplay.getDefaultTaskDisplayArea().getHomeActivity(); - startRecentsInDifferentRotation(home); - - // If the recents activity becomes the top running activity (e.g. the original top activity - // is either finishing or moved to back during recents animation), the display orientation - // will be determined by it so the fixed rotation must be cleared. - activity.finishing = true; - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - assertTopFixedRotationLaunchingAppCleared(home); - - startRecentsInDifferentRotation(home); - // Assume recents activity becomes invisible for some reason (e.g. screen off). - home.setVisible(false); - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - // Although there won't be a transition finish callback, the fixed rotation must be cleared. - assertTopFixedRotationLaunchingAppCleared(home); - } - - @Test - public void testKeepFixedRotationWhenMovingRecentsToTop() { - final ActivityRecord activity = prepareFixedRotationLaunchingAppWithRecentsAnim(); - // Assume a transition animation has started running before recents animation. Then the - // activity will receive onAnimationFinished that notifies app transition finished when - // removing the recents animation of task. - activity.getTask().getAnimationSources().add(activity); - - // Simulate swiping to home/recents before the transition is done. - mController.cleanupAnimation(REORDER_MOVE_TO_TOP); - // The rotation transform should be preserved. In real case, it will be cleared by the next - // move-to-top transition. - assertTrue(activity.hasFixedRotationTransform()); - } - - @Test - public void testCheckRotationAfterCleanup() { - mWm.setRecentsAnimationController(mController); - spyOn(mDisplayContent.mFixedRotationTransitionListener); - final ActivityRecord recents = mock(ActivityRecord.class); - recents.setOverrideOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); - doReturn(ORIENTATION_PORTRAIT).when(recents) - .getRequestedConfigurationOrientation(anyBoolean()); - mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recents); - - // Rotation update is skipped while the recents animation is running. - final DisplayRotation displayRotation = mDisplayContent.getDisplayRotation(); - final int topOrientation = DisplayContentTests.getRotatedOrientation(mDefaultDisplay); - assertFalse(displayRotation.updateOrientation(topOrientation, false /* forceUpdate */)); - assertEquals(ActivityInfo.SCREEN_ORIENTATION_UNSET, displayRotation.getLastOrientation()); - final int prevRotation = mDisplayContent.getRotation(); - mWm.cleanupRecentsAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - - // In real case, it is called from RecentsAnimation#finishAnimation -> continueWindowLayout - // -> handleAppTransitionReady -> add FINISH_LAYOUT_REDO_CONFIG, and DisplayContent# - // applySurfaceChangesTransaction will call updateOrientation for FINISH_LAYOUT_REDO_CONFIG. - assertTrue(displayRotation.updateOrientation(topOrientation, false /* forceUpdate */)); - // The display should be updated to the changed orientation after the animation is finished. - assertNotEquals(displayRotation.getRotation(), prevRotation); - } - - @Test - public void testWallpaperHasFixedRotationApplied() { - makeDisplayPortrait(mDefaultDisplay); - unblockDisplayRotation(mDefaultDisplay); - mWm.setRecentsAnimationController(mController); - - // Create a portrait home activity, a wallpaper and a landscape activity displayed on top. - final ActivityRecord homeActivity = createHomeActivity(); - homeActivity.setOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - - final WindowState homeWindow = createWindow(null, TYPE_BASE_APPLICATION, homeActivity, - "homeWindow"); - makeWindowVisible(homeWindow); - homeActivity.addWindow(homeWindow); - homeWindow.getAttrs().flags |= FLAG_SHOW_WALLPAPER; - - // Landscape application - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState applicationWindow = createWindow(null, TYPE_BASE_APPLICATION, activity, - "applicationWindow"); - activity.addWindow(applicationWindow); - activity.setOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - - // Wallpaper - final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm, - mock(IBinder.class), true, mDefaultDisplay, true /* ownerCanManageAppTokens */); - final WindowState wallpaperWindow = createWindow(null, TYPE_WALLPAPER, wallpaperWindowToken, - "wallpaperWindow"); - - // Make sure the landscape activity is on top and the display is in landscape - activity.moveFocusableActivityToTop("test"); - mDefaultDisplay.getConfiguration().windowConfiguration.setRotation( - mDefaultDisplay.getRotation()); - - spyOn(mDefaultDisplay.mWallpaperController); - doReturn(true).when(mDefaultDisplay.mWallpaperController).isWallpaperVisible(); - - // Start the recents animation - initializeRecentsAnimationController(mController, homeActivity); - - mDefaultDisplay.mWallpaperController.adjustWallpaperWindows(); - - // Check preconditions - ArrayList<WallpaperWindowToken> wallpapers = new ArrayList<>(1); - mDefaultDisplay.forAllWallpaperWindows(wallpapers::add); - - Truth.assertThat(wallpapers).hasSize(1); - Truth.assertThat(wallpapers.get(0).getTopChild()).isEqualTo(wallpaperWindow); - - // Actual check - assertEquals(Configuration.ORIENTATION_PORTRAIT, - wallpapers.get(0).getConfiguration().orientation); - - mController.cleanupAnimation(REORDER_MOVE_TO_TOP); - // The transform state should keep because we expect to listen the signal from the - // transition executed by moving the task to front. - assertTrue(homeActivity.hasFixedRotationTransform()); - assertTrue(mDefaultDisplay.isFixedRotationLaunchingApp(homeActivity)); - - mDefaultDisplay.mFixedRotationTransitionListener.onAppTransitionFinishedLocked( - homeActivity.token); - // Wallpaper's transform state should be cleared with home. - assertFalse(homeActivity.hasFixedRotationTransform()); - assertFalse(wallpaperWindowToken.hasFixedRotationTransform()); - } - - @Test - public void testIsAnimatingByRecents() { - final ActivityRecord homeActivity = createHomeActivity(); - final Task rootTask = createTask(mDefaultDisplay); - final Task childTask = createTaskInRootTask(rootTask, 0 /* userId */); - final Task leafTask = createTaskInRootTask(childTask, 0 /* userId */); - spyOn(leafTask); - doReturn(true).when(leafTask).isVisible(); - - initializeRecentsAnimationController(mController, homeActivity); - - // Verify RecentsAnimationController will animate visible leaf task by default. - verify(mController).addAnimation(eq(leafTask), anyBoolean(), anyBoolean(), any()); - assertTrue(leafTask.isAnimatingByRecents()); - - // Make sure isAnimatingByRecents will also return true when it called by the parent task. - assertTrue(rootTask.isAnimatingByRecents()); - assertTrue(childTask.isAnimatingByRecents()); - } - - @Test - public void testRestoreNavBarWhenEnteringRecents_expectAnimation() { - setupForShouldAttachNavBarDuringTransition(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final ActivityRecord homeActivity = createHomeActivity(); - initializeRecentsAnimationController(mController, homeActivity); - - final WindowToken navToken = mDefaultDisplay.getDisplayPolicy().getNavigationBar().mToken; - final SurfaceControl.Transaction transaction = navToken.getPendingTransaction(); - - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(false)); - verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl()); - verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE); - assertTrue(mController.isNavigationBarAttachedToApp()); - - mController.cleanupAnimation(REORDER_MOVE_TO_TOP); - verify(mController).restoreNavigationBarFromApp(eq(true)); - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(true)); - verify(transaction).setLayer(navToken.getSurfaceControl(), 0); - assertFalse(mController.isNavigationBarAttachedToApp()); - assertTrue(navToken.isAnimating(ANIMATION_TYPE_TOKEN_TRANSFORM)); - } - - @Test - public void testRestoreNavBarWhenBackToApp_expectNoAnimation() { - setupForShouldAttachNavBarDuringTransition(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final ActivityRecord homeActivity = createHomeActivity(); - initializeRecentsAnimationController(mController, homeActivity); - - final WindowToken navToken = mDefaultDisplay.getDisplayPolicy().getNavigationBar().mToken; - final SurfaceControl.Transaction transaction = navToken.getPendingTransaction(); - - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(false)); - verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl()); - verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE); - assertTrue(mController.isNavigationBarAttachedToApp()); - - final WindowContainer parent = navToken.getParent(); - - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - verify(mController).restoreNavigationBarFromApp(eq(false)); - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(true)); - verify(transaction).setLayer(navToken.getSurfaceControl(), 0); - verify(transaction).reparent(navToken.getSurfaceControl(), parent.getSurfaceControl()); - assertFalse(mController.isNavigationBarAttachedToApp()); - assertFalse(navToken.isAnimating(ANIMATION_TYPE_TOKEN_TRANSFORM)); - } - - @Test - public void testAddTaskToTargets_expectAnimation() { - setupForShouldAttachNavBarDuringTransition(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final ActivityRecord homeActivity = createHomeActivity(); - initializeRecentsAnimationController(mController, homeActivity); - - final WindowToken navToken = mDefaultDisplay.getDisplayPolicy().getNavigationBar().mToken; - final SurfaceControl.Transaction transaction = navToken.getPendingTransaction(); - - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(false)); - verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl()); - verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE); - assertTrue(mController.isNavigationBarAttachedToApp()); - - final WindowContainer parent = navToken.getParent(); - - mController.addTaskToTargets(createTask(mDefaultDisplay), (type, anim) -> {}); - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - verify(mController).restoreNavigationBarFromApp(eq(true)); - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(true)); - verify(transaction).setLayer(navToken.getSurfaceControl(), 0); - assertFalse(mController.isNavigationBarAttachedToApp()); - assertTrue(navToken.isAnimating(ANIMATION_TYPE_TOKEN_TRANSFORM)); - } - - @Test - public void testNotAttachNavigationBar_controlledByFadeRotationAnimation() { - setupForShouldAttachNavBarDuringTransition(); - AsyncRotationController mockController = - mock(AsyncRotationController.class); - doReturn(mockController).when(mDefaultDisplay).getAsyncRotationController(); - final ActivityRecord homeActivity = createHomeActivity(); - initializeRecentsAnimationController(mController, homeActivity); - assertFalse(mController.isNavigationBarAttachedToApp()); - } - - @Test - public void testAttachNavBarInSplitScreenMode() { - setupForShouldAttachNavBarDuringTransition(); - TestSplitOrganizer organizer = new TestSplitOrganizer(mAtm); - final ActivityRecord primary = createActivityRecordWithParentTask( - organizer.createTaskToPrimary(true)); - final ActivityRecord secondary = createActivityRecordWithParentTask( - organizer.createTaskToSecondary(true)); - final ActivityRecord homeActivity = createHomeActivity(); - homeActivity.setVisibility(true); - initializeRecentsAnimationController(mController, homeActivity); - - WindowState navWindow = mController.getNavigationBarWindow(); - final WindowToken navToken = navWindow.mToken; - final SurfaceControl.Transaction transaction = navToken.getPendingTransaction(); - - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(false)); - verify(navWindow).setSurfaceTranslationY(-secondary.getBounds().top); - verify(transaction).reparent(navToken.getSurfaceControl(), secondary.getSurfaceControl()); - assertTrue(mController.isNavigationBarAttachedToApp()); - reset(navWindow); - - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - final WindowContainer parent = navToken.getParent(); - verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled( - eq(mDefaultDisplay.mDisplayId), eq(true)); - verify(navWindow).setSurfaceTranslationY(0); - verify(transaction).reparent(navToken.getSurfaceControl(), parent.getSurfaceControl()); - verify(mController).restoreNavigationBarFromApp(eq(false)); - assertFalse(mController.isNavigationBarAttachedToApp()); - } - - @Test - public void testCleanupAnimation_expectExitAnimationDone() { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - - initializeRecentsAnimationController(mController, homeActivity); - mController.startAnimation(); - - spyOn(win1); - spyOn(win1.mWinAnimator); - // Simulate when the window is exiting and cleanupAnimation invoked - // (e.g. screen off during RecentsAnimation animating), will expect the window receives - // onExitAnimationDone to destroy the surface when the removal is allowed. - win1.mWinAnimator.mSurfaceControl = mock(SurfaceControl.class); - win1.mHasSurface = true; - win1.mAnimatingExit = true; - win1.mRemoveOnExit = true; - win1.mWindowRemovalAllowed = true; - mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION); - verify(win1).onAnimationFinished(eq(ANIMATION_TYPE_RECENTS), any()); - verify(win1).onExitAnimationDone(); - verify(win1).destroySurface(eq(false), eq(false)); - assertFalse(win1.mAnimatingExit); - assertFalse(win1.mHasSurface); - } - - @Test - public void testCancelForRotation_ReorderToTop() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - - mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */); - mController.setWillFinishToHome(true); - mController.cancelAnimationForDisplayChange(); - - verify(mMockRunner).onAnimationCanceled(any(), any()); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_MOVE_TO_TOP, false); - } - - @Test - public void testCancelForRotation_ReorderToOriginalPosition() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - - mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */); - mController.setWillFinishToHome(false); - mController.cancelAnimationForDisplayChange(); - - verify(mMockRunner).onAnimationCanceled(any(), any()); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_MOVE_TO_ORIGINAL_POSITION, false); - } - - @Test - public void testCancelForStartHome() throws Exception { - mWm.setRecentsAnimationController(mController); - final ActivityRecord homeActivity = createHomeActivity(); - final ActivityRecord activity = createActivityRecord(mDefaultDisplay); - final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); - activity.addWindow(win1); - - initializeRecentsAnimationController(mController, homeActivity); - mController.setWillFinishToHome(true); - - // Verify cancel is called with a snapshot and that we've created an overlay - spyOn(mWm.mTaskSnapshotController); - doReturn(mMockTaskSnapshot).when(mWm.mTaskSnapshotController).getSnapshot(anyInt(), - anyInt(), eq(false) /* restoreFromDisk */, eq(false) /* isLowResolution */); - mController.cancelAnimationForHomeStart(); - verify(mMockRunner).onAnimationCanceled(any(), any()); - - // Continue the animation (simulating a call to cleanupScreenshot()) - mController.continueDeferredCancelAnimation(); - verify(mAnimationCallbacks).onAnimationFinished(REORDER_MOVE_TO_TOP, false); - - // Assume home was moved to front so will-be-top callback should not be called. - homeActivity.moveFocusableActivityToTop("test"); - spyOn(mDefaultDisplay.mFixedRotationTransitionListener); - mController.cleanupAnimation(REORDER_MOVE_TO_TOP); - verify(mDefaultDisplay.mFixedRotationTransitionListener, never()).notifyRecentsWillBeTop(); - } - - private ActivityRecord createHomeActivity() { - final ActivityRecord homeActivity = new ActivityBuilder(mWm.mAtmService) - .setParentTask(mRootHomeTask) - .setCreateTask(true) - .build(); - // Avoid {@link RecentsAnimationController.TaskAnimationAdapter#createRemoteAnimationTarget} - // returning null when calling {@link RecentsAnimationController#createAppAnimations}. - homeActivity.setVisibility(true); - return homeActivity; - } - - private void startRecentsInDifferentRotation(ActivityRecord recentsActivity) { - final DisplayContent displayContent = recentsActivity.mDisplayContent; - displayContent.setFixedRotationLaunchingApp(recentsActivity, - (displayContent.getRotation() + 1) % 4); - mController = new RecentsAnimationController(mWm, mMockRunner, mAnimationCallbacks, - displayContent.getDisplayId()); - initializeRecentsAnimationController(mController, recentsActivity); - assertTrue(recentsActivity.hasFixedRotationTransform()); - } - - private static void assertTopFixedRotationLaunchingAppCleared(ActivityRecord activity) { - assertFalse(activity.hasFixedRotationTransform()); - assertFalse(activity.mDisplayContent.hasTopFixedRotationLaunchingApp()); - } - - private void setupForShouldAttachNavBarDuringTransition() { - final WindowState navBar = spy(createWindow(null, TYPE_NAVIGATION_BAR, "NavigationBar")); - mDefaultDisplay.getDisplayPolicy().addWindowLw(navBar, navBar.mAttrs); - mWm.setRecentsAnimationController(mController); - doReturn(navBar).when(mController).getNavigationBarWindow(); - final DisplayPolicy displayPolicy = spy(mDefaultDisplay.getDisplayPolicy()); - doReturn(displayPolicy).when(mDefaultDisplay).getDisplayPolicy(); - doReturn(true).when(displayPolicy).shouldAttachNavBarToAppDuringTransition(); - } - - private static void initializeRecentsAnimationController(RecentsAnimationController controller, - ActivityRecord activity) { - controller.initialize(activity.getActivityType(), new SparseBooleanArray(), activity); - } - - private static void verifyNoMoreInteractionsExceptAsBinder(IInterface binder) { - verify(binder, atLeast(0)).asBinder(); - verifyNoMoreInteractions(binder); - } -} diff --git a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java index f93ffb83178f..1e8c3b27b12e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java @@ -728,25 +728,6 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { } } - @Test - public void testNonAppTarget_notSendNavBar_controlledByRecents() throws Exception { - final RecentsAnimationController mockController = - mock(RecentsAnimationController.class); - doReturn(mockController).when(mWm).getRecentsAnimationController(); - final int transit = TRANSIT_OLD_TASK_OPEN; - setupForNonAppTargetNavBar(transit, true); - - final ArgumentCaptor<RemoteAnimationTarget[]> nonAppsCaptor = - ArgumentCaptor.forClass(RemoteAnimationTarget[].class); - verify(mMockRunner).onAnimationStart(eq(transit), - any(), any(), nonAppsCaptor.capture(), any()); - for (int i = 0; i < nonAppsCaptor.getValue().length; i++) { - if (nonAppsCaptor.getValue()[0].windowType == TYPE_NAVIGATION_BAR) { - fail("Non-app animation target must not contain navbar"); - } - } - } - @android.platform.test.annotations.RequiresFlagsDisabled( com.android.window.flags.Flags.FLAG_DO_NOT_SKIP_IME_BY_TARGET_VISIBILITY) @SetupWindows(addWindows = W_INPUT_METHOD) diff --git a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java index e019a416c069..6adf0fe15ba8 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java @@ -1260,68 +1260,38 @@ public class RootTaskTests extends WindowTestsBase { @Test public void testShouldSleepActivities() { + final Task task = new TaskBuilder(mSupervisor).build(); + task.mDisplayContent = mock(DisplayContent.class); // When focused activity and keyguard is going away, we should not sleep regardless // of the display state, but keyguard-going-away should only take effects on default - // display since there is no keyguard on secondary displays (yet). - verifyShouldSleepActivities(true /* focusedRootTask */, true /*keyguardGoingAway*/, + // display because the keyguard-going-away state of secondary displays are already the + // same as default display. + verifyShouldSleepActivities(task, true /* isVisibleTask */, true /* keyguardGoingAway */, true /* displaySleeping */, true /* isDefaultDisplay */, false /* expected */); - verifyShouldSleepActivities(true /* focusedRootTask */, true /*keyguardGoingAway*/, + verifyShouldSleepActivities(task, true /* isVisibleTask */, true /* keyguardGoingAway */, true /* displaySleeping */, false /* isDefaultDisplay */, true /* expected */); // When not the focused root task, defer to display sleeping state. - verifyShouldSleepActivities(false /* focusedRootTask */, true /*keyguardGoingAway*/, + verifyShouldSleepActivities(task, false /* isVisibleTask */, true /* keyguardGoingAway */, true /* displaySleeping */, true /* isDefaultDisplay */, true /* expected */); // If keyguard is going away, defer to the display sleeping state. - verifyShouldSleepActivities(true /* focusedRootTask */, false /*keyguardGoingAway*/, + verifyShouldSleepActivities(task, true /* isVisibleTask */, false /* keyguardGoingAway */, true /* displaySleeping */, true /* isDefaultDisplay */, true /* expected */); - verifyShouldSleepActivities(true /* focusedRootTask */, false /*keyguardGoingAway*/, + verifyShouldSleepActivities(task, true /* isVisibleTask */, false /* keyguardGoingAway */, false /* displaySleeping */, true /* isDefaultDisplay */, false /* expected */); } - @Test - public void testRootTaskOrderChangedOnRemoveRootTask() { - final Task task = new TaskBuilder(mSupervisor).build(); - RootTaskOrderChangedListener listener = new RootTaskOrderChangedListener(); - mDefaultTaskDisplayArea.registerRootTaskOrderChangedListener(listener); - try { - mDefaultTaskDisplayArea.removeRootTask(task); - } finally { - mDefaultTaskDisplayArea.unregisterRootTaskOrderChangedListener(listener); - } - assertTrue(listener.mChanged); - } - - @Test - public void testRootTaskOrderChangedOnAddPositionRootTask() { - final Task task = new TaskBuilder(mSupervisor).build(); - mDefaultTaskDisplayArea.removeRootTask(task); - - RootTaskOrderChangedListener listener = new RootTaskOrderChangedListener(); - mDefaultTaskDisplayArea.registerRootTaskOrderChangedListener(listener); - try { - task.mReparenting = true; - mDefaultTaskDisplayArea.addChild(task, 0); - } finally { - mDefaultTaskDisplayArea.unregisterRootTaskOrderChangedListener(listener); - } - assertTrue(listener.mChanged); - } + private static void verifyShouldSleepActivities(Task task, boolean isVisibleTask, + boolean keyguardGoingAway, boolean displaySleeping, boolean isDefaultDisplay, + boolean expected) { + final DisplayContent display = task.mDisplayContent; + display.isDefaultDisplay = isDefaultDisplay; + doReturn(keyguardGoingAway).when(display).isKeyguardGoingAway(); + doReturn(displaySleeping).when(display).isSleeping(); + doReturn(isVisibleTask).when(task).shouldBeVisible(null /* starting */); - @Test - public void testRootTaskOrderChangedOnPositionRootTask() { - RootTaskOrderChangedListener listener = new RootTaskOrderChangedListener(); - try { - final Task fullscreenRootTask1 = createTaskForShouldBeVisibleTest( - mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, - true /* onTop */); - mDefaultTaskDisplayArea.registerRootTaskOrderChangedListener(listener); - mDefaultTaskDisplayArea.positionChildAt(POSITION_BOTTOM, fullscreenRootTask1, - false /*includingParents*/); - } finally { - mDefaultTaskDisplayArea.unregisterRootTaskOrderChangedListener(listener); - } - assertTrue(listener.mChanged); + assertEquals(expected, task.shouldSleepActivities()); } @Test @@ -1451,11 +1421,6 @@ public class RootTaskTests extends WindowTestsBase { anyBoolean()); } - private boolean isAssistantOnTop() { - return mContext.getResources().getBoolean( - com.android.internal.R.bool.config_assistantOnTopOfDream); - } - private void verifyShouldSleepActivities(boolean focusedRootTask, boolean keyguardGoingAway, boolean displaySleeping, boolean isDefaultDisplay, boolean expected) { @@ -1471,14 +1436,4 @@ public class RootTaskTests extends WindowTestsBase { assertEquals(expected, task.shouldSleepActivities()); } - - private static class RootTaskOrderChangedListener - implements TaskDisplayArea.OnRootTaskOrderChangedListener { - public boolean mChanged = false; - - @Override - public void onRootTaskOrderChanged(Task rootTask) { - mChanged = true; - } - } } diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index 5bb437827dae..f74340113a04 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -613,7 +613,7 @@ public class SizeCompatTests extends WindowTestsBase { assertFalse(mActivity.mDisplayContent.shouldImeAttachedToApp()); // Recompute the natural configuration without resolving size compat configuration. - mActivity.clearSizeCompatMode(); + mActivity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); mActivity.onConfigurationChanged(mTask.getConfiguration()); // It should keep non-attachable because the resolved bounds will be computed according to // the aspect ratio that won't match its parent bounds. @@ -706,7 +706,7 @@ public class SizeCompatTests extends WindowTestsBase { / originalBounds.width())); // Recompute the natural configuration in the new display. - mActivity.clearSizeCompatMode(); + mActivity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); mActivity.ensureActivityConfiguration(); // Because the display cannot rotate, the portrait activity will fit the short side of // display with keeping portrait bounds [200, 0 - 700, 1000] in center. @@ -1482,7 +1482,7 @@ public class SizeCompatTests extends WindowTestsBase { // After changing the orientation to portrait the override should be applied. activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); // The per-package override forces the activity into a 3:2 aspect ratio assertEquals(1200, activity.getBounds().height()); @@ -1511,7 +1511,7 @@ public class SizeCompatTests extends WindowTestsBase { // After changing the orientation to portrait the override should be applied. activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); // The per-package override forces the activity into a 3:2 aspect ratio assertEquals(1200, activity.getBounds().height()); @@ -1538,7 +1538,7 @@ public class SizeCompatTests extends WindowTestsBase { // After changing the orientation to landscape the override shouldn't be applied. activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); // The per-package override should have no effect assertEquals(1200, activity.getBounds().height()); @@ -3054,7 +3054,10 @@ public class SizeCompatTests extends WindowTestsBase { false /* deferPause */); // App still in size compat, and the bounds don't change. - verify(mActivity, never()).clearSizeCompatMode(); + final AppCompatSizeCompatModePolicy scmPolicy = mActivity.mAppCompatController + .getAppCompatSizeCompatModePolicy(); + spyOn(scmPolicy); + verify(scmPolicy, never()).clearSizeCompatMode(); assertFalse(mActivity.mAppCompatController.getAppCompatAspectRatioPolicy() .isLetterboxedForFixedOrientationAndAspectRatio()); assertDownScaled(); @@ -3896,7 +3899,7 @@ public class SizeCompatTests extends WindowTestsBase { private void recomputeNaturalConfigurationOfUnresizableActivity() { // Recompute the natural configuration of the non-resizable activity and the split screen. - mActivity.clearSizeCompatMode(); + mActivity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); // Draw letterbox. mActivity.setVisible(false); @@ -4827,7 +4830,7 @@ public class SizeCompatTests extends WindowTestsBase { assertEquals(origDensity, mActivity.getConfiguration().densityDpi); // Activity should exit size compat with new density. - mActivity.clearSizeCompatMode(); + mActivity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); assertFitted(); assertEquals(newDensity, mActivity.getConfiguration().densityDpi); @@ -5013,7 +5016,7 @@ public class SizeCompatTests extends WindowTestsBase { activity.setRequestedOrientation(screenOrientation); } // Make sure to use the provided configuration to construct the size compat fields. - activity.clearSizeCompatMode(); + activity.mAppCompatController.getAppCompatSizeCompatModePolicy().clearSizeCompatMode(); activity.ensureActivityConfiguration(); // Make sure the display configuration reflects the change of activity. if (activity.mDisplayContent.updateOrientation()) { diff --git a/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java index fa28d117c5bc..7a440e676b39 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java @@ -323,7 +323,10 @@ public class TransparentPolicyTest extends WindowTestsBase { ta.launchTransparentActivityInTask(); a.assertNotNullOnTopActivity(ActivityRecord::getAppCompatDisplayInsets); - a.applyToTopActivity(ActivityRecord::clearSizeCompatMode); + a.applyToTopActivity((top) -> { + top.mAppCompatController.getAppCompatSizeCompatModePolicy() + .clearSizeCompatMode(); + }); a.assertNullOnTopActivity(ActivityRecord::getAppCompatDisplayInsets); }); }); diff --git a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java index c65b76efd614..7652861449de 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java @@ -37,7 +37,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -276,9 +275,8 @@ public class WallpaperControllerTests extends WindowTestsBase { final DisplayContent dc = mDisplayContent; final WindowState homeWin = createWallpaperTargetWindow(dc); final WindowState appWin = createWindow(null, TYPE_BASE_APPLICATION, "app"); - final RecentsAnimationController recentsController = mock(RecentsAnimationController.class); - doReturn(true).when(recentsController).isWallpaperVisible(eq(appWin)); - mWm.setRecentsAnimationController(recentsController); + appWin.mAttrs.flags |= FLAG_SHOW_WALLPAPER; + makeWindowVisible(appWin); dc.mWallpaperController.adjustWallpaperWindows(); assertEquals(appWin, dc.mWallpaperController.getWallpaperTarget()); @@ -354,46 +352,6 @@ public class WallpaperControllerTests extends WindowTestsBase { } @Test - public void testFixedRotationRecentsAnimatingTask() { - final WindowState wallpaperWindow = createWallpaperWindow(mDisplayContent); - final WallpaperWindowToken wallpaperToken = wallpaperWindow.mToken.asWallpaperToken(); - final WindowState appWin = createWindow(null, TYPE_BASE_APPLICATION, "app"); - makeWindowVisible(appWin); - final ActivityRecord r = appWin.mActivityRecord; - final RecentsAnimationController recentsController = mock(RecentsAnimationController.class); - doReturn(true).when(recentsController).isWallpaperVisible(eq(appWin)); - mWm.setRecentsAnimationController(recentsController); - - r.applyFixedRotationTransform(mDisplayContent.getDisplayInfo(), - mDisplayContent.mDisplayFrames, mDisplayContent.getConfiguration()); - // Invisible requested activity should not share its rotation transform. - r.setVisibleRequested(false); - mDisplayContent.mWallpaperController.adjustWallpaperWindows(); - assertFalse(wallpaperToken.hasFixedRotationTransform()); - - // Wallpaper should link the transform of its target. - r.setVisibleRequested(true); - mDisplayContent.mWallpaperController.adjustWallpaperWindows(); - assertEquals(appWin, mDisplayContent.mWallpaperController.getWallpaperTarget()); - assertTrue(r.hasFixedRotationTransform()); - assertTrue(wallpaperToken.hasFixedRotationTransform()); - - // The case with shell transition. - registerTestTransitionPlayer(); - final Transition t = r.mTransitionController.createTransition(TRANSIT_OPEN); - final ActivityRecord recents = mock(ActivityRecord.class); - t.collect(r.getTask()); - r.mTransitionController.setTransientLaunch(recents, r.getTask()); - // The activity in restore-below task should not be the target if keyguard is not locked. - mDisplayContent.mWallpaperController.adjustWallpaperWindows(); - assertNotEquals(appWin, mDisplayContent.mWallpaperController.getWallpaperTarget()); - // The activity in restore-below task should not be the target if keyguard is occluded. - doReturn(true).when(mDisplayContent).isKeyguardLocked(); - mDisplayContent.mWallpaperController.adjustWallpaperWindows(); - assertNotEquals(appWin, mDisplayContent.mWallpaperController.getWallpaperTarget()); - } - - @Test public void testWallpaperReportConfigChange() { final WindowState wallpaperWindow = createWallpaperWindow(mDisplayContent); createWallpaperTargetWindow(mDisplayContent); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java index 0cb22ad47355..9bad2ec2ca2a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java @@ -44,7 +44,6 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; import android.Manifest; @@ -197,21 +196,6 @@ public class WindowProcessControllerTests extends WindowTestsBase { } @Test - public void testSetRunningBothAnimations() { - mWpc.setRunningRemoteAnimation(true); - mWpc.setRunningRecentsAnimation(true); - - mWpc.setRunningRecentsAnimation(false); - mWpc.setRunningRemoteAnimation(false); - waitHandlerIdle(mAtm.mH); - - InOrder orderVerifier = Mockito.inOrder(mMockListener); - orderVerifier.verify(mMockListener, times(1)).setRunningRemoteAnimation(eq(true)); - orderVerifier.verify(mMockListener, times(1)).setRunningRemoteAnimation(eq(false)); - orderVerifier.verifyNoMoreInteractions(); - } - - @Test public void testConfigurationForSecondaryScreenDisplayArea() { // By default, the process should not listen to any display area. assertNull(mWpc.getDisplayArea()); diff --git a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java index 973ab846fa4a..d537bd764905 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java @@ -48,15 +48,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import android.graphics.PixelFormat; import android.graphics.Rect; -import android.os.Binder; import android.platform.test.annotations.Presubmit; -import android.util.SparseBooleanArray; -import android.view.IRecentsAnimationRunner; import android.view.SurfaceControl; import android.view.SurfaceSession; import android.window.ScreenCapture; @@ -493,43 +488,6 @@ public class ZOrderingTests extends WindowTestsBase { } @Test - public void testAttachNavBarWhenEnteringRecents_expectNavBarHigherThanIme() { - // create RecentsAnimationController - IRecentsAnimationRunner mockRunner = mock(IRecentsAnimationRunner.class); - when(mockRunner.asBinder()).thenReturn(new Binder()); - final int displayId = mDisplayContent.getDisplayId(); - RecentsAnimationController controller = new RecentsAnimationController( - mWm, mockRunner, null, displayId); - spyOn(controller); - doReturn(mNavBarWindow).when(controller).getNavigationBarWindow(); - mWm.setRecentsAnimationController(controller); - - // set ime visible - spyOn(mDisplayContent.mInputMethodWindow); - doReturn(true).when(mDisplayContent.mInputMethodWindow).isVisible(); - - DisplayPolicy policy = mDisplayContent.getDisplayPolicy(); - spyOn(policy); - doReturn(true).when(policy).shouldAttachNavBarToAppDuringTransition(); - - // create home activity - Task rootHomeTask = mDisplayContent.getDefaultTaskDisplayArea().getRootHomeTask(); - final ActivityRecord homeActivity = new ActivityBuilder(mWm.mAtmService) - .setParentTask(rootHomeTask) - .setCreateTask(true) - .build(); - homeActivity.setVisibility(true); - - // start recent animation - controller.initialize(homeActivity.getActivityType(), new SparseBooleanArray(), - homeActivity); - - mDisplayContent.assignChildLayers(mTransaction); - assertZOrderGreaterThan(mTransaction, mNavBarWindow.mToken.getSurfaceControl(), - mDisplayContent.getImeContainer().getSurfaceControl()); - } - - @Test public void testPopupWindowAndParentIsImeTarget_expectHigherThanIme_inMultiWindow() { // Simulate the app window is in multi windowing mode and being IME target mAppWindow.getConfiguration().windowConfiguration.setWindowingMode( diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 3e8b3268ae4c..7481daa8e396 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1777,8 +1777,8 @@ public class TelephonyManager { /** * Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE} - * to indicate user to decide whether current SIM should be preferred for all - * data / voice / sms. {@link #EXTRA_SUBSCRIPTION_ID} will specified to indicate + * to indicate the current SIM should be preferred for all data / voice / sms. + * {@link #EXTRA_SUBSCRIPTION_ID} will specified to indicate * which subscription should be the default subscription. * @hide */ diff --git a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonLandscape.kt b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonLandscape.kt index 8040610c485b..cfc818b6c0e9 100644 --- a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonLandscape.kt +++ b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonLandscape.kt @@ -31,8 +31,7 @@ import org.junit.runner.RunWith @RunWith(FlickerServiceJUnit4ClassRunner::class) class CloseAppBackButton3ButtonLandscape : CloseAppBackButton(NavBar.MODE_3BUTTON, Rotation.ROTATION_90) { - // TODO: Missing CUJ (b/300078127) - @ExpectedScenarios(["ENTIRE_TRACE"]) + @ExpectedScenarios(["APP_CLOSE_TO_HOME"]) @Test override fun closeAppBackButtonTest() = super.closeAppBackButtonTest() diff --git a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonPortrait.kt b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonPortrait.kt index aacccf4e680c..6bf32a8e2083 100644 --- a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonPortrait.kt +++ b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButton3ButtonPortrait.kt @@ -31,8 +31,7 @@ import org.junit.runner.RunWith @RunWith(FlickerServiceJUnit4ClassRunner::class) class CloseAppBackButton3ButtonPortrait : CloseAppBackButton(NavBar.MODE_3BUTTON, Rotation.ROTATION_0) { - // TODO: Missing CUJ (b/300078127) - @ExpectedScenarios(["ENTIRE_TRACE"]) + @ExpectedScenarios(["APP_CLOSE_TO_HOME"]) @Test override fun closeAppBackButtonTest() = super.closeAppBackButtonTest() diff --git a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavLandscape.kt b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavLandscape.kt index 74ee46093f6e..4b6ab773f15e 100644 --- a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavLandscape.kt +++ b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavLandscape.kt @@ -31,8 +31,7 @@ import org.junit.runner.RunWith @RunWith(FlickerServiceJUnit4ClassRunner::class) class CloseAppBackButtonGesturalNavLandscape : CloseAppBackButton(NavBar.MODE_GESTURAL, Rotation.ROTATION_90) { - // TODO: Missing CUJ (b/300078127) - @ExpectedScenarios(["ENTIRE_TRACE"]) + @ExpectedScenarios(["APP_CLOSE_TO_HOME"]) @Test override fun closeAppBackButtonTest() = super.closeAppBackButtonTest() diff --git a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavPortrait.kt b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavPortrait.kt index 57463c33c1fa..7cc9db027e1f 100644 --- a/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavPortrait.kt +++ b/tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/close/flicker/CloseAppBackButtonGesturalNavPortrait.kt @@ -31,8 +31,7 @@ import org.junit.runner.RunWith @RunWith(FlickerServiceJUnit4ClassRunner::class) class CloseAppBackButtonGesturalNavPortrait : CloseAppBackButton(NavBar.MODE_GESTURAL, Rotation.ROTATION_0) { - // TODO: Missing CUJ (b/300078127) - @ExpectedScenarios(["ENTIRE_TRACE"]) + @ExpectedScenarios(["APP_CLOSE_TO_HOME"]) @Test override fun closeAppBackButtonTest() = super.closeAppBackButtonTest() diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java index b0f68f7870ee..f68ae2c7e249 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -98,6 +98,18 @@ public class SharedConnectivityManager { } @Override + public void onServiceDisconnected() { + if (mCallback != null) { + final long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(() -> mCallback.onServiceDisconnected()); + } finally { + Binder.restoreCallingIdentity(token); + } + } + } + + @Override public void onHotspotNetworksUpdated(@NonNull List<HotspotNetwork> networks) { if (mCallback != null) { final long token = Binder.clearCallingIdentity(); @@ -247,13 +259,13 @@ public class SharedConnectivityManager { mService = null; synchronized (mProxyDataLock) { if (!mCallbackProxyCache.isEmpty()) { - mCallbackProxyCache.keySet().forEach( - SharedConnectivityClientCallback::onServiceDisconnected); + mCallbackProxyCache.values().forEach( + SharedConnectivityCallbackProxy::onServiceDisconnected); mCallbackProxyCache.clear(); } if (!mProxyMap.isEmpty()) { - mProxyMap.keySet().forEach( - SharedConnectivityClientCallback::onServiceDisconnected); + mProxyMap.values().forEach( + SharedConnectivityCallbackProxy::onServiceDisconnected); mProxyMap.clear(); } } diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl index 521f94367f6f..7b892af3c529 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl @@ -32,4 +32,5 @@ interface ISharedConnectivityCallback { oneway void onKnownNetworkConnectionStatusChanged(in KnownNetworkConnectionStatus status); oneway void onSharedConnectivitySettingsChanged(in SharedConnectivitySettingsState state); oneway void onServiceConnected(); + oneway void onServiceDisconnected(); } |