diff options
709 files changed, 21279 insertions, 6437 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index cb54d88860eb..70cb597875ff 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -515,6 +515,17 @@ filegroup { ], } +// common protolog sources without classes that rely on Android SDK +filegroup { + name: "protolog-common-no-android-src", + srcs: [ + ":protolog-common-src", + ], + exclude_srcs: [ + "com/android/internal/protolog/common/ProtoLog.java", + ], +} + java_library { name: "protolog-lib", platform_apis: true, diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 70a2e5382f60..08543eec38be 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1084,6 +1084,16 @@ public class Activity extends ContextThemeWrapper } /** + * Update the forced status bar appearance. + * @hide + */ + @Override + public void updateStatusBarAppearance(int appearance) { + mTaskDescription.setStatusBarAppearance(appearance); + setTaskDescription(mTaskDescription); + } + + /** * Update the forced navigation bar color. * @hide */ @@ -3882,7 +3892,9 @@ public class Activity extends ContextThemeWrapper * it will set up the dispatch to call {@link #onKeyUp} where the action * will be performed; for earlier applications, it will perform the * action immediately in on-down, as those versions of the platform - * behaved. + * behaved. This implementation will also take care of {@link KeyEvent#KEYCODE_ESCAPE} + * by finishing the activity if it would be closed by touching outside + * of it. * * <p>Other additional default key handling may be performed * if configured with {@link #setDefaultKeyMode}. @@ -3904,6 +3916,11 @@ public class Activity extends ContextThemeWrapper return true; } + if (keyCode == KeyEvent.KEYCODE_ESCAPE && mWindow.shouldCloseOnTouchOutside()) { + event.startTracking(); + return true; + } + if (mDefaultKeyMode == DEFAULT_KEYS_DISABLE) { return false; } else if (mDefaultKeyMode == DEFAULT_KEYS_SHORTCUT) { @@ -3999,6 +4016,15 @@ public class Activity extends ContextThemeWrapper return true; } } + + if (keyCode == KeyEvent.KEYCODE_ESCAPE + && mWindow.shouldCloseOnTouchOutside() + && event.isTracking() + && !event.isCanceled()) { + finish(); + return true; + } + return false; } diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index b5ee895a5a01..ff0f437ea8a1 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -81,6 +81,7 @@ import android.util.ArrayMap; import android.util.DisplayMetrics; import android.util.Singleton; import android.util.Size; +import android.view.WindowInsetsController.Appearance; import android.window.TaskSnapshot; import com.android.internal.app.LocalePicker; @@ -1553,6 +1554,8 @@ public class ActivityManager { private int mColorBackgroundFloating; private int mStatusBarColor; private int mNavigationBarColor; + @Appearance + private int mStatusBarAppearance; private boolean mEnsureStatusBarContrastWhenTransparent; private boolean mEnsureNavigationBarContrastWhenTransparent; private int mResizeMode; @@ -1653,8 +1656,8 @@ public class ActivityManager { final Icon icon = mIconRes == Resources.ID_NULL ? null : Icon.createWithResource(ActivityThread.currentPackageName(), mIconRes); return new TaskDescription(mLabel, icon, mPrimaryColor, mBackgroundColor, - mStatusBarColor, mNavigationBarColor, false, false, RESIZE_MODE_RESIZEABLE, - -1, -1, 0); + mStatusBarColor, mNavigationBarColor, 0, false, false, + RESIZE_MODE_RESIZEABLE, -1, -1, 0); } } @@ -1672,7 +1675,7 @@ public class ActivityManager { @Deprecated public TaskDescription(String label, @DrawableRes int iconRes, int colorPrimary) { this(label, Icon.createWithResource(ActivityThread.currentPackageName(), iconRes), - colorPrimary, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); + colorPrimary, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) { throw new RuntimeException("A TaskDescription's primary color should be opaque"); } @@ -1690,7 +1693,7 @@ public class ActivityManager { @Deprecated public TaskDescription(String label, @DrawableRes int iconRes) { this(label, Icon.createWithResource(ActivityThread.currentPackageName(), iconRes), - 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); + 0, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); } /** @@ -1702,7 +1705,7 @@ public class ActivityManager { */ @Deprecated public TaskDescription(String label) { - this(label, null, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); + this(label, null, 0, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); } /** @@ -1712,7 +1715,7 @@ public class ActivityManager { */ @Deprecated public TaskDescription() { - this(null, null, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); + this(null, null, 0, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); } /** @@ -1728,7 +1731,7 @@ public class ActivityManager { @Deprecated public TaskDescription(String label, Bitmap icon, int colorPrimary) { this(label, icon != null ? Icon.createWithBitmap(icon) : null, colorPrimary, 0, 0, 0, - false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); + 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) { throw new RuntimeException("A TaskDescription's primary color should be opaque"); } @@ -1744,14 +1747,15 @@ public class ActivityManager { */ @Deprecated public TaskDescription(String label, Bitmap icon) { - this(label, icon != null ? Icon.createWithBitmap(icon) : null, 0, 0, 0, 0, false, false, - RESIZE_MODE_RESIZEABLE, -1, -1, 0); + this(label, icon != null ? Icon.createWithBitmap(icon) : null, 0, 0, 0, 0, 0, false, + false, RESIZE_MODE_RESIZEABLE, -1, -1, 0); } /** @hide */ public TaskDescription(@Nullable String label, @Nullable Icon icon, int colorPrimary, int colorBackground, int statusBarColor, int navigationBarColor, + @Appearance int statusBarAppearance, boolean ensureStatusBarContrastWhenTransparent, boolean ensureNavigationBarContrastWhenTransparent, int resizeMode, int minWidth, int minHeight, int colorBackgroundFloating) { @@ -1761,6 +1765,7 @@ public class ActivityManager { mColorBackground = colorBackground; mStatusBarColor = statusBarColor; mNavigationBarColor = navigationBarColor; + mStatusBarAppearance = statusBarAppearance; mEnsureStatusBarContrastWhenTransparent = ensureStatusBarContrastWhenTransparent; mEnsureNavigationBarContrastWhenTransparent = ensureNavigationBarContrastWhenTransparent; @@ -1789,6 +1794,7 @@ public class ActivityManager { mColorBackground = other.mColorBackground; mStatusBarColor = other.mStatusBarColor; mNavigationBarColor = other.mNavigationBarColor; + mStatusBarAppearance = other.mStatusBarAppearance; mEnsureStatusBarContrastWhenTransparent = other.mEnsureStatusBarContrastWhenTransparent; mEnsureNavigationBarContrastWhenTransparent = other.mEnsureNavigationBarContrastWhenTransparent; @@ -1818,6 +1824,9 @@ public class ActivityManager { if (other.mNavigationBarColor != 0) { mNavigationBarColor = other.mNavigationBarColor; } + if (other.mStatusBarAppearance != 0) { + mStatusBarAppearance = other.mStatusBarAppearance; + } mEnsureStatusBarContrastWhenTransparent = other.mEnsureStatusBarContrastWhenTransparent; mEnsureNavigationBarContrastWhenTransparent = @@ -2089,6 +2098,14 @@ public class ActivityManager { /** * @hide */ + @Appearance + public int getStatusBarAppearance() { + return mStatusBarAppearance; + } + + /** + * @hide + */ public void setEnsureStatusBarContrastWhenTransparent( boolean ensureStatusBarContrastWhenTransparent) { mEnsureStatusBarContrastWhenTransparent = ensureStatusBarContrastWhenTransparent; @@ -2097,6 +2114,13 @@ public class ActivityManager { /** * @hide */ + public void setStatusBarAppearance(@Appearance int statusBarAppearance) { + mStatusBarAppearance = statusBarAppearance; + } + + /** + * @hide + */ public boolean getEnsureNavigationBarContrastWhenTransparent() { return mEnsureNavigationBarContrastWhenTransparent; } @@ -2218,6 +2242,7 @@ public class ActivityManager { dest.writeInt(mColorBackground); dest.writeInt(mStatusBarColor); dest.writeInt(mNavigationBarColor); + dest.writeInt(mStatusBarAppearance); dest.writeBoolean(mEnsureStatusBarContrastWhenTransparent); dest.writeBoolean(mEnsureNavigationBarContrastWhenTransparent); dest.writeInt(mResizeMode); @@ -2241,6 +2266,7 @@ public class ActivityManager { mColorBackground = source.readInt(); mStatusBarColor = source.readInt(); mNavigationBarColor = source.readInt(); + mStatusBarAppearance = source.readInt(); mEnsureStatusBarContrastWhenTransparent = source.readBoolean(); mEnsureNavigationBarContrastWhenTransparent = source.readBoolean(); mResizeMode = source.readInt(); @@ -2289,6 +2315,7 @@ public class ActivityManager { && mColorBackground == other.mColorBackground && mStatusBarColor == other.mStatusBarColor && mNavigationBarColor == other.mNavigationBarColor + && mStatusBarAppearance == other.mStatusBarAppearance && mEnsureStatusBarContrastWhenTransparent == other.mEnsureStatusBarContrastWhenTransparent && mEnsureNavigationBarContrastWhenTransparent diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 411d157fa927..4851279eea97 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -694,12 +694,22 @@ public class Dialog implements DialogInterface, Window.Callback, */ @Override public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) { - if ((keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) - && event.isTracking() - && !event.isCanceled() - && !WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { - onBackPressed(); - return true; + if (event.isTracking() && !event.isCanceled()) { + switch (keyCode) { + case KeyEvent.KEYCODE_BACK: + if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { + onBackPressed(); + return true; + } + break; + case KeyEvent.KEYCODE_ESCAPE: + if (mCancelable) { + cancel(); + } else { + dismiss(); + } + return true; + } } return false; } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 2eb6ca758970..8d2394b20438 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -2833,12 +2833,14 @@ public class Notification implements Parcelable } /** - * Note all {@link Uri} that are referenced internally, with the expectation - * that Uri permission grants will need to be issued to ensure the recipient - * of this object is able to render its contents. - * - * @hide - */ + * Note all {@link Uri} that are referenced internally, with the expectation that Uri permission + * grants will need to be issued to ensure the recipient of this object is able to render its + * contents. + * See b/281044385 for more context and examples about what happens when this isn't done + * correctly. + * + * @hide + */ public void visitUris(@NonNull Consumer<Uri> visitor) { if (publicVersion != null) { publicVersion.visitUris(visitor); @@ -2882,13 +2884,13 @@ public class Notification implements Parcelable ArrayList<Person> people = extras.getParcelableArrayList(EXTRA_PEOPLE_LIST, android.app.Person.class); if (people != null && !people.isEmpty()) { for (Person p : people) { - visitor.accept(p.getIconUri()); + p.visitUris(visitor); } } final Person person = extras.getParcelable(EXTRA_MESSAGING_PERSON, Person.class); if (person != null) { - visitor.accept(person.getIconUri()); + person.visitUris(visitor); } final RemoteInputHistoryItem[] history = extras.getParcelableArray( @@ -2910,12 +2912,7 @@ public class Notification implements Parcelable if (!ArrayUtils.isEmpty(messages)) { for (MessagingStyle.Message message : MessagingStyle.Message .getMessagesFromBundleArray(messages)) { - visitor.accept(message.getDataUri()); - - Person senderPerson = message.getSenderPerson(); - if (senderPerson != null) { - visitor.accept(senderPerson.getIconUri()); - } + message.visitUris(visitor); } } @@ -2924,12 +2921,7 @@ public class Notification implements Parcelable if (!ArrayUtils.isEmpty(historic)) { for (MessagingStyle.Message message : MessagingStyle.Message .getMessagesFromBundleArray(historic)) { - visitor.accept(message.getDataUri()); - - Person senderPerson = message.getSenderPerson(); - if (senderPerson != null) { - visitor.accept(senderPerson.getIconUri()); - } + message.visitUris(visitor); } } @@ -2939,7 +2931,7 @@ public class Notification implements Parcelable if (isStyle(CallStyle.class) & extras != null) { Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON, Person.class); if (callPerson != null) { - visitor.accept(callPerson.getIconUri()); + callPerson.visitUris(visitor); } visitIconUri(visitor, extras.getParcelable(EXTRA_VERIFICATION_ICON, Icon.class)); } @@ -8833,6 +8825,18 @@ public class Notification implements Parcelable } /** + * See {@link Notification#visitUris(Consumer)}. + * + * @hide + */ + public void visitUris(@NonNull Consumer<Uri> visitor) { + visitor.accept(getDataUri()); + if (mSender != null) { + mSender.visitUris(visitor); + } + } + + /** * Returns a list of messages read from the given bundle list, e.g. * {@link #EXTRA_MESSAGES} or {@link #EXTRA_HISTORIC_MESSAGES}. */ diff --git a/core/java/android/app/Person.java b/core/java/android/app/Person.java index 97a794d4e4ea..18fc0ce6af15 100644 --- a/core/java/android/app/Person.java +++ b/core/java/android/app/Person.java @@ -24,6 +24,7 @@ import android.os.Parcel; import android.os.Parcelable; import java.util.Objects; +import java.util.function.Consumer; /** * Provides an immutable reference to an entity that appears repeatedly on different surfaces of the @@ -177,6 +178,19 @@ public final class Person implements Parcelable { dest.writeBoolean(mIsBot); } + /** + * Note all {@link Uri} that are referenced internally, with the expectation that Uri permission + * grants will need to be issued to ensure the recipient of this object is able to render its + * contents. + * See b/281044385 for more context and examples about what happens when this isn't done + * correctly. + * + * @hide + */ + public void visitUris(@NonNull Consumer<Uri> visitor) { + visitor.accept(getIconUri()); + } + /** Builder for the immutable {@link Person} class. */ public static class Builder { @Nullable private CharSequence mName; diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index b3eb149bcdcd..397e6f5cc229 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -853,7 +853,7 @@ public class WallpaperManager { private static boolean isLockscreenLiveWallpaperEnabledHelper() { if (sGlobals == null) { sIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean( - "persist.wm.debug.lockscreen_live_wallpaper", false); + "persist.wm.debug.lockscreen_live_wallpaper", true); } if (sIsLockscreenLiveWallpaperEnabled == null) { try { @@ -2932,21 +2932,62 @@ public class WallpaperManager { } } - // Check if the package exists - if (cn != null) { - try { - final PackageManager packageManager = context.getPackageManager(); - packageManager.getPackageInfo(cn.getPackageName(), - PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE); - } catch (PackageManager.NameNotFoundException e) { - cn = null; + if (!isComponentExist(context, cn)) { + cn = null; + } + + return cn; + } + + /** + * Return {@link ComponentName} of the CMF default wallpaper, or + * {@link #getDefaultWallpaperComponent(Context)} if none is defined. + * + * @hide + */ + public static ComponentName getCmfDefaultWallpaperComponent(Context context) { + ComponentName cn = null; + String[] cmfWallpaperMap = context.getResources().getStringArray( + com.android.internal.R.array.default_wallpaper_component_per_device_color); + if (cmfWallpaperMap == null || cmfWallpaperMap.length == 0) { + Log.d(TAG, "No CMF wallpaper config"); + return getDefaultWallpaperComponent(context); + } + + for (String entry : cmfWallpaperMap) { + String[] cmfWallpaper; + if (!TextUtils.isEmpty(entry)) { + cmfWallpaper = entry.split(","); + if (cmfWallpaper != null && cmfWallpaper.length == 2 && VALUE_CMF_COLOR.equals( + cmfWallpaper[0]) && !TextUtils.isEmpty(cmfWallpaper[1])) { + cn = ComponentName.unflattenFromString(cmfWallpaper[1]); + break; + } } } + if (!isComponentExist(context, cn)) { + cn = null; + } + return cn; } + private static boolean isComponentExist(Context context, ComponentName cn) { + if (cn == null) { + return false; + } + try { + final PackageManager packageManager = context.getPackageManager(); + packageManager.getPackageInfo(cn.getPackageName(), + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE); + } catch (PackageManager.NameNotFoundException e) { + return false; + } + return true; + } + /** * Register a callback for lock wallpaper observation. Only the OS may use this. * diff --git a/core/java/android/app/servertransaction/TransactionExecutorHelper.java b/core/java/android/app/servertransaction/TransactionExecutorHelper.java index 5311b09e609d..baf2a4722dff 100644 --- a/core/java/android/app/servertransaction/TransactionExecutorHelper.java +++ b/core/java/android/app/servertransaction/TransactionExecutorHelper.java @@ -193,8 +193,8 @@ public class TransactionExecutorHelper { switch (prevState) { // TODO(lifecycler): Extend to support all possible states. case ON_START: - lifecycleItem = StartActivityItem.obtain(null /* activityOptions */); - break; + // Fall through to return the PAUSE item to ensure the activity is properly + // resumed while relaunching. case ON_PAUSE: lifecycleItem = PauseActivityItem.obtain(); break; diff --git a/core/java/android/content/ContentCaptureOptions.java b/core/java/android/content/ContentCaptureOptions.java index 856bde870bcf..36e0529e3566 100644 --- a/core/java/android/content/ContentCaptureOptions.java +++ b/core/java/android/content/ContentCaptureOptions.java @@ -76,6 +76,20 @@ public final class ContentCaptureOptions implements Parcelable { public final boolean disableFlushForViewTreeAppearing; /** + * Is the content capture receiver enabled. + * + * @hide + */ + public final boolean enableReceiver; + + /** + * Options for the content protection flow. + * + * @hide + */ + @NonNull public final ContentProtectionOptions contentProtectionOptions; + + /** * List of activities explicitly allowlisted for content capture (or {@code null} if allowlisted * for all acitivites in the package). */ @@ -94,52 +108,99 @@ public final class ContentCaptureOptions implements Parcelable { * for contexts belonging to the content capture service app. */ public ContentCaptureOptions(int loggingLevel) { - this(/* lite= */ true, loggingLevel, /* maxBufferSize= */ 0, - /* idleFlushingFrequencyMs= */ 0, /* textChangeFlushingFrequencyMs= */ 0, - /* logHistorySize= */ 0, /* disableFlushForViewTreeAppearing= */ false, + this( + /* lite= */ true, + loggingLevel, + /* maxBufferSize= */ 0, + /* idleFlushingFrequencyMs= */ 0, + /* textChangeFlushingFrequencyMs= */ 0, + /* logHistorySize= */ 0, + /* disableFlushForViewTreeAppearing= */ false, + /* enableReceiver= */ false, + new ContentProtectionOptions( + /* enableReceiver= */ false, + /* bufferSize= */ 0), /* whitelistedComponents= */ null); } - /** - * Default constructor. - */ - public ContentCaptureOptions(int loggingLevel, int maxBufferSize, int idleFlushingFrequencyMs, - int textChangeFlushingFrequencyMs, int logHistorySize, - @SuppressLint({"ConcreteCollection", "NullableCollection"}) - @Nullable ArraySet<ComponentName> whitelistedComponents) { - this(/* lite= */ false, loggingLevel, maxBufferSize, idleFlushingFrequencyMs, - textChangeFlushingFrequencyMs, logHistorySize, + /** Default constructor. */ + public ContentCaptureOptions( + int loggingLevel, + int maxBufferSize, + int idleFlushingFrequencyMs, + int textChangeFlushingFrequencyMs, + int logHistorySize, + @SuppressLint({"ConcreteCollection", "NullableCollection"}) @Nullable + ArraySet<ComponentName> whitelistedComponents) { + this( + /* lite= */ false, + loggingLevel, + maxBufferSize, + idleFlushingFrequencyMs, + textChangeFlushingFrequencyMs, + logHistorySize, ContentCaptureManager.DEFAULT_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING, + ContentCaptureManager.DEFAULT_ENABLE_CONTENT_CAPTURE_RECEIVER, + new ContentProtectionOptions( + ContentCaptureManager.DEFAULT_ENABLE_CONTENT_PROTECTION_RECEIVER, + ContentCaptureManager.DEFAULT_CONTENT_PROTECTION_BUFFER_SIZE), whitelistedComponents); } /** @hide */ - public ContentCaptureOptions(int loggingLevel, int maxBufferSize, int idleFlushingFrequencyMs, - int textChangeFlushingFrequencyMs, int logHistorySize, + public ContentCaptureOptions( + int loggingLevel, + int maxBufferSize, + int idleFlushingFrequencyMs, + int textChangeFlushingFrequencyMs, + int logHistorySize, boolean disableFlushForViewTreeAppearing, - @SuppressLint({"ConcreteCollection", "NullableCollection"}) - @Nullable ArraySet<ComponentName> whitelistedComponents) { - this(/* lite= */ false, loggingLevel, maxBufferSize, idleFlushingFrequencyMs, - textChangeFlushingFrequencyMs, logHistorySize, disableFlushForViewTreeAppearing, + boolean enableReceiver, + @NonNull ContentProtectionOptions contentProtectionOptions, + @SuppressLint({"ConcreteCollection", "NullableCollection"}) @Nullable + ArraySet<ComponentName> whitelistedComponents) { + this( + /* lite= */ false, + loggingLevel, + maxBufferSize, + idleFlushingFrequencyMs, + textChangeFlushingFrequencyMs, + logHistorySize, + disableFlushForViewTreeAppearing, + enableReceiver, + contentProtectionOptions, whitelistedComponents); } /** @hide */ @VisibleForTesting public ContentCaptureOptions(@Nullable ArraySet<ComponentName> whitelistedComponents) { - this(ContentCaptureManager.LOGGING_LEVEL_VERBOSE, + this( + ContentCaptureManager.LOGGING_LEVEL_VERBOSE, ContentCaptureManager.DEFAULT_MAX_BUFFER_SIZE, ContentCaptureManager.DEFAULT_IDLE_FLUSHING_FREQUENCY_MS, ContentCaptureManager.DEFAULT_TEXT_CHANGE_FLUSHING_FREQUENCY_MS, ContentCaptureManager.DEFAULT_LOG_HISTORY_SIZE, ContentCaptureManager.DEFAULT_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING, + ContentCaptureManager.DEFAULT_ENABLE_CONTENT_CAPTURE_RECEIVER, + new ContentProtectionOptions( + ContentCaptureManager.DEFAULT_ENABLE_CONTENT_PROTECTION_RECEIVER, + ContentCaptureManager.DEFAULT_CONTENT_PROTECTION_BUFFER_SIZE), whitelistedComponents); } - private ContentCaptureOptions(boolean lite, int loggingLevel, int maxBufferSize, - int idleFlushingFrequencyMs, int textChangeFlushingFrequencyMs, int logHistorySize, + private ContentCaptureOptions( + boolean lite, + int loggingLevel, + int maxBufferSize, + int idleFlushingFrequencyMs, + int textChangeFlushingFrequencyMs, + int logHistorySize, boolean disableFlushForViewTreeAppearing, - @Nullable ArraySet<ComponentName> whitelistedComponents) { + boolean enableReceiver, + @NonNull ContentProtectionOptions contentProtectionOptions, + @SuppressLint({"ConcreteCollection", "NullableCollection"}) @Nullable + ArraySet<ComponentName> whitelistedComponents) { this.lite = lite; this.loggingLevel = loggingLevel; this.maxBufferSize = maxBufferSize; @@ -147,6 +208,8 @@ public final class ContentCaptureOptions implements Parcelable { this.textChangeFlushingFrequencyMs = textChangeFlushingFrequencyMs; this.logHistorySize = logHistorySize; this.disableFlushForViewTreeAppearing = disableFlushForViewTreeAppearing; + this.enableReceiver = enableReceiver; + this.contentProtectionOptions = contentProtectionOptions; this.whitelistedComponents = whitelistedComponents; } @@ -191,12 +254,22 @@ public final class ContentCaptureOptions implements Parcelable { return "ContentCaptureOptions [loggingLevel=" + loggingLevel + " (lite)]"; } final StringBuilder string = new StringBuilder("ContentCaptureOptions ["); - string.append("loggingLevel=").append(loggingLevel) - .append(", maxBufferSize=").append(maxBufferSize) - .append(", idleFlushingFrequencyMs=").append(idleFlushingFrequencyMs) - .append(", textChangeFlushingFrequencyMs=").append(textChangeFlushingFrequencyMs) - .append(", logHistorySize=").append(logHistorySize) - .append(", disableFlushForViewTreeAppearing=").append(disableFlushForViewTreeAppearing); + string.append("loggingLevel=") + .append(loggingLevel) + .append(", maxBufferSize=") + .append(maxBufferSize) + .append(", idleFlushingFrequencyMs=") + .append(idleFlushingFrequencyMs) + .append(", textChangeFlushingFrequencyMs=") + .append(textChangeFlushingFrequencyMs) + .append(", logHistorySize=") + .append(logHistorySize) + .append(", disableFlushForViewTreeAppearing=") + .append(disableFlushForViewTreeAppearing) + .append(", enableReceiver=") + .append(enableReceiver) + .append(", contentProtectionOptions=") + .append(contentProtectionOptions); if (whitelistedComponents != null) { string.append(", whitelisted=").append(whitelistedComponents); } @@ -210,11 +283,21 @@ public final class ContentCaptureOptions implements Parcelable { pw.print(", lite"); return; } - pw.print(", bufferSize="); pw.print(maxBufferSize); - pw.print(", idle="); pw.print(idleFlushingFrequencyMs); - pw.print(", textIdle="); pw.print(textChangeFlushingFrequencyMs); - pw.print(", logSize="); pw.print(logHistorySize); - pw.print(", disableFlushForViewTreeAppearing="); pw.print(disableFlushForViewTreeAppearing); + pw.print(", bufferSize="); + pw.print(maxBufferSize); + pw.print(", idle="); + pw.print(idleFlushingFrequencyMs); + pw.print(", textIdle="); + pw.print(textChangeFlushingFrequencyMs); + pw.print(", logSize="); + pw.print(logHistorySize); + pw.print(", disableFlushForViewTreeAppearing="); + pw.print(disableFlushForViewTreeAppearing); + pw.print(", enableReceiver="); + pw.print(enableReceiver); + pw.print(", contentProtectionOptions=["); + contentProtectionOptions.dumpShort(pw); + pw.print("]"); if (whitelistedComponents != null) { pw.print(", whitelisted="); pw.print(whitelistedComponents); } @@ -236,6 +319,8 @@ public final class ContentCaptureOptions implements Parcelable { parcel.writeInt(textChangeFlushingFrequencyMs); parcel.writeInt(logHistorySize); parcel.writeBoolean(disableFlushForViewTreeAppearing); + parcel.writeBoolean(enableReceiver); + contentProtectionOptions.writeToParcel(parcel); parcel.writeArraySet(whitelistedComponents); } @@ -254,12 +339,22 @@ public final class ContentCaptureOptions implements Parcelable { final int textChangeFlushingFrequencyMs = parcel.readInt(); final int logHistorySize = parcel.readInt(); final boolean disableFlushForViewTreeAppearing = parcel.readBoolean(); + final boolean enableReceiver = parcel.readBoolean(); + final ContentProtectionOptions contentProtectionOptions = + ContentProtectionOptions.createFromParcel(parcel); @SuppressWarnings("unchecked") final ArraySet<ComponentName> whitelistedComponents = (ArraySet<ComponentName>) parcel.readArraySet(null); - return new ContentCaptureOptions(loggingLevel, maxBufferSize, - idleFlushingFrequencyMs, textChangeFlushingFrequencyMs, logHistorySize, - disableFlushForViewTreeAppearing, whitelistedComponents); + return new ContentCaptureOptions( + loggingLevel, + maxBufferSize, + idleFlushingFrequencyMs, + textChangeFlushingFrequencyMs, + logHistorySize, + disableFlushForViewTreeAppearing, + enableReceiver, + contentProtectionOptions, + whitelistedComponents); } @Override @@ -267,4 +362,62 @@ public final class ContentCaptureOptions implements Parcelable { return new ContentCaptureOptions[size]; } }; + + /** + * Content protection options for a given package. + * + * <p>Does not implement {@code Parcelable} since it is an inner class without a matching AIDL. + * + * @hide + */ + public static class ContentProtectionOptions { + + /** + * Is the content protection receiver enabled. + * + * @hide + */ + public final boolean enableReceiver; + + /** + * Size of the in-memory ring buffer for the content protection flow. + * + * @hide + */ + public final int bufferSize; + + public ContentProtectionOptions(boolean enableReceiver, int bufferSize) { + this.enableReceiver = enableReceiver; + this.bufferSize = bufferSize; + } + + @Override + public String toString() { + StringBuilder stringBuilder = new StringBuilder("ContentProtectionOptions ["); + stringBuilder + .append("enableReceiver=") + .append(enableReceiver) + .append(", bufferSize=") + .append(bufferSize); + return stringBuilder.append(']').toString(); + } + + private void dumpShort(@NonNull PrintWriter pw) { + pw.print("enableReceiver="); + pw.print(enableReceiver); + pw.print(", bufferSize="); + pw.print(bufferSize); + } + + private void writeToParcel(Parcel parcel) { + parcel.writeBoolean(enableReceiver); + parcel.writeInt(bufferSize); + } + + private static ContentProtectionOptions createFromParcel(Parcel parcel) { + boolean enableReceiver = parcel.readBoolean(); + int bufferSize = parcel.readInt(); + return new ContentProtectionOptions(enableReceiver, bufferSize); + } + } } diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index d6df03321298..94bff893b5a8 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -413,6 +413,15 @@ public abstract class DisplayManagerInternal { public abstract HostUsiVersion getHostUsiVersion(int displayId); /** + * Get the ALS data for a particular display. + * + * @param displayId The id of the display. + * @return {@link AmbientLightSensorData} + */ + @Nullable + public abstract AmbientLightSensorData getAmbientLightSensorData(int displayId); + + /** * Get all available DisplayGroupIds. */ public abstract IntArray getDisplayGroupIds(); @@ -669,4 +678,23 @@ public abstract class DisplayManagerInternal { return "RefreshRateLimitation(" + type + ": " + range + ")"; } } + + /** + * Class to provide Ambient sensor data using the API + * {@link DisplayManagerInternal#getAmbientLightSensorData(int)} + */ + public static final class AmbientLightSensorData { + public String sensorName; + public String sensorType; + + public AmbientLightSensorData(String name, String type) { + sensorName = name; + sensorType = type; + } + + @Override + public String toString() { + return "AmbientLightSensorData(" + sensorName + ", " + sensorType + ")"; + } + } } diff --git a/core/java/android/hardware/input/InputSettings.java b/core/java/android/hardware/input/InputSettings.java index 17bbe1459d03..33960c058baa 100644 --- a/core/java/android/hardware/input/InputSettings.java +++ b/core/java/android/hardware/input/InputSettings.java @@ -266,7 +266,7 @@ public class InputSettings { */ public static boolean useTouchpadTapToClick(@NonNull Context context) { return Settings.System.getIntForUser(context.getContentResolver(), - Settings.System.TOUCHPAD_TAP_TO_CLICK, 0, UserHandle.USER_CURRENT) == 1; + Settings.System.TOUCHPAD_TAP_TO_CLICK, 1, UserHandle.USER_CURRENT) == 1; } /** diff --git a/core/java/android/hardware/lights/Light.java b/core/java/android/hardware/lights/Light.java index 1df9b75f0b09..18d0b09faa14 100644 --- a/core/java/android/hardware/lights/Light.java +++ b/core/java/android/hardware/lights/Light.java @@ -110,6 +110,8 @@ public final class Light implements Parcelable { private final int mOrdinal; private final int mType; private final int mCapabilities; + @Nullable + private final int[] mPreferredBrightnessLevels; /** * Creates a new light with the given data. @@ -117,7 +119,7 @@ public final class Light implements Parcelable { * @hide */ public Light(int id, int ordinal, int type) { - this(id, "Light", ordinal, type, 0); + this(id, "Light", ordinal, type, 0, null); } /** @@ -126,11 +128,22 @@ public final class Light implements Parcelable { * @hide */ public Light(int id, String name, int ordinal, int type, int capabilities) { + this(id, name, ordinal, type, capabilities, null); + } + + /** + * Creates a new light with the given data. + * + * @hide + */ + public Light(int id, String name, int ordinal, int type, int capabilities, + @Nullable int[] preferredBrightnessLevels) { mId = id; mName = name; mOrdinal = ordinal; mType = type; mCapabilities = capabilities; + mPreferredBrightnessLevels = preferredBrightnessLevels; } private Light(@NonNull Parcel in) { @@ -139,6 +152,7 @@ public final class Light implements Parcelable { mOrdinal = in.readInt(); mType = in.readInt(); mCapabilities = in.readInt(); + mPreferredBrightnessLevels = in.createIntArray(); } /** Implement the Parcelable interface */ @@ -149,6 +163,7 @@ public final class Light implements Parcelable { dest.writeInt(mOrdinal); dest.writeInt(mType); dest.writeInt(mCapabilities); + dest.writeIntArray(mPreferredBrightnessLevels); } /** Implement the Parcelable interface */ @@ -252,4 +267,17 @@ public final class Light implements Parcelable { return (mCapabilities & LIGHT_CAPABILITY_COLOR_RGB) == LIGHT_CAPABILITY_COLOR_RGB; } + /** + * Returns preferred brightness levels for the light which will be used when user + * increase/decrease brightness levels for the light (currently only used for Keyboard + * backlight control using backlight up/down keys). + * + * The values in the preferred brightness level array are in the range [0, 255]. + * + * @hide + */ + @Nullable + public int[] getPreferredBrightnessLevels() { + return mPreferredBrightnessLevels; + } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d695c0cb3760..d425bf8ae557 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7486,6 +7486,14 @@ public final class Settings { public static final String STYLUS_BUTTONS_ENABLED = "stylus_buttons_enabled"; /** + * Preferred default user profile to use with the notes task button shortcut. + * + * @hide + */ + @SuppressLint("NoSettingsProvider") + public static final String DEFAULT_NOTE_TASK_PROFILE = "default_note_task_profile"; + + /** * Host name and port for global http proxy. Uses ':' seperator for * between host and port. * @@ -17979,6 +17987,15 @@ public final class Settings { "review_permissions_notification_state"; /** + * Whether repair mode is active on the device. + * <p> + * Set to 1 for true and 0 for false. + * + * @hide + */ + public static final String REPAIR_MODE_ACTIVE = "repair_mode_active"; + + /** * Settings migrated from Wear OS settings provider. * @hide */ diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index 737c95fadccd..7fa0ac846d60 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -37,6 +37,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.ParcelFileDescriptor; +import android.os.Process; import android.os.RemoteException; import android.util.Log; import android.util.Slog; @@ -88,6 +89,18 @@ public abstract class ContentCaptureService extends Service { "android.service.contentcapture.ContentCaptureService"; /** + * The {@link Intent} that must be declared as handled by the protection service. + * + * <p>To be supported, the service must also require the {@link + * android.Manifest.permission#BIND_CONTENT_CAPTURE_SERVICE} permission so that other + * applications can not abuse it. + * + * @hide + */ + public static final String PROTECTION_SERVICE_INTERFACE = + "android.service.contentcapture.ContentProtectionService"; + + /** * Name under which a ContentCaptureService component publishes information about itself. * * <p>This meta-data should reference an XML resource containing a @@ -128,10 +141,9 @@ public abstract class ContentCaptureService extends Service { private long mCallerMismatchTimeout = 1000; private long mLastCallerMismatchLog; - /** - * Binder that receives calls from the system server. - */ - private final IContentCaptureService mServerInterface = new IContentCaptureService.Stub() { + /** Binder that receives calls from the system server in the content capture flow. */ + private final IContentCaptureService mContentCaptureServerInterface = + new IContentCaptureService.Stub() { @Override public void onConnected(IBinder callback, boolean verbose, boolean debug) { @@ -187,10 +199,24 @@ public abstract class ContentCaptureService extends Service { } }; - /** - * Binder that receives calls from the app. - */ - private final IContentCaptureDirectManager mClientInterface = + /** Binder that receives calls from the system server in the content protection flow. */ + private final IContentProtectionService mContentProtectionServerInterface = + new IContentProtectionService.Stub() { + + @Override + public void onLoginDetected( + @SuppressWarnings("rawtypes") ParceledListSlice events) { + mHandler.sendMessage( + obtainMessage( + ContentCaptureService::handleOnLoginDetected, + ContentCaptureService.this, + Binder.getCallingUid(), + events)); + } + }; + + /** Binder that receives calls from the app in the content capture flow. */ + private final IContentCaptureDirectManager mContentCaptureClientInterface = new IContentCaptureDirectManager.Stub() { @Override @@ -220,9 +246,19 @@ public abstract class ContentCaptureService extends Service { @Override public final IBinder onBind(Intent intent) { if (SERVICE_INTERFACE.equals(intent.getAction())) { - return mServerInterface.asBinder(); - } - Log.w(TAG, "Tried to bind to wrong intent (should be " + SERVICE_INTERFACE + ": " + intent); + return mContentCaptureServerInterface.asBinder(); + } + if (PROTECTION_SERVICE_INTERFACE.equals(intent.getAction())) { + return mContentProtectionServerInterface.asBinder(); + } + Log.w( + TAG, + "Tried to bind to wrong intent (should be " + + SERVICE_INTERFACE + + " or " + + PROTECTION_SERVICE_INTERFACE + + "): " + + intent); return null; } @@ -456,7 +492,7 @@ public abstract class ContentCaptureService extends Service { } else { stateFlags |= ContentCaptureSession.STATE_DISABLED; } - setClientState(clientReceiver, stateFlags, mClientInterface.asBinder()); + setClientState(clientReceiver, stateFlags, mContentCaptureClientInterface.asBinder()); } private void handleSendEvents(int uid, @@ -524,6 +560,18 @@ public abstract class ContentCaptureService extends Service { writeFlushMetrics(lastSessionId, activityComponent, metrics, options, reason); } + private void handleOnLoginDetected( + int uid, @NonNull ParceledListSlice<ContentCaptureEvent> parceledEvents) { + if (uid != Process.SYSTEM_UID) { + Log.e(TAG, "handleOnLoginDetected() not allowed for uid: " + uid); + return; + } + List<ContentCaptureEvent> events = parceledEvents.getList(); + int sessionIdInt = events.isEmpty() ? NO_SESSION_ID : events.get(0).getSessionId(); + ContentCaptureSessionId sessionId = new ContentCaptureSessionId(sessionIdInt); + events.forEach(event -> onContentCaptureEvent(sessionId, event)); + } + private void handleOnActivitySnapshot(int sessionId, @NonNull SnapshotData snapshotData) { onActivitySnapshot(new ContentCaptureSessionId(sessionId), snapshotData); } diff --git a/core/java/android/service/contentcapture/ContentCaptureServiceInfo.java b/core/java/android/service/contentcapture/ContentCaptureServiceInfo.java index fb6061916d99..4aa5c00a6a52 100644 --- a/core/java/android/service/contentcapture/ContentCaptureServiceInfo.java +++ b/core/java/android/service/contentcapture/ContentCaptureServiceInfo.java @@ -48,7 +48,7 @@ import java.io.PrintWriter; * * @hide */ -public final class ContentCaptureServiceInfo { +public class ContentCaptureServiceInfo { private static final String TAG = ContentCaptureServiceInfo.class.getSimpleName(); private static final String XML_TAG_SERVICE = "content-capture-service"; diff --git a/core/java/android/service/contentcapture/IContentProtectionService.aidl b/core/java/android/service/contentcapture/IContentProtectionService.aidl new file mode 100644 index 000000000000..4a13c3f63a33 --- /dev/null +++ b/core/java/android/service/contentcapture/IContentProtectionService.aidl @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.contentcapture; + +import android.content.pm.ParceledListSlice; +import android.view.contentcapture.ContentCaptureEvent; + +/** + * Interface from the system server to the content protection service. + * + * @hide + */ +oneway interface IContentProtectionService { + + void onLoginDetected(in ParceledListSlice events); +} diff --git a/core/java/android/service/dreams/DreamOverlayService.java b/core/java/android/service/dreams/DreamOverlayService.java index 5469916bea4e..9a02b74b37d0 100644 --- a/core/java/android/service/dreams/DreamOverlayService.java +++ b/core/java/android/service/dreams/DreamOverlayService.java @@ -71,13 +71,7 @@ public abstract class DreamOverlayService extends Service { @Override public void wakeUp() { - mService.wakeUp(this, () -> { - try { - mDreamOverlayCallback.onWakeUpComplete(); - } catch (RemoteException e) { - Log.e(TAG, "Could not notify dream of wakeUp", e); - } - }); + mService.wakeUp(this); } @Override @@ -125,14 +119,14 @@ public abstract class DreamOverlayService extends Service { mCurrentClient = null; } - private void wakeUp(OverlayClient client, Runnable callback) { + private void wakeUp(OverlayClient client) { // Run on executor as this is a binder call from OverlayClient. mExecutor.execute(() -> { if (mCurrentClient != client) { return; } - onWakeUp(callback); + onWakeUp(); }); } @@ -190,19 +184,10 @@ public abstract class DreamOverlayService extends Service { /** * This method is overridden by implementations to handle when the dream has been requested - * to wakeup. This allows any overlay animations to run. By default, the method will invoke - * the callback immediately. - * - * This callback will be run on the {@link Executor} provided in the constructor if provided, or - * on the main executor if none was provided. - * - * @param onCompleteCallback The callback to trigger to notify the dream service that the - * overlay has completed waking up. + * to wakeup. * @hide */ - public void onWakeUp(@NonNull Runnable onCompleteCallback) { - onCompleteCallback.run(); - } + public void onWakeUp() {} /** * This method is overridden by implementations to handle when the dream has ended. There may diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 3a323524b68e..cd57de5649da 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -249,13 +249,6 @@ public class DreamService extends Service implements Window.Callback { // Simply finish dream when exit is requested. mHandler.post(() -> finish()); } - - @Override - public void onWakeUpComplete() { - // Finish the dream once overlay animations are complete. Execute on handler since - // this is coming in on the overlay binder. - mHandler.post(() -> finish()); - } }; @@ -923,6 +916,7 @@ public class DreamService extends Service implements Window.Callback { overlay.wakeUp(); } catch (RemoteException e) { Slog.e(TAG, "Error waking the overlay service", e); + } finally { finish(); } }); diff --git a/core/java/android/service/dreams/IDreamOverlayCallback.aidl b/core/java/android/service/dreams/IDreamOverlayCallback.aidl index 4ad63f1317d1..ec76a334d5b2 100644 --- a/core/java/android/service/dreams/IDreamOverlayCallback.aidl +++ b/core/java/android/service/dreams/IDreamOverlayCallback.aidl @@ -28,7 +28,4 @@ interface IDreamOverlayCallback { * Invoked to request the dream exit. */ void onExitRequested(); - - /** Invoked when the dream overlay wakeUp animation is complete. */ - void onWakeUpComplete(); }
\ No newline at end of file diff --git a/core/java/android/view/ISurfaceControlViewHost.aidl b/core/java/android/view/ISurfaceControlViewHost.aidl index 15008ae18618..fd4b329570d9 100644 --- a/core/java/android/view/ISurfaceControlViewHost.aidl +++ b/core/java/android/view/ISurfaceControlViewHost.aidl @@ -19,6 +19,7 @@ package android.view; import android.content.res.Configuration; import android.graphics.Rect; import android.view.InsetsState; +import android.view.ISurfaceControlViewHostParent; import android.window.ISurfaceSyncGroup; /** @@ -34,4 +35,9 @@ interface ISurfaceControlViewHost { oneway void onDispatchDetachedFromWindow(); oneway void onInsetsChanged(in InsetsState state, in Rect insetFrame); ISurfaceSyncGroup getSurfaceSyncGroup(); + /** + * Attaches the parent interface so the embedded content can communicate back to the parent. + * If null is passed in, it will remove the parent interface and no more updates will be sent. + */ + oneway void attachParentInterface(in @nullable ISurfaceControlViewHostParent parentInterface); } diff --git a/core/java/android/view/ISurfaceControlViewHostParent.aidl b/core/java/android/view/ISurfaceControlViewHostParent.aidl new file mode 100644 index 000000000000..f42e00148587 --- /dev/null +++ b/core/java/android/view/ISurfaceControlViewHostParent.aidl @@ -0,0 +1,27 @@ +/* +** Copyright 2023, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +package android.view; + +import android.view.WindowManager; + +/** + * API from embedded content in SurfaceControlViewHost to parent containing the embedded. + * {@hide} + */ +oneway interface ISurfaceControlViewHostParent { + void updateParams(in WindowManager.LayoutParams[] childAttrs); +} diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 209729b2a38b..6d96bb9423c5 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -471,10 +471,23 @@ interface IWindowManager * Requests Keyboard Shortcuts from the displayed window. * * @param receiver The receiver to deliver the results to. + * @param deviceId The deviceId of KeyEvent by which this request is triggered, or -1 if it's + * not triggered by a KeyEvent. + * @see #requestImeKeyboardShortcuts(IResultReceiver, int) */ void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId); /** + * Requests Keyboard Shortcuts from currently selected IME. + * + * @param receiver The receiver to deliver the results to. + * @param deviceId The deviceId of KeyEvent by which this request is triggered, or -1 if it's + * not triggered by a KeyEvent. + * @see #requestAppKeyboardShortcuts(IResultReceiver, int) + */ + void requestImeKeyboardShortcuts(IResultReceiver receiver, int deviceId); + + /** * Retrieves the current stable insets from the primary display. */ @UnsupportedAppUsage diff --git a/core/java/android/view/InsetsFrameProvider.java b/core/java/android/view/InsetsFrameProvider.java index 37b6c77e3c74..83bdb087a539 100644 --- a/core/java/android/view/InsetsFrameProvider.java +++ b/core/java/android/view/InsetsFrameProvider.java @@ -164,6 +164,10 @@ public class InsetsFrameProvider implements Parcelable { return mFlags; } + public boolean hasFlags(@Flags int mask) { + return (mFlags & mask) == mask; + } + public InsetsFrameProvider setInsetsSize(Insets insetsSize) { mInsetsSize = insetsSize; return this; diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java index 9fc42fff7084..e10184976abe 100644 --- a/core/java/android/view/InsetsSource.java +++ b/core/java/android/view/InsetsSource.java @@ -58,9 +58,20 @@ public class InsetsSource implements Parcelable { */ public static final int FLAG_SUPPRESS_SCRIM = 1; + /** + * Controls whether the insets frame will be used to move {@link RoundedCorner} inward with the + * insets frame size when calculating the rounded corner insets to other windows. + * + * For example, task bar will draw fake rounded corners above itself, so we need to move the + * rounded corner up by the task bar insets size to make other windows see a rounded corner + * above the task bar. + */ + public static final int FLAG_INSETS_ROUNDED_CORNER = 1 << 1; + @Retention(RetentionPolicy.SOURCE) @IntDef(flag = true, prefix = "FLAG_", value = { FLAG_SUPPRESS_SCRIM, + FLAG_INSETS_ROUNDED_CORNER, }) public @interface Flags {} @@ -78,7 +89,6 @@ public class InsetsSource implements Parcelable { private @Nullable Rect mVisibleFrame; private boolean mVisible; - private boolean mInsetsRoundedCornerFrame; private final Rect mTmpFrame = new Rect(); @@ -98,7 +108,6 @@ public class InsetsSource implements Parcelable { ? new Rect(other.mVisibleFrame) : null; mFlags = other.mFlags; - mInsetsRoundedCornerFrame = other.mInsetsRoundedCornerFrame; } public void set(InsetsSource other) { @@ -108,7 +117,6 @@ public class InsetsSource implements Parcelable { ? new Rect(other.mVisibleFrame) : null; mFlags = other.mFlags; - mInsetsRoundedCornerFrame = other.mInsetsRoundedCornerFrame; } public InsetsSource setFrame(int left, int top, int right, int bottom) { @@ -136,6 +144,11 @@ public class InsetsSource implements Parcelable { return this; } + public InsetsSource setFlags(@Flags int flags, @Flags int mask) { + mFlags = (mFlags & ~mask) | (flags & mask); + return this; + } + public int getId() { return mId; } @@ -160,20 +173,15 @@ public class InsetsSource implements Parcelable { return mFlags; } + public boolean hasFlags(int flags) { + return (mFlags & flags) == flags; + } + boolean isUserControllable() { // If mVisibleFrame is null, it will be the same area as mFrame. return mVisibleFrame == null || !mVisibleFrame.isEmpty(); } - public boolean insetsRoundedCornerFrame() { - return mInsetsRoundedCornerFrame; - } - - public InsetsSource setInsetsRoundedCornerFrame(boolean insetsRoundedCornerFrame) { - mInsetsRoundedCornerFrame = insetsRoundedCornerFrame; - return this; - } - /** * Calculates the insets this source will cause to a client window. * @@ -317,6 +325,9 @@ public class InsetsSource implements Parcelable { if ((flags & FLAG_SUPPRESS_SCRIM) != 0) { joiner.add("SUPPRESS_SCRIM"); } + if ((flags & FLAG_INSETS_ROUNDED_CORNER) != 0) { + joiner.add("INSETS_ROUNDED_CORNER"); + } return joiner.toString(); } @@ -347,7 +358,6 @@ public class InsetsSource implements Parcelable { } pw.print(" visible="); pw.print(mVisible); pw.print(" flags="); pw.print(flagsToString(mFlags)); - pw.print(" insetsRoundedCornerFrame="); pw.print(mInsetsRoundedCornerFrame); pw.println(); } @@ -372,14 +382,12 @@ public class InsetsSource implements Parcelable { if (mFlags != that.mFlags) return false; if (excludeInvisibleImeFrames && !mVisible && mType == WindowInsets.Type.ime()) return true; if (!Objects.equals(mVisibleFrame, that.mVisibleFrame)) return false; - if (mInsetsRoundedCornerFrame != that.mInsetsRoundedCornerFrame) return false; return mFrame.equals(that.mFrame); } @Override public int hashCode() { - return Objects.hash(mId, mType, mFrame, mVisibleFrame, mVisible, mFlags, - mInsetsRoundedCornerFrame); + return Objects.hash(mId, mType, mFrame, mVisibleFrame, mVisible, mFlags); } public InsetsSource(Parcel in) { @@ -393,7 +401,6 @@ public class InsetsSource implements Parcelable { } mVisible = in.readBoolean(); mFlags = in.readInt(); - mInsetsRoundedCornerFrame = in.readBoolean(); } @Override @@ -414,7 +421,6 @@ public class InsetsSource implements Parcelable { } dest.writeBoolean(mVisible); dest.writeInt(mFlags); - dest.writeBoolean(mInsetsRoundedCornerFrame); } @Override @@ -424,7 +430,6 @@ public class InsetsSource implements Parcelable { + " mFrame=" + mFrame.toShortString() + " mVisible=" + mVisible + " mFlags=[" + flagsToString(mFlags) + "]" - + (mInsetsRoundedCornerFrame ? " insetsRoundedCornerFrame" : "") + "}"; } diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index 5b974cdb2bca..61a72772200c 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -16,6 +16,7 @@ package android.view; +import static android.view.InsetsSource.FLAG_INSETS_ROUNDED_CORNER; import static android.view.InsetsStateProto.DISPLAY_CUTOUT; import static android.view.InsetsStateProto.DISPLAY_FRAME; import static android.view.InsetsStateProto.SOURCES; @@ -219,7 +220,7 @@ public class InsetsState implements Parcelable { final Rect roundedCornerFrame = new Rect(mRoundedCornerFrame); for (int i = mSources.size() - 1; i >= 0; i--) { final InsetsSource source = mSources.valueAt(i); - if (source.insetsRoundedCornerFrame()) { + if (source.hasFlags(FLAG_INSETS_ROUNDED_CORNER)) { final Insets insets = source.calculateInsets(roundedCornerFrame, false); roundedCornerFrame.inset(insets); } diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 1af8ca2efe11..c703af5af4e6 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1285,6 +1285,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { * </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. + * <p> + * This axis is only set on the first pointer in a motion event. */ public static final int AXIS_GESTURE_X_OFFSET = 48; @@ -1304,6 +1306,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { * </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. + * <p> + * This axis is only set on the first pointer in a motion event. */ public static final int AXIS_GESTURE_SCROLL_X_DISTANCE = 50; @@ -1324,14 +1328,29 @@ public final class MotionEvent extends InputEvent implements Parcelable { * </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. + * <p> + * This axis is only set on the first pointer in a motion event. */ public static final int AXIS_GESTURE_PINCH_SCALE_FACTOR = 52; + /** + * Axis constant: the number of fingers being used in a multi-finger swipe gesture. + * <p> + * <ul> + * <li>For a touch pad, reports the number of fingers being used in a multi-finger swipe gesture + * (with CLASSIFICATION_MULTI_FINGER_SWIPE). + * </ul> + * <p> + * Since CLASSIFICATION_MULTI_FINGER_SWIPE is a hidden API, so is this axis. It is only set on + * the first pointer in a motion event. + * @hide + */ + public static final int AXIS_GESTURE_SWIPE_FINGER_COUNT = 53; + // NOTE: If you add a new axis here you must also add it to: // frameworks/native/include/android/input.h // frameworks/native/libs/input/InputEventLabels.cpp - // platform/cts/tests/tests/view/src/android/view/cts/MotionEventTest.java - // (testAxisFromToString) + // cts/tests/tests/view/src/android/view/cts/MotionEventTest.java (testAxisFromToString) // Symbolic names of all axes. private static final SparseArray<String> AXIS_SYMBOLIC_NAMES = new SparseArray<String>(); @@ -1387,6 +1406,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { names.append(AXIS_GESTURE_SCROLL_X_DISTANCE, "AXIS_GESTURE_SCROLL_X_DISTANCE"); names.append(AXIS_GESTURE_SCROLL_Y_DISTANCE, "AXIS_GESTURE_SCROLL_Y_DISTANCE"); names.append(AXIS_GESTURE_PINCH_SCALE_FACTOR, "AXIS_GESTURE_PINCH_SCALE_FACTOR"); + names.append(AXIS_GESTURE_SWIPE_FINGER_COUNT, "AXIS_GESTURE_SWIPE_FINGER_COUNT"); } /** diff --git a/core/java/android/view/SurfaceControlViewHost.java b/core/java/android/view/SurfaceControlViewHost.java index c8cf7d9a5194..effc127dabd2 100644 --- a/core/java/android/view/SurfaceControlViewHost.java +++ b/core/java/android/view/SurfaceControlViewHost.java @@ -54,7 +54,7 @@ public class SurfaceControlViewHost { private final static String TAG = "SurfaceControlViewHost"; private final ViewRootImpl mViewRoot; private final CloseGuard mCloseGuard = CloseGuard.get(); - private WindowlessWindowManager mWm; + private final WindowlessWindowManager mWm; private SurfaceControl mSurfaceControl; private IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection; @@ -67,9 +67,7 @@ public class SurfaceControlViewHost { return; } mViewRoot.mHandler.post(() -> { - if (mWm != null) { - mWm.setConfiguration(configuration); - } + mWm.setConfiguration(configuration); if (mViewRoot != null) { mViewRoot.forceWmRelayout(); } @@ -116,6 +114,11 @@ public class SurfaceControlViewHost { } return null; } + + @Override + public void attachParentInterface(@Nullable ISurfaceControlViewHostParent parentInterface) { + mViewRoot.mHandler.post(() -> mWm.setParentInterface(parentInterface)); + } } private ISurfaceControlViewHost mRemoteInterface = new ISurfaceControlViewHostImpl(); @@ -148,10 +151,11 @@ public class SurfaceControlViewHost { private SurfaceControl mSurfaceControl; private final IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection; private final IBinder mInputToken; + @NonNull private final ISurfaceControlViewHost mRemoteInterface; SurfacePackage(SurfaceControl sc, IAccessibilityEmbeddedConnection connection, - IBinder inputToken, ISurfaceControlViewHost ri) { + IBinder inputToken, @NonNull ISurfaceControlViewHost ri) { mSurfaceControl = sc; mAccessibilityEmbeddedConnection = connection; mInputToken = inputToken; @@ -213,6 +217,7 @@ public class SurfaceControlViewHost { /** * @hide */ + @NonNull public ISurfaceControlViewHost getRemoteInterface() { return mRemoteInterface; } diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 0e4cf89e7772..1e268bed3b17 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -16,6 +16,7 @@ package android.view; +import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON; import static android.view.WindowManagerPolicyConstants.APPLICATION_MEDIA_OVERLAY_SUBLAYER; import static android.view.WindowManagerPolicyConstants.APPLICATION_MEDIA_SUBLAYER; import static android.view.WindowManagerPolicyConstants.APPLICATION_PANEL_SUBLAYER; @@ -40,6 +41,7 @@ import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; +import android.os.RemoteException; import android.os.SystemClock; import android.util.ArraySet; import android.util.AttributeSet; @@ -54,6 +56,8 @@ import com.android.internal.view.SurfaceCallbackHelper; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.Arrays; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; @@ -302,6 +306,26 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall private SurfaceControl mBlastSurfaceControl; private BLASTBufferQueue mBlastBufferQueue; + private final ConcurrentLinkedQueue<WindowManager.LayoutParams> mEmbeddedWindowParams = + new ConcurrentLinkedQueue<>(); + + private final ISurfaceControlViewHostParent mSurfaceControlViewHostParent = + new ISurfaceControlViewHostParent.Stub() { + @Override + public void updateParams(WindowManager.LayoutParams[] childAttrs) { + mEmbeddedWindowParams.clear(); + mEmbeddedWindowParams.addAll(Arrays.asList(childAttrs)); + + if (isAttachedToWindow()) { + runOnUiThread(() -> { + if (mParent != null) { + mParent.recomputeViewAttributes(SurfaceView.this); + } + }); + } + } + }; + public SurfaceView(Context context) { this(context, null); } @@ -801,9 +825,18 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall mBlastSurfaceControl = null; } - if (releaseSurfacePackage && mSurfacePackage != null) { - mSurfacePackage.release(); - mSurfacePackage = null; + if (mSurfacePackage != null) { + try { + mSurfacePackage.getRemoteInterface().attachParentInterface(null); + mEmbeddedWindowParams.clear(); + } catch (RemoteException e) { + Log.d(TAG, "Failed to remove parent interface from SCVH. Likely SCVH is " + + "already dead"); + } + if (releaseSurfacePackage) { + mSurfacePackage.release(); + mSurfacePackage = null; + } } applyTransactionOnVriDraw(transaction); @@ -1854,6 +1887,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall applyTransactionOnVriDraw(transaction); } mSurfacePackage = p; + try { + mSurfacePackage.getRemoteInterface().attachParentInterface( + mSurfaceControlViewHostParent); + } catch (RemoteException e) { + Log.d(TAG, "Failed to attach parent interface to SCVH. Likely SCVH is already dead."); + } if (isFocused()) { requestEmbeddedFocus(true); @@ -2014,4 +2053,19 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall mBlastBufferQueue.mergeWithNextTransaction(transaction, frameNumber); } } + + @Override + void performCollectViewAttributes(AttachInfo attachInfo, int visibility) { + super.performCollectViewAttributes(attachInfo, visibility); + if (mEmbeddedWindowParams.isEmpty()) { + return; + } + + for (WindowManager.LayoutParams embeddedWindowAttr : mEmbeddedWindowParams) { + if ((embeddedWindowAttr.flags & FLAG_KEEP_SCREEN_ON) == FLAG_KEEP_SCREEN_ON) { + attachInfo.mKeepScreenOn = true; + break; + } + } + } } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index d4578475e9c3..01a99b92a055 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2043,7 +2043,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager final float x = event.getXDispatchLocation(pointerIndex); final float y = event.getYDispatchLocation(pointerIndex); if (isOnScrollbarThumb(x, y) || isDraggingScrollBar()) { - return PointerIcon.getSystemIcon(mContext, PointerIcon.TYPE_ARROW); + // Return null here so that it fallbacks to the default PointerIcon for the source + // device. For mouse, the default PointerIcon is PointerIcon.TYPE_ARROW. + // For stylus, the default PointerIcon is PointerIcon.TYPE_NULL. + return null; } // Check what the child under the pointer says about the pointer. final int childrenCount = mChildrenCount; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index a28be4be24ad..c396af6323d2 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1900,9 +1900,10 @@ public final class ViewRootImpl implements ViewParent, && !Objects.equals(mTmpFrames.attachedFrame, attachedFrame); final boolean displayChanged = mDisplay.getDisplayId() != displayId; final boolean compatScaleChanged = mTmpFrames.compatScale != compatScale; + final boolean dragResizingChanged = mPendingDragResizing != dragResizing; if (msg == MSG_RESIZED && !frameChanged && !configChanged && !attachedFrameChanged && !displayChanged && !forceNextWindowRelayout - && !compatScaleChanged) { + && !compatScaleChanged && !dragResizingChanged) { return; } diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 21fe87f42e1b..2f04b0c695da 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -658,6 +658,12 @@ public abstract class Window { void updateStatusBarColor(int color); /** + * Update the status bar appearance. + */ + + void updateStatusBarAppearance(int appearance); + + /** * Update the navigation bar color to a forced one. */ void updateNavigationBarColor(int color); @@ -1039,6 +1045,9 @@ public abstract class Window { if (mDecorCallback != null) { mDecorCallback.onSystemBarAppearanceChanged(appearance); } + if (mWindowControllerCallback != null) { + mWindowControllerCallback.updateStatusBarAppearance(appearance); + } } /** @hide */ @@ -1482,6 +1491,11 @@ public abstract class Window { } /** @hide */ + public boolean shouldCloseOnTouchOutside() { + return mCloseOnTouchOutside; + } + + /** @hide */ @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void alwaysReadCloseOnTouchAttr(); diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index a91781580ac4..d702367965a1 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1384,15 +1384,28 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"; /** - * Request for keyboard shortcuts to be retrieved asynchronously. + * Request for app's keyboard shortcuts to be retrieved asynchronously. * * @param receiver The callback to be triggered when the result is ready. + * @param deviceId The deviceId of KeyEvent by which this request is triggered, or -1 if it's + * not triggered by a KeyEvent. * * @hide */ public void requestAppKeyboardShortcuts(final KeyboardShortcutsReceiver receiver, int deviceId); /** + * Request for ime's keyboard shortcuts to be retrieved asynchronously. + * + * @param receiver The callback to be triggered when the result is ready. + * @param deviceId The deviceId of KeyEvent by which this request is triggered, or -1 if it's + * not triggered by a KeyEvent. + * + * @hide + */ + default void requestImeKeyboardShortcuts(KeyboardShortcutsReceiver receiver, int deviceId) {}; + + /** * Return the touch region for the current IME window, or an empty region if there is none. * * @return The region of the IME that is accepting touch inputs, or null if there is no IME, no @@ -4294,17 +4307,6 @@ public interface WindowManager extends ViewManager { public InsetsFrameProvider[] providedInsets; /** - * If specified, the frame that used to calculate relative {@link RoundedCorner} will be - * the window frame of this window minus the insets that this window provides. - * - * Task bar will draw fake rounded corners above itself, so we need this insets to calculate - * correct rounded corners for this window. - * - * @hide - */ - public boolean insetsRoundedCornerFrame = false; - - /** * {@link LayoutParams} to be applied to the window when layout with a assigned rotation. * This will make layout during rotation change smoothly. * @@ -4760,7 +4762,6 @@ public interface WindowManager extends ViewManager { out.writeBoolean(mFitInsetsIgnoringVisibility); out.writeBoolean(preferMinimalPostProcessing); out.writeInt(mBlurBehindRadius); - out.writeBoolean(insetsRoundedCornerFrame); out.writeBoolean(mWallpaperTouchEventsEnabled); out.writeTypedArray(providedInsets, 0 /* parcelableFlags */); checkNonRecursiveParams(); @@ -4832,7 +4833,6 @@ public interface WindowManager extends ViewManager { mFitInsetsIgnoringVisibility = in.readBoolean(); preferMinimalPostProcessing = in.readBoolean(); mBlurBehindRadius = in.readInt(); - insetsRoundedCornerFrame = in.readBoolean(); mWallpaperTouchEventsEnabled = in.readBoolean(); providedInsets = in.createTypedArray(InsetsFrameProvider.CREATOR); paramsForRotation = in.createTypedArray(LayoutParams.CREATOR); @@ -5140,11 +5140,6 @@ public interface WindowManager extends ViewManager { changes |= LAYOUT_CHANGED; } - if (insetsRoundedCornerFrame != o.insetsRoundedCornerFrame) { - insetsRoundedCornerFrame = o.insetsRoundedCornerFrame; - changes |= LAYOUT_CHANGED; - } - if (paramsForRotation != o.paramsForRotation) { if ((changes & LAYOUT_CHANGED) == 0) { if (paramsForRotation != null && o.paramsForRotation != null @@ -5382,10 +5377,6 @@ public interface WindowManager extends ViewManager { sb.append(prefix).append(" ").append(providedInsets[i]); } } - if (insetsRoundedCornerFrame) { - sb.append(" insetsRoundedCornerFrame="); - sb.append(insetsRoundedCornerFrame); - } if (paramsForRotation != null && paramsForRotation.length != 0) { sb.append(System.lineSeparator()); sb.append(prefix).append(" paramsForRotation:"); diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index df3e0bb74292..b57163c4e435 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -215,14 +215,36 @@ public final class WindowManagerImpl implements WindowManager { @Override public void send(int resultCode, Bundle resultData) throws RemoteException { List<KeyboardShortcutGroup> result = - resultData.getParcelableArrayList(PARCEL_KEY_SHORTCUTS_ARRAY, android.view.KeyboardShortcutGroup.class); + resultData.getParcelableArrayList(PARCEL_KEY_SHORTCUTS_ARRAY, + android.view.KeyboardShortcutGroup.class); receiver.onKeyboardShortcutsReceived(result); } }; try { WindowManagerGlobal.getWindowManagerService() - .requestAppKeyboardShortcuts(resultReceiver, deviceId); + .requestAppKeyboardShortcuts(resultReceiver, deviceId); } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override + public void requestImeKeyboardShortcuts( + final KeyboardShortcutsReceiver receiver, int deviceId) { + IResultReceiver resultReceiver = new IResultReceiver.Stub() { + @Override + public void send(int resultCode, Bundle resultData) throws RemoteException { + List<KeyboardShortcutGroup> result = + resultData.getParcelableArrayList(PARCEL_KEY_SHORTCUTS_ARRAY, + android.view.KeyboardShortcutGroup.class); + receiver.onKeyboardShortcutsReceived(result); + } + }; + try { + WindowManagerGlobal.getWindowManagerService() + .requestImeKeyboardShortcuts(resultReceiver, deviceId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } } diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index 96bfb2d9e1e6..7d3d283a45f2 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -49,7 +49,8 @@ public class WindowlessWindowManager implements IWindowSession { private class State { SurfaceControl mSurfaceControl; - WindowManager.LayoutParams mParams = new WindowManager.LayoutParams(); + final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams(); + final WindowManager.LayoutParams mLastReportedParams = new WindowManager.LayoutParams(); int mDisplayId; IBinder mInputChannelToken; Region mInputRegion; @@ -94,6 +95,8 @@ public class WindowlessWindowManager implements IWindowSession { private final MergedConfiguration mTmpConfig = new MergedConfiguration(); private final WindowlessWindowLayout mLayout = new WindowlessWindowLayout(); + private ISurfaceControlViewHostParent mParentInterface; + public WindowlessWindowManager(Configuration c, SurfaceControl rootSurface, IBinder hostInputToken) { mRootSurface = rootSurface; @@ -244,6 +247,7 @@ public class WindowlessWindowManager implements IWindowSession { final int res = WindowManagerGlobal.ADD_OKAY | WindowManagerGlobal.ADD_FLAG_APP_VISIBLE | WindowManagerGlobal.ADD_FLAG_USE_BLAST; + sendLayoutParamsToParent(); // Include whether the window is in touch mode. return isInTouchModeInternal(displayId) ? res | WindowManagerGlobal.ADD_FLAG_IN_TOUCH_MODE : res; @@ -425,6 +429,7 @@ public class WindowlessWindowManager implements IWindowSession { outInsetsState.set(mInsetsState); } + sendLayoutParamsToParent(); return 0; } @@ -645,4 +650,45 @@ public class WindowlessWindowManager implements IWindowSession { " we shouldn't get here!"); return false; } + + void setParentInterface(@Nullable ISurfaceControlViewHostParent parentInterface) { + IBinder oldInterface = mParentInterface == null ? null : mParentInterface.asBinder(); + IBinder newInterface = parentInterface == null ? null : parentInterface.asBinder(); + // If the parent interface has changed, it needs to clear the last reported params so it + // will update the new interface with the params. + if (oldInterface != newInterface) { + clearLastReportedParams(); + } + mParentInterface = parentInterface; + sendLayoutParamsToParent(); + } + + private void clearLastReportedParams() { + WindowManager.LayoutParams emptyParam = new WindowManager.LayoutParams(); + for (State windowInfo : mStateForWindow.values()) { + windowInfo.mLastReportedParams.copyFrom(emptyParam); + } + } + + private void sendLayoutParamsToParent() { + if (mParentInterface == null) { + return; + } + WindowManager.LayoutParams[] params = + new WindowManager.LayoutParams[mStateForWindow.size()]; + int index = 0; + boolean hasChanges = false; + for (State windowInfo : mStateForWindow.values()) { + int changes = windowInfo.mLastReportedParams.copyFrom(windowInfo.mParams); + hasChanges |= (changes != 0); + params[index++] = windowInfo.mParams; + } + + if (hasChanges) { + try { + mParentInterface.updateParams(params); + } catch (RemoteException e) { + } + } + } } diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java index 668351b949c1..c9afdc0ad074 100644 --- a/core/java/android/view/contentcapture/ContentCaptureManager.java +++ b/core/java/android/view/contentcapture/ContentCaptureManager.java @@ -52,6 +52,7 @@ import android.view.contentcapture.ContentCaptureSession.FlushReason; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.RingBuffer; import com.android.internal.util.SyncResultReceiver; import java.io.PrintWriter; @@ -352,6 +353,30 @@ public final class ContentCaptureManager { public static final String DEVICE_CONFIG_PROPERTY_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING = "disable_flush_for_view_tree_appearing"; + /** + * Enables the content protection receiver. + * + * @hide + */ + public static final String DEVICE_CONFIG_PROPERTY_ENABLE_CONTENT_PROTECTION_RECEIVER = + "enable_content_protection_receiver"; + + /** + * Sets the size of the app blocklist for the content protection flow. + * + * @hide + */ + public static final String DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_APPS_BLOCKLIST_SIZE = + "content_protection_apps_blocklist_size"; + + /** + * Sets the size of the in-memory ring buffer for the content protection flow. + * + * @hide + */ + public static final String DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_BUFFER_SIZE = + "content_protection_buffer_size"; + /** @hide */ @TestApi public static final int LOGGING_LEVEL_OFF = 0; @@ -384,6 +409,14 @@ public final class ContentCaptureManager { public static final int DEFAULT_LOG_HISTORY_SIZE = 10; /** @hide */ public static final boolean DEFAULT_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING = false; + /** @hide */ + public static final boolean DEFAULT_ENABLE_CONTENT_CAPTURE_RECEIVER = true; + /** @hide */ + public static final boolean DEFAULT_ENABLE_CONTENT_PROTECTION_RECEIVER = false; + /** @hide */ + public static final int DEFAULT_CONTENT_PROTECTION_APPS_BLOCKLIST_SIZE = 1000; + /** @hide */ + public static final int DEFAULT_CONTENT_PROTECTION_BUFFER_SIZE = 150; private final Object mLock = new Object(); @@ -414,6 +447,9 @@ public final class ContentCaptureManager { @Nullable // set on-demand by addDumpable() private Dumper mDumpable; + // Created here in order to live across activity and session changes + @Nullable private final RingBuffer<ContentCaptureEvent> mContentProtectionEventBuffer; + /** @hide */ public interface ContentCaptureClient { /** @@ -424,12 +460,15 @@ public final class ContentCaptureManager { } /** @hide */ - static class StrippedContext { - final String mPackageName; - final String mContext; + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + public static class StrippedContext { + @NonNull final String mPackageName; + @NonNull final String mContext; final @UserIdInt int mUserId; - private StrippedContext(Context context) { + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + public StrippedContext(@NonNull Context context) { mPackageName = context.getPackageName(); mContext = context.toString(); mUserId = context.getUserId(); @@ -440,6 +479,7 @@ public final class ContentCaptureManager { return mContext; } + @NonNull public String getPackageName() { return mPackageName; } @@ -469,6 +509,16 @@ public final class ContentCaptureManager { mHandler = Handler.createAsync(Looper.getMainLooper()); mDataShareAdapterResourceManager = new LocalDataShareAdapterResourceManager(); + + if (mOptions.contentProtectionOptions.enableReceiver + && mOptions.contentProtectionOptions.bufferSize > 0) { + mContentProtectionEventBuffer = + new RingBuffer( + ContentCaptureEvent.class, + mOptions.contentProtectionOptions.bufferSize); + } else { + mContentProtectionEventBuffer = null; + } } /** @@ -837,6 +887,13 @@ public final class ContentCaptureManager { activity.addDumpable(mDumpable); } + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @Nullable + public RingBuffer<ContentCaptureEvent> getContentProtectionEventBuffer() { + return mContentProtectionEventBuffer; + } + // NOTE: ContentCaptureManager cannot implement it directly as it would be exposed as public API private final class Dumper implements Dumpable { @Override diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index 62044aa78213..dc3d32317ded 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -191,20 +191,22 @@ public abstract class ContentCaptureSession implements AutoCloseable { static final long NOTIFY_NODES_DISAPPEAR_NOW_SENDS_TREE_EVENTS = 258825825L; /** @hide */ - @IntDef(prefix = { "FLUSH_REASON_" }, value = { - FLUSH_REASON_FULL, - FLUSH_REASON_VIEW_ROOT_ENTERED, - FLUSH_REASON_SESSION_STARTED, - FLUSH_REASON_SESSION_FINISHED, - FLUSH_REASON_IDLE_TIMEOUT, - FLUSH_REASON_TEXT_CHANGE_TIMEOUT, - FLUSH_REASON_SESSION_CONNECTED, - FLUSH_REASON_FORCE_FLUSH, - FLUSH_REASON_VIEW_TREE_APPEARING, - FLUSH_REASON_VIEW_TREE_APPEARED - }) + @IntDef( + prefix = {"FLUSH_REASON_"}, + value = { + FLUSH_REASON_FULL, + FLUSH_REASON_VIEW_ROOT_ENTERED, + FLUSH_REASON_SESSION_STARTED, + FLUSH_REASON_SESSION_FINISHED, + FLUSH_REASON_IDLE_TIMEOUT, + FLUSH_REASON_TEXT_CHANGE_TIMEOUT, + FLUSH_REASON_SESSION_CONNECTED, + FLUSH_REASON_FORCE_FLUSH, + FLUSH_REASON_VIEW_TREE_APPEARING, + FLUSH_REASON_VIEW_TREE_APPEARED + }) @Retention(RetentionPolicy.SOURCE) - public @interface FlushReason{} + public @interface FlushReason {} private final Object mLock = new Object(); @@ -686,7 +688,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { case FLUSH_REASON_VIEW_TREE_APPEARED: return "VIEW_TREE_APPEARED"; default: - return "UNKOWN-" + reason; + return "UNKNOWN-" + reason; } } diff --git a/core/java/android/view/contentcapture/IContentCaptureManager.aidl b/core/java/android/view/contentcapture/IContentCaptureManager.aidl index a64111069c9b..14879977d2a5 100644 --- a/core/java/android/view/contentcapture/IContentCaptureManager.aidl +++ b/core/java/android/view/contentcapture/IContentCaptureManager.aidl @@ -17,6 +17,7 @@ package android.view.contentcapture; import android.content.ComponentName; +import android.content.pm.ParceledListSlice; import android.view.contentcapture.ContentCaptureContext; import android.view.contentcapture.ContentCaptureEvent; import android.view.contentcapture.DataRemovalRequest; @@ -108,4 +109,9 @@ oneway interface IContentCaptureManager { */ void registerContentCaptureOptionsCallback(String packageName, in IContentCaptureOptionsCallback callback); + + /** + * Notifies the system server that a login was detected. + */ + void onLoginDetected(in ParceledListSlice<ContentCaptureEvent> events); } diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index efd50e7d2343..2241fd5dc37a 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -52,8 +52,10 @@ import android.util.Log; import android.util.TimeUtils; import android.view.autofill.AutofillId; import android.view.contentcapture.ViewNode.ViewStructureImpl; +import android.view.contentprotection.ContentProtectionEventProcessor; import android.view.inputmethod.BaseInputConnection; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.IResultReceiver; import java.io.PrintWriter; @@ -118,9 +120,13 @@ public final class MainContentCaptureSession extends ContentCaptureSession { /** * Direct interface to the service binder object - it's used to send the events, including the * last ones (when the session is finished) + * + * @hide */ - @NonNull - private IContentCaptureDirectManager mDirectServiceInterface; + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @Nullable + public IContentCaptureDirectManager mDirectServiceInterface; + @Nullable private DeathRecipient mDirectServiceVulture; @@ -131,14 +137,19 @@ public final class MainContentCaptureSession extends ContentCaptureSession { @Nullable private IBinder mShareableActivityToken; + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @Nullable - private ComponentName mComponentName; + public ComponentName mComponentName; /** * List of events held to be sent as a batch. + * + * @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @Nullable - private ArrayList<ContentCaptureEvent> mEvents; + public ArrayList<ContentCaptureEvent> mEvents; // Used just for debugging purposes (on dump) private long mNextFlush; @@ -157,6 +168,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession { @NonNull private final SessionStateReceiver mSessionStateReceiver; + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @Nullable + public ContentProtectionEventProcessor mContentProtectionEventProcessor; + private static class SessionStateReceiver extends IResultReceiver.Stub { private final WeakReference<MainContentCaptureSession> mMainSession; @@ -194,8 +210,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } } - protected MainContentCaptureSession(@NonNull ContentCaptureManager.StrippedContext context, - @NonNull ContentCaptureManager manager, @NonNull Handler handler, + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PROTECTED) + public MainContentCaptureSession( + @NonNull ContentCaptureManager.StrippedContext context, + @NonNull ContentCaptureManager manager, + @NonNull Handler handler, @NonNull IContentCaptureManager systemServerInterface) { mContext = context; mManager = manager; @@ -273,15 +293,16 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } /** - * Callback from {@code system_server} after call to - * {@link IContentCaptureManager#startSession(IBinder, ComponentName, String, int, - * IResultReceiver)}. + * Callback from {@code system_server} after call to {@link + * IContentCaptureManager#startSession(IBinder, ComponentName, String, int, IResultReceiver)}. * * @param resultCode session state * @param binder handle to {@code IContentCaptureDirectManager} + * @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @UiThread - private void onSessionStarted(int resultCode, @Nullable IBinder binder) { + public void onSessionStarted(int resultCode, @Nullable IBinder binder) { if (binder != null) { mDirectServiceInterface = IContentCaptureDirectManager.Stub.asInterface(binder); mDirectServiceVulture = () -> { @@ -296,6 +317,20 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } } + // Should not be possible for mComponentName to be null here but check anyway + if (mManager.mOptions.contentProtectionOptions.enableReceiver + && mManager.getContentProtectionEventBuffer() != null + && mComponentName != null) { + mContentProtectionEventProcessor = + new ContentProtectionEventProcessor( + mManager.getContentProtectionEventBuffer(), + mHandler, + mSystemServerInterface, + mComponentName.getPackageName()); + } else { + mContentProtectionEventProcessor = null; + } + if ((resultCode & STATE_DISABLED) != 0) { resetSession(resultCode); } else { @@ -311,8 +346,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } } + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @UiThread - private void sendEvent(@NonNull ContentCaptureEvent event) { + public void sendEvent(@NonNull ContentCaptureEvent event) { sendEvent(event, /* forceFlush= */ false); } @@ -337,6 +374,25 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (sVerbose) Log.v(TAG, "handleSendEvent(): ignoring when disabled"); return; } + + if (isContentProtectionReceiverEnabled()) { + sendContentProtectionEvent(event); + } + if (isContentCaptureReceiverEnabled()) { + sendContentCaptureEvent(event, forceFlush); + } + } + + @UiThread + private void sendContentProtectionEvent(@NonNull ContentCaptureEvent event) { + if (mContentProtectionEventProcessor != null) { + mContentProtectionEventProcessor.processEvent(event); + } + } + + @UiThread + private void sendContentCaptureEvent(@NonNull ContentCaptureEvent event, boolean forceFlush) { + final int eventType = event.getType(); final int maxBufferSize = mManager.mOptions.maxBufferSize; if (mEvents == null) { if (sVerbose) { @@ -528,9 +584,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession { flush(reason); } + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) @Override @UiThread - void flush(@FlushReason int reason) { + public void flush(@FlushReason int reason) { if (mEvents == null || mEvents.size() == 0) { if (sVerbose) { Log.v(TAG, "Don't flush for empty event buffer."); @@ -544,6 +602,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession { return; } + if (!isContentCaptureReceiverEnabled()) { + return; + } + if (mDirectServiceInterface == null) { if (sVerbose) { Log.v(TAG, "handleForceFlush(" + getDebugState(reason) + "): hold your horses, " @@ -607,8 +669,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession { return new ParceledListSlice<>(events); } + /** hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @UiThread - private void destroySession() { + public void destroySession() { if (sDebug) { Log.d(TAG, "Destroying session (ctx=" + mContext + ", id=" + mId + ") with " + (mEvents == null ? 0 : mEvents.size()) + " event(s) for " @@ -626,12 +690,15 @@ public final class MainContentCaptureSession extends ContentCaptureSession { mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0); } mDirectServiceInterface = null; + mContentProtectionEventProcessor = null; } // TODO(b/122454205): once we support multiple sessions, we might need to move some of these // clearings out. + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @UiThread - private void resetSession(int newState) { + public void resetSession(int newState) { if (sVerbose) { Log.v(TAG, "handleResetSession(" + getActivityName() + "): from " + getStateAsString(mState) + " to " + getStateAsString(newState)); @@ -651,6 +718,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } } mDirectServiceInterface = null; + mContentProtectionEventProcessor = null; mHandler.removeMessages(MSG_FLUSH); } @@ -878,4 +946,14 @@ public final class MainContentCaptureSession extends ContentCaptureSession { private String getDebugState(@FlushReason int reason) { return getDebugState() + ", reason=" + getFlushReasonAsString(reason); } + + @UiThread + private boolean isContentProtectionReceiverEnabled() { + return mManager.mOptions.contentProtectionOptions.enableReceiver; + } + + @UiThread + private boolean isContentCaptureReceiverEnabled() { + return mManager.mOptions.enableReceiver; + } } diff --git a/core/java/android/view/contentcapture/ViewNode.java b/core/java/android/view/contentcapture/ViewNode.java index 044a31f3b297..f218995e55ad 100644 --- a/core/java/android/view/contentcapture/ViewNode.java +++ b/core/java/android/view/contentcapture/ViewNode.java @@ -480,6 +480,11 @@ public final class ViewNode extends AssistStructure.ViewNode { return mLocaleList; } + /** @hide */ + public void setTextIdEntry(@NonNull String textIdEntry) { + mTextIdEntry = textIdEntry; + } + private void writeSelfToParcel(@NonNull Parcel parcel, int parcelFlags) { long nodeFlags = mFlags; diff --git a/core/java/android/view/contentprotection/ContentProtectionEventProcessor.java b/core/java/android/view/contentprotection/ContentProtectionEventProcessor.java new file mode 100644 index 000000000000..b44abf3eb04d --- /dev/null +++ b/core/java/android/view/contentprotection/ContentProtectionEventProcessor.java @@ -0,0 +1,254 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.contentprotection; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.UiThread; +import android.content.pm.ParceledListSlice; +import android.os.Handler; +import android.text.InputType; +import android.util.Log; +import android.view.contentcapture.ContentCaptureEvent; +import android.view.contentcapture.IContentCaptureManager; +import android.view.contentcapture.ViewNode; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.RingBuffer; + +import java.time.Duration; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * Main entry point for processing {@link ContentCaptureEvent} for the content protection flow. + * + * @hide + */ +public class ContentProtectionEventProcessor { + + private static final String TAG = "ContentProtectionEventProcessor"; + + private static final List<Integer> PASSWORD_FIELD_INPUT_TYPES = + Collections.unmodifiableList( + Arrays.asList( + InputType.TYPE_NUMBER_VARIATION_PASSWORD, + InputType.TYPE_TEXT_VARIATION_PASSWORD, + InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD, + InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD)); + + private static final List<String> PASSWORD_TEXTS = + Collections.unmodifiableList( + Arrays.asList("password", "pass word", "code", "pin", "credential")); + + private static final List<String> ADDITIONAL_SUSPICIOUS_TEXTS = + Collections.unmodifiableList( + Arrays.asList("user", "mail", "phone", "number", "login", "log in", "sign in")); + + private static final Duration MIN_DURATION_BETWEEN_FLUSHING = Duration.ofSeconds(3); + + private static final String ANDROID_CLASS_NAME_PREFIX = "android."; + + private static final Set<Integer> EVENT_TYPES_TO_STORE = + Collections.unmodifiableSet( + new HashSet<>( + Arrays.asList( + ContentCaptureEvent.TYPE_VIEW_APPEARED, + ContentCaptureEvent.TYPE_VIEW_DISAPPEARED, + ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED))); + + private static final int RESET_LOGIN_TOTAL_EVENTS_TO_PROCESS = 150; + + @NonNull private final RingBuffer<ContentCaptureEvent> mEventBuffer; + + @NonNull private final Handler mHandler; + + @NonNull private final IContentCaptureManager mContentCaptureManager; + + @NonNull private final String mPackageName; + + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + public boolean mPasswordFieldDetected = false; + + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + public boolean mSuspiciousTextDetected = false; + + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @Nullable + public Instant mLastFlushTime; + + private int mResetLoginRemainingEventsToProcess; + + public ContentProtectionEventProcessor( + @NonNull RingBuffer<ContentCaptureEvent> eventBuffer, + @NonNull Handler handler, + @NonNull IContentCaptureManager contentCaptureManager, + @NonNull String packageName) { + mEventBuffer = eventBuffer; + mHandler = handler; + mContentCaptureManager = contentCaptureManager; + mPackageName = packageName; + } + + /** Main entry point for {@link ContentCaptureEvent} processing. */ + @UiThread + public void processEvent(@NonNull ContentCaptureEvent event) { + if (EVENT_TYPES_TO_STORE.contains(event.getType())) { + storeEvent(event); + } + if (event.getType() == ContentCaptureEvent.TYPE_VIEW_APPEARED) { + processViewAppearedEvent(event); + } + } + + @UiThread + private void storeEvent(@NonNull ContentCaptureEvent event) { + // Ensure receiver gets the package name which might not be set + ViewNode viewNode = (event.getViewNode() != null) ? event.getViewNode() : new ViewNode(); + viewNode.setTextIdEntry(mPackageName); + event.setViewNode(viewNode); + mEventBuffer.append(event); + } + + @UiThread + private void processViewAppearedEvent(@NonNull ContentCaptureEvent event) { + mPasswordFieldDetected |= isPasswordField(event); + mSuspiciousTextDetected |= isSuspiciousText(event); + if (mPasswordFieldDetected && mSuspiciousTextDetected) { + loginDetected(); + } else { + maybeResetLoginFlags(); + } + } + + @UiThread + private void loginDetected() { + if (mLastFlushTime == null + || Instant.now().isAfter(mLastFlushTime.plus(MIN_DURATION_BETWEEN_FLUSHING))) { + flush(); + } + resetLoginFlags(); + } + + @UiThread + private void resetLoginFlags() { + mPasswordFieldDetected = false; + mSuspiciousTextDetected = false; + mResetLoginRemainingEventsToProcess = 0; + } + + @UiThread + private void maybeResetLoginFlags() { + if (mPasswordFieldDetected || mSuspiciousTextDetected) { + if (mResetLoginRemainingEventsToProcess <= 0) { + mResetLoginRemainingEventsToProcess = RESET_LOGIN_TOTAL_EVENTS_TO_PROCESS; + } else { + mResetLoginRemainingEventsToProcess--; + if (mResetLoginRemainingEventsToProcess <= 0) { + resetLoginFlags(); + } + } + } + } + + @UiThread + private void flush() { + mLastFlushTime = Instant.now(); + + // Note the thread annotations, do not move clearEvents to mHandler + ParceledListSlice<ContentCaptureEvent> events = clearEvents(); + mHandler.post(() -> handlerOnLoginDetected(events)); + } + + @UiThread + @NonNull + private ParceledListSlice<ContentCaptureEvent> clearEvents() { + List<ContentCaptureEvent> events = Arrays.asList(mEventBuffer.toArray()); + mEventBuffer.clear(); + return new ParceledListSlice<>(events); + } + + private void handlerOnLoginDetected(@NonNull ParceledListSlice<ContentCaptureEvent> events) { + try { + mContentCaptureManager.onLoginDetected(events); + } catch (Exception ex) { + Log.e(TAG, "Failed to flush events for: " + mPackageName, ex); + } + } + + private boolean isPasswordField(@NonNull ContentCaptureEvent event) { + return isPasswordField(event.getViewNode()); + } + + private boolean isPasswordField(@Nullable ViewNode viewNode) { + if (viewNode == null) { + return false; + } + return isAndroidPasswordField(viewNode) || isWebViewPasswordField(viewNode); + } + + private boolean isAndroidPasswordField(@NonNull ViewNode viewNode) { + if (!isAndroidViewNode(viewNode)) { + return false; + } + int inputType = viewNode.getInputType(); + return PASSWORD_FIELD_INPUT_TYPES.stream() + .anyMatch(passwordInputType -> (inputType & passwordInputType) != 0); + } + + private boolean isWebViewPasswordField(@NonNull ViewNode viewNode) { + if (viewNode.getClassName() != null) { + return false; + } + return isPasswordText(ContentProtectionUtils.getViewNodeText(viewNode)); + } + + private boolean isAndroidViewNode(@NonNull ViewNode viewNode) { + String className = viewNode.getClassName(); + return className != null && className.startsWith(ANDROID_CLASS_NAME_PREFIX); + } + + private boolean isSuspiciousText(@NonNull ContentCaptureEvent event) { + return isSuspiciousText(ContentProtectionUtils.getEventText(event)) + || isSuspiciousText(ContentProtectionUtils.getViewNodeText(event)); + } + + private boolean isSuspiciousText(@Nullable String text) { + if (text == null) { + return false; + } + if (isPasswordText(text)) { + return true; + } + String lowerCaseText = text.toLowerCase(); + return ADDITIONAL_SUSPICIOUS_TEXTS.stream() + .anyMatch(suspiciousText -> lowerCaseText.contains(suspiciousText)); + } + + private boolean isPasswordText(@Nullable String text) { + if (text == null) { + return false; + } + String lowerCaseText = text.toLowerCase(); + return PASSWORD_TEXTS.stream() + .anyMatch(passwordText -> lowerCaseText.contains(passwordText)); + } +} diff --git a/core/java/android/view/contentprotection/ContentProtectionUtils.java b/core/java/android/view/contentprotection/ContentProtectionUtils.java new file mode 100644 index 000000000000..9abf6f10d05d --- /dev/null +++ b/core/java/android/view/contentprotection/ContentProtectionUtils.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.contentprotection; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.view.contentcapture.ContentCaptureEvent; +import android.view.contentcapture.ViewNode; + +/** + * Utilities for reading data from {@link ContentCaptureEvent} and {@link ViewNode}. + * + * @hide + */ +public final class ContentProtectionUtils { + + /** Returns the text extracted directly from the {@link ContentCaptureEvent}, if set. */ + @Nullable + public static String getEventText(@NonNull ContentCaptureEvent event) { + CharSequence text = event.getText(); + if (text == null) { + return null; + } + return text.toString(); + } + + /** Returns the text extracted from the event's {@link ViewNode}, if set. */ + @Nullable + public static String getViewNodeText(@NonNull ContentCaptureEvent event) { + ViewNode viewNode = event.getViewNode(); + if (viewNode == null) { + return null; + } + return getViewNodeText(viewNode); + } + + /** Returns the text extracted directly from the {@link ViewNode}, if set. */ + @Nullable + public static String getViewNodeText(@NonNull ViewNode viewNode) { + CharSequence text = viewNode.getText(); + if (text == null) { + return null; + } + return text.toString(); + } +} diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 41ef44e1ac1f..40b060ad0bbf 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -4361,15 +4361,14 @@ public final class InputMethodManager { * @param icProto {@link InputConnection} call data in proto format. * @hide */ - @GuardedBy("mH") public void dumpDebug(ProtoOutputStream proto, @Nullable byte[] icProto) { - if (!isImeSessionAvailableLocked()) { - return; - } - - proto.write(DISPLAY_ID, mDisplayId); - final long token = proto.start(INPUT_METHOD_MANAGER); synchronized (mH) { + if (!isImeSessionAvailableLocked()) { + return; + } + + proto.write(DISPLAY_ID, mDisplayId); + final long token = proto.start(INPUT_METHOD_MANAGER); proto.write(CUR_ID, mCurBindState.mImeId); proto.write(FULLSCREEN_MODE, mFullscreenMode); proto.write(ACTIVE, mActive); diff --git a/core/java/android/view/inputmethod/TextAppearanceInfo.java b/core/java/android/view/inputmethod/TextAppearanceInfo.java index 05717dd5d930..7eee33f7f617 100644 --- a/core/java/android/view/inputmethod/TextAppearanceInfo.java +++ b/core/java/android/view/inputmethod/TextAppearanceInfo.java @@ -238,7 +238,10 @@ public final class TextAppearanceInfo implements Parcelable { .setFontFeatureSettings(textPaint.getFontFeatureSettings()) .setFontVariationSettings(textPaint.getFontVariationSettings()) .setTextScaleX(textPaint.getTextScaleX()) - .setTextColor(textPaint.getColor()) + // When there is a hint text (text length is 0), the text color should be the normal + // text color rather than hint text color. + .setTextColor(text.length() == 0 + ? textView.getCurrentTextColor() : textPaint.getColor()) .setLinkTextColor(textPaint.linkColor) .setAllCaps(textView.isAllCaps()) .setFallbackLineSpacing(textView.isFallbackLineSpacing()) diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index adeb88909d38..6ad1960cbda9 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -4703,7 +4703,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te @Override public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { - if (mFastScroll != null) { + if (mFastScroll != null && event.isFromSource(InputDevice.SOURCE_MOUSE)) { PointerIcon pointerIcon = mFastScroll.onResolvePointerIcon(event, pointerIndex); if (pointerIcon != null) { return pointerIcon; diff --git a/core/java/android/widget/Button.java b/core/java/android/widget/Button.java index 634cbe323d86..405099d6a260 100644 --- a/core/java/android/widget/Button.java +++ b/core/java/android/widget/Button.java @@ -18,6 +18,7 @@ package android.widget; import android.content.Context; import android.util.AttributeSet; +import android.view.InputDevice; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.PointerIcon; @@ -173,7 +174,8 @@ public class Button extends TextView { @Override public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { - if (getPointerIcon() == null && isClickable() && isEnabled()) { + if (getPointerIcon() == null && isClickable() && isEnabled() + && event.isFromSource(InputDevice.SOURCE_MOUSE)) { return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); } return super.onResolvePointerIcon(event, pointerIndex); diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 2dbff581fe84..d37c37a392a5 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -8112,16 +8112,10 @@ public class Editor { mHighlightPaint = new Paint(); mHighlightPath = new Path(); - // The highlight color is supposed to be 12% of the color primary40. We can't - // directly access Material 3 theme. But because Material 3 sets the colorPrimary to - // be primary40, here we hardcoded it to be 12% of colorPrimary. - final TypedValue typedValue = new TypedValue(); - mTextView.getContext().getTheme() - .resolveAttribute(R.attr.colorPrimary, typedValue, true); - final int colorPrimary = typedValue.data; - final int highlightColor = ColorUtils.setAlphaComponent(colorPrimary, - (int) (0.12f * Color.alpha(colorPrimary))); - mHighlightPaint.setColor(highlightColor); + // Insert mode highlight color is 20% opacity of the default text color. + int color = mTextView.getTextColors().getDefaultColor(); + color = ColorUtils.setAlphaComponent(color, (int) (0.2f * Color.alpha(color))); + mHighlightPaint.setColor(color); } /** diff --git a/core/java/android/widget/ImageButton.java b/core/java/android/widget/ImageButton.java index e1b0c915c684..b6c5396ca176 100644 --- a/core/java/android/widget/ImageButton.java +++ b/core/java/android/widget/ImageButton.java @@ -18,6 +18,7 @@ package android.widget; import android.content.Context; import android.util.AttributeSet; +import android.view.InputDevice; import android.view.MotionEvent; import android.view.PointerIcon; import android.widget.RemoteViews.RemoteView; @@ -99,7 +100,8 @@ public class ImageButton extends ImageView { @Override public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { - if (getPointerIcon() == null && isClickable() && isEnabled()) { + if (getPointerIcon() == null && isClickable() && isEnabled() + && event.isFromSource(InputDevice.SOURCE_MOUSE)) { return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); } return super.onResolvePointerIcon(event, pointerIndex); diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java index f3600b0de22b..edf0f48c3577 100644 --- a/core/java/android/widget/RadialTimePickerView.java +++ b/core/java/android/widget/RadialTimePickerView.java @@ -38,6 +38,7 @@ import android.util.MathUtils; import android.util.StateSet; import android.util.TypedValue; import android.view.HapticFeedbackConstants; +import android.view.InputDevice; import android.view.MotionEvent; import android.view.PointerIcon; import android.view.View; @@ -1060,9 +1061,11 @@ public class RadialTimePickerView extends View { if (!isEnabled()) { return null; } - final int degrees = getDegreesFromXY(event.getX(), event.getY(), false); - if (degrees != -1) { - return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); + if (event.isFromSource(InputDevice.SOURCE_MOUSE)) { + final int degrees = getDegreesFromXY(event.getX(), event.getY(), false); + if (degrees != -1) { + return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); + } } return super.onResolvePointerIcon(event, pointerIndex); } diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 7f96266a1f69..3be8c3d6b502 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -232,6 +232,7 @@ public class RemoteViews implements Parcelable, Filter { private static final int NIGHT_MODE_REFLECTION_ACTION_TAG = 30; private static final int SET_REMOTE_COLLECTION_ITEMS_ADAPTER_TAG = 31; private static final int ATTRIBUTE_REFLECTION_ACTION_TAG = 32; + private static final int SET_REMOTE_ADAPTER_TAG = 33; /** @hide **/ @IntDef(prefix = "MARGIN_", value = { @@ -960,6 +961,11 @@ public class RemoteViews implements Parcelable, Filter { return SET_REMOTE_VIEW_ADAPTER_LIST_TAG; } + @Override + public String getUniqueKey() { + return (SET_REMOTE_ADAPTER_TAG + "_" + viewId); + } + int viewTypeCount; ArrayList<RemoteViews> list; } @@ -1082,6 +1088,11 @@ public class RemoteViews implements Parcelable, Filter { public int getActionTag() { return SET_REMOTE_COLLECTION_ITEMS_ADAPTER_TAG; } + + @Override + public String getUniqueKey() { + return (SET_REMOTE_ADAPTER_TAG + "_" + viewId); + } } private class SetRemoteViewsAdapterIntent extends Action { diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java index 6c53a44c79fa..1317b51f7bfa 100644 --- a/core/java/android/widget/SimpleMonthView.java +++ b/core/java/android/widget/SimpleMonthView.java @@ -39,6 +39,7 @@ import android.util.AttributeSet; import android.util.IntArray; import android.util.MathUtils; import android.util.StateSet; +import android.view.InputDevice; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.PointerIcon; @@ -1041,12 +1042,15 @@ class SimpleMonthView extends View { if (!isEnabled()) { return null; } - // Add 0.5f to event coordinates to match the logic in onTouchEvent. - final int x = (int) (event.getX() + 0.5f); - final int y = (int) (event.getY() + 0.5f); - final int dayUnderPointer = getDayAtLocation(x, y); - if (dayUnderPointer >= 0) { - return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); + + if (event.isFromSource(InputDevice.SOURCE_MOUSE)) { + // Add 0.5f to event coordinates to match the logic in onTouchEvent. + final int x = (int) (event.getX() + 0.5f); + final int y = (int) (event.getY() + 0.5f); + final int dayUnderPointer = getDayAtLocation(x, y); + if (dayUnderPointer >= 0) { + return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); + } } return super.onResolvePointerIcon(event, pointerIndex); } diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index ad431efc0bd2..ecc41a5ec6c9 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -38,6 +38,7 @@ import android.util.AttributeSet; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.Gravity; +import android.view.InputDevice; import android.view.MotionEvent; import android.view.PointerIcon; import android.view.View; @@ -935,7 +936,8 @@ public class Spinner extends AbsSpinner implements OnClickListener { @Override public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { - if (getPointerIcon() == null && isClickable() && isEnabled()) { + if (getPointerIcon() == null && isClickable() && isEnabled() + && event.isFromSource(InputDevice.SOURCE_MOUSE)) { return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND); } return super.onResolvePointerIcon(event, pointerIndex); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index db7d48471d9d..7e1e52dd0707 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -9223,18 +9223,20 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @Override public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { - if (mSpannable != null && mLinksClickable) { - final float x = event.getX(pointerIndex); - final float y = event.getY(pointerIndex); - final int offset = getOffsetForPosition(x, y); - final ClickableSpan[] clickables = mSpannable.getSpans(offset, offset, - ClickableSpan.class); - if (clickables.length > 0) { - return PointerIcon.getSystemIcon(mContext, PointerIcon.TYPE_HAND); - } - } - if (isTextSelectable() || isTextEditable()) { - return PointerIcon.getSystemIcon(mContext, PointerIcon.TYPE_TEXT); + if (event.isFromSource(InputDevice.SOURCE_MOUSE)) { + if (mSpannable != null && mLinksClickable) { + final float x = event.getX(pointerIndex); + final float y = event.getY(pointerIndex); + final int offset = getOffsetForPosition(x, y); + final ClickableSpan[] clickables = mSpannable.getSpans(offset, offset, + ClickableSpan.class); + if (clickables.length > 0) { + return PointerIcon.getSystemIcon(mContext, PointerIcon.TYPE_HAND); + } + } + if (isTextSelectable() || isTextEditable()) { + return PointerIcon.getSystemIcon(mContext, PointerIcon.TYPE_TEXT); + } } return super.onResolvePointerIcon(event, pointerIndex); } diff --git a/core/java/com/android/internal/accessibility/common/MagnificationConstants.java b/core/java/com/android/internal/accessibility/common/MagnificationConstants.java index 94c230bc94fb..95c3419180a9 100644 --- a/core/java/com/android/internal/accessibility/common/MagnificationConstants.java +++ b/core/java/com/android/internal/accessibility/common/MagnificationConstants.java @@ -27,4 +27,10 @@ public final class MagnificationConstants { * the min value, there will be no obvious magnification effect. */ public static final float PERSISTED_SCALE_MIN_VALUE = 1.3f; + + /** Minimum supported value for magnification scale. */ + public static final float SCALE_MIN_VALUE = 1.0f; + + /** Maximum supported value for magnification scale. */ + public static final float SCALE_MAX_VALUE = 8.0f; } diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java index 57cc38cc6dfd..0ea80144a798 100644 --- a/core/java/com/android/internal/app/AssistUtils.java +++ b/core/java/com/android/internal/app/AssistUtils.java @@ -59,6 +59,8 @@ public class AssistUtils { public static final int INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS = 6; /** value for INVOCATION_TYPE_KEY: press on physcial assistant button */ public static final int INVOCATION_TYPE_ASSIST_BUTTON = 7; + /** value for INVOCATION_TYPE_KEY: long press on nav handle */ + public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS = 8; private final Context mContext; private final IVoiceInteractionManagerService mVoiceInteractionManagerService; diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index dd52de4f84c7..9ffccb34f44d 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -574,6 +574,11 @@ public final class SystemUiDeviceConfigFlags { */ public static final String COMBINED_BROADCAST_ENABLED = "combined_broadcast_enabled"; + /** + * (boolean) Whether to allow cursor hover states for certain elements. + */ + public static final String CURSOR_HOVER_STATES_ENABLED = "cursor_hover_states_enabled"; + private SystemUiDeviceConfigFlags() { } } diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index e530aec2119a..869b69611eba 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -28,6 +28,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_ANIMATION; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_ALL_APPS_SCROLL; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_CLOSE_TO_HOME; +import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_CLOSE_TO_PIP; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_ICON; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_RECENTS; @@ -258,8 +259,16 @@ public class InteractionJankMonitor { public static final int CUJ_IME_INSETS_ANIMATION = 69; public static final int CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION = 70; public static final int CUJ_LAUNCHER_OPEN_SEARCH_RESULT = 71; + // 72 - 77 are reserved for b/281564325. - private static final int LAST_CUJ = CUJ_LAUNCHER_OPEN_SEARCH_RESULT; + /** + * In some cases when we do not have any end-target, we play a simple slide-down animation. + * eg: Open an app from Overview/Task switcher such that there is no home-screen icon. + * eg: Exit the app using back gesture. + */ + public static final int CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK = 78; + + private static final int LAST_CUJ = CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK; private static final int NO_STATSD_LOGGING = -1; // Used to convert CujType to InteractionType enum value for statsd logging. @@ -340,6 +349,14 @@ public class InteractionJankMonitor { CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_ANIMATION; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_CLOCK_MOVE_ANIMATION; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_OPEN_SEARCH_RESULT] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_SEARCH_RESULT; + // 72 - 77 are reserved for b/281564325. + CUJ_TO_STATSD_INTERACTION_TYPE[72] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[73] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[74] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[75] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[76] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[77] = NO_STATSD_LOGGING; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK; } private static class InstanceHolder { @@ -439,6 +456,7 @@ public class InteractionJankMonitor { CUJ_IME_INSETS_ANIMATION, CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION, CUJ_LAUNCHER_OPEN_SEARCH_RESULT, + CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK, }) @Retention(RetentionPolicy.SOURCE) public @interface CujType { @@ -1050,6 +1068,8 @@ public class InteractionJankMonitor { return "LOCKSCREEN_CLOCK_MOVE_ANIMATION"; case CUJ_LAUNCHER_OPEN_SEARCH_RESULT: return "LAUNCHER_OPEN_SEARCH_RESULT"; + case CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK: + return "LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK"; } return "UNKNOWN"; } diff --git a/core/java/com/android/internal/protolog/common/ProtoLog.java b/core/java/com/android/internal/protolog/common/ProtoLog.java index 93765cdf0890..8870096f3db7 100644 --- a/core/java/com/android/internal/protolog/common/ProtoLog.java +++ b/core/java/com/android/internal/protolog/common/ProtoLog.java @@ -16,6 +16,8 @@ package com.android.internal.protolog.common; +import android.util.Log; + /** * ProtoLog API - exposes static logging methods. Usage of this API is similar * to {@code android.utils.Log} class. Instead of plain text log messages each call consists of @@ -53,6 +55,9 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.d(group.getTag(), String.format(messageString, args)); + } } /** @@ -68,6 +73,9 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.v(group.getTag(), String.format(messageString, args)); + } } /** @@ -83,6 +91,9 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.i(group.getTag(), String.format(messageString, args)); + } } /** @@ -98,6 +109,9 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.w(group.getTag(), String.format(messageString, args)); + } } /** @@ -113,6 +127,9 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.e(group.getTag(), String.format(messageString, args)); + } } /** @@ -128,5 +145,8 @@ public class ProtoLog { throw new UnsupportedOperationException( "ProtoLog calls MUST be processed with ProtoLogTool"); } + if (group.isLogToLogcat()) { + Log.wtf(group.getTag(), String.format(messageString, args)); + } } } diff --git a/core/java/com/android/internal/statusbar/IAppClipsService.aidl b/core/java/com/android/internal/statusbar/IAppClipsService.aidl index 013d0d32e7a2..d6ab8bcdde20 100644 --- a/core/java/com/android/internal/statusbar/IAppClipsService.aidl +++ b/core/java/com/android/internal/statusbar/IAppClipsService.aidl @@ -23,4 +23,6 @@ package com.android.internal.statusbar; */ interface IAppClipsService { boolean canLaunchCaptureContentActivityForNote(in int taskId); -}
\ No newline at end of file + + int canLaunchCaptureContentActivityForNoteInternal(in int taskId); +} diff --git a/core/java/com/android/internal/util/TraceBuffer.java b/core/java/com/android/internal/util/TraceBuffer.java index fcc77bd4f043..c23e90254179 100644 --- a/core/java/com/android/internal/util/TraceBuffer.java +++ b/core/java/com/android/internal/util/TraceBuffer.java @@ -18,6 +18,7 @@ package com.android.internal.util; import android.util.proto.ProtoOutputStream; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import java.io.File; @@ -39,12 +40,13 @@ import java.util.function.Consumer; * {@hide} */ public class TraceBuffer<P, S extends P, T extends P> { - private final Object mBufferLock = new Object(); - private final ProtoProvider<P, S, T> mProtoProvider; + @GuardedBy("this") private final Queue<T> mBuffer = new ArrayDeque<>(); private final Consumer mProtoDequeuedCallback; + @GuardedBy("this") private int mBufferUsedSize; + @GuardedBy("this") private int mBufferCapacity; /** @@ -115,18 +117,18 @@ public class TraceBuffer<P, S extends P, T extends P> { resetBuffer(); } - public int getAvailableSpace() { + public synchronized int getAvailableSpace() { return mBufferCapacity - mBufferUsedSize; } /** * Returns buffer size. */ - public int size() { + public synchronized int size() { return mBuffer.size(); } - public void setCapacity(int capacity) { + public synchronized void setCapacity(int capacity) { mBufferCapacity = capacity; } @@ -137,22 +139,19 @@ public class TraceBuffer<P, S extends P, T extends P> { * @throws IllegalStateException if the element cannot be added because it is larger * than the buffer size. */ - public void add(T proto) { + public synchronized void add(T proto) { int protoLength = mProtoProvider.getItemSize(proto); if (protoLength > mBufferCapacity) { throw new IllegalStateException("Trace object too large for the buffer. Buffer size:" + mBufferCapacity + " Object size: " + protoLength); } - synchronized (mBufferLock) { - discardOldest(protoLength); - mBuffer.add(proto); - mBufferUsedSize += protoLength; - mBufferLock.notify(); - } + discardOldest(protoLength); + mBuffer.add(proto); + mBufferUsedSize += protoLength; } @VisibleForTesting - public boolean contains(byte[] other) { + public synchronized boolean contains(byte[] other) { return mBuffer.stream() .anyMatch(p -> Arrays.equals(mProtoProvider.getBytes(p), other)); } @@ -160,15 +159,13 @@ public class TraceBuffer<P, S extends P, T extends P> { /** * Writes the trace buffer to disk inside the encapsulatingProto. */ - public void writeTraceToFile(File traceFile, S encapsulatingProto) + public synchronized void writeTraceToFile(File traceFile, S encapsulatingProto) throws IOException { - synchronized (mBufferLock) { - traceFile.delete(); - try (OutputStream os = new FileOutputStream(traceFile)) { - traceFile.setReadable(true /* readable */, false /* ownerOnly */); - mProtoProvider.write(encapsulatingProto, mBuffer, os); - os.flush(); - } + traceFile.delete(); + try (OutputStream os = new FileOutputStream(traceFile)) { + traceFile.setReadable(true /* readable */, false /* ownerOnly */); + mProtoProvider.write(encapsulatingProto, mBuffer, os); + os.flush(); } } @@ -199,31 +196,27 @@ public class TraceBuffer<P, S extends P, T extends P> { /** * Removes all elements from the buffer */ - public void resetBuffer() { - synchronized (mBufferLock) { - if (mProtoDequeuedCallback != null) { - for (T item : mBuffer) { - mProtoDequeuedCallback.accept(item); - } + public synchronized void resetBuffer() { + if (mProtoDequeuedCallback != null) { + for (T item : mBuffer) { + mProtoDequeuedCallback.accept(item); } - mBuffer.clear(); - mBufferUsedSize = 0; } + mBuffer.clear(); + mBufferUsedSize = 0; } @VisibleForTesting - public int getBufferSize() { + public synchronized int getBufferSize() { return mBufferUsedSize; } /** * Returns the buffer status in human-readable form. */ - public String getStatus() { - synchronized (mBufferLock) { - return "Buffer size: " + mBufferCapacity + " bytes" + "\n" - + "Buffer usage: " + mBufferUsedSize + " bytes" + "\n" - + "Elements in the buffer: " + mBuffer.size(); - } + public synchronized String getStatus() { + return "Buffer size: " + mBufferCapacity + " bytes" + "\n" + + "Buffer usage: " + mBufferUsedSize + " bytes" + "\n" + + "Elements in the buffer: " + mBuffer.size(); } } diff --git a/core/java/com/android/internal/widget/PointerLocationView.java b/core/java/com/android/internal/widget/PointerLocationView.java index f55d15de1d51..e65b4b65945f 100644 --- a/core/java/com/android/internal/widget/PointerLocationView.java +++ b/core/java/com/android/internal/widget/PointerLocationView.java @@ -163,6 +163,8 @@ public class PointerLocationView extends View implements InputDeviceListener, @UnsupportedAppUsage private boolean mPrintCoords = true; + private float mDensity; + public PointerLocationView(Context c) { super(c); setFocusableInTouchMode(true); @@ -365,11 +367,8 @@ public class PointerLocationView extends View implements InputDeviceListener, drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.toolMajor, ps.mCoords.toolMinor, ps.mCoords.orientation, mPaint); - // Draw the orientation arrow. - float arrowSize = ps.mCoords.toolMajor * 0.7f; - if (arrowSize < 20) { - arrowSize = 20; - } + // Draw the orientation arrow, and ensure it has a minimum size of 24dp. + final float arrowSize = Math.max(ps.mCoords.toolMajor * 0.7f, 24 * mDensity); mPaint.setARGB(255, pressureLevel, 255, 0); float orientationVectorX = (float) (Math.sin(ps.mCoords.orientation) * arrowSize); @@ -398,7 +397,7 @@ public class PointerLocationView extends View implements InputDeviceListener, canvas.drawCircle( ps.mCoords.x + orientationVectorX * tiltScale, ps.mCoords.y + orientationVectorY * tiltScale, - 3.0f, mPaint); + 3.0f * mDensity, mPaint); // Draw the current bounding box if (ps.mHasBoundingBox) { @@ -1003,10 +1002,10 @@ public class PointerLocationView extends View implements InputDeviceListener, // Compute size by display density. private void configureDensityDependentFactors() { - final float density = getResources().getDisplayMetrics().density; - mTextPaint.setTextSize(10 * density); - mPaint.setStrokeWidth(1 * density); - mCurrentPointPaint.setStrokeWidth(1 * density); - mPathPaint.setStrokeWidth(1 * density); + mDensity = getResources().getDisplayMetrics().density; + mTextPaint.setTextSize(10 * mDensity); + mPaint.setStrokeWidth(1 * mDensity); + mCurrentPointPaint.setStrokeWidth(1 * mDensity); + mPathPaint.setStrokeWidth(1 * mDensity); } } diff --git a/core/proto/android/input/keyboard_configured.proto b/core/proto/android/input/keyboard_configured.proto new file mode 100644 index 000000000000..16990087b319 --- /dev/null +++ b/core/proto/android/input/keyboard_configured.proto @@ -0,0 +1,50 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +syntax = "proto2"; + +package com.android.internal.os; + +option java_outer_classname = "KeyboardConfiguredProto"; + +/** + * RepeatedKeyboardLayout proto from input_extension_atoms.proto, + * duplicated here so that it's accessible in the build. + * Must be kept in sync with the version in input_extension_atoms.proto. + */ + +// Message containing the repeated field for KeyboardLayoutConfig +message RepeatedKeyboardLayoutConfig { + repeated KeyboardLayoutConfig keyboard_layout_config = 1; +} + +// Keyboard layout configured when the device is connected +// used in KeyboardConfigured atom +message KeyboardLayoutConfig { + // Keyboard configuration details + // Layout type mappings found at: + // frameworks/base/core/res/res/values/attrs.xml + optional int32 keyboard_layout_type = 1; + // PK language language tag (e.g. en-US, ru-Cyrl, etc). This will follow + // BCP-47 language tag standards. + optional string keyboard_language_tag = 2; + // Selected keyboard layout name (e.g. English(US), English(Dvorak), etc.) + optional string keyboard_layout_name = 3; + // Criteria for layout selection (such as user, device, virtual keyboard based) + // IntDef annotation at: + // services/core/java/com/android/server/input/KeyboardMetricsCollector.java + optional int32 layout_selection_criteria = 4; +} diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 52cc35d0d86e..f33afe2ec8e7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1675,16 +1675,56 @@ in the config_autoBrightnessLevels array. This array should have size one greater than the size of the config_autoBrightnessLevels array. The brightness values must be between 0 and 255 and be non-decreasing. + This must be overridden in platform specific overlays --> <integer-array name="config_autoBrightnessButtonBacklightValues"> </integer-array> + <!-- Smoothing constant for Ambient keyboard backlight change. It should contain value + in the range (0.0, 1.0] that will be used to calculate smoothed lux values using + simple exponential smoothing. This value indicated how quickly we transition to + the lux values provided by the Ambient light sensor. + Simple formula for newLuxValue = (1-constant)*currLuxValue + constant*rawLuxValue, where + rawLuxValue is the value provided by the Ambient light sensor. (e.g. value of 1.0 means we + immediately start using the value provided by the Ambient light sensor) + This must be overridden in platform specific overlays --> + <item name="config_autoKeyboardBrightnessSmoothingConstant" format="float" type="dimen"> + 1.0 + </item> + <!-- Array of output values for keyboard backlight corresponding to the lux values - in the config_autoBrightnessLevels array. This array should have size one greater - than the size of the config_autoBrightnessLevels array. + in the config_autoKeyboardBacklight(Increase/Decrease)LuxThreshold arrays. The brightness values must be between 0 and 255 and be non-decreasing. - This must be overridden in platform specific overlays --> - <integer-array name="config_autoBrightnessKeyboardBacklightValues"> + + This can be overridden in platform specific overlays --> + <integer-array name="config_autoKeyboardBacklightBrightnessValues"> + <item>102</item> + <item>153</item> + <item>0</item> + </integer-array> + + <!-- Array of threshold values for keyboard backlight corresponding to the values + in the config_autoKeyboardBacklightBrightnessValues array. + These lux values indicate when to move to a lower keyboard backlight value, + as defined in config_autoKeyboardBacklightBrightnessValues array. + + This can be overridden in platform specific overlays --> + <integer-array name="config_autoKeyboardBacklightDecreaseLuxThreshold"> + <item>-1</item> + <item>40</item> + <item>150</item> + </integer-array> + + <!-- Array of threshold values for keyboard backlight corresponding to the values + in the config_autoKeyboardBacklightBrightnessValues array. + These lux values indicate when to move to a higher keyboard backlight value, + as defined in config_autoKeyboardBacklightBrightnessValues array. + + This can be overridden in platform specific overlays --> + <integer-array name="config_autoKeyboardBacklightIncreaseLuxThreshold"> + <item>55</item> + <item>200</item> + <item>-1</item> </integer-array> <!-- An array describing the screen's backlight values corresponding to the brightness @@ -1817,6 +1857,17 @@ specified --> <string name="default_wallpaper_component" translatable="false">@null</string> + <!-- Default wallpaper component per device color map, each item is a comma separated key-value + pair with key being a device color and value being the corresponding wallpaper component. + The component with its key matching the device color will be the default wallpaper, the + default wallpaper component will be the default if this config is not specified. + + E.g. for SLV color, and com.android.example/com.android.example.SlVDefaultWallpaper + <item>SLV,com.android.example/com.android.example.SlVDefaultWallpaper</item> --> + <string-array name="default_wallpaper_component_per_device_color" translatable="false"> + <!-- Add packages here --> + </string-array> + <!-- By default a product has no distinct default lock wallpaper --> <item name="default_lock_wallpaper" type="drawable">@null</item> @@ -4419,6 +4470,14 @@ --> <string name="config_defaultContentCaptureService" translatable="false"></string> + <!-- The package name for the system's content protection service. + This service must be trusted, as it can be activated without explicit consent of the user. + If no service with the specified name exists on the device, content protection will be + disabled. + Example: "com.android.contentprotection/.ContentProtectionService" + --> + <string name="config_defaultContentProtectionService" translatable="false"></string> + <!-- The package name for the system's augmented autofill service. This service must be trusted, as it can be activated without explicit consent of the user. If no service with the specified name exists on the device, augmented autofill wil be @@ -6188,7 +6247,7 @@ <!-- Flag indicating whether the show Stylus pointer icon. If set, a pointer icon will be shown over the location of a stylus pointer.--> - <bool name="config_enableStylusPointerIcon">false</bool> + <bool name="config_enableStylusPointerIcon">true</bool> <!-- Determines whether SafetyCenter feature is enabled. --> <bool name="config_enableSafetyCenter">true</bool> @@ -6449,4 +6508,9 @@ <!-- Whether the AOSP support for app cloning building blocks is to be enabled for the device. --> <bool name="config_enableAppCloningBuildingBlocks">true</bool> + + <!-- Enables or disables support for repair mode. The feature creates a secure + environment to protect the user's privacy when the device is being repaired. + Off by default, since OEMs may have had a similar feature on their devices. --> + <bool name="config_repairModeSupported">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index da0ba870212f..b95b8ed722ee 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -520,6 +520,7 @@ <java-symbol type="dimen" name="config_viewConfigurationHandwritingSlop" /> <java-symbol type="dimen" name="config_viewConfigurationHoverSlop" /> <java-symbol type="dimen" name="config_ambiguousGestureMultiplier" /> + <java-symbol type="dimen" name="config_autoKeyboardBrightnessSmoothingConstant" /> <java-symbol type="dimen" name="config_viewMinFlingVelocity" /> <java-symbol type="dimen" name="config_viewMaxFlingVelocity" /> <java-symbol type="dimen" name="config_viewMinRotaryEncoderFlingVelocity" /> @@ -1888,11 +1889,13 @@ <java-symbol type="anim" name="dream_activity_open_enter" /> <java-symbol type="anim" name="dream_activity_close_exit" /> <java-symbol type="array" name="config_autoBrightnessButtonBacklightValues" /> - <java-symbol type="array" name="config_autoBrightnessKeyboardBacklightValues" /> <java-symbol type="array" name="config_autoBrightnessLcdBacklightValues" /> <java-symbol type="array" name="config_autoBrightnessLcdBacklightValues_doze" /> <java-symbol type="array" name="config_autoBrightnessLevels" /> <java-symbol type="array" name="config_autoBrightnessLevelsIdle" /> + <java-symbol type="array" name="config_autoKeyboardBacklightBrightnessValues" /> + <java-symbol type="array" name="config_autoKeyboardBacklightDecreaseLuxThreshold" /> + <java-symbol type="array" name="config_autoKeyboardBacklightIncreaseLuxThreshold" /> <java-symbol type="array" name="config_ambientThresholdLevels" /> <java-symbol type="array" name="config_ambientBrighteningThresholds" /> <java-symbol type="array" name="config_ambientDarkeningThresholds" /> @@ -2116,6 +2119,7 @@ <java-symbol type="string" name="data_usage_rapid_body" /> <java-symbol type="string" name="data_usage_rapid_app_body" /> <java-symbol type="string" name="default_wallpaper_component" /> + <java-symbol type="array" name="default_wallpaper_component_per_device_color" /> <java-symbol type="string" name="device_storage_monitor_notification_channel" /> <java-symbol type="string" name="dlg_ok" /> <java-symbol type="string" name="dump_heap_notification" /> @@ -3764,6 +3768,7 @@ <java-symbol type="string" name="config_defaultTextClassifierPackage" /> <java-symbol type="string" name="config_defaultWellbeingPackage" /> <java-symbol type="string" name="config_defaultContentCaptureService" /> + <java-symbol type="string" name="config_defaultContentProtectionService" /> <java-symbol type="string" name="config_defaultAugmentedAutofillService" /> <java-symbol type="string" name="config_defaultTranslationService" /> <java-symbol type="string" name="config_defaultAppPredictionService" /> @@ -4914,6 +4919,8 @@ <java-symbol type="bool" name="config_safetyProtectionEnabled" /> + <java-symbol type="bool" name="config_repairModeSupported" /> + <java-symbol type="string" name="config_devicePolicyManagementUpdater" /> <java-symbol type="string" name="config_deviceSpecificDeviceStatePolicyProvider" /> diff --git a/core/tests/BroadcastRadioTests/Android.bp b/core/tests/BroadcastRadioTests/Android.bp index 436f058f3cbc..85d54e02d318 100644 --- a/core/tests/BroadcastRadioTests/Android.bp +++ b/core/tests/BroadcastRadioTests/Android.bp @@ -45,6 +45,7 @@ android_test { libs: ["android.test.base"], test_suites: [ "general-tests", + "automotive-general-tests", ], // mockito-target-inline dependency jni_libs: [ diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index c1deba3288e5..129de649a4b5 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -1716,6 +1716,17 @@ <meta-data android:name="android.view.im" android:resource="@xml/ime_meta_handwriting"/> </service> + + <activity android:name="android.widget.PointerIconTestActivity" + android:label="PointerIconTestActivity" + android:screenOrientation="portrait" + android:exported="true" + android:theme="@android:style/Theme.Material.Light"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" /> + </intent-filter> + </activity> </application> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" diff --git a/core/tests/coretests/res/layout/pointer_icon_test.xml b/core/tests/coretests/res/layout/pointer_icon_test.xml new file mode 100644 index 000000000000..a2a64473ae23 --- /dev/null +++ b/core/tests/coretests/res/layout/pointer_icon_test.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:id="@+id/textview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Test"/> + + <EditText + android:id="@+id/edittext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Test"/> + + <Button + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Test"/> + + <ImageButton + android:id="@+id/imagebutton" + android:layout_width="50dp" + android:layout_height="50dp"/> + + <Spinner + android:id="@+id/spinner" + android:layout_width="50dp" + android:layout_height="50dp"/> + + <RadialTimePickerView + android:id="@+id/timepicker" + android:layout_width="200dp" + android:layout_height="200dp"/> + + <CalendarView + android:id="@+id/calendar" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> +</LinearLayout>
\ No newline at end of file diff --git a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java index 81eb213ce78a..5ac99db3aea5 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java @@ -128,6 +128,7 @@ public class ActivityManagerTest extends AndroidTestCase { 0x222222, // colorBackground 0x333333, // statusBarColor 0x444444, // navigationBarColor + 0, // statusBarAppearance true, // ensureStatusBarContrastWhenTransparent true, // ensureNavigationBarContrastWhenTransparent RESIZE_MODE_RESIZEABLE, // resizeMode @@ -152,6 +153,7 @@ public class ActivityManagerTest extends AndroidTestCase { 0x222222, // colorBackground 0x333333, // statusBarColor 0x444444, // navigationBarColor + 0, // statusBarAppearance false, // ensureStatusBarContrastWhenTransparent false, // ensureNavigationBarContrastWhenTransparent RESIZE_MODE_UNRESIZEABLE, // resizeMode @@ -167,6 +169,7 @@ public class ActivityManagerTest extends AndroidTestCase { 0x2222222, // colorBackground 0x3333332, // statusBarColor 0x4444442, // navigationBarColor + 0, // statusBarAppearance true, // ensureStatusBarContrastWhenTransparent true, // ensureNavigationBarContrastWhenTransparent RESIZE_MODE_RESIZEABLE, // resizeMode @@ -197,6 +200,7 @@ public class ActivityManagerTest extends AndroidTestCase { 0x222222, // colorBackground 0x333333, // statusBarColor 0x444444, // navigationBarColor + 0, // statusBarAppearance false, // ensureStatusBarContrastWhenTransparent false, // ensureNavigationBarContrastWhenTransparent RESIZE_MODE_UNRESIZEABLE, // resizeMode @@ -219,6 +223,7 @@ public class ActivityManagerTest extends AndroidTestCase { 0x222222, // colorBackground 0x333333, // statusBarColor 0x444444, // navigationBarColor + 0, // statusBarAppearance false, // ensureStatusBarContrastWhenTransparent false, // ensureNavigationBarContrastWhenTransparent RESIZE_MODE_UNRESIZEABLE, // resizeMode @@ -250,6 +255,7 @@ public class ActivityManagerTest extends AndroidTestCase { assertEquals(td1.getBackgroundColor(), td2.getBackgroundColor()); assertEquals(td1.getStatusBarColor(), td2.getStatusBarColor()); assertEquals(td1.getNavigationBarColor(), td2.getNavigationBarColor()); + assertEquals(td1.getStatusBarAppearance(), td2.getStatusBarAppearance()); assertEquals(td1.getResizeMode(), td2.getResizeMode()); assertEquals(td1.getMinWidth(), td2.getMinWidth()); assertEquals(td1.getMinHeight(), td2.getMinHeight()); diff --git a/core/tests/coretests/src/android/content/ContentCaptureOptionsTest.java b/core/tests/coretests/src/android/content/ContentCaptureOptionsTest.java index c6f4fa27dc83..f8348d28b7fe 100644 --- a/core/tests/coretests/src/android/content/ContentCaptureOptionsTest.java +++ b/core/tests/coretests/src/android/content/ContentCaptureOptionsTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.annotation.Nullable; +import android.os.Parcel; import android.util.ArraySet; import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient; @@ -40,16 +41,29 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ContentCaptureOptionsTest { - private final ComponentName mContextComponent = new ComponentName("marco", "polo"); - private final ComponentName mComp1 = new ComponentName("comp", "one"); - private final ComponentName mComp2 = new ComponentName("two", "comp"); + private static final ComponentName CONTEXT_COMPONENT = new ComponentName("marco", "polo"); + private static final ComponentName COMPONENT1 = new ComponentName("comp", "one"); + private static final ComponentName COMPONENT2 = new ComponentName("two", "comp"); + private static final ContentCaptureOptions CONTENT_CAPTURE_OPTIONS = + new ContentCaptureOptions( + /* loggingLevel= */ 1000, + /* maxBufferSize= */ 1001, + /* idleFlushingFrequencyMs= */ 1002, + /* textChangeFlushingFrequencyMs= */ 1003, + /* logHistorySize= */ 1004, + /* disableFlushForViewTreeAppearing= */ true, + /* enableReceiver= */ false, + new ContentCaptureOptions.ContentProtectionOptions( + /* enableReceiver= */ true, + /* bufferSize= */ 2001), + /* whitelistedComponents= */ toSet(COMPONENT1, COMPONENT2)); @Mock private Context mContext; @Mock private ContentCaptureClient mClient; @Before public void setExpectation() { - when(mClient.contentCaptureClientGetComponentName()).thenReturn(mContextComponent); + when(mClient.contentCaptureClientGetComponentName()).thenReturn(CONTEXT_COMPONENT); when(mContext.getContentCaptureClient()).thenReturn(mClient); } @@ -67,26 +81,27 @@ public class ContentCaptureOptionsTest { @Test public void testIsWhitelisted_notWhitelisted() { - ContentCaptureOptions options = new ContentCaptureOptions(toSet(mComp1, mComp2)); + ContentCaptureOptions options = new ContentCaptureOptions(toSet(COMPONENT1, COMPONENT2)); assertThat(options.isWhitelisted(mContext)).isFalse(); } @Test public void testIsWhitelisted_whitelisted() { - ContentCaptureOptions options = new ContentCaptureOptions(toSet(mComp1, mContextComponent)); + ContentCaptureOptions options = + new ContentCaptureOptions(toSet(COMPONENT1, CONTEXT_COMPONENT)); assertThat(options.isWhitelisted(mContext)).isTrue(); } @Test public void testIsWhitelisted_invalidContext() { - ContentCaptureOptions options = new ContentCaptureOptions(toSet(mContextComponent)); + ContentCaptureOptions options = new ContentCaptureOptions(toSet(CONTEXT_COMPONENT)); Context invalidContext = mock(Context.class); // has no client assertThat(options.isWhitelisted(invalidContext)).isFalse(); } @Test public void testIsWhitelisted_clientWithNullComponentName() { - ContentCaptureOptions options = new ContentCaptureOptions(toSet(mContextComponent)); + ContentCaptureOptions options = new ContentCaptureOptions(toSet(CONTEXT_COMPONENT)); ContentCaptureClient client = mock(ContentCaptureClient.class); Context context = mock(Context.class); when(context.getContentCaptureClient()).thenReturn(client); @@ -94,8 +109,69 @@ public class ContentCaptureOptionsTest { assertThat(options.isWhitelisted(context)).isFalse(); } + @Test + public void testToString() { + String actual = CONTENT_CAPTURE_OPTIONS.toString(); + + String expected = + new StringBuilder("ContentCaptureOptions [") + .append("loggingLevel=") + .append(CONTENT_CAPTURE_OPTIONS.loggingLevel) + .append(", maxBufferSize=") + .append(CONTENT_CAPTURE_OPTIONS.maxBufferSize) + .append(", idleFlushingFrequencyMs=") + .append(CONTENT_CAPTURE_OPTIONS.idleFlushingFrequencyMs) + .append(", textChangeFlushingFrequencyMs=") + .append(CONTENT_CAPTURE_OPTIONS.textChangeFlushingFrequencyMs) + .append(", logHistorySize=") + .append(CONTENT_CAPTURE_OPTIONS.logHistorySize) + .append(", disableFlushForViewTreeAppearing=") + .append(CONTENT_CAPTURE_OPTIONS.disableFlushForViewTreeAppearing) + .append(", enableReceiver=") + .append(CONTENT_CAPTURE_OPTIONS.enableReceiver) + .append(", contentProtectionOptions=ContentProtectionOptions [") + .append("enableReceiver=") + .append(CONTENT_CAPTURE_OPTIONS.contentProtectionOptions.enableReceiver) + .append(", bufferSize=") + .append(CONTENT_CAPTURE_OPTIONS.contentProtectionOptions.bufferSize) + .append("], whitelisted=") + .append(CONTENT_CAPTURE_OPTIONS.whitelistedComponents) + .append(']') + .toString(); + assertThat(actual).isEqualTo(expected); + } + + @Test + public void testParcelSerializationDeserialization() { + Parcel parcel = Parcel.obtain(); + CONTENT_CAPTURE_OPTIONS.writeToParcel(parcel, /* flags= */ 0); + parcel.setDataPosition(0); + + ContentCaptureOptions actual = ContentCaptureOptions.CREATOR.createFromParcel(parcel); + parcel.recycle(); + + assertThat(actual).isNotNull(); + assertThat(actual.loggingLevel).isEqualTo(CONTENT_CAPTURE_OPTIONS.loggingLevel); + assertThat(actual.maxBufferSize).isEqualTo(CONTENT_CAPTURE_OPTIONS.maxBufferSize); + assertThat(actual.idleFlushingFrequencyMs) + .isEqualTo(CONTENT_CAPTURE_OPTIONS.idleFlushingFrequencyMs); + assertThat(actual.textChangeFlushingFrequencyMs) + .isEqualTo(CONTENT_CAPTURE_OPTIONS.textChangeFlushingFrequencyMs); + assertThat(actual.logHistorySize).isEqualTo(CONTENT_CAPTURE_OPTIONS.logHistorySize); + assertThat(actual.disableFlushForViewTreeAppearing) + .isEqualTo(CONTENT_CAPTURE_OPTIONS.disableFlushForViewTreeAppearing); + assertThat(actual.enableReceiver).isEqualTo(CONTENT_CAPTURE_OPTIONS.enableReceiver); + assertThat(actual.contentProtectionOptions).isNotNull(); + assertThat(actual.contentProtectionOptions.enableReceiver) + .isEqualTo(CONTENT_CAPTURE_OPTIONS.contentProtectionOptions.enableReceiver); + assertThat(actual.contentProtectionOptions.bufferSize) + .isEqualTo(CONTENT_CAPTURE_OPTIONS.contentProtectionOptions.bufferSize); + assertThat(actual.whitelistedComponents) + .containsExactlyElementsIn(CONTENT_CAPTURE_OPTIONS.whitelistedComponents); + } + @NonNull - private ArraySet<ComponentName> toSet(@Nullable ComponentName... comps) { + private static ArraySet<ComponentName> toSet(@Nullable ComponentName... comps) { ArraySet<ComponentName> set = new ArraySet<>(); if (comps != null) { for (int i = 0; i < comps.length; i++) { diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureManagerTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureManagerTest.java index 17ed4c478350..101f7c21fa19 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureManagerTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureManagerTest.java @@ -15,14 +15,17 @@ */ package android.view.contentcapture; +import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_STARTED; + import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; import static org.testng.Assert.assertThrows; import android.content.ContentCaptureOptions; import android.content.Context; +import com.android.internal.util.RingBuffer; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -37,9 +40,15 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ContentCaptureManagerTest { + private static final int BUFFER_SIZE = 100; + + private static final ContentCaptureOptions EMPTY_OPTIONS = new ContentCaptureOptions(null); + @Mock private Context mMockContext; + @Mock private IContentCaptureManager mMockContentCaptureManager; + @Test public void testConstructor_invalidParametersThrowsException() { assertThrows(NullPointerException.class, @@ -48,11 +57,65 @@ public class ContentCaptureManagerTest { } @Test + public void testConstructor_contentProtection_default_bufferNotCreated() { + ContentCaptureManager manager = + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, EMPTY_OPTIONS); + + assertThat(manager.getContentProtectionEventBuffer()).isNull(); + } + + @Test + public void testConstructor_contentProtection_disabled_bufferNotCreated() { + ContentCaptureOptions options = + createOptions( + new ContentCaptureOptions.ContentProtectionOptions( + /* enableReceiver= */ false, BUFFER_SIZE)); + + ContentCaptureManager manager = + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, options); + + assertThat(manager.getContentProtectionEventBuffer()).isNull(); + } + + @Test + public void testConstructor_contentProtection_invalidBufferSize_bufferNotCreated() { + ContentCaptureOptions options = + createOptions( + new ContentCaptureOptions.ContentProtectionOptions( + /* enableReceiver= */ true, /* bufferSize= */ 0)); + + ContentCaptureManager manager = + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, options); + + assertThat(manager.getContentProtectionEventBuffer()).isNull(); + } + + @Test + public void testConstructor_contentProtection_enabled_bufferCreated() { + ContentCaptureOptions options = + createOptions( + new ContentCaptureOptions.ContentProtectionOptions( + /* enableReceiver= */ true, BUFFER_SIZE)); + + ContentCaptureManager manager = + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, options); + RingBuffer<ContentCaptureEvent> buffer = manager.getContentProtectionEventBuffer(); + + assertThat(buffer).isNotNull(); + ContentCaptureEvent[] expected = new ContentCaptureEvent[BUFFER_SIZE]; + int offset = 3; + for (int i = 0; i < BUFFER_SIZE + offset; i++) { + ContentCaptureEvent event = new ContentCaptureEvent(i, TYPE_SESSION_STARTED); + buffer.append(event); + expected[(i + BUFFER_SIZE - offset) % BUFFER_SIZE] = event; + } + assertThat(buffer.toArray()).isEqualTo(expected); + } + + @Test public void testRemoveData_invalidParametersThrowsException() { - final IContentCaptureManager mockService = mock(IContentCaptureManager.class); - final ContentCaptureOptions options = new ContentCaptureOptions(null); final ContentCaptureManager manager = - new ContentCaptureManager(mMockContext, mockService, options); + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, EMPTY_OPTIONS); assertThrows(NullPointerException.class, () -> manager.removeData(null)); } @@ -60,10 +123,8 @@ public class ContentCaptureManagerTest { @Test @SuppressWarnings("GuardedBy") public void testFlushViewTreeAppearingEventDisabled_setAndGet() { - final IContentCaptureManager mockService = mock(IContentCaptureManager.class); - final ContentCaptureOptions options = new ContentCaptureOptions(null); final ContentCaptureManager manager = - new ContentCaptureManager(mMockContext, mockService, options); + new ContentCaptureManager(mMockContext, mMockContentCaptureManager, EMPTY_OPTIONS); assertThat(manager.getFlushViewTreeAppearingEventDisabled()).isFalse(); manager.setFlushViewTreeAppearingEventDisabled(true); @@ -71,4 +132,18 @@ public class ContentCaptureManagerTest { manager.setFlushViewTreeAppearingEventDisabled(false); assertThat(manager.getFlushViewTreeAppearingEventDisabled()).isFalse(); } + + private ContentCaptureOptions createOptions( + ContentCaptureOptions.ContentProtectionOptions contentProtectionOptions) { + return new ContentCaptureOptions( + /* loggingLevel= */ 0, + /* maxBufferSize= */ 0, + /* idleFlushingFrequencyMs= */ 0, + /* textChangeFlushingFrequencyMs= */ 0, + /* logHistorySize= */ 0, + /* disableFlushForViewTreeAppearing= */ false, + /* enableReceiver= */ true, + contentProtectionOptions, + /* whitelistedComponents= */ null); + } } diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java index 27d58b8cdcb7..23b9b9bdb451 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java @@ -27,9 +27,12 @@ import android.view.ViewStructure; import android.view.autofill.AutofillId; import android.view.contentcapture.ViewNode.ViewStructureImpl; +import com.google.common.collect.ImmutableMap; + import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges; import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; @@ -37,6 +40,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import java.util.Map; + /** * Unit tests for {@link ContentCaptureSession}. * @@ -126,6 +131,7 @@ public class ContentCaptureSessionTest { () -> mSession1.notifyViewsDisappeared(new AutofillId(42, 108), new long[] {666})); } + @Ignore("b/286134492") @Test public void testNotifyViewsDisappeared_noSendTreeEventBeforeU() { MyContentCaptureSession session = new MyContentCaptureSession(121); @@ -135,6 +141,7 @@ public class ContentCaptureSessionTest { assertThat(session.mInternalNotifyViewTreeEventFinishedCount).isEqualTo(0); } + @Ignore("b/286134492") @EnableCompatChanges({ContentCaptureSession.NOTIFY_NODES_DISAPPEAR_NOW_SENDS_TREE_EVENTS}) @Test public void testNotifyViewsDisappeared_sendTreeEventSinceU() { @@ -145,6 +152,34 @@ public class ContentCaptureSessionTest { assertThat(session.mInternalNotifyViewTreeEventFinishedCount).isEqualTo(1); } + @Test + public void testGetFlushReasonAsString() { + int invalidFlushReason = ContentCaptureSession.FLUSH_REASON_VIEW_TREE_APPEARED + 1; + Map<Integer, String> expectedMap = + new ImmutableMap.Builder<Integer, String>() + .put(ContentCaptureSession.FLUSH_REASON_FULL, "FULL") + .put(ContentCaptureSession.FLUSH_REASON_VIEW_ROOT_ENTERED, "VIEW_ROOT") + .put(ContentCaptureSession.FLUSH_REASON_SESSION_STARTED, "STARTED") + .put(ContentCaptureSession.FLUSH_REASON_SESSION_FINISHED, "FINISHED") + .put(ContentCaptureSession.FLUSH_REASON_IDLE_TIMEOUT, "IDLE") + .put(ContentCaptureSession.FLUSH_REASON_TEXT_CHANGE_TIMEOUT, "TEXT_CHANGE") + .put(ContentCaptureSession.FLUSH_REASON_SESSION_CONNECTED, "CONNECTED") + .put(ContentCaptureSession.FLUSH_REASON_FORCE_FLUSH, "FORCE_FLUSH") + .put( + ContentCaptureSession.FLUSH_REASON_VIEW_TREE_APPEARING, + "VIEW_TREE_APPEARING") + .put( + ContentCaptureSession.FLUSH_REASON_VIEW_TREE_APPEARED, + "VIEW_TREE_APPEARED") + .put(invalidFlushReason, "UNKNOWN-" + invalidFlushReason) + .build(); + + expectedMap.forEach( + (reason, expected) -> + assertThat(ContentCaptureSession.getFlushReasonAsString(reason)) + .isEqualTo(expected)); + } + // Cannot use @Spy because we need to pass the session id on constructor private class MyContentCaptureSession extends ContentCaptureSession { int mInternalNotifyViewTreeEventStartedCount = 0; diff --git a/core/tests/coretests/src/android/view/contentcapture/MainContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/MainContentCaptureSessionTest.java new file mode 100644 index 000000000000..3373b8b13273 --- /dev/null +++ b/core/tests/coretests/src/android/view/contentcapture/MainContentCaptureSessionTest.java @@ -0,0 +1,360 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.contentcapture; + +import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_STARTED; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; + +import android.content.ComponentName; +import android.content.ContentCaptureOptions; +import android.content.Context; +import android.content.pm.ParceledListSlice; +import android.os.Handler; +import android.os.Looper; +import android.view.contentprotection.ContentProtectionEventProcessor; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Test for {@link MainContentCaptureSession}. + * + * <p>Run with: {@code atest + * FrameworksCoreTests:android.view.contentcapture.MainContentCaptureSessionTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class MainContentCaptureSessionTest { + + private static final int BUFFER_SIZE = 100; + + private static final int REASON = 123; + + private static final ContentCaptureEvent EVENT = + new ContentCaptureEvent(/* sessionId= */ 0, TYPE_SESSION_STARTED); + + private static final ComponentName COMPONENT_NAME = + new ComponentName("com.test.package", "TestClass"); + + private static final Context sContext = ApplicationProvider.getApplicationContext(); + + private static final ContentCaptureManager.StrippedContext sStrippedContext = + new ContentCaptureManager.StrippedContext(sContext); + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private IContentCaptureManager mMockSystemServerInterface; + + @Mock private ContentProtectionEventProcessor mMockContentProtectionEventProcessor; + + @Mock private IContentCaptureDirectManager mMockContentCaptureDirectManager; + + @Test + public void onSessionStarted_contentProtectionEnabled_processorCreated() { + MainContentCaptureSession session = createSession(); + assertThat(session.mContentProtectionEventProcessor).isNull(); + + session.onSessionStarted(/* resultCode= */ 0, /* binder= */ null); + + assertThat(session.mContentProtectionEventProcessor).isNotNull(); + } + + @Test + public void onSessionStarted_contentProtectionDisabled_processorNotCreated() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ true, + /* enableContentProtectionReceiver= */ false); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.onSessionStarted(/* resultCode= */ 0, /* binder= */ null); + + assertThat(session.mContentProtectionEventProcessor).isNull(); + verifyZeroInteractions(mMockContentProtectionEventProcessor); + } + + @Test + public void onSessionStarted_contentProtectionNoBuffer_processorNotCreated() { + ContentCaptureOptions options = + createOptions( + /* enableContentCaptureReceiver= */ true, + new ContentCaptureOptions.ContentProtectionOptions( + /* enableReceiver= */ true, -BUFFER_SIZE)); + MainContentCaptureSession session = createSession(options); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.onSessionStarted(/* resultCode= */ 0, /* binder= */ null); + + assertThat(session.mContentProtectionEventProcessor).isNull(); + verifyZeroInteractions(mMockContentProtectionEventProcessor); + } + + @Test + public void onSessionStarted_noComponentName_processorNotCreated() { + MainContentCaptureSession session = createSession(); + session.mComponentName = null; + + session.onSessionStarted(/* resultCode= */ 0, /* binder= */ null); + + assertThat(session.mContentProtectionEventProcessor).isNull(); + } + + @Test + public void sendEvent_contentCaptureDisabled_contentProtectionDisabled() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ false, + /* enableContentProtectionReceiver= */ false); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.sendEvent(EVENT); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mEvents).isNull(); + } + + @Test + public void sendEvent_contentCaptureDisabled_contentProtectionEnabled() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ false, + /* enableContentProtectionReceiver= */ true); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.sendEvent(EVENT); + + verify(mMockContentProtectionEventProcessor).processEvent(EVENT); + assertThat(session.mEvents).isNull(); + } + + @Test + public void sendEvent_contentCaptureEnabled_contentProtectionDisabled() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ true, + /* enableContentProtectionReceiver= */ false); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.sendEvent(EVENT); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mEvents).isNotNull(); + assertThat(session.mEvents).containsExactly(EVENT); + } + + @Test + public void sendEvent_contentCaptureEnabled_contentProtectionEnabled() { + MainContentCaptureSession session = createSession(); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.sendEvent(EVENT); + + verify(mMockContentProtectionEventProcessor).processEvent(EVENT); + assertThat(session.mEvents).isNotNull(); + assertThat(session.mEvents).containsExactly(EVENT); + } + + @Test + public void sendEvent_contentProtectionEnabled_processorNotCreated() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ false, + /* enableContentProtectionReceiver= */ true); + + session.sendEvent(EVENT); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mEvents).isNull(); + } + + @Test + public void flush_contentCaptureDisabled_contentProtectionDisabled() throws Exception { + ContentCaptureOptions options = + createOptions( + /* enableContentCaptureReceiver= */ false, + /* enableContentProtectionReceiver= */ false); + MainContentCaptureSession session = createSession(options); + session.mEvents = new ArrayList<>(Arrays.asList(EVENT)); + session.mDirectServiceInterface = mMockContentCaptureDirectManager; + + session.flush(REASON); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + verifyZeroInteractions(mMockContentCaptureDirectManager); + assertThat(session.mEvents).containsExactly(EVENT); + } + + @Test + public void flush_contentCaptureDisabled_contentProtectionEnabled() { + MainContentCaptureSession session = + createSession( + /* enableContentCaptureReceiver= */ false, + /* enableContentProtectionReceiver= */ true); + session.mEvents = new ArrayList<>(Arrays.asList(EVENT)); + session.mDirectServiceInterface = mMockContentCaptureDirectManager; + + session.flush(REASON); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + verifyZeroInteractions(mMockContentCaptureDirectManager); + assertThat(session.mEvents).containsExactly(EVENT); + } + + @Test + public void flush_contentCaptureEnabled_contentProtectionDisabled() throws Exception { + ContentCaptureOptions options = + createOptions( + /* enableContentCaptureReceiver= */ true, + /* enableContentProtectionReceiver= */ false); + MainContentCaptureSession session = createSession(options); + session.mEvents = new ArrayList<>(Arrays.asList(EVENT)); + session.mDirectServiceInterface = mMockContentCaptureDirectManager; + + session.flush(REASON); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mEvents).isEmpty(); + assertEventFlushedContentCapture(options); + } + + @Test + public void flush_contentCaptureEnabled_contentProtectionEnabled() throws Exception { + ContentCaptureOptions options = + createOptions( + /* enableContentCaptureReceiver= */ true, + /* enableContentProtectionReceiver= */ true); + MainContentCaptureSession session = createSession(options); + session.mEvents = new ArrayList<>(Arrays.asList(EVENT)); + session.mDirectServiceInterface = mMockContentCaptureDirectManager; + + session.flush(REASON); + + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mEvents).isEmpty(); + assertEventFlushedContentCapture(options); + } + + @Test + public void destroySession() throws Exception { + MainContentCaptureSession session = createSession(); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.destroySession(); + + verify(mMockSystemServerInterface).finishSession(anyInt()); + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mDirectServiceInterface).isNull(); + assertThat(session.mContentProtectionEventProcessor).isNull(); + } + + @Test + public void resetSession() { + MainContentCaptureSession session = createSession(); + session.mContentProtectionEventProcessor = mMockContentProtectionEventProcessor; + + session.resetSession(/* newState= */ 0); + + verifyZeroInteractions(mMockSystemServerInterface); + verifyZeroInteractions(mMockContentProtectionEventProcessor); + assertThat(session.mDirectServiceInterface).isNull(); + assertThat(session.mContentProtectionEventProcessor).isNull(); + } + + private static ContentCaptureOptions createOptions( + boolean enableContentCaptureReceiver, + ContentCaptureOptions.ContentProtectionOptions contentProtectionOptions) { + return new ContentCaptureOptions( + /* loggingLevel= */ 0, + BUFFER_SIZE, + /* idleFlushingFrequencyMs= */ 0, + /* textChangeFlushingFrequencyMs= */ 0, + /* logHistorySize= */ 0, + /* disableFlushForViewTreeAppearing= */ false, + enableContentCaptureReceiver, + contentProtectionOptions, + /* whitelistedComponents= */ null); + } + + private static ContentCaptureOptions createOptions( + boolean enableContentCaptureReceiver, boolean enableContentProtectionReceiver) { + return createOptions( + enableContentCaptureReceiver, + new ContentCaptureOptions.ContentProtectionOptions( + enableContentProtectionReceiver, BUFFER_SIZE)); + } + + private ContentCaptureManager createManager(ContentCaptureOptions options) { + return new ContentCaptureManager(sContext, mMockSystemServerInterface, options); + } + + private MainContentCaptureSession createSession(ContentCaptureManager manager) { + MainContentCaptureSession session = + new MainContentCaptureSession( + sStrippedContext, + manager, + new Handler(Looper.getMainLooper()), + mMockSystemServerInterface); + session.mComponentName = COMPONENT_NAME; + return session; + } + + private MainContentCaptureSession createSession(ContentCaptureOptions options) { + return createSession(createManager(options)); + } + + private MainContentCaptureSession createSession( + boolean enableContentCaptureReceiver, boolean enableContentProtectionReceiver) { + return createSession( + createOptions(enableContentCaptureReceiver, enableContentProtectionReceiver)); + } + + private MainContentCaptureSession createSession() { + return createSession( + /* enableContentCaptureReceiver= */ true, + /* enableContentProtectionReceiver= */ true); + } + + private void assertEventFlushedContentCapture(ContentCaptureOptions options) throws Exception { + ArgumentCaptor<ParceledListSlice> captor = ArgumentCaptor.forClass(ParceledListSlice.class); + verify(mMockContentCaptureDirectManager) + .sendEvents(captor.capture(), eq(REASON), eq(options)); + + assertThat(captor.getValue()).isNotNull(); + List<ContentCaptureEvent> actual = captor.getValue().getList(); + assertThat(actual).isNotNull(); + assertThat(actual).containsExactly(EVENT); + } +} diff --git a/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java b/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java index 93315f11d242..a4e77f5d8dc5 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java @@ -41,49 +41,60 @@ public class ViewNodeTest { private final Context mContext = InstrumentationRegistry.getTargetContext(); + private final View mView = new View(mContext); + + private final ViewStructureImpl mViewStructure = new ViewStructureImpl(mView); + + private final ViewNode mViewNode = mViewStructure.getNode(); + @Mock private HtmlInfo mHtmlInfoMock; @Test public void testUnsupportedProperties() { - View view = new View(mContext); + mViewStructure.setChildCount(1); + assertThat(mViewNode.getChildCount()).isEqualTo(0); + + mViewStructure.addChildCount(1); + assertThat(mViewNode.getChildCount()).isEqualTo(0); - ViewStructureImpl structure = new ViewStructureImpl(view); - ViewNode node = structure.getNode(); + assertThat(mViewStructure.newChild(0)).isNull(); + assertThat(mViewNode.getChildCount()).isEqualTo(0); - structure.setChildCount(1); - assertThat(node.getChildCount()).isEqualTo(0); + assertThat(mViewStructure.asyncNewChild(0)).isNull(); + assertThat(mViewNode.getChildCount()).isEqualTo(0); - structure.addChildCount(1); - assertThat(node.getChildCount()).isEqualTo(0); + mViewStructure.asyncCommit(); + assertThat(mViewNode.getChildCount()).isEqualTo(0); - assertThat(structure.newChild(0)).isNull(); - assertThat(node.getChildCount()).isEqualTo(0); + mViewStructure.setWebDomain("Y U NO SET?"); + assertThat(mViewNode.getWebDomain()).isNull(); - assertThat(structure.asyncNewChild(0)).isNull(); - assertThat(node.getChildCount()).isEqualTo(0); + assertThat(mViewStructure.newHtmlInfoBuilder("WHATEVER")).isNull(); - structure.asyncCommit(); - assertThat(node.getChildCount()).isEqualTo(0); + mViewStructure.setHtmlInfo(mHtmlInfoMock); + assertThat(mViewNode.getHtmlInfo()).isNull(); - structure.setWebDomain("Y U NO SET?"); - assertThat(node.getWebDomain()).isNull(); + mViewStructure.setDataIsSensitive(true); - assertThat(structure.newHtmlInfoBuilder("WHATEVER")).isNull(); + assertThat(mViewStructure.getTempRect()).isNull(); - structure.setHtmlInfo(mHtmlInfoMock); - assertThat(node.getHtmlInfo()).isNull(); + // Graphic properties + mViewStructure.setElevation(6.66f); + assertThat(mViewNode.getElevation()).isEqualTo(0f); + mViewStructure.setAlpha(66.6f); + assertThat(mViewNode.getAlpha()).isEqualTo(1.0f); + mViewStructure.setTransformation(Matrix.IDENTITY_MATRIX); + assertThat(mViewNode.getTransformation()).isNull(); + } - structure.setDataIsSensitive(true); + @Test + public void testGetSet_textIdEntry() { + assertThat(mViewNode.getTextIdEntry()).isNull(); - assertThat(structure.getTempRect()).isNull(); + String expected = "TEXT_ID_ENTRY"; + mViewNode.setTextIdEntry(expected); - // Graphic properties - structure.setElevation(6.66f); - assertThat(node.getElevation()).isWithin(1.0e-10f).of(0f); - structure.setAlpha(66.6f); - assertThat(node.getAlpha()).isWithin(1.0e-10f).of(1.0f); - structure.setTransformation(Matrix.IDENTITY_MATRIX); - assertThat(node.getTransformation()).isNull(); + assertThat(mViewNode.getTextIdEntry()).isEqualTo(expected); } } diff --git a/core/tests/coretests/src/android/view/contentprotection/ContentProtectionEventProcessorTest.java b/core/tests/coretests/src/android/view/contentprotection/ContentProtectionEventProcessorTest.java new file mode 100644 index 000000000000..39a2e0e048e8 --- /dev/null +++ b/core/tests/coretests/src/android/view/contentprotection/ContentProtectionEventProcessorTest.java @@ -0,0 +1,568 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.contentprotection; + +import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_APPEARED; +import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_DISAPPEARED; +import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; + +import android.annotation.Nullable; +import android.content.Context; +import android.content.pm.ParceledListSlice; +import android.os.Handler; +import android.os.Looper; +import android.text.InputType; +import android.view.View; +import android.view.contentcapture.ContentCaptureEvent; +import android.view.contentcapture.IContentCaptureManager; +import android.view.contentcapture.ViewNode; +import android.view.contentcapture.ViewNode.ViewStructureImpl; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.internal.util.RingBuffer; + +import com.google.common.collect.ImmutableSet; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * Test for {@link ContentProtectionEventProcessor}. + * + * <p>Run with: {@code atest + * FrameworksCoreTests:android.view.contentprotection.ContentProtectionEventProcessorTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class ContentProtectionEventProcessorTest { + + private static final String PACKAGE_NAME = "com.test.package.name"; + + private static final String ANDROID_CLASS_NAME = "android.test.some.class.name"; + + private static final String PASSWORD_TEXT = "ENTER PASSWORD HERE"; + + private static final String SUSPICIOUS_TEXT = "PLEASE SIGN IN"; + + private static final String SAFE_TEXT = "SAFE TEXT"; + + private static final ContentCaptureEvent PROCESS_EVENT = createProcessEvent(); + + private static final ContentCaptureEvent[] BUFFERED_EVENTS = + new ContentCaptureEvent[] {PROCESS_EVENT}; + + private static final Set<Integer> EVENT_TYPES_TO_STORE = + ImmutableSet.of(TYPE_VIEW_APPEARED, TYPE_VIEW_DISAPPEARED, TYPE_VIEW_TEXT_CHANGED); + + private static final int RESET_LOGIN_TOTAL_EVENTS_TO_PROCESS = 150; + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private RingBuffer<ContentCaptureEvent> mMockEventBuffer; + + @Mock private IContentCaptureManager mMockContentCaptureManager; + + private final Context mContext = ApplicationProvider.getApplicationContext(); + + private ContentProtectionEventProcessor mContentProtectionEventProcessor; + + @Before + public void setup() { + mContentProtectionEventProcessor = + new ContentProtectionEventProcessor( + mMockEventBuffer, + new Handler(Looper.getMainLooper()), + mMockContentCaptureManager, + PACKAGE_NAME); + } + + @Test + public void processEvent_buffer_storesOnlySubsetOfEventTypes() { + List<ContentCaptureEvent> expectedEvents = new ArrayList<>(); + for (int type = -100; type <= 100; type++) { + ContentCaptureEvent event = createEvent(type); + if (EVENT_TYPES_TO_STORE.contains(type)) { + expectedEvents.add(event); + } + + mContentProtectionEventProcessor.processEvent(event); + } + + assertThat(expectedEvents).hasSize(EVENT_TYPES_TO_STORE.size()); + expectedEvents.forEach((expectedEvent) -> verify(mMockEventBuffer).append(expectedEvent)); + verifyNoMoreInteractions(mMockEventBuffer); + } + + @Test + public void processEvent_buffer_setsTextIdEntry_withoutExistingViewNode() { + ContentCaptureEvent event = createStoreEvent(); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(event.getViewNode()).isNotNull(); + assertThat(event.getViewNode().getTextIdEntry()).isEqualTo(PACKAGE_NAME); + verify(mMockEventBuffer).append(event); + } + + @Test + public void processEvent_buffer_setsTextIdEntry_withExistingViewNode() { + ViewNode viewNode = new ViewNode(); + viewNode.setTextIdEntry(PACKAGE_NAME + "TO BE OVERWRITTEN"); + ContentCaptureEvent event = createStoreEvent(); + event.setViewNode(viewNode); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(event.getViewNode()).isSameInstanceAs(viewNode); + assertThat(viewNode.getTextIdEntry()).isEqualTo(PACKAGE_NAME); + verify(mMockEventBuffer).append(event); + } + + @Test + public void processEvent_loginDetected_inspectsOnlyTypeViewAppeared() { + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + + for (int type = -100; type <= 100; type++) { + if (type == TYPE_VIEW_APPEARED) { + continue; + } + + mContentProtectionEventProcessor.processEvent(createEvent(type)); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isTrue(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + } + + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void processEvent_loginDetected() throws Exception { + when(mMockEventBuffer.toArray()).thenReturn(BUFFERED_EVENTS); + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer).clear(); + verify(mMockEventBuffer).toArray(); + assertOnLoginDetected(); + } + + @Test + public void processEvent_loginDetected_passwordFieldNotDetected() { + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void processEvent_loginDetected_suspiciousTextNotDetected() { + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isTrue(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void processEvent_loginDetected_withoutViewNode() { + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void processEvent_loginDetected_belowResetLimit() throws Exception { + when(mMockEventBuffer.toArray()).thenReturn(BUFFERED_EVENTS); + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + ANDROID_CLASS_NAME, InputType.TYPE_TEXT_VARIATION_PASSWORD); + + for (int i = 0; i < RESET_LOGIN_TOTAL_EVENTS_TO_PROCESS; i++) { + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + } + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer).clear(); + verify(mMockEventBuffer).toArray(); + assertOnLoginDetected(); + } + + @Test + public void processEvent_loginDetected_aboveResetLimit() throws Exception { + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + ANDROID_CLASS_NAME, InputType.TYPE_TEXT_VARIATION_PASSWORD); + + for (int i = 0; i < RESET_LOGIN_TOTAL_EVENTS_TO_PROCESS + 1; i++) { + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + } + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isTrue(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + } + + @Test + public void processEvent_multipleLoginsDetected_belowFlushThreshold() throws Exception { + when(mMockEventBuffer.toArray()).thenReturn(BUFFERED_EVENTS); + + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer).clear(); + verify(mMockEventBuffer).toArray(); + assertOnLoginDetected(); + } + + @Test + public void processEvent_multipleLoginsDetected_aboveFlushThreshold() throws Exception { + when(mMockEventBuffer.toArray()).thenReturn(BUFFERED_EVENTS); + + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + mContentProtectionEventProcessor.mLastFlushTime = Instant.now().minusSeconds(5); + + mContentProtectionEventProcessor.mPasswordFieldDetected = true; + mContentProtectionEventProcessor.mSuspiciousTextDetected = true; + mContentProtectionEventProcessor.processEvent(PROCESS_EVENT); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, times(2)).clear(); + verify(mMockEventBuffer, times(2)).toArray(); + assertOnLoginDetected(PROCESS_EVENT, /* times= */ 2); + } + + @Test + public void isPasswordField_android() { + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + ANDROID_CLASS_NAME, InputType.TYPE_TEXT_VARIATION_PASSWORD); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_android_withoutClassName() { + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + /* className= */ null, InputType.TYPE_TEXT_VARIATION_PASSWORD); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_android_wrongClassName() { + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + "wrong.prefix" + ANDROID_CLASS_NAME, + InputType.TYPE_TEXT_VARIATION_PASSWORD); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_android_wrongInputType() { + ContentCaptureEvent event = + createAndroidPasswordFieldEvent( + ANDROID_CLASS_NAME, InputType.TYPE_TEXT_VARIATION_NORMAL); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_webView() throws Exception { + ContentCaptureEvent event = + createWebViewPasswordFieldEvent( + /* className= */ null, /* eventText= */ null, PASSWORD_TEXT); + when(mMockEventBuffer.toArray()).thenReturn(new ContentCaptureEvent[] {event}); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer).clear(); + verify(mMockEventBuffer).toArray(); + assertOnLoginDetected(event, /* times= */ 1); + } + + @Test + public void isPasswordField_webView_withClassName() { + ContentCaptureEvent event = + createWebViewPasswordFieldEvent( + /* className= */ "any.class.name", /* eventText= */ null, PASSWORD_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_webView_withSafeViewNodeText() { + ContentCaptureEvent event = + createWebViewPasswordFieldEvent( + /* className= */ null, /* eventText= */ null, SAFE_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isPasswordField_webView_withEventText() { + ContentCaptureEvent event = + createWebViewPasswordFieldEvent(/* className= */ null, PASSWORD_TEXT, SAFE_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mPasswordFieldDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isSuspiciousText_withSafeText() { + ContentCaptureEvent event = createSuspiciousTextEvent(SAFE_TEXT, SAFE_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isFalse(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isSuspiciousText_eventText_suspiciousText() { + ContentCaptureEvent event = createSuspiciousTextEvent(SUSPICIOUS_TEXT, SAFE_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isSuspiciousText_viewNodeText_suspiciousText() { + ContentCaptureEvent event = createSuspiciousTextEvent(SAFE_TEXT, SUSPICIOUS_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isSuspiciousText_eventText_passwordText() { + ContentCaptureEvent event = createSuspiciousTextEvent(PASSWORD_TEXT, SAFE_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + @Test + public void isSuspiciousText_viewNodeText_passwordText() { + // Specify the class to differ from {@link isPasswordField_webView} test in this version + ContentCaptureEvent event = + createProcessEvent( + "test.class.not.a.web.view", /* inputType= */ 0, SAFE_TEXT, PASSWORD_TEXT); + + mContentProtectionEventProcessor.processEvent(event); + + assertThat(mContentProtectionEventProcessor.mSuspiciousTextDetected).isTrue(); + verify(mMockEventBuffer, never()).clear(); + verify(mMockEventBuffer, never()).toArray(); + verifyZeroInteractions(mMockContentCaptureManager); + } + + private static ContentCaptureEvent createEvent(int type) { + return new ContentCaptureEvent(/* sessionId= */ 123, type); + } + + private static ContentCaptureEvent createStoreEvent() { + return createEvent(TYPE_VIEW_TEXT_CHANGED); + } + + private static ContentCaptureEvent createProcessEvent() { + return createEvent(TYPE_VIEW_APPEARED); + } + + private ContentCaptureEvent createProcessEvent( + @Nullable String className, + int inputType, + @Nullable String eventText, + @Nullable String viewNodeText) { + View view = new View(mContext); + ViewStructureImpl viewStructure = new ViewStructureImpl(view); + if (className != null) { + viewStructure.setClassName(className); + } + if (viewNodeText != null) { + viewStructure.setText(viewNodeText); + } + viewStructure.setInputType(inputType); + + ContentCaptureEvent event = createProcessEvent(); + event.setViewNode(viewStructure.getNode()); + if (eventText != null) { + event.setText(eventText); + } + + return event; + } + + private ContentCaptureEvent createAndroidPasswordFieldEvent( + @Nullable String className, int inputType) { + return createProcessEvent( + className, inputType, /* eventText= */ null, /* viewNodeText= */ null); + } + + private ContentCaptureEvent createWebViewPasswordFieldEvent( + @Nullable String className, @Nullable String eventText, @Nullable String viewNodeText) { + return createProcessEvent(className, /* inputType= */ 0, eventText, viewNodeText); + } + + private ContentCaptureEvent createSuspiciousTextEvent( + @Nullable String eventText, @Nullable String viewNodeText) { + return createProcessEvent( + /* className= */ null, /* inputType= */ 0, eventText, viewNodeText); + } + + private void assertOnLoginDetected() throws Exception { + assertOnLoginDetected(PROCESS_EVENT, /* times= */ 1); + } + + private void assertOnLoginDetected(ContentCaptureEvent event, int times) throws Exception { + ArgumentCaptor<ParceledListSlice> captor = ArgumentCaptor.forClass(ParceledListSlice.class); + verify(mMockContentCaptureManager, times(times)).onLoginDetected(captor.capture()); + + assertThat(captor.getValue()).isNotNull(); + List<ContentCaptureEvent> actual = captor.getValue().getList(); + assertThat(actual).isNotNull(); + assertThat(actual).containsExactly(event); + } +} diff --git a/core/tests/coretests/src/android/view/contentprotection/ContentProtectionUtilsTest.java b/core/tests/coretests/src/android/view/contentprotection/ContentProtectionUtilsTest.java new file mode 100644 index 000000000000..1459799adee5 --- /dev/null +++ b/core/tests/coretests/src/android/view/contentprotection/ContentProtectionUtilsTest.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2013 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 android.view.contentprotection; + +import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_STARTED; + +import static com.google.common.truth.Truth.assertThat; + +import android.view.View; +import android.view.contentcapture.ContentCaptureEvent; +import android.view.contentcapture.ViewNode; +import android.view.contentcapture.ViewNode.ViewStructureImpl; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test for {@link ContentProtectionUtils}. + * + * <p>Run with: {@code atest + * FrameworksCoreTests:android.view.contentprotection.ContentProtectionUtilsTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class ContentProtectionUtilsTest { + + private static final String TEXT = "TEST_TEXT"; + + private static final ContentCaptureEvent EVENT = createEvent(); + + private static final ViewNode VIEW_NODE = new ViewNode(); + + private static final ViewNode VIEW_NODE_WITH_TEXT = createViewNodeWithText(); + + @Test + public void event_getEventText_null() { + String actual = ContentProtectionUtils.getEventText(EVENT); + + assertThat(actual).isNull(); + } + + @Test + public void event_getEventText_notNull() { + ContentCaptureEvent event = createEvent(); + event.setText(TEXT); + + String actual = ContentProtectionUtils.getEventText(event); + + assertThat(actual).isEqualTo(TEXT); + } + + @Test + public void event_getViewNodeText_null() { + String actual = ContentProtectionUtils.getViewNodeText(EVENT); + + assertThat(actual).isNull(); + } + + @Test + public void event_getViewNodeText_notNull() { + ContentCaptureEvent event = createEvent(); + event.setViewNode(VIEW_NODE_WITH_TEXT); + + String actual = ContentProtectionUtils.getViewNodeText(event); + + assertThat(actual).isEqualTo(TEXT); + } + + @Test + public void viewNode_getViewNodeText_null() { + String actual = ContentProtectionUtils.getViewNodeText(VIEW_NODE); + + assertThat(actual).isNull(); + } + + @Test + public void viewNode_getViewNodeText_notNull() { + String actual = ContentProtectionUtils.getViewNodeText(VIEW_NODE_WITH_TEXT); + + assertThat(actual).isEqualTo(TEXT); + } + + private static ContentCaptureEvent createEvent() { + return new ContentCaptureEvent(/* sessionId= */ 123, TYPE_SESSION_STARTED); + } + + private static ViewNode createViewNodeWithText() { + View view = new View(ApplicationProvider.getApplicationContext()); + ViewStructureImpl viewStructure = new ViewStructureImpl(view); + viewStructure.setText(TEXT); + return viewStructure.getNode(); + } +} diff --git a/core/tests/coretests/src/android/view/inputmethod/TextAppearanceInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/TextAppearanceInfoTest.java index f93cd18a8521..0750cf1a64ab 100644 --- a/core/tests/coretests/src/android/view/inputmethod/TextAppearanceInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/TextAppearanceInfoTest.java @@ -37,6 +37,7 @@ import android.text.style.ForegroundColorSpan; import android.text.style.ScaleXSpan; import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; +import android.text.util.Linkify; import android.view.ViewGroup; import android.widget.EditText; @@ -53,7 +54,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class TextAppearanceInfoTest { private static final float EPSILON = 0.0000001f; - private static final String TEST_TEXT = "Happy birthday!"; + private static final String TEST_TEXT = "Hello: google.com"; private static final float TEXT_SIZE = 16.5f; private static final LocaleList TEXT_LOCALES = LocaleList.forLanguageTags("en,ja"); private static final String FONT_FAMILY_NAME = "sans-serif"; @@ -84,39 +85,7 @@ public class TextAppearanceInfoTest { @Before public void setUp() { - mEditText.setText(mSpannableText); - mEditText.getPaint().setTextSize(TEXT_SIZE); - mEditText.setTextLocales(TEXT_LOCALES); - Typeface family = Typeface.create(FONT_FAMILY_NAME, Typeface.NORMAL); - mEditText.setTypeface( - Typeface.create(family, TEXT_WEIGHT, (TEXT_STYLE & Typeface.ITALIC) != 0)); - mEditText.setAllCaps(ALL_CAPS); - mEditText.setShadowLayer(SHADOW_RADIUS, SHADOW_DX, SHADOW_DY, SHADOW_COLOR); - mEditText.setElegantTextHeight(ELEGANT_TEXT_HEIGHT); - mEditText.setFallbackLineSpacing(FALLBACK_LINE_SPACING); - mEditText.setLetterSpacing(LETTER_SPACING); - mEditText.setFontFeatureSettings(FONT_FEATURE_SETTINGS); - mEditText.setFontVariationSettings(FONT_VARIATION_SETTINGS); - mEditText.setLineBreakStyle(LINE_BREAK_STYLE); - mEditText.setLineBreakWordStyle(LINE_BREAK_WORD_STYLE); - mEditText.setTextScaleX(TEXT_SCALEX); - mEditText.setHighlightColor(HIGHLIGHT_TEXT_COLOR); - mEditText.setTextColor(TEXT_COLOR); - mEditText.setHintTextColor(HINT_TEXT_COLOR); - mEditText.setLinkTextColor(LINK_TEXT_COLOR); - ViewGroup.LayoutParams params = - new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); - mEditText.setLayoutParams(params); - mEditText.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); - Bitmap bitmap = - Bitmap.createBitmap( - Math.max(1, mEditText.getMeasuredWidth()), - Math.max(1, mEditText.getMeasuredHeight()), - Bitmap.Config.ARGB_8888); - mEditText.layout(0, 0, mEditText.getMeasuredWidth(), mEditText.getMeasuredHeight()); - mCanvas = new Canvas(bitmap); - mEditText.draw(mCanvas); + initEditText(mSpannableText); } @Test @@ -233,6 +202,43 @@ public class TextAppearanceInfoTest { assertEquals(info1.getSystemFontFamilyName(), FONT_FAMILY_NAME); } + private void initEditText(CharSequence text) { + mEditText.setText(text); + mEditText.getPaint().setTextSize(TEXT_SIZE); + mEditText.setTextLocales(TEXT_LOCALES); + Typeface family = Typeface.create(FONT_FAMILY_NAME, Typeface.NORMAL); + mEditText.setTypeface( + Typeface.create(family, TEXT_WEIGHT, (TEXT_STYLE & Typeface.ITALIC) != 0)); + mEditText.setAllCaps(ALL_CAPS); + mEditText.setShadowLayer(SHADOW_RADIUS, SHADOW_DX, SHADOW_DY, SHADOW_COLOR); + mEditText.setElegantTextHeight(ELEGANT_TEXT_HEIGHT); + mEditText.setFallbackLineSpacing(FALLBACK_LINE_SPACING); + mEditText.setLetterSpacing(LETTER_SPACING); + mEditText.setFontFeatureSettings(FONT_FEATURE_SETTINGS); + mEditText.setFontVariationSettings(FONT_VARIATION_SETTINGS); + mEditText.setLineBreakStyle(LINE_BREAK_STYLE); + mEditText.setLineBreakWordStyle(LINE_BREAK_WORD_STYLE); + mEditText.setTextScaleX(TEXT_SCALEX); + mEditText.setHighlightColor(HIGHLIGHT_TEXT_COLOR); + mEditText.setTextColor(TEXT_COLOR); + mEditText.setHintTextColor(HINT_TEXT_COLOR); + mEditText.setHint("Hint text"); + mEditText.setLinkTextColor(LINK_TEXT_COLOR); + mEditText.setAutoLinkMask(Linkify.WEB_URLS); + ViewGroup.LayoutParams params = + new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + mEditText.setLayoutParams(params); + mEditText.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + Bitmap bitmap = + Bitmap.createBitmap( + Math.max(1, mEditText.getMeasuredWidth()), + Math.max(1, mEditText.getMeasuredHeight()), + Bitmap.Config.ARGB_8888); + mEditText.layout(0, 0, mEditText.getMeasuredWidth(), mEditText.getMeasuredHeight()); + mCanvas = new Canvas(bitmap); + mEditText.draw(mCanvas); + } private void assertTextAppearanceInfoContentsEqual(TextAppearanceInfo textAppearanceInfo) { assertEquals(textAppearanceInfo.getTextSize(), TEXT_SIZE, EPSILON); assertEquals(textAppearanceInfo.getTextLocales(), TEXT_LOCALES); @@ -258,6 +264,15 @@ public class TextAppearanceInfoTest { assertEquals(textAppearanceInfo.getLinkTextColor(), LINK_TEXT_COLOR); } + @Test + public void testCreateFromTextView_withHintText() { + // Make hint text display + initEditText(""); + + // The text color should not be hint color + assertTextAppearanceInfoContentsEqual(TextAppearanceInfo.createFromTextView(mEditText)); + } + static class CustomForegroundColorSpan extends ForegroundColorSpan { @Nullable public TextPaint lastTextPaint = null; diff --git a/core/tests/coretests/src/android/widget/PointerIconTest.java b/core/tests/coretests/src/android/widget/PointerIconTest.java new file mode 100644 index 000000000000..8e9e1a50d8c9 --- /dev/null +++ b/core/tests/coretests/src/android/widget/PointerIconTest.java @@ -0,0 +1,306 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.widget; + +import static com.google.common.truth.Truth.assertThat; + +import android.annotation.UiThread; +import android.app.Instrumentation; +import android.graphics.Rect; +import android.os.SystemClock; +import android.view.InputDevice; +import android.view.MotionEvent; +import android.view.PointerIcon; +import android.view.View; + +import androidx.test.ext.junit.rules.ActivityScenarioRule; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; + +import com.android.frameworks.coretests.R; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.Calendar; +import java.util.GregorianCalendar; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class PointerIconTest { + private Instrumentation mInstrumentation; + + @Before + public void setup() { + mInstrumentation = InstrumentationRegistry.getInstrumentation(); + } + + @Rule + public ActivityScenarioRule<PointerIconTestActivity> mActivityScenarioRule = + new ActivityScenarioRule<>(PointerIconTestActivity.class); + + @Test + @UiThread + public void button_mouse_onResolvePointerIcon_returnsTypeHand() { + assertOnResolvePointerIconForMouseEvent(R.id.button, PointerIcon.TYPE_HAND); + } + + @Test + @UiThread + public void button_mouse_disabled_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.button, /* enabled */ false, /* clickable */ true, + /* isMouse */ true); + } + + @Test + @UiThread + public void button_mouse_unclickable_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.button, /* enabled */ true, /* clickable */ false, + /* isMouse */ true); + } + + @Test + @UiThread + public void button_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.button, /* enabled */ true, /* clickable */ true, + /* isMouse */ false); + } + + @Test + @UiThread + public void imageButton_mouse_onResolvePointerIconreturnsTypeHand() { + assertOnResolvePointerIconForMouseEvent(R.id.imagebutton, PointerIcon.TYPE_HAND); + } + + @Test + @UiThread + public void imageButton_mouse_diabled_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.imagebutton, /* enabled */ false, + /* clickable */ true, /* isMouse */ true); + } + + @Test + @UiThread + public void imageButton_mouse_unclickable_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.imagebutton, /* enabled */ true, + /* clickable */ false, /* isMouse */ true); + } + + @Test + @UiThread + public void imageButton_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.imagebutton, /* enabled */ true, + /* clickable */ true, /* isMouse */ false); + } + + @Test + @UiThread + public void textView_mouse_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.textview, /* enabled */ true, + /* clickable */ true, /* isMouse */ true); + } + + @Test + @UiThread + public void textView_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.textview, /* enabled */ true, + /* clickable */ true, /* isMouse */ false); + } + + @Test + @UiThread + public void editText_mouse_onResolvePointerIcon_returnsTypeText() { + assertOnResolvePointerIconForMouseEvent(R.id.edittext, PointerIcon.TYPE_TEXT); + } + + @Test + @UiThread + public void editText_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.edittext, /* enabled */ true, + /* clickable */ true, /* isMouse */ false); + } + + @Test + @UiThread + public void spinner_mouse_onResolvePointerIcon_returnsTypeHand() { + assertOnResolvePointerIconForMouseEvent(R.id.spinner, PointerIcon.TYPE_HAND); + } + + @Test + @UiThread + public void spinner_mouse_disabled_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.spinner, /* enabled */ false, + /* clickable */ true, /* isMouse */ true); + } + + @Test + @UiThread + public void spinner_mouse_unclickable_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.spinner, /* enabled */ true, + /* clickable */ false, /* isMouse */ true); + } + + @Test + @UiThread + public void spinner_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.spinner, /* enabled */ true, /* clickable */ true, + /* isMouse */ false); + } + + @Test + @UiThread + public void radialTimePickerView_mouse_onResolvePointerIcon_returnsTypeHand() { + assertOnResolvePointerIconForMouseEvent(R.id.timepicker, PointerIcon.TYPE_HAND); + + } + + @Test + @UiThread + public void radialTimePickerView_mouse_disabled_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.timepicker, /* enabled */ false, + /* clickable */ true, /* isMouse */ true); + } + + @Test + @UiThread + public void radialTimePickerView_stylus_onResolvePointerIcon_returnsNull() { + assertOnResolvePointerIconReturnNull(R.id.timepicker, /* enabled */ true, + /* clickable */ true, /* isMouse */ false); + } + + @Test + @UiThread + public void calendarView_mouse_onResolvePointerIcon_returnsTypeHand() { + assertPointerIconForCalendarView(/* pointerType */ PointerIcon.TYPE_HAND, + /* isMouse */ true); + } + + @Test + @UiThread + public void calendarView_stylus_onResolvePointerIcon_returnsNull() { + assertPointerIconForCalendarView(/* pointerType */ Integer.MIN_VALUE, /* isMouse */ false); + } + + /** + * Assert {@link View#onResolvePointerIcon} method for {@link CalendarView}. + * + * @param pointerType the expected type of the {@link PointerIcon}. + * When {@link Integer#MIN_VALUE} is passed, it will verify that the + * returned {@link PointerIcon} is null. + * @param isMouse if true, mouse events are used to test the given view. Otherwise, it uses + * stylus events to test the view. + */ + void assertPointerIconForCalendarView(int pointerType, boolean isMouse) { + Calendar calendar = new GregorianCalendar(); + calendar.set(2023, 0, 1); + long time = calendar.getTimeInMillis(); + mActivityScenarioRule.getScenario().onActivity(activity -> { + CalendarView calendarView = activity.findViewById(R.id.calendar); + calendarView.setDate(time, /* animate */ false, /* center */true); + }); + + // Wait for setDate to finish and then verify. + mInstrumentation.waitForIdleSync(); + mActivityScenarioRule.getScenario().onActivity(activity -> { + CalendarView calendarView = activity.findViewById(R.id.calendar); + Rect bounds = new Rect(); + calendarView.getBoundsForDate(time, bounds); + MotionEvent event = createHoverEvent(isMouse, bounds.centerX(), bounds.centerY()); + PointerIcon icon = calendarView.onResolvePointerIcon(event, /* pointerIndex */ 0); + if (pointerType != Integer.MIN_VALUE) { + assertThat(icon.getType()).isEqualTo(pointerType); + } else { + assertThat(icon).isNull(); + } + }); + } + + /** + * Assert that the given view's {@link View#onResolvePointerIcon(MotionEvent, int)} method + * returns a {@link PointerIcon} with the specified pointer type. The passed {@link MotionEvent} + * locates at the center of the view. + * + * @param resId the resource id of the view to be tested. + * @param pointerType the expected pointer type. When {@link Integer#MIN_VALUE} is passed, it + * will verify that the returned {@link PointerIcon} is null. + */ + public void assertOnResolvePointerIconForMouseEvent(int resId, int pointerType) { + mActivityScenarioRule.getScenario().onActivity(activity -> { + View view = activity.findViewById(resId); + MotionEvent event = createHoverEvent(/* isMouse */ true, /* x */ 0, /* y */ 0); + PointerIcon icon = view.onResolvePointerIcon(event, /* pointerIndex */ 0); + if (pointerType != Integer.MIN_VALUE) { + assertThat(icon.getType()).isEqualTo(pointerType); + } else { + assertThat(icon).isNull(); + } + }); + } + + /** + * Assert that the given view's {@link View#onResolvePointerIcon(MotionEvent, int)} method + * returns a {@link PointerIcon} with the specified pointer type. The passed {@link MotionEvent} + * locates at the center of the view. + * + * @param resId the resource id of the view to be tested. + * @param enabled whether the tested view is enabled. + * @param clickable whether the tested view is clickable. + * @param isMouse if true, mouse events are used to test the given view. Otherwise, it uses + * stylus events to test the view. + */ + public void assertOnResolvePointerIconReturnNull(int resId, boolean enabled, boolean clickable, + boolean isMouse) { + mActivityScenarioRule.getScenario().onActivity(activity -> { + View view = activity.findViewById(resId); + view.setEnabled(enabled); + view.setClickable(clickable); + MotionEvent event = createHoverEvent(isMouse, /* x */ 0, /* y */ 0); + PointerIcon icon = view.onResolvePointerIcon(event, /* pointerIndex */ 0); + assertThat(icon).isNull(); + }); + } + + + /** + * Create a hover {@link MotionEvent} for testing. + * + * @param isMouse if true, a {@link MotionEvent} from mouse is returned. Otherwise, + * a {@link MotionEvent} from stylus is returned. + * @param x the x coordinate of the returned {@link MotionEvent} + * @param y the y coordinate of the returned {@link MotionEvent} + */ + private MotionEvent createHoverEvent(boolean isMouse, int x, int y) { + MotionEvent.PointerProperties[] properties = MotionEvent.PointerProperties.createArray(1); + properties[0].toolType = + isMouse ? MotionEvent.TOOL_TYPE_MOUSE : MotionEvent.TOOL_TYPE_STYLUS; + + MotionEvent.PointerCoords[] coords = MotionEvent.PointerCoords.createArray(1); + coords[0].x = x; + coords[0].y = y; + + int source = isMouse ? InputDevice.SOURCE_MOUSE : InputDevice.SOURCE_STYLUS; + long eventTime = SystemClock.uptimeMillis(); + return MotionEvent.obtain(/* downTime */ 0, eventTime, MotionEvent.ACTION_HOVER_MOVE, + /* pointerCount */ 1, properties, coords, /* metaState */ 0, /* buttonState */ 0, + /* xPrecision */ 1, /* yPrecision */ 1, /* deviceId */ 0, /* edgeFlags */ 0, + source, /* flags */ 0); + } + +} diff --git a/core/tests/coretests/src/android/widget/PointerIconTestActivity.java b/core/tests/coretests/src/android/widget/PointerIconTestActivity.java new file mode 100644 index 000000000000..d491fb051e30 --- /dev/null +++ b/core/tests/coretests/src/android/widget/PointerIconTestActivity.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.widget; + +import android.app.Activity; +import android.os.Bundle; + +import com.android.frameworks.coretests.R; + +public class PointerIconTestActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.pointer_icon_test); + + RadialTimePickerView timePicker = findViewById(R.id.timepicker); + // Set the time of TimePicker to 0:00 so that the test is stable. + timePicker.setCurrentHour(0); + timePicker.setCurrentMinute(0); + } +} diff --git a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java index be2c27de637c..3e0e36d6f3b8 100644 --- a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java +++ b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java @@ -181,7 +181,7 @@ public class ActivityThreadClientTest { // Verify for ON_START state. Activity should be relaunched. getInstrumentation().runOnMainSync(() -> clientSession.startActivity(r)); - recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_START); + recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_PAUSE); // Verify for ON_RESUME state. Activity should be relaunched. getInstrumentation().runOnMainSync(() -> clientSession.resumeActivity(r)); diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 93e44f1d2f87..94e23e735d06 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -3385,6 +3385,12 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, + "975028389": { + "message": "unable to call receiver for empty keyboard shortcuts", + "level": "ERROR", + "group": "WM_ERROR", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "975275467": { "message": "Set animatingExit: reason=remove\/isAnimating win=%s", "level": "VERBOSE", diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 89f4890c254e..4cedd41e2d9a 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -308,7 +308,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen forAllTaskContainers(taskContainer -> { synchronized (mLock) { - final List<TaskFragmentContainer> containers = taskContainer.mContainers; + final List<TaskFragmentContainer> containers = + taskContainer.getTaskFragmentContainers(); // Clean up the TaskFragmentContainers by the z-order from the lowest. for (int i = 0; i < containers.size(); i++) { final TaskFragmentContainer container = containers.get(i); @@ -611,8 +612,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @NonNull TaskContainer taskContainer) { // Update all TaskFragments in the Task. Make a copy of the list since some may be // removed on updating. - final List<TaskFragmentContainer> containers = - new ArrayList<>(taskContainer.mContainers); + final List<TaskFragmentContainer> containers = taskContainer.getTaskFragmentContainers(); for (int i = containers.size() - 1; i >= 0; i--) { final TaskFragmentContainer container = containers.get(i); // Wait until onTaskFragmentAppeared to update new container. @@ -1331,7 +1331,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // Check pending appeared activity first because there can be a delay for the server // update. for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i).mContainers; + final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) + .getTaskFragmentContainers(); for (int j = containers.size() - 1; j >= 0; j--) { final TaskFragmentContainer container = containers.get(j); if (container.hasPendingAppearedActivity(activityToken)) { @@ -1342,7 +1343,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // Check appeared activity if there is no such pending appeared activity. for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i).mContainers; + final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) + .getTaskFragmentContainers(); for (int j = containers.size() - 1; j >= 0; j--) { final TaskFragmentContainer container = containers.get(j); if (container.hasAppearedActivity(activityToken)) { @@ -1418,7 +1420,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (splitRule instanceof SplitPairRule && ((SplitPairRule) splitRule).shouldClearTop()) { removeExistingSecondaryContainers(wct, primaryContainer); } - primaryContainer.getTaskContainer().mSplitContainers.add(splitContainer); + primaryContainer.getTaskContainer().addSplitContainer(splitContainer); } /** Cleanups all the dependencies when the TaskFragment is entering PIP. */ @@ -1430,8 +1432,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return; } final List<SplitContainer> splitsToRemove = new ArrayList<>(); + final List<SplitContainer> splitContainers = taskContainer.getSplitContainers(); final Set<TaskFragmentContainer> containersToUpdate = new ArraySet<>(); - for (SplitContainer splitContainer : taskContainer.mSplitContainers) { + for (SplitContainer splitContainer : splitContainers) { if (splitContainer.getPrimaryContainer() != container && splitContainer.getSecondaryContainer() != container) { continue; @@ -1449,7 +1452,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } container.resetDependencies(); - taskContainer.mSplitContainers.removeAll(splitsToRemove); + taskContainer.removeSplitContainers(splitsToRemove); // If there is any TaskFragment split with the PIP TaskFragment, update their presentations // since the split is dismissed. // We don't want to close any of them even if they are dependencies of the PIP TaskFragment. @@ -1471,7 +1474,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen void removeContainers(@NonNull TaskContainer taskContainer, @NonNull List<TaskFragmentContainer> containers) { // Remove all split containers that included this one - taskContainer.mContainers.removeAll(containers); + taskContainer.removeTaskFragmentContainers(containers); // Marked as a pending removal which will be removed after it is actually removed on the // server side (#onTaskFragmentVanished). // In this way, we can keep track of the Task bounds until we no longer have any @@ -1481,7 +1484,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // Cleanup any split references. final List<SplitContainer> containersToRemove = new ArrayList<>(); - for (SplitContainer splitContainer : taskContainer.mSplitContainers) { + final List<SplitContainer> splitContainers = taskContainer.getSplitContainers(); + for (SplitContainer splitContainer : splitContainers) { if (containersToRemove.contains(splitContainer)) { // Don't need to check because it has been in the remove list. continue; @@ -1492,10 +1496,12 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen containersToRemove.add(splitContainer); } } - taskContainer.mSplitContainers.removeAll(containersToRemove); + taskContainer.removeSplitContainers(containersToRemove); // Cleanup any dependent references. - for (TaskFragmentContainer containerToUpdate : taskContainer.mContainers) { + final List<TaskFragmentContainer> taskFragmentContainers = + taskContainer.getTaskFragmentContainers(); + for (TaskFragmentContainer containerToUpdate : taskFragmentContainers) { containerToUpdate.removeContainersToFinishOnExit(containers); } } @@ -1534,8 +1540,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (taskContainer == null) { return null; } - for (int i = taskContainer.mContainers.size() - 1; i >= 0; i--) { - final TaskFragmentContainer container = taskContainer.mContainers.get(i); + final List<TaskFragmentContainer> containers = taskContainer.getTaskFragmentContainers(); + for (int i = containers.size() - 1; i >= 0; i--) { + final TaskFragmentContainer container = containers.get(i); if (!container.isFinished() && (container.getRunningActivityCount() > 0 // We may be waiting for the top TaskFragment to become non-empty after // creation. In that case, we don't want to treat the TaskFragment below it as @@ -1629,7 +1636,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** Whether the given split is the topmost split in the Task. */ private boolean isTopMostSplit(@NonNull SplitContainer splitContainer) { final List<SplitContainer> splitContainers = splitContainer.getPrimaryContainer() - .getTaskContainer().mSplitContainers; + .getTaskContainer().getSplitContainers(); return splitContainer == splitContainers.get(splitContainers.size() - 1); } @@ -1641,7 +1648,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (container == null) { return null; } - final List<SplitContainer> splitContainers = container.getTaskContainer().mSplitContainers; + final List<SplitContainer> splitContainers = + container.getTaskContainer().getSplitContainers(); if (splitContainers.isEmpty()) { return null; } @@ -1665,7 +1673,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @NonNull TaskFragmentContainer firstContainer, @NonNull TaskFragmentContainer secondContainer) { final List<SplitContainer> splitContainers = firstContainer.getTaskContainer() - .mSplitContainers; + .getSplitContainers(); for (int i = splitContainers.size() - 1; i >= 0; i--) { final SplitContainer splitContainer = splitContainers.get(i); final TaskFragmentContainer primary = splitContainer.getPrimaryContainer(); @@ -1930,7 +1938,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @GuardedBy("mLock") TaskFragmentContainer getContainer(@NonNull IBinder fragmentToken) { for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i).mContainers; + final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) + .getTaskFragmentContainers(); for (TaskFragmentContainer container : containers) { if (container.getTaskFragmentToken().equals(fragmentToken)) { return container; @@ -1945,7 +1954,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @GuardedBy("mLock") SplitContainer getSplitContainer(@NonNull IBinder token) { for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<SplitContainer> containers = mTaskContainers.valueAt(i).mSplitContainers; + final List<SplitContainer> containers = mTaskContainers.valueAt(i).getSplitContainers(); for (SplitContainer container : containers) { if (container.getToken().equals(token)) { return container; @@ -2091,7 +2100,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } for (int i = mTaskContainers.size() - 1; i >= 0; i--) { final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) - .mContainers; + .getTaskFragmentContainers(); for (int j = containers.size() - 1; j >= 0; j--) { final TaskFragmentContainer container = containers.get(j); if (!container.hasActivity(activityToken) diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java index 4b15bb187035..4580c9836168 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java @@ -51,11 +51,11 @@ class TaskContainer { /** Active TaskFragments in this Task. */ @NonNull - final List<TaskFragmentContainer> mContainers = new ArrayList<>(); + private final List<TaskFragmentContainer> mContainers = new ArrayList<>(); /** Active split pairs in this Task. */ @NonNull - final List<SplitContainer> mSplitContainers = new ArrayList<>(); + private final List<SplitContainer> mSplitContainers = new ArrayList<>(); @NonNull private final Configuration mConfiguration; @@ -207,6 +207,53 @@ class TaskContainer { return false; } + /** + * Returns a list of {@link SplitContainer}. Do not modify the containers directly on the + * returned list. Use {@link #addSplitContainer} or {@link #removeSplitContainers} instead. + */ + @NonNull + List<SplitContainer> getSplitContainers() { + return mSplitContainers; + } + + void addSplitContainer(@NonNull SplitContainer splitContainer) { + mSplitContainers.add(splitContainer); + } + + void removeSplitContainers(@NonNull List<SplitContainer> containers) { + mSplitContainers.removeAll(containers); + } + + void addTaskFragmentContainer(@NonNull TaskFragmentContainer taskFragmentContainer) { + mContainers.add(taskFragmentContainer); + } + + void addTaskFragmentContainer(int index, @NonNull TaskFragmentContainer taskFragmentContainer) { + mContainers.add(index, taskFragmentContainer); + } + + void removeTaskFragmentContainer(@NonNull TaskFragmentContainer taskFragmentContainer) { + mContainers.remove(taskFragmentContainer); + } + + void removeTaskFragmentContainers(@NonNull List<TaskFragmentContainer> taskFragmentContainer) { + mContainers.removeAll(taskFragmentContainer); + } + + void clearTaskFragmentContainer() { + mContainers.clear(); + } + + /** + * Returns a list of {@link TaskFragmentContainer}. Do not modify the containers directly on + * the returned list. Use {@link #addTaskFragmentContainer}, + * {@link #removeTaskFragmentContainer} or other related methods instead. + */ + @NonNull + List<TaskFragmentContainer> getTaskFragmentContainers() { + return mContainers; + } + /** Adds the descriptors of split states in this Task to {@code outSplitStates}. */ void getSplitStates(@NonNull List<SplitInfo> outSplitStates) { for (SplitContainer container : mSplitContainers) { diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java index 60be9d16d749..61df335515b8 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java @@ -180,23 +180,25 @@ class TaskFragmentContainer { throw new IllegalArgumentException( "pairedPrimaryContainer must be in the same Task"); } - final int primaryIndex = taskContainer.mContainers.indexOf(pairedPrimaryContainer); - taskContainer.mContainers.add(primaryIndex + 1, this); + final int primaryIndex = taskContainer.indexOf(pairedPrimaryContainer); + taskContainer.addTaskFragmentContainer(primaryIndex + 1, this); } else if (pendingAppearedActivity != null) { // The TaskFragment will be positioned right above the pending appeared Activity. If any // existing TaskFragment is empty with pending Intent, it is likely that the Activity of // the pending Intent hasn't been created yet, so the new Activity should be below the // empty TaskFragment. - int i = taskContainer.mContainers.size() - 1; + final List<TaskFragmentContainer> containers = + taskContainer.getTaskFragmentContainers(); + int i = containers.size() - 1; for (; i >= 0; i--) { - final TaskFragmentContainer container = taskContainer.mContainers.get(i); + final TaskFragmentContainer container = containers.get(i); if (!container.isEmpty() || container.getPendingAppearedIntent() == null) { break; } } - taskContainer.mContainers.add(i + 1, this); + taskContainer.addTaskFragmentContainer(i + 1, this); } else { - taskContainer.mContainers.add(this); + taskContainer.addTaskFragmentContainer(this); } if (pendingAppearedActivity != null) { addPendingAppearedActivity(pendingAppearedActivity); diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java index ff08782e8cd8..9e264726a65a 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java @@ -183,23 +183,23 @@ public class SplitControllerTest { // tf2 has running activity so is active. final TaskFragmentContainer tf2 = mock(TaskFragmentContainer.class); doReturn(1).when(tf2).getRunningActivityCount(); - taskContainer.mContainers.add(tf2); + taskContainer.addTaskFragmentContainer(tf2); // tf3 is finished so is not active. final TaskFragmentContainer tf3 = mock(TaskFragmentContainer.class); doReturn(true).when(tf3).isFinished(); doReturn(false).when(tf3).isWaitingActivityAppear(); - taskContainer.mContainers.add(tf3); + taskContainer.addTaskFragmentContainer(tf3); mSplitController.mTaskContainers.put(TASK_ID, taskContainer); assertWithMessage("Must return tf2 because tf3 is not active.") .that(mSplitController.getTopActiveContainer(TASK_ID)).isEqualTo(tf2); - taskContainer.mContainers.remove(tf3); + taskContainer.removeTaskFragmentContainer(tf3); assertWithMessage("Must return tf2 because tf2 has running activity.") .that(mSplitController.getTopActiveContainer(TASK_ID)).isEqualTo(tf2); - taskContainer.mContainers.remove(tf2); + taskContainer.removeTaskFragmentContainer(tf2); assertWithMessage("Must return tf because we are waiting for tf1 to appear.") .that(mSplitController.getTopActiveContainer(TASK_ID)).isEqualTo(tf1); @@ -320,11 +320,11 @@ public class SplitControllerTest { doReturn(tf).when(splitContainer).getSecondaryContainer(); doReturn(createTestTaskContainer()).when(splitContainer).getTaskContainer(); doReturn(createSplitRule(mActivity, mActivity)).when(splitContainer).getSplitRule(); - final List<SplitContainer> splitContainers = - mSplitController.getTaskContainer(TASK_ID).mSplitContainers; - splitContainers.add(splitContainer); + final TaskContainer taskContainer = mSplitController.getTaskContainer(TASK_ID); + taskContainer.addSplitContainer(splitContainer); // Add a mock SplitContainer on top of splitContainer - splitContainers.add(1, mock(SplitContainer.class)); + final SplitContainer splitContainer2 = mock(SplitContainer.class); + taskContainer.addSplitContainer(splitContainer2); mSplitController.updateContainer(mTransaction, tf); @@ -332,7 +332,9 @@ public class SplitControllerTest { // Verify if one or both containers in the top SplitContainer are finished, // dismissPlaceholder() won't be called. - splitContainers.remove(1); + final ArrayList<SplitContainer> splitContainersToRemove = new ArrayList<>(); + splitContainersToRemove.add(splitContainer2); + taskContainer.removeSplitContainers(splitContainersToRemove); doReturn(true).when(tf).isFinished(); mSplitController.updateContainer(mTransaction, tf); @@ -363,7 +365,8 @@ public class SplitControllerTest { final Activity r1 = createMockActivity(); addSplitTaskFragments(r0, r1); final TaskContainer taskContainer = mSplitController.getTaskContainer(TASK_ID); - final TaskFragmentContainer taskFragmentContainer = taskContainer.mContainers.get(0); + final TaskFragmentContainer taskFragmentContainer = + taskContainer.getTaskFragmentContainers().get(0); spyOn(taskContainer); // No update when the Task is invisible. @@ -377,7 +380,7 @@ public class SplitControllerTest { doReturn(true).when(taskContainer).isVisible(); mSplitController.updateContainer(mTransaction, taskFragmentContainer); - verify(mSplitPresenter).updateSplitContainer(taskContainer.mSplitContainers.get(0), + verify(mSplitPresenter).updateSplitContainer(taskContainer.getSplitContainers().get(0), mTransaction); } @@ -1090,8 +1093,8 @@ public class SplitControllerTest { verify(mTransaction).finishActivity(mActivity.getActivityToken()); verify(mTransaction).finishActivity(secondaryActivity0.getActivityToken()); verify(mTransaction).finishActivity(secondaryActivity1.getActivityToken()); - assertTrue(taskContainer.mContainers.isEmpty()); - assertTrue(taskContainer.mSplitContainers.isEmpty()); + assertTrue(taskContainer.getTaskFragmentContainers().isEmpty()); + assertTrue(taskContainer.getSplitContainers().isEmpty()); } @Test @@ -1363,15 +1366,13 @@ public class SplitControllerTest { TaskFragmentContainer tf = mSplitController.newContainer(mActivity, TASK_ID); tf.setInfo(mTransaction, createMockTaskFragmentInfo(tf, mActivity)); - List<TaskFragmentContainer> containers = mSplitController.mTaskContainers.get(TASK_ID) - .mContainers; - - assertEquals(containers.get(0), tf); + final TaskContainer taskContainer = mSplitController.mTaskContainers.get(TASK_ID); + assertEquals(taskContainer.getTaskFragmentContainers().get(0), tf); mSplitController.finishActivityStacks(Collections.singleton(tf.getTaskFragmentToken())); verify(mSplitPresenter).deleteTaskFragment(any(), eq(tf.getTaskFragmentToken())); - assertTrue(containers.isEmpty()); + assertTrue(taskContainer.getTaskFragmentContainers().isEmpty()); } @Test @@ -1381,10 +1382,8 @@ public class SplitControllerTest { bottomTf.setInfo(mTransaction, createMockTaskFragmentInfo(bottomTf, mActivity)); topTf.setInfo(mTransaction, createMockTaskFragmentInfo(topTf, createMockActivity())); - List<TaskFragmentContainer> containers = mSplitController.mTaskContainers.get(TASK_ID) - .mContainers; - - assertEquals(containers.size(), 2); + final TaskContainer taskContainer = mSplitController.mTaskContainers.get(TASK_ID); + assertEquals(taskContainer.getTaskFragmentContainers().size(), 2); Set<IBinder> activityStackTokens = new ArraySet<>(new IBinder[]{ topTf.getTaskFragmentToken(), bottomTf.getTaskFragmentToken()}); @@ -1403,7 +1402,7 @@ public class SplitControllerTest { + "regardless of the order in ActivityStack set", topTf.getTaskFragmentToken(), fragmentTokens.get(1)); - assertTrue(containers.isEmpty()); + assertTrue(taskContainer.getTaskFragmentContainers().isEmpty()); } @Test diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java index 13e709271221..11af1d1f20e1 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java @@ -127,7 +127,7 @@ public class TaskContainerTest { assertFalse(taskContainer.isEmpty()); taskContainer.mFinishedContainer.add(tf.getTaskFragmentToken()); - taskContainer.mContainers.clear(); + taskContainer.clearTaskFragmentContainer(); assertFalse(taskContainer.isEmpty()); } @@ -152,13 +152,13 @@ public class TaskContainerTest { assertNull(taskContainer.getTopNonFinishingActivity()); final TaskFragmentContainer tf0 = mock(TaskFragmentContainer.class); - taskContainer.mContainers.add(tf0); + taskContainer.addTaskFragmentContainer(tf0); final Activity activity0 = mock(Activity.class); doReturn(activity0).when(tf0).getTopNonFinishingActivity(); assertEquals(activity0, taskContainer.getTopNonFinishingActivity()); final TaskFragmentContainer tf1 = mock(TaskFragmentContainer.class); - taskContainer.mContainers.add(tf1); + taskContainer.addTaskFragmentContainer(tf1); assertEquals(activity0, taskContainer.getTopNonFinishingActivity()); final Activity activity1 = mock(Activity.class); diff --git a/libs/WindowManager/Shell/res/drawable/bubble_manage_menu_section.xml b/libs/WindowManager/Shell/res/drawable/bubble_manage_menu_section.xml new file mode 100644 index 000000000000..d99d64d8da20 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/bubble_manage_menu_section.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <ripple android:color="#99999999"> + <item android:drawable="@drawable/bubble_manage_menu_bg" /> + </ripple> + </item> + <item android:drawable="@drawable/bubble_manage_menu_bg" /> +</selector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml b/libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml index 5d7771366bec..ce242751c172 100644 --- a/libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml +++ b/libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml @@ -13,13 +13,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <group android:translateY="8.0"> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="128dp" + android:height="4dp" + android:viewportWidth="128" + android:viewportHeight="4" + > + <group> + <clip-path + android:pathData="M2 0H126C127.105 0 128 0.895431 128 2C128 3.10457 127.105 4 126 4H2C0.895431 4 0 3.10457 0 2C0 0.895431 0.895431 0 2 0Z" + /> <path - android:fillColor="@android:color/black" android:pathData="M3,5V3H21V5Z"/> + android:pathData="M0 0V4H128V0" + android:fillColor="@android:color/black" + /> </group> </vector> diff --git a/libs/WindowManager/Shell/res/drawable/ic_expand_less.xml b/libs/WindowManager/Shell/res/drawable/ic_expand_less.xml new file mode 100644 index 000000000000..f4508464883d --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/ic_expand_less.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M18.59,16.41L20,15L12,7L4,15L5.41,16.41L12,9.83" + android:fillColor="#5F6368"/> +</vector> diff --git a/libs/WindowManager/Shell/res/layout/bubble_bar_menu_item.xml b/libs/WindowManager/Shell/res/layout/bubble_bar_menu_item.xml new file mode 100644 index 000000000000..ddcd5c60d9c8 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/bubble_bar_menu_item.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<com.android.wm.shell.bubbles.bar.BubbleBarMenuItemView + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="@dimen/bubble_bar_manage_menu_item_height" + android:gravity="center_vertical" + android:paddingStart="@dimen/bubble_menu_padding" + android:paddingEnd="@dimen/bubble_menu_padding" + android:background="@drawable/bubble_manage_menu_row"> + + <ImageView + android:id="@+id/bubble_bar_menu_item_icon" + android:layout_width="@dimen/bubble_bar_manage_menu_item_icon_size" + android:layout_height="@dimen/bubble_bar_manage_menu_item_icon_size" + android:contentDescription="@null"/> + + <TextView + android:id="@+id/bubble_bar_menu_item_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:textColor="?android:attr/textColorPrimary" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault" /> + +</com.android.wm.shell.bubbles.bar.BubbleBarMenuItemView>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/bubble_bar_menu_view.xml b/libs/WindowManager/Shell/res/layout/bubble_bar_menu_view.xml new file mode 100644 index 000000000000..82e5aee41ff2 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/bubble_bar_menu_view.xml @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<com.android.wm.shell.bubbles.bar.BubbleBarMenuView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:minWidth="@dimen/bubble_bar_manage_menu_min_width" + android:orientation="vertical" + android:elevation="@dimen/bubble_manage_menu_elevation" + android:paddingTop="@dimen/bubble_bar_manage_menu_padding_top" + android:paddingHorizontal="@dimen/bubble_bar_manage_menu_padding" + android:paddingBottom="@dimen/bubble_bar_manage_menu_padding" + android:clipToPadding="false"> + + <LinearLayout + android:id="@+id/bubble_bar_manage_menu_bubble_section" + android:layout_width="match_parent" + android:layout_height="@dimen/bubble_bar_manage_menu_item_height" + android:orientation="horizontal" + android:gravity="center_vertical" + android:paddingStart="14dp" + android:paddingEnd="12dp" + android:background="@drawable/bubble_manage_menu_section" + android:elevation="@dimen/bubble_manage_menu_elevation"> + + <ImageView + android:id="@+id/bubble_bar_manage_menu_bubble_icon" + android:layout_width="@dimen/bubble_menu_icon_size" + android:layout_height="@dimen/bubble_menu_icon_size" + android:contentDescription="@null" /> + + <TextView + android:id="@+id/bubble_bar_manage_menu_bubble_title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_weight="1" + android:textColor="?android:attr/textColorPrimary" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault" /> + + <ImageView + android:id="@+id/bubble_bar_manage_menu_dismiss_icon" + android:layout_width="@dimen/bubble_bar_manage_menu_dismiss_icon_size" + android:layout_height="@dimen/bubble_bar_manage_menu_dismiss_icon_size" + android:layout_marginStart="8dp" + android:contentDescription="@null" + android:src="@drawable/ic_expand_less" + app:tint="?android:attr/textColorPrimary" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/bubble_bar_manage_menu_actions_section" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_marginTop="@dimen/bubble_bar_manage_menu_section_spacing" + android:background="@drawable/bubble_manage_menu_bg" + android:elevation="@dimen/bubble_manage_menu_elevation" /> + +</com.android.wm.shell.bubbles.bar.BubbleBarMenuView>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml index 1d6864c152c2..0ca912e20527 100644 --- a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml +++ b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml @@ -28,6 +28,7 @@ android:layout_width="176dp" android:layout_height="42dp" android:paddingHorizontal="24dp" + android:paddingVertical="19dp" android:contentDescription="@string/handle_text" android:src="@drawable/decor_handle_dark" tools:tint="@color/desktop_mode_caption_handle_bar_dark" diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml index 171a6b2fe5fb..f2a07857cd4a 100644 --- a/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml @@ -30,6 +30,9 @@ <color name="bubbles_light">#FFFFFF</color> <color name="bubbles_dark">@color/GM2_grey_800</color> <color name="bubbles_icon_tint">@color/GM2_grey_700</color> + <color name="bubble_bar_expanded_view_handle_light">#EBffffff</color> + <color name="bubble_bar_expanded_view_handle_dark">#99000000</color> + <color name="bubble_bar_expanded_view_menu_close">#DC362E</color> <!-- PiP --> <color name="pip_custom_close_bg">#D93025</color> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 2be34c90a661..214125928892 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -229,7 +229,25 @@ <!-- Size of the bubble bar (height), should match transient_taskbar_size in Launcher. --> <dimen name="bubblebar_size">72dp</dimen> <!-- The size of the drag handle / menu shown along with a bubble bar expanded view. --> - <dimen name="bubblebar_expanded_view_menu_size">16dp</dimen> + <dimen name="bubble_bar_expanded_view_handle_size">40dp</dimen> + <!-- The width of the drag handle shown along with a bubble bar expanded view. --> + <dimen name="bubble_bar_expanded_view_handle_width">128dp</dimen> + <!-- The height of the drag handle shown along with a bubble bar expanded view. --> + <dimen name="bubble_bar_expanded_view_handle_height">4dp</dimen> + <!-- Minimum width of the bubble bar manage menu. --> + <dimen name="bubble_bar_manage_menu_min_width">200dp</dimen> + <!-- Size of the dismiss icon in the bubble bar manage menu. --> + <dimen name="bubble_bar_manage_menu_dismiss_icon_size">16dp</dimen> + <!-- Padding of the bubble bar manage menu, provides space for menu shadows --> + <dimen name="bubble_bar_manage_menu_padding">8dp</dimen> + <!-- Top padding of the bubble bar manage menu --> + <dimen name="bubble_bar_manage_menu_padding_top">2dp</dimen> + <!-- Spacing between sections of the bubble bar manage menu --> + <dimen name="bubble_bar_manage_menu_section_spacing">2dp</dimen> + <!-- Height of an item in the bubble bar manage menu. --> + <dimen name="bubble_bar_manage_menu_item_height">52dp</dimen> + <!-- Size of the icons in the bubble bar manage menu. --> + <dimen name="bubble_bar_manage_menu_item_icon_size">20dp</dimen> <!-- Bottom and end margin for compat buttons. --> <dimen name="compat_button_margin">24dp</dimen> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java index 102f2cb4b8d0..504839fedf06 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java @@ -855,7 +855,8 @@ public class Bubble implements BubbleViewProvider { return mIsAppBubble; } - Intent getSettingsIntent(final Context context) { + /** Creates open app settings intent */ + public Intent getSettingsIntent(final Context context) { final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS); intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName()); final int uid = getUid(context); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 3eb9fa2eef6b..146774189490 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -720,6 +720,7 @@ public class BubbleController implements ConfigurationChangeListener, // TODO(b/273312602): consider foldables where we do need a stack view when folded if (mLayerView == null) { mLayerView = new BubbleBarLayerView(mContext, this); + mLayerView.setUnBubbleConversationCallback(mSysuiProxy::onUnbubbleConversation); } } else { if (mStackView == null) { @@ -1221,6 +1222,13 @@ public class BubbleController implements ConfigurationChangeListener, } /** + * Dismiss bubble if it exists and remove it from the stack + */ + public void dismissBubble(Bubble bubble, @Bubbles.DismissReason int reason) { + mBubbleData.dismissBubbleWithKey(bubble.getKey(), reason); + } + + /** * Performs a screenshot that may exclude the bubble layer, if one is present. The screenshot * can be access via the supplied {@link ScreenshotSync#get()} asynchronously. */ @@ -1846,7 +1854,7 @@ public class BubbleController implements ConfigurationChangeListener, if (mStackView != null) { mStackView.setVisibility(VISIBLE); } - if (mLayerView != null && isStackExpanded()) { + if (mLayerView != null) { mLayerView.setVisibility(VISIBLE); } } @@ -2144,7 +2152,7 @@ public class BubbleController implements ConfigurationChangeListener, pw.println(" suppressing: " + key); } - pw.print("mAppBubbleTaskIds: " + mAppBubbleTaskIds.values()); + pw.println("mAppBubbleTaskIds: " + mAppBubbleTaskIds.values()); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java index 7a5815994dd0..da4a9898a44c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java @@ -15,6 +15,7 @@ */ package com.android.wm.shell.bubbles; +import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; @@ -110,6 +111,9 @@ public class BubbleTaskViewHelper { try { options.setTaskAlwaysOnTop(true); options.setLaunchedFromBubble(true); + options.setPendingIntentBackgroundActivityStartMode( + MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + options.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true); Intent fillInIntent = new Intent(); // Apply flags to make behaviour match documentLaunchMode=always. @@ -117,11 +121,19 @@ public class BubbleTaskViewHelper { fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); if (mBubble.isAppBubble()) { - PendingIntent pi = PendingIntent.getActivity(mContext, 0, - mBubble.getAppBubbleIntent(), - PendingIntent.FLAG_MUTABLE, - null); - mTaskView.startActivity(pi, fillInIntent, options, launchBounds); + Context context = + mContext.createContextAsUser( + mBubble.getUser(), Context.CONTEXT_RESTRICTED); + PendingIntent pi = PendingIntent.getActivity( + context, + /* requestCode= */ 0, + mBubble.getAppBubbleIntent() + .addFlags(FLAG_ACTIVITY_NEW_DOCUMENT) + .addFlags(FLAG_ACTIVITY_MULTIPLE_TASK), + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, + /* options= */ null); + mTaskView.startActivity(pi, /* fillInIntent= */ null, options, + launchBounds); } else if (mBubble.hasMetadataShortcutId()) { options.setApplyActivityFlagsForBubbles(true); mTaskView.startShortcutActivity(mBubble.getShortcutInfo(), diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java index 8ab9841ff0c2..80e29998e8d3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java @@ -104,7 +104,11 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask @Override protected BubbleViewInfo doInBackground(Void... voids) { - if (mController.get().isShowingAsBubbleBar()) { + if (!verifyState()) { + // If we're in an inconsistent state, then switched modes and should just bail now. + return null; + } + if (mLayerView.get() != null) { return BubbleViewInfo.populateForBubbleBar(mContext.get(), mController.get(), mLayerView.get(), mIconFactory, mBubble, mSkipInflation); } else { @@ -118,7 +122,11 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask if (isCancelled() || viewInfo == null) { return; } + mMainExecutor.execute(() -> { + if (!verifyState()) { + return; + } mBubble.setViewInfo(viewInfo); if (mCallback != null) { mCallback.onBubbleViewsReady(mBubble); @@ -126,6 +134,14 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask }); } + private boolean verifyState() { + if (mController.get().isShowingAsBubbleBar()) { + return mLayerView.get() != null; + } else { + return mStackView.get() != null; + } + } + /** * Info necessary to render a bubble. */ @@ -192,6 +208,11 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask } info.rawBadgeBitmap = iconFactory.getBadgeBitmap(badgedIcon, false).icon; + float[] bubbleBitmapScale = new float[1]; + info.bubbleBitmap = iconFactory.getBubbleBitmap( + iconFactory.getBubbleDrawable(c, info.shortcutInfo, + b.getIcon()), bubbleBitmapScale); + return info; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index b8f049becb6f..32ed10258eee 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -16,11 +16,14 @@ package com.android.wm.shell.bubbles.bar; +import android.annotation.ColorInt; +import android.annotation.Nullable; import android.app.ActivityManager; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.Outline; +import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.ViewOutlineProvider; @@ -31,8 +34,12 @@ import com.android.wm.shell.R; import com.android.wm.shell.bubbles.Bubble; import com.android.wm.shell.bubbles.BubbleController; import com.android.wm.shell.bubbles.BubbleTaskViewHelper; +import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.taskview.TaskView; +import java.util.function.Consumer; +import java.util.function.Supplier; + /** * Expanded view of a bubble when it's part of the bubble bar. * @@ -45,11 +52,14 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView private BubbleController mController; private BubbleTaskViewHelper mBubbleTaskViewHelper; + private BubbleBarMenuViewController mMenuViewController; + private @Nullable Supplier<Rect> mLayerBoundsSupplier; + private @Nullable Consumer<String> mUnBubbleConversationCallback; - private HandleView mMenuView; - private TaskView mTaskView; + private BubbleBarHandleView mHandleView = new BubbleBarHandleView(getContext()); + private @Nullable TaskView mTaskView; - private int mMenuHeight; + private int mHandleHeight; private int mBackgroundColor; private float mCornerRadius = 0f; @@ -83,11 +93,9 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView super.onFinishInflate(); Context context = getContext(); setElevation(getResources().getDimensionPixelSize(R.dimen.bubble_elevation)); - mMenuHeight = context.getResources().getDimensionPixelSize( - R.dimen.bubblebar_expanded_view_menu_size); - mMenuView = new HandleView(context); - addView(mMenuView); - + mHandleHeight = context.getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_handle_size); + addView(mHandleView); applyThemeAttrs(); setClipToOutline(true); setOutlineProvider(new ViewOutlineProvider() { @@ -98,6 +106,13 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView }); } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + // Hide manage menu when view disappears + mMenuViewController.hideMenu(false /* animated */); + } + /** Set the BubbleController on the view, must be called before doing anything else. */ public void initialize(BubbleController controller) { mController = controller; @@ -108,13 +123,43 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView addView(mTaskView); mTaskView.setEnableSurfaceClipping(true); mTaskView.setCornerRadius(mCornerRadius); + mMenuViewController = new BubbleBarMenuViewController(mContext, this); + mMenuViewController.setListener(new BubbleBarMenuViewController.Listener() { + @Override + public void onMenuVisibilityChanged(boolean visible) { + if (mTaskView == null || mLayerBoundsSupplier == null) return; + // Updates the obscured touchable region for the task surface. + mTaskView.setObscuredTouchRect(visible ? mLayerBoundsSupplier.get() : null); + } + + @Override + public void onUnBubbleConversation(Bubble bubble) { + if (mUnBubbleConversationCallback != null) { + mUnBubbleConversationCallback.accept(bubble.getKey()); + } + } + + @Override + public void onOpenAppSettings(Bubble bubble) { + mController.collapseStack(); + mContext.startActivityAsUser(bubble.getSettingsIntent(mContext), bubble.getUser()); + } + + @Override + public void onDismissBubble(Bubble bubble) { + mController.dismissBubble(bubble, Bubbles.DISMISS_USER_REMOVED); + } + }); + mHandleView.setOnClickListener(view -> { + mMenuViewController.showMenu(true /* animated */); + }); } // TODO (b/275087636): call this when theme/config changes void applyThemeAttrs() { boolean supportsRoundedCorners = ScreenDecorationsUtils.supportsRoundedCornersOnWindows( mContext.getResources()); - final TypedArray ta = mContext.obtainStyledAttributes(new int[] { + final TypedArray ta = mContext.obtainStyledAttributes(new int[]{ android.R.attr.dialogCornerRadius, android.R.attr.colorBackgroundFloating}); mCornerRadius = supportsRoundedCorners ? ta.getDimensionPixelSize(0, 0) : 0; @@ -123,14 +168,12 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView ta.recycle(); - mMenuView.setCornerRadius(mCornerRadius); - mMenuHeight = getResources().getDimensionPixelSize( - R.dimen.bubblebar_expanded_view_menu_size); + mHandleHeight = getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_handle_size); if (mTaskView != null) { mTaskView.setCornerRadius(mCornerRadius); - mTaskView.setElevation(150); - updateMenuColor(); + updateHandleAndBackgroundColor(true /* animated */); } } @@ -138,10 +181,8 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); int height = MeasureSpec.getSize(heightMeasureSpec); - - // Add corner radius here so that the menu extends behind the rounded corners of TaskView. - int menuViewHeight = Math.min((int) (mMenuHeight + mCornerRadius), height); - measureChild(mMenuView, widthMeasureSpec, MeasureSpec.makeMeasureSpec(menuViewHeight, + int menuViewHeight = Math.min(mHandleHeight, height); + measureChild(mHandleView, widthMeasureSpec, MeasureSpec.makeMeasureSpec(menuViewHeight, MeasureSpec.getMode(heightMeasureSpec))); if (mTaskView != null) { @@ -153,12 +194,12 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); // Drag handle above - final int dragHandleBottom = t + mMenuView.getMeasuredHeight(); - mMenuView.layout(l, t, r, dragHandleBottom); + final int dragHandleBottom = t + mHandleView.getMeasuredHeight(); + mHandleView.layout(l, t, r, dragHandleBottom); if (mTaskView != null) { - // Subtract radius so that the menu extends behind the rounded corners of TaskView. - mTaskView.layout(l, (int) (dragHandleBottom - mCornerRadius), r, + mTaskView.layout(l, dragHandleBottom, r, dragHandleBottom + mTaskView.getMeasuredHeight()); } } @@ -166,7 +207,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView @Override public void onTaskCreated() { setContentVisibility(true); - updateMenuColor(); + updateHandleAndBackgroundColor(false /* animated */); } @Override @@ -187,11 +228,13 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView } mBubbleTaskViewHelper.cleanUpTaskView(); } + mMenuViewController.hideMenu(false /* animated */); } - /** Updates the bubble shown in this task view. */ + /** Updates the bubble shown in the expanded view. */ public void update(Bubble bubble) { mBubbleTaskViewHelper.update(bubble); + mMenuViewController.updateMenu(bubble); } /** The task id of the activity shown in the task view, if it exists. */ @@ -199,6 +242,17 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView return mBubbleTaskViewHelper != null ? mBubbleTaskViewHelper.getTaskId() : INVALID_TASK_ID; } + /** Sets layer bounds supplier used for obscured touchable region of task view */ + void setLayerBoundsSupplier(@Nullable Supplier<Rect> supplier) { + mLayerBoundsSupplier = supplier; + } + + /** Sets the function to call to un-bubble the given conversation. */ + public void setUnBubbleConversationCallback( + @Nullable Consumer<String> unBubbleConversationCallback) { + mUnBubbleConversationCallback = unBubbleConversationCallback; + } + /** * Call when the location or size of the view has changed to update TaskView. */ @@ -218,16 +272,33 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView } } - /** Updates the menu bar to be the status bar color specified by the app. */ - private void updateMenuColor() { + /** + * Updates the background color to match with task view status/bg color, and sets handle color + * to contrast with the background + */ + private void updateHandleAndBackgroundColor(boolean animated) { if (mTaskView == null) return; - ActivityManager.RunningTaskInfo info = mTaskView.getTaskInfo(); - final int taskBgColor = info.taskDescription.getStatusBarColor(); - final int color = Color.valueOf(taskBgColor == -1 ? Color.WHITE : taskBgColor).toArgb(); - if (color != -1) { - mMenuView.setBackgroundColor(color); + final int color = getTaskViewColor(); + final boolean isRegionDark = Color.luminance(color) <= 0.5; + mHandleView.updateHandleColor(isRegionDark, animated); + setBackgroundColor(color); + } + + /** + * Retrieves task view status/nav bar color or background if available + * + * TODO (b/283075226): Update with color sampling when + * RegionSamplingHelper or alternative is available + */ + private @ColorInt int getTaskViewColor() { + if (mTaskView == null || mTaskView.getTaskInfo() == null) return mBackgroundColor; + ActivityManager.TaskDescription taskDescription = mTaskView.getTaskInfo().taskDescription; + if (taskDescription.getStatusBarColor() != Color.TRANSPARENT) { + return taskDescription.getStatusBarColor(); + } else if (taskDescription.getBackgroundColor() != Color.TRANSPARENT) { + return taskDescription.getBackgroundColor(); } else { - mMenuView.setBackgroundColor(mBackgroundColor); + return mBackgroundColor; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleView.java new file mode 100644 index 000000000000..ce26bc0322b3 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleView.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.bubbles.bar; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ObjectAnimator; +import android.annotation.Nullable; +import android.content.Context; +import android.graphics.Outline; +import android.graphics.Rect; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewOutlineProvider; + +import androidx.annotation.ColorInt; +import androidx.core.content.ContextCompat; + +import com.android.wm.shell.R; + +/** + * Handle view to show at the top of a bubble bar expanded view. + */ +public class BubbleBarHandleView extends View { + private static final long COLOR_CHANGE_DURATION = 120; + + private int mHandleWidth; + private int mHandleHeight; + private @ColorInt int mHandleLightColor; + private @ColorInt int mHandleDarkColor; + private @Nullable ObjectAnimator mColorChangeAnim; + + public BubbleBarHandleView(Context context) { + this(context, null /* attrs */); + } + + public BubbleBarHandleView(Context context, AttributeSet attrs) { + this(context, attrs, 0 /* defStyleAttr */); + } + + public BubbleBarHandleView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0 /* defStyleRes */); + } + + public BubbleBarHandleView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + + mHandleWidth = getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_handle_width); + mHandleHeight = getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_handle_height); + mHandleLightColor = ContextCompat.getColor(getContext(), + R.color.bubble_bar_expanded_view_handle_light); + mHandleDarkColor = ContextCompat.getColor(getContext(), + R.color.bubble_bar_expanded_view_handle_dark); + + setClipToOutline(true); + setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + final int handleCenterX = view.getWidth() / 2; + final int handleCenterY = view.getHeight() / 2; + final float handleRadius = mHandleHeight / 2f; + Rect handleBounds = new Rect( + handleCenterX - mHandleWidth / 2, + handleCenterY - mHandleHeight / 2, + handleCenterX + mHandleWidth / 2, + handleCenterY + mHandleHeight / 2); + outline.setRoundRect(handleBounds, handleRadius); + } + }); + } + + /** + * Updates the handle color. + * + * @param isRegionDark Whether the background behind the handle is dark, and thus the handle + * should be light (and vice versa). + * @param animated Whether to animate the change, or apply it immediately. + */ + public void updateHandleColor(boolean isRegionDark, boolean animated) { + int newColor = isRegionDark ? mHandleLightColor : mHandleDarkColor; + if (mColorChangeAnim != null) { + mColorChangeAnim.cancel(); + } + if (animated) { + mColorChangeAnim = ObjectAnimator.ofArgb(this, "backgroundColor", newColor); + mColorChangeAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + mColorChangeAnim = null; + } + }); + mColorChangeAnim.setDuration(COLOR_CHANGE_DURATION); + mColorChangeAnim.start(); + } else { + setBackgroundColor(newColor); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java index b1a725b6e5c4..bc622e7a7a3e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java @@ -32,6 +32,8 @@ import com.android.wm.shell.bubbles.BubbleController; import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubbleViewProvider; +import java.util.function.Consumer; + /** * Similar to {@link com.android.wm.shell.bubbles.BubbleStackView}, this view is added to window * manager to display bubbles. However, it is only used when bubbles are being displayed in @@ -53,6 +55,7 @@ public class BubbleBarLayerView extends FrameLayout @Nullable private BubbleViewProvider mExpandedBubble; private BubbleBarExpandedView mExpandedView; + private @Nullable Consumer<String> mUnBubbleConversationCallback; // TODO(b/273310265) - currently the view is always on the right, need to update for RTL. /** Whether the expanded view is displaying on the left of the screen or not. */ @@ -146,6 +149,13 @@ public class BubbleBarLayerView extends FrameLayout final int width = mPositioner.getExpandedViewWidthForBubbleBar(); final int height = mPositioner.getExpandedViewHeightForBubbleBar(); mExpandedView.setVisibility(GONE); + mExpandedView.setUnBubbleConversationCallback(mUnBubbleConversationCallback); + mExpandedView.setLayerBoundsSupplier(() -> new Rect(0, 0, getWidth(), getHeight())); + mExpandedView.setUnBubbleConversationCallback(bubbleKey -> { + if (mUnBubbleConversationCallback != null) { + mUnBubbleConversationCallback.accept(bubbleKey); + } + }); addView(mExpandedView, new FrameLayout.LayoutParams(width, height)); } @@ -165,6 +175,12 @@ public class BubbleBarLayerView extends FrameLayout showScrim(false); } + /** Sets the function to call to un-bubble the given conversation. */ + public void setUnBubbleConversationCallback( + @Nullable Consumer<String> unBubbleConversationCallback) { + mUnBubbleConversationCallback = unBubbleConversationCallback; + } + /** Updates the expanded view size and position. */ private void updateExpandedView() { if (mExpandedView == null) return; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuItemView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuItemView.java new file mode 100644 index 000000000000..00b977721bea --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuItemView.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.bubbles.bar; + +import android.annotation.ColorInt; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.drawable.Icon; +import android.util.AttributeSet; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.wm.shell.R; + +/** + * Bubble bar expanded view menu item view to display menu action details + */ +public class BubbleBarMenuItemView extends LinearLayout { + private ImageView mImageView; + private TextView mTextView; + + public BubbleBarMenuItemView(Context context) { + this(context, null /* attrs */); + } + + public BubbleBarMenuItemView(Context context, AttributeSet attrs) { + this(context, attrs, 0 /* defStyleAttr */); + } + + public BubbleBarMenuItemView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0 /* defStyleRes */); + } + + public BubbleBarMenuItemView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mImageView = findViewById(R.id.bubble_bar_menu_item_icon); + mTextView = findViewById(R.id.bubble_bar_menu_item_title); + } + + /** + * Update menu item with the details and tint color + */ + void update(Icon icon, String title, @ColorInt int tint) { + if (tint == Color.TRANSPARENT) { + final TypedArray typedArray = getContext().obtainStyledAttributes( + new int[]{android.R.attr.textColorPrimary}); + mTextView.setTextColor(typedArray.getColor(0, Color.BLACK)); + } else { + icon.setTint(tint); + mTextView.setTextColor(tint); + } + + mImageView.setImageIcon(icon); + mTextView.setText(title); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java new file mode 100644 index 000000000000..211fe0d48e43 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuView.java @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.bubbles.bar; + +import android.annotation.ColorInt; +import android.content.Context; +import android.graphics.Color; +import android.graphics.drawable.Icon; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.wm.shell.R; +import com.android.wm.shell.bubbles.Bubble; + +import java.util.ArrayList; + +/** + * Bubble bar expanded view menu + */ +public class BubbleBarMenuView extends LinearLayout { + private ViewGroup mBubbleSectionView; + private ViewGroup mActionsSectionView; + private ImageView mBubbleIconView; + private TextView mBubbleTitleView; + + public BubbleBarMenuView(Context context) { + this(context, null /* attrs */); + } + + public BubbleBarMenuView(Context context, AttributeSet attrs) { + this(context, attrs, 0 /* defStyleAttr */); + } + + public BubbleBarMenuView(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0 /* defStyleRes */); + } + + public BubbleBarMenuView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mBubbleSectionView = findViewById(R.id.bubble_bar_manage_menu_bubble_section); + mActionsSectionView = findViewById(R.id.bubble_bar_manage_menu_actions_section); + mBubbleIconView = findViewById(R.id.bubble_bar_manage_menu_bubble_icon); + mBubbleTitleView = findViewById(R.id.bubble_bar_manage_menu_bubble_title); + } + + /** Update menu details with bubble info */ + void updateInfo(Bubble bubble) { + if (bubble.getIcon() != null) { + mBubbleIconView.setImageIcon(bubble.getIcon()); + } else { + mBubbleIconView.setImageBitmap(bubble.getBubbleIcon()); + } + mBubbleTitleView.setText(bubble.getTitle()); + } + + /** + * Update menu action items views + * @param actions used to populate menu item views + */ + void updateActions(ArrayList<MenuAction> actions) { + mActionsSectionView.removeAllViews(); + LayoutInflater inflater = LayoutInflater.from(mContext); + + for (MenuAction action : actions) { + BubbleBarMenuItemView itemView = (BubbleBarMenuItemView) inflater.inflate( + R.layout.bubble_bar_menu_item, mActionsSectionView, false); + itemView.update(action.mIcon, action.mTitle, action.mTint); + itemView.setOnClickListener(action.mOnClick); + mActionsSectionView.addView(itemView); + } + } + + /** Sets on close menu listener */ + void setOnCloseListener(Runnable onClose) { + mBubbleSectionView.setOnClickListener(view -> { + onClose.run(); + }); + } + + /** + * Overridden to proxy to section views alpha. + * @implNote + * If animate alpha on the parent (menu container) view, section view shadows get distorted. + * To prevent distortion and artifacts alpha changes applied directly on the section views. + */ + @Override + public void setAlpha(float alpha) { + mBubbleSectionView.setAlpha(alpha); + mActionsSectionView.setAlpha(alpha); + } + + /** + * Overridden to proxy section view alpha value. + * @implNote + * The assumption is that both section views have the same alpha value + */ + @Override + public float getAlpha() { + return mBubbleSectionView.getAlpha(); + } + + /** + * Menu action details used to create menu items + */ + static class MenuAction { + private Icon mIcon; + private @ColorInt int mTint; + private String mTitle; + private OnClickListener mOnClick; + + MenuAction(Icon icon, String title, OnClickListener onClick) { + this(icon, title, Color.TRANSPARENT, onClick); + } + + MenuAction(Icon icon, String title, @ColorInt int tint, OnClickListener onClick) { + this.mIcon = icon; + this.mTitle = title; + this.mTint = tint; + this.mOnClick = onClick; + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java new file mode 100644 index 000000000000..8be140c16435 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarMenuViewController.java @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.bubbles.bar; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.drawable.Icon; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.core.content.ContextCompat; +import androidx.dynamicanimation.animation.DynamicAnimation; +import androidx.dynamicanimation.animation.SpringForce; + +import com.android.wm.shell.R; +import com.android.wm.shell.animation.PhysicsAnimator; +import com.android.wm.shell.bubbles.Bubble; + +import java.util.ArrayList; + +/** + * Manages bubble bar expanded view menu presentation and animations + */ +class BubbleBarMenuViewController { + private static final float MENU_INITIAL_SCALE = 0.5f; + private final Context mContext; + private final ViewGroup mRootView; + private @Nullable Listener mListener; + private @Nullable Bubble mBubble; + private @Nullable BubbleBarMenuView mMenuView; + /** A transparent view used to intercept touches to collapse menu when presented */ + private @Nullable View mScrimView; + private @Nullable PhysicsAnimator<BubbleBarMenuView> mMenuAnimator; + private PhysicsAnimator.SpringConfig mMenuSpringConfig; + + BubbleBarMenuViewController(Context context, ViewGroup rootView) { + mContext = context; + mRootView = rootView; + mMenuSpringConfig = new PhysicsAnimator.SpringConfig( + SpringForce.STIFFNESS_MEDIUM, SpringForce.DAMPING_RATIO_LOW_BOUNCY); + } + + /** Sets menu actions listener */ + void setListener(@Nullable Listener listener) { + mListener = listener; + } + + /** Update menu with bubble */ + void updateMenu(@NonNull Bubble bubble) { + mBubble = bubble; + } + + /** + * Show bubble bar expanded view menu + * @param animated if should animate transition + */ + void showMenu(boolean animated) { + if (mMenuView == null || mScrimView == null) { + setupMenu(); + } + cancelAnimations(); + mMenuView.setVisibility(View.VISIBLE); + mScrimView.setVisibility(View.VISIBLE); + Runnable endActions = () -> { + mMenuView.getChildAt(0).requestAccessibilityFocus(); + if (mListener != null) { + mListener.onMenuVisibilityChanged(true /* isShown */); + } + }; + if (animated) { + animateTransition(true /* show */, endActions); + } else { + endActions.run(); + } + } + + /** + * Hide bubble bar expanded view menu + * @param animated if should animate transition + */ + void hideMenu(boolean animated) { + if (mMenuView == null || mScrimView == null) return; + cancelAnimations(); + Runnable endActions = () -> { + mMenuView.setVisibility(View.GONE); + mScrimView.setVisibility(View.GONE); + if (mListener != null) { + mListener.onMenuVisibilityChanged(false /* isShown */); + } + }; + if (animated) { + animateTransition(false /* show */, endActions); + } else { + endActions.run(); + } + } + + /** + * Animate show/hide menu transition + * @param show if should show or hide the menu + * @param endActions will be called when animation ends + */ + private void animateTransition(boolean show, Runnable endActions) { + if (mMenuView == null) return; + mMenuAnimator = PhysicsAnimator.getInstance(mMenuView); + mMenuAnimator.setDefaultSpringConfig(mMenuSpringConfig); + mMenuAnimator + .spring(DynamicAnimation.ALPHA, show ? 1f : 0f) + .spring(DynamicAnimation.SCALE_Y, show ? 1f : MENU_INITIAL_SCALE) + .withEndActions(() -> { + mMenuAnimator = null; + endActions.run(); + }) + .start(); + } + + /** Cancel running animations */ + private void cancelAnimations() { + if (mMenuAnimator != null) { + mMenuAnimator.cancel(); + mMenuAnimator = null; + } + } + + /** Sets up and inflate menu views */ + private void setupMenu() { + // Menu view setup + mMenuView = (BubbleBarMenuView) LayoutInflater.from(mContext).inflate( + R.layout.bubble_bar_menu_view, mRootView, false); + mMenuView.setAlpha(0f); + mMenuView.setPivotY(0f); + mMenuView.setScaleY(MENU_INITIAL_SCALE); + mMenuView.setOnCloseListener(() -> hideMenu(true /* animated */)); + if (mBubble != null) { + mMenuView.updateInfo(mBubble); + mMenuView.updateActions(createMenuActions(mBubble)); + } + // Scrim view setup + mScrimView = new View(mContext); + mScrimView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + mScrimView.setOnClickListener(view -> hideMenu(true /* animated */)); + // Attach to root view + mRootView.addView(mScrimView); + mRootView.addView(mMenuView); + } + + /** + * Creates menu actions to populate menu view + * @param bubble used to create actions depending on bubble type + */ + private ArrayList<BubbleBarMenuView.MenuAction> createMenuActions(Bubble bubble) { + ArrayList<BubbleBarMenuView.MenuAction> menuActions = new ArrayList<>(); + Resources resources = mContext.getResources(); + + if (bubble.isConversation()) { + // Don't bubble conversation action + menuActions.add(new BubbleBarMenuView.MenuAction( + Icon.createWithResource(mContext, R.drawable.bubble_ic_stop_bubble), + resources.getString(R.string.bubbles_dont_bubble_conversation), + view -> { + hideMenu(true /* animated */); + if (mListener != null) { + mListener.onUnBubbleConversation(bubble); + } + } + )); + // Open settings action + Icon appIcon = bubble.getRawAppBadge() != null ? Icon.createWithBitmap( + bubble.getRawAppBadge()) : null; + menuActions.add(new BubbleBarMenuView.MenuAction( + appIcon, + resources.getString(R.string.bubbles_app_settings, bubble.getAppName()), + view -> { + hideMenu(true /* animated */); + if (mListener != null) { + mListener.onOpenAppSettings(bubble); + } + } + )); + } + + // Dismiss bubble action + menuActions.add(new BubbleBarMenuView.MenuAction( + Icon.createWithResource(resources, R.drawable.ic_remove_no_shadow), + resources.getString(R.string.bubble_dismiss_text), + ContextCompat.getColor(mContext, R.color.bubble_bar_expanded_view_menu_close), + view -> { + hideMenu(true /* animated */); + if (mListener != null) { + mListener.onDismissBubble(bubble); + } + } + )); + + return menuActions; + } + + /** + * Bubble bar expanded view menu actions listener + */ + interface Listener { + /** + * Called when manage menu is shown/hidden + * If animated will be called when animation ends + */ + void onMenuVisibilityChanged(boolean visible); + + /** + * Un-bubbles conversation and removes the bubble from the stack + * This conversation will not be bubbled with new messages + * @see com.android.wm.shell.bubbles.BubbleController + */ + void onUnBubbleConversation(Bubble bubble); + + /** + * Launches app notification bubble settings for the bubble with intent created in: + * {@code Bubble.getSettingsIntent} + */ + void onOpenAppSettings(Bubble bubble); + + /** + * Dismiss bubble and remove it from the bubble stack + */ + void onDismissBubble(Bubble bubble); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java deleted file mode 100644 index 9ee8a9d98aa1..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/HandleView.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.wm.shell.bubbles.bar; - -import android.content.Context; -import android.view.Gravity; -import android.widget.LinearLayout; - -/** - * Handle / menu view to show at the top of a bubble bar expanded view. - */ -public class HandleView extends LinearLayout { - - // TODO(b/273307221): implement the manage menu in this view. - public HandleView(Context context) { - super(context); - setOrientation(LinearLayout.HORIZONTAL); - setGravity(Gravity.CENTER); - } - - /** - * The menu extends past the top of the TaskView because of the rounded corners. This means - * to center content in the menu we must subtract the radius (i.e. the amount of space covered - * by TaskView). - */ - public void setCornerRadius(float radius) { - setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), (int) radius); - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/LaunchAdjacentController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/LaunchAdjacentController.kt new file mode 100644 index 000000000000..81592c35e4ac --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/LaunchAdjacentController.kt @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.common + +import android.window.WindowContainerToken +import android.window.WindowContainerTransaction +import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG +import com.android.wm.shell.util.KtProtoLog + +/** + * Controller to manage behavior of activities launched with + * [android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT]. + */ +class LaunchAdjacentController(private val syncQueue: SyncTransactionQueue) { + + /** Allows to temporarily disable launch adjacent handling */ + var launchAdjacentEnabled: Boolean = true + set(value) { + if (field != value) { + KtProtoLog.d(WM_SHELL_TASK_ORG, "set launch adjacent flag root enabled=%b", value) + field = value + container?.let { c -> + if (value) { + enableContainer(c) + } else { + disableContainer((c)) + } + } + } + } + private var container: WindowContainerToken? = null + + /** + * Set [container] as the new launch adjacent flag root container. + * + * If launch adjacent handling is disabled through [setLaunchAdjacentEnabled], won't set the + * container until after it is enabled again. + * + * @see WindowContainerTransaction.setLaunchAdjacentFlagRoot + */ + fun setLaunchAdjacentRoot(container: WindowContainerToken) { + KtProtoLog.d(WM_SHELL_TASK_ORG, "set new launch adjacent flag root container") + this.container = container + if (launchAdjacentEnabled) { + enableContainer(container) + } + } + + /** + * Clear a container previously set through [setLaunchAdjacentRoot]. + * + * Always clears the container, regardless of [launchAdjacentEnabled] value. + * + * @see WindowContainerTransaction.clearLaunchAdjacentFlagRoot + */ + fun clearLaunchAdjacentRoot() { + KtProtoLog.d(WM_SHELL_TASK_ORG, "clear launch adjacent flag root container") + container?.let { + disableContainer(it) + container = null + } + } + + private fun enableContainer(container: WindowContainerToken) { + KtProtoLog.v(WM_SHELL_TASK_ORG, "enable launch adjacent flag root container") + val wct = WindowContainerTransaction() + wct.setLaunchAdjacentFlagRoot(container) + syncQueue.queue(wct) + } + + private fun disableContainer(container: WindowContainerToken) { + KtProtoLog.v(WM_SHELL_TASK_ORG, "disable launch adjacent flag root container") + val wct = WindowContainerTransaction() + wct.clearLaunchAdjacentFlagRoot(container) + syncQueue.queue(wct) + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerHandleView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerHandleView.java index c76937de6669..ec2680085fb5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerHandleView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerHandleView.java @@ -76,6 +76,9 @@ public class DividerHandleView extends View { private int mCurrentHeight; private AnimatorSet mAnimator; private boolean mTouching; + private boolean mHovering; + private final int mHoveringWidth; + private final int mHoveringHeight; public DividerHandleView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); @@ -87,6 +90,8 @@ public class DividerHandleView extends View { mCurrentHeight = mHeight; mTouchingWidth = mWidth > mHeight ? mWidth / 2 : mWidth; mTouchingHeight = mHeight > mWidth ? mHeight / 2 : mHeight; + mHoveringWidth = mWidth > mHeight ? ((int) (mWidth * 1.5f)) : mWidth; + mHoveringHeight = mHeight > mWidth ? ((int) (mHeight * 1.5f)) : mHeight; } /** Sets touching state for this handle view. */ @@ -94,24 +99,32 @@ public class DividerHandleView extends View { if (touching == mTouching) { return; } + setInputState(touching, animate, mTouchingWidth, mTouchingHeight); + mTouching = touching; + } + + /** Sets hovering state for this handle view. */ + public void setHovering(boolean hovering, boolean animate) { + if (hovering == mHovering) { + return; + } + setInputState(hovering, animate, mHoveringWidth, mHoveringHeight); + mHovering = hovering; + } + + private void setInputState(boolean stateOn, boolean animate, int stateWidth, int stateHeight) { if (mAnimator != null) { mAnimator.cancel(); mAnimator = null; } if (!animate) { - if (touching) { - mCurrentWidth = mTouchingWidth; - mCurrentHeight = mTouchingHeight; - } else { - mCurrentWidth = mWidth; - mCurrentHeight = mHeight; - } + mCurrentWidth = stateOn ? stateWidth : mWidth; + mCurrentHeight = stateOn ? stateHeight : mHeight; invalidate(); } else { - animateToTarget(touching ? mTouchingWidth : mWidth, - touching ? mTouchingHeight : mHeight, touching); + animateToTarget(stateOn ? stateWidth : mWidth, + stateOn ? stateHeight : mHeight, stateOn); } - mTouching = touching; } private void animateToTarget(int targetWidth, int targetHeight, boolean touching) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java index 69f0bad4fb45..262d487b1d1b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java @@ -17,14 +17,19 @@ package com.android.wm.shell.common.split; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.view.PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW; +import static android.view.PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW; import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; +import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CURSOR_HOVER_STATES_ENABLED; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Rect; import android.os.Bundle; +import android.provider.DeviceConfig; import android.util.AttributeSet; import android.util.Property; import android.view.GestureDetector; @@ -32,6 +37,7 @@ import android.view.InsetsController; import android.view.InsetsSource; import android.view.InsetsState; import android.view.MotionEvent; +import android.view.PointerIcon; import android.view.SurfaceControlViewHost; import android.view.VelocityTracker; import android.view.View; @@ -46,6 +52,7 @@ import android.widget.FrameLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.DividerSnapAlgorithm; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; @@ -222,7 +229,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { for (int i = insetsState.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = insetsState.sourceAt(i); if (source.getType() == WindowInsets.Type.navigationBars() - && source.insetsRoundedCornerFrame()) { + && source.hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)) { mTempRect.inset(source.calculateVisibleInsets(mTempRect)); } } @@ -270,6 +277,12 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { } @Override + public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { + return PointerIcon.getSystemIcon(getContext(), + isLandscape() ? TYPE_HORIZONTAL_DOUBLE_ARROW : TYPE_VERTICAL_DOUBLE_ARROW); + } + + @Override public boolean onTouch(View v, MotionEvent event) { if (mSplitLayout == null || !mInteractive) { return false; @@ -371,6 +384,43 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { mViewHost.relayout(lp); } + @Override + public boolean onHoverEvent(MotionEvent event) { + if (!DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, CURSOR_HOVER_STATES_ENABLED, + /* defaultValue = */ false)) { + return false; + } + + if (event.getAction() == MotionEvent.ACTION_HOVER_ENTER) { + setHovering(); + return true; + } else if (event.getAction() == MotionEvent.ACTION_HOVER_EXIT) { + releaseHovering(); + return true; + } + return false; + } + + @VisibleForTesting + void setHovering() { + mHandle.setHovering(true, true); + mHandle.animate() + .setInterpolator(Interpolators.TOUCH_RESPONSE) + .setDuration(TOUCH_ANIMATION_DURATION) + .translationZ(mTouchElevation) + .start(); + } + + @VisibleForTesting + void releaseHovering() { + mHandle.setHovering(false, true); + mHandle.animate() + .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) + .setDuration(TOUCH_RELEASE_ANIMATION_DURATION) + .translationZ(0) + .start(); + } + /** * Set divider should interactive to user or not. * diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java index 12d51f54a09c..47d58afb6aba 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java @@ -25,6 +25,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; @@ -86,13 +87,14 @@ public class TvWMShellModule { TransactionPool transactionPool, IconProvider iconProvider, Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, @ShellMainThread ShellExecutor mainExecutor, Handler mainHandler, SystemWindows systemWindows) { return new TvSplitScreenController(context, shellInit, shellCommandHandler, shellController, shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController, displayImeController, displayInsetsController, dragAndDropController, transitions, - transactionPool, iconProvider, recentTasks, mainExecutor, mainHandler, - systemWindows); + transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor, + mainHandler, systemWindows); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java index c491fed5d896..34a6e0ae406c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java @@ -46,6 +46,7 @@ import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.DockStateReader; import com.android.wm.shell.common.FloatingContentCoordinator; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; @@ -275,6 +276,13 @@ public abstract class WMShellBaseModule { return new WindowManagerShellWrapper(mainExecutor); } + @WMSingleton + @Provides + static LaunchAdjacentController provideLaunchAdjacentController( + SyncTransactionQueue syncQueue) { + return new LaunchAdjacentController(syncQueue); + } + // // Back animation // diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index 4980e49a6fc3..ec4024418860 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -41,12 +41,14 @@ import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.FloatingContentCoordinator; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; import com.android.wm.shell.common.TabletopModeController; import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.common.TransactionPool; +import com.android.wm.shell.common.annotations.ShellAnimationThread; import com.android.wm.shell.common.annotations.ShellBackgroundThread; import com.android.wm.shell.common.annotations.ShellMainThread; import com.android.wm.shell.desktopmode.DesktopModeController; @@ -55,6 +57,7 @@ import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler; import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler; +import com.android.wm.shell.desktopmode.ToggleResizeDesktopTaskTransitionHandler; import com.android.wm.shell.draganddrop.DragAndDropController; import com.android.wm.shell.freeform.FreeformComponents; import com.android.wm.shell.freeform.FreeformTaskListener; @@ -203,8 +206,7 @@ public abstract class WMShellModule { SyncTransactionQueue syncQueue, Transitions transitions, Optional<DesktopModeController> desktopModeController, - Optional<DesktopTasksController> desktopTasksController, - Optional<SplitScreenController> splitScreenController) { + Optional<DesktopTasksController> desktopTasksController) { if (DesktopModeStatus.isAnyEnabled()) { return new DesktopModeWindowDecorViewModel( context, @@ -215,8 +217,7 @@ public abstract class WMShellModule { syncQueue, transitions, desktopModeController, - desktopTasksController, - splitScreenController); + desktopTasksController); } return new CaptionWindowDecorViewModel( context, @@ -264,8 +265,13 @@ public abstract class WMShellModule { static FreeformTaskTransitionHandler provideFreeformTaskTransitionHandler( ShellInit shellInit, Transitions transitions, - WindowDecorViewModel windowDecorViewModel) { - return new FreeformTaskTransitionHandler(shellInit, transitions, windowDecorViewModel); + Context context, + WindowDecorViewModel windowDecorViewModel, + DisplayController displayController, + @ShellMainThread ShellExecutor mainExecutor, + @ShellAnimationThread ShellExecutor animExecutor) { + return new FreeformTaskTransitionHandler(shellInit, transitions, context, + windowDecorViewModel, displayController, mainExecutor, animExecutor); } @WMSingleton @@ -328,11 +334,14 @@ public abstract class WMShellModule { TransactionPool transactionPool, IconProvider iconProvider, Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, + Optional<WindowDecorViewModel> windowDecorViewModel, @ShellMainThread ShellExecutor mainExecutor) { return new SplitScreenController(context, shellInit, shellCommandHandler, shellController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, displayController, displayImeController, displayInsetsController, dragAndDropController, transitions, - transactionPool, iconProvider, recentTasks, mainExecutor); + transactionPool, iconProvider, recentTasks, launchAdjacentController, + windowDecorViewModel, mainExecutor); } // @@ -536,9 +545,12 @@ public abstract class WMShellModule { Optional<PipTouchHandler> pipTouchHandlerOptional, Optional<RecentsTransitionHandler> recentsTransitionHandler, KeyguardTransitionHandler keyguardTransitionHandler, + Optional<DesktopModeController> desktopModeController, + Optional<DesktopTasksController> desktopTasksController, Transitions transitions) { return new DefaultMixedHandler(shellInit, transitions, splitScreenOptional, - pipTouchHandlerOptional, recentsTransitionHandler, keyguardTransitionHandler); + pipTouchHandlerOptional, recentsTransitionHandler, keyguardTransitionHandler, + desktopModeController, desktopTasksController); } @WMSingleton @@ -670,6 +682,7 @@ public abstract class WMShellModule { static DesktopTasksController provideDesktopTasksController( Context context, ShellInit shellInit, + ShellCommandHandler shellCommandHandler, ShellController shellController, DisplayController displayController, ShellTaskOrganizer shellTaskOrganizer, @@ -678,13 +691,16 @@ public abstract class WMShellModule { Transitions transitions, EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler, ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler, + ToggleResizeDesktopTaskTransitionHandler toggleResizeDesktopTaskTransitionHandler, @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository, + LaunchAdjacentController launchAdjacentController, @ShellMainThread ShellExecutor mainExecutor ) { - return new DesktopTasksController(context, shellInit, shellController, displayController, - shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, transitions, - enterDesktopTransitionHandler, exitDesktopTransitionHandler, - desktopModeTaskRepository, mainExecutor); + return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController, + displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, + transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler, + toggleResizeDesktopTaskTransitionHandler, desktopModeTaskRepository, + launchAdjacentController, mainExecutor); } @WMSingleton @@ -696,6 +712,13 @@ public abstract class WMShellModule { @WMSingleton @Provides + static ToggleResizeDesktopTaskTransitionHandler provideToggleResizeDesktopTaskTransitionHandler( + Transitions transitions) { + return new ToggleResizeDesktopTaskTransitionHandler(transitions); + } + + @WMSingleton + @Provides static ExitDesktopTaskTransitionHandler provideExitDesktopTaskTransitionHandler( Transitions transitions, Context context diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java index b9d2be280efb..db6c258e84c2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java @@ -33,6 +33,7 @@ import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DE import android.app.ActivityManager.RunningTaskInfo; import android.app.WindowConfiguration; import android.content.Context; +import android.content.res.TypedArray; import android.database.ContentObserver; import android.graphics.Region; import android.net.Uri; @@ -414,6 +415,25 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll } /** + * Applies the proper surface states (rounded corners) to tasks when desktop mode is active. + * This is intended to be used when desktop mode is part of another animation but isn't, itself, + * animating. + */ + public void syncSurfaceState(@NonNull TransitionInfo info, + SurfaceControl.Transaction finishTransaction) { + // Add rounded corners to freeform windows + final TypedArray ta = mContext.obtainStyledAttributes( + new int[]{android.R.attr.dialogCornerRadius}); + final int cornerRadius = ta.getDimensionPixelSize(0, 0); + ta.recycle(); + for (TransitionInfo.Change change: info.getChanges()) { + if (change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_FREEFORM) { + finishTransaction.setCornerRadius(change.getLeash(), cornerRadius); + } + } + } + + /** * A {@link ContentObserver} for listening to changes to {@link Settings.System#DESKTOP_MODE} */ private final class SettingsObserver extends ContentObserver { @@ -500,6 +520,11 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll } @Override + public void showDesktopApp(int taskId) throws RemoteException { + // TODO + } + + @Override public int getVisibleTaskCount(int displayId) throws RemoteException { int[] result = new int[1]; executeRemoteCallWithTaskPermission(mController, "getVisibleTaskCount", @@ -508,5 +533,20 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll ); return result[0]; } + + @Override + public void stashDesktopApps(int displayId) throws RemoteException { + // Stashing of desktop apps not needed. Apps always launch on desktop + } + + @Override + public void hideStashedDesktopApps(int displayId) throws RemoteException { + // Stashing of desktop apps not needed. Apps always launch on desktop + } + + @Override + public void setTaskListener(IDesktopTaskListener listener) throws RemoteException { + // TODO(b/261234402): move visibility from sysui state to listener + } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt index 3ab175d3b68a..711df0d89936 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt @@ -25,6 +25,7 @@ import androidx.core.util.keyIterator import androidx.core.util.valueIterator import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE import com.android.wm.shell.util.KtProtoLog +import java.io.PrintWriter import java.util.concurrent.Executor import java.util.function.Consumer @@ -43,6 +44,7 @@ class DesktopModeTaskRepository { */ val activeTasks: ArraySet<Int> = ArraySet(), val visibleTasks: ArraySet<Int> = ArraySet(), + var stashed: Boolean = false ) // Tasks currently in freeform mode, ordered from top to bottom (top is at index 0). @@ -85,8 +87,10 @@ class DesktopModeTaskRepository { visibleTasksListeners[visibleTasksListener] = executor displayData.keyIterator().forEach { displayId -> val visibleTasks = getVisibleTaskCount(displayId) + val stashed = isStashed(displayId) executor.execute { visibleTasksListener.onVisibilityChanged(displayId, visibleTasks > 0) + visibleTasksListener.onStashedChanged(displayId, stashed) } } } @@ -312,6 +316,52 @@ class DesktopModeTaskRepository { } /** + * Update stashed status on display with id [displayId] + */ + fun setStashed(displayId: Int, stashed: Boolean) { + val data = displayData.getOrCreate(displayId) + val oldValue = data.stashed + data.stashed = stashed + if (oldValue != stashed) { + KtProtoLog.d( + WM_SHELL_DESKTOP_MODE, + "DesktopTaskRepo: mark stashed=%b displayId=%d", + stashed, + displayId + ) + visibleTasksListeners.forEach { (listener, executor) -> + executor.execute { listener.onStashedChanged(displayId, stashed) } + } + } + } + + /** + * Check if display with id [displayId] has desktop tasks stashed + */ + fun isStashed(displayId: Int): Boolean { + return displayData[displayId]?.stashed ?: false + } + + internal fun dump(pw: PrintWriter, prefix: String) { + val innerPrefix = "$prefix " + pw.println("${prefix}DesktopModeTaskRepository") + dumpDisplayData(pw, innerPrefix) + pw.println("${innerPrefix}freeformTasksInZOrder=${freeformTasksInZOrder.toDumpString()}") + pw.println("${innerPrefix}activeTasksListeners=${activeTasksListeners.size}") + pw.println("${innerPrefix}visibleTasksListeners=${visibleTasksListeners.size}") + } + + private fun dumpDisplayData(pw: PrintWriter, prefix: String) { + val innerPrefix = "$prefix " + displayData.forEach { displayId, data -> + pw.println("${prefix}Display $displayId:") + pw.println("${innerPrefix}activeTasks=${data.activeTasks.toDumpString()}") + pw.println("${innerPrefix}visibleTasks=${data.visibleTasks.toDumpString()}") + pw.println("${innerPrefix}stashed=${data.stashed}") + } + } + + /** * Defines interface for classes that can listen to changes for active tasks in desktop mode. */ interface ActiveTasksListener { @@ -331,5 +381,15 @@ class DesktopModeTaskRepository { */ @JvmDefault fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {} + + /** + * Called when the desktop stashed status changes. + */ + @JvmDefault + fun onStashedChanged(displayId: Int, stashed: Boolean) {} } } + +private fun <T> Iterable<T>.toDumpString(): String { + return joinToString(separator = ", ", prefix = "[", postfix = "]") +}
\ No newline at end of file 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 91bb155d9d01..d016e73cda96 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 @@ -16,6 +16,7 @@ package com.android.wm.shell.desktopmode +import android.R import android.app.ActivityManager.RunningTaskInfo import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD @@ -24,11 +25,13 @@ import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED import android.app.WindowConfiguration.WindowingMode import android.content.Context +import android.content.res.TypedArray import android.graphics.Point import android.graphics.Rect import android.graphics.Region import android.os.IBinder import android.os.SystemProperties +import android.util.DisplayMetrics.DENSITY_DEFAULT import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CHANGE import android.view.WindowManager.TRANSIT_NONE @@ -36,7 +39,6 @@ import android.view.WindowManager.TRANSIT_OPEN import android.view.WindowManager.TRANSIT_TO_FRONT import android.window.TransitionInfo import android.window.TransitionRequestInfo -import android.window.WindowContainerToken import android.window.WindowContainerTransaction import androidx.annotation.BinderThread import com.android.wm.shell.RootTaskDisplayAreaOrganizer @@ -44,18 +46,23 @@ import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.ExecutorUtils import com.android.wm.shell.common.ExternalInterfaceBinder +import com.android.wm.shell.common.LaunchAdjacentController 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.annotations.ExternalThread import com.android.wm.shell.common.annotations.ShellMainThread import com.android.wm.shell.desktopmode.DesktopModeTaskRepository.VisibleTasksListener import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE +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.sysui.ShellSharedConstants import com.android.wm.shell.transition.Transitions import com.android.wm.shell.util.KtProtoLog +import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration +import java.io.PrintWriter import java.util.concurrent.Executor import java.util.function.Consumer @@ -63,6 +70,7 @@ import java.util.function.Consumer class DesktopTasksController( private val context: Context, shellInit: ShellInit, + private val shellCommandHandler: ShellCommandHandler, private val shellController: ShellController, private val displayController: DisplayController, private val shellTaskOrganizer: ShellTaskOrganizer, @@ -71,7 +79,10 @@ class DesktopTasksController( private val transitions: Transitions, private val enterDesktopTaskTransitionHandler: EnterDesktopTaskTransitionHandler, private val exitDesktopTaskTransitionHandler: ExitDesktopTaskTransitionHandler, + private val toggleResizeDesktopTaskTransitionHandler: + ToggleResizeDesktopTaskTransitionHandler, private val desktopModeTaskRepository: DesktopModeTaskRepository, + private val launchAdjacentController: LaunchAdjacentController, @ShellMainThread private val mainExecutor: ShellExecutor ) : RemoteCallable<DesktopTasksController>, Transitions.TransitionHandler { @@ -82,6 +93,11 @@ class DesktopTasksController( visualIndicator?.releaseVisualIndicator(t) visualIndicator = null } + private val taskVisibilityListener = object : VisibleTasksListener { + override fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) { + launchAdjacentController.launchAdjacentEnabled = !hasVisibleFreeformTasks + } + } init { desktopMode = DesktopModeImpl() @@ -92,12 +108,14 @@ class DesktopTasksController( private fun onInit() { KtProtoLog.d(WM_SHELL_DESKTOP_MODE, "Initialize DesktopTasksController") + shellCommandHandler.addDumpCallback(this::dump, this) shellController.addExternalInterface( ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE, { createExternalInterface() }, this ) transitions.addHandler(this) + desktopModeTaskRepository.addVisibleTasksListener(taskVisibilityListener, mainExecutor) } /** Show all tasks, that are part of the desktop, on top of launcher */ @@ -118,27 +136,58 @@ class DesktopTasksController( } } + /** + * Stash desktop tasks on display with id [displayId]. + * + * When desktop tasks are stashed, launcher home screen icons are fully visible. New apps + * launched in this state will be added to the desktop. Existing desktop tasks will be brought + * back to front during the launch. + */ + fun stashDesktopApps(displayId: Int) { + KtProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: stashDesktopApps") + desktopModeTaskRepository.setStashed(displayId, true) + } + + /** + * Clear the stashed state for the given display + */ + fun hideStashedDesktopApps(displayId: Int) { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "DesktopTasksController: hideStashedApps displayId=%d", + displayId + ) + desktopModeTaskRepository.setStashed(displayId, false) + } + /** Get number of tasks that are marked as visible */ fun getVisibleTaskCount(displayId: Int): Int { return desktopModeTaskRepository.getVisibleTaskCount(displayId) } /** Move a task with given `taskId` to desktop */ - fun moveToDesktop(taskId: Int) { - shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task -> moveToDesktop(task) } + fun moveToDesktop(taskId: Int, wct: WindowContainerTransaction = WindowContainerTransaction()) { + shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { + task -> moveToDesktop(task, wct) + } } - /** Move a task to desktop */ - fun moveToDesktop(task: RunningTaskInfo) { + /** + * Move a task to desktop + */ + fun moveToDesktop( + task: RunningTaskInfo, + wct: WindowContainerTransaction = WindowContainerTransaction() + ) { KtProtoLog.v( WM_SHELL_DESKTOP_MODE, "DesktopTasksController: moveToDesktop taskId=%d", task.taskId ) - val wct = WindowContainerTransaction() // Bring other apps to front first bringDesktopAppsToFront(task.displayId, wct) - addMoveToDesktopChanges(wct, task.token) + addMoveToDesktopChanges(wct, task) + if (Transitions.ENABLE_SHELL_TRANSITIONS) { transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */) } else { @@ -158,7 +207,7 @@ class DesktopTasksController( ) val wct = WindowContainerTransaction() moveHomeTaskToFront(wct) - addMoveToDesktopChanges(wct, taskInfo.getToken()) + addMoveToDesktopChanges(wct, taskInfo) wct.setBounds(taskInfo.token, startBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { @@ -178,7 +227,7 @@ class DesktopTasksController( ) val wct = WindowContainerTransaction() bringDesktopAppsToFront(taskInfo.displayId, wct) - addMoveToDesktopChanges(wct, taskInfo.getToken()) + addMoveToDesktopChanges(wct, taskInfo) wct.setBounds(taskInfo.token, freeformBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { @@ -204,7 +253,7 @@ class DesktopTasksController( ) val wct = WindowContainerTransaction() - addMoveToFullscreenChanges(wct, task.token) + addMoveToFullscreenChanges(wct, task) if (Transitions.ENABLE_SHELL_TRANSITIONS) { transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */) } else { @@ -223,7 +272,7 @@ class DesktopTasksController( task.taskId ) val wct = WindowContainerTransaction() - addMoveToFullscreenChanges(wct, task.token) + addMoveToFullscreenChanges(wct, task) if (Transitions.ENABLE_SHELL_TRANSITIONS) { enterDesktopTaskTransitionHandler.startCancelMoveToDesktopMode(wct, position, mOnAnimationFinishedCallback) @@ -240,7 +289,7 @@ class DesktopTasksController( task.taskId ) val wct = WindowContainerTransaction() - addMoveToFullscreenChanges(wct, task.token) + addMoveToFullscreenChanges(wct, task) if (Transitions.ENABLE_SHELL_TRANSITIONS) { exitDesktopTaskTransitionHandler.startTransition( @@ -252,6 +301,11 @@ class DesktopTasksController( } /** Move a task to the front */ + fun moveTaskToFront(taskId: Int) { + shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task -> moveTaskToFront(task) } + } + + /** Move a task to the front */ fun moveTaskToFront(taskInfo: RunningTaskInfo) { KtProtoLog.v( WM_SHELL_DESKTOP_MODE, @@ -331,6 +385,49 @@ class DesktopTasksController( } } + /** Quick-resizes a desktop task, toggling between the stable bounds and the default bounds. */ + fun toggleDesktopTaskSize(taskInfo: RunningTaskInfo, windowDecor: DesktopModeWindowDecoration) { + val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return + + val stableBounds = Rect() + displayLayout.getStableBounds(stableBounds) + val destinationBounds = Rect() + if (taskInfo.configuration.windowConfiguration.bounds == stableBounds) { + // The desktop task is currently occupying the whole stable bounds, toggle to the + // default bounds. + getDefaultDesktopTaskBounds( + density = taskInfo.configuration.densityDpi.toFloat() / DENSITY_DEFAULT, + stableBounds = stableBounds, + outBounds = destinationBounds + ) + } else { + // Toggle to the stable bounds. + destinationBounds.set(stableBounds) + } + + val wct = WindowContainerTransaction().setBounds(taskInfo.token, destinationBounds) + if (Transitions.ENABLE_SHELL_TRANSITIONS) { + toggleResizeDesktopTaskTransitionHandler.startTransition( + wct, + taskInfo.taskId, + windowDecor + ) + } else { + shellTaskOrganizer.applyTransaction(wct) + } + } + + private fun getDefaultDesktopTaskBounds(density: Float, stableBounds: Rect, outBounds: Rect) { + val width = (DESKTOP_MODE_DEFAULT_WIDTH_DP * density + 0.5f).toInt() + val height = (DESKTOP_MODE_DEFAULT_HEIGHT_DP * density + 0.5f).toInt() + outBounds.set(0, 0, width, height) + // Center the task in stable bounds + outBounds.offset( + stableBounds.centerX() - outBounds.centerX(), + stableBounds.centerY() - outBounds.centerY() + ) + } + /** * Get windowing move for a given `taskId` * @@ -397,6 +494,11 @@ class DesktopTasksController( transition: IBinder, request: TransitionRequestInfo ): WindowContainerTransaction? { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "DesktopTasksController: handleRequest request=%s", + request + ) // Check if we should skip handling this transition val shouldHandleRequest = when { @@ -418,62 +520,115 @@ class DesktopTasksController( } val task: RunningTaskInfo = request.triggerTask - val activeTasks = desktopModeTaskRepository.getActiveTasks(task.displayId) - // Check if we should switch a fullscreen task to freeform - if (task.windowingMode == WINDOWING_MODE_FULLSCREEN) { - // If there are any visible desktop tasks, switch the task to freeform - if (activeTasks.any { desktopModeTaskRepository.isVisibleTask(it) }) { - KtProtoLog.d( + return when { + // If display has tasks stashed, handle as stashed launch + desktopModeTaskRepository.isStashed(task.displayId) -> handleStashedTaskLaunch(task) + // Check if fullscreen task should be updated + task.windowingMode == WINDOWING_MODE_FULLSCREEN -> handleFullscreenTaskLaunch(task) + // Check if freeform task should be updated + task.windowingMode == WINDOWING_MODE_FREEFORM -> handleFreeformTaskLaunch(task) + else -> null + } + } + + /** + * Applies the proper surface states (rounded corners) to tasks when desktop mode is active. + * This is intended to be used when desktop mode is part of another animation but isn't, itself, + * animating. + */ + fun syncSurfaceState( + info: TransitionInfo, + finishTransaction: SurfaceControl.Transaction + ) { + // Add rounded corners to freeform windows + val ta: TypedArray = context.obtainStyledAttributes( + intArrayOf(R.attr.dialogCornerRadius)) + val cornerRadius = ta.getDimensionPixelSize(0, 0).toFloat() + ta.recycle() + info.changes + .filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM } + .forEach { finishTransaction.setCornerRadius(it.leash, cornerRadius) } + } + + private fun handleFreeformTaskLaunch(task: RunningTaskInfo): WindowContainerTransaction? { + val activeTasks = desktopModeTaskRepository.getActiveTasks(task.displayId) + if (activeTasks.none { desktopModeTaskRepository.isVisibleTask(it) }) { + KtProtoLog.d( WM_SHELL_DESKTOP_MODE, - "DesktopTasksController: switch fullscreen task to freeform on transition" + - " taskId=%d", + "DesktopTasksController: switch freeform task to fullscreen oon transition" + + " taskId=%d", task.taskId - ) - return WindowContainerTransaction().also { wct -> - addMoveToDesktopChanges(wct, task.token) - } + ) + return WindowContainerTransaction().also { wct -> + addMoveToFullscreenChanges(wct, task) } } + return null + } - // CHeck if we should switch a freeform task to fullscreen - if (task.windowingMode == WINDOWING_MODE_FREEFORM) { - // If no visible desktop tasks, switch this task to freeform as the transition came - // outside of this controller - if (activeTasks.none { desktopModeTaskRepository.isVisibleTask(it) }) { - KtProtoLog.d( + private fun handleFullscreenTaskLaunch(task: RunningTaskInfo): WindowContainerTransaction? { + val activeTasks = desktopModeTaskRepository.getActiveTasks(task.displayId) + if (activeTasks.any { desktopModeTaskRepository.isVisibleTask(it) }) { + KtProtoLog.d( WM_SHELL_DESKTOP_MODE, - "DesktopTasksController: switch freeform task to fullscreen oon transition" + - " taskId=%d", + "DesktopTasksController: switch fullscreen task to freeform on transition" + + " taskId=%d", task.taskId - ) - return WindowContainerTransaction().also { wct -> - addMoveToFullscreenChanges(wct, task.token) - } + ) + return WindowContainerTransaction().also { wct -> + addMoveToDesktopChanges(wct, task) } } return null } + private fun handleStashedTaskLaunch(task: RunningTaskInfo): WindowContainerTransaction { + KtProtoLog.d( + WM_SHELL_DESKTOP_MODE, + "DesktopTasksController: launch apps with stashed on transition taskId=%d", + task.taskId + ) + val wct = WindowContainerTransaction() + bringDesktopAppsToFront(task.displayId, wct) + addMoveToDesktopChanges(wct, task) + desktopModeTaskRepository.setStashed(task.displayId, false) + return wct + } + private fun addMoveToDesktopChanges( wct: WindowContainerTransaction, - token: WindowContainerToken + taskInfo: RunningTaskInfo ) { - wct.setWindowingMode(token, WINDOWING_MODE_FREEFORM) - wct.reorder(token, true /* onTop */) + val displayWindowingMode = taskInfo.configuration.windowConfiguration.displayWindowingMode + val targetWindowingMode = if (displayWindowingMode == WINDOWING_MODE_FREEFORM) { + // Display windowing is freeform, set to undefined and inherit it + WINDOWING_MODE_UNDEFINED + } else { + WINDOWING_MODE_FREEFORM + } + wct.setWindowingMode(taskInfo.token, targetWindowingMode) + wct.reorder(taskInfo.token, true /* onTop */) if (isDesktopDensityOverrideSet()) { - wct.setDensityDpi(token, getDesktopDensityDpi()) + wct.setDensityDpi(taskInfo.token, getDesktopDensityDpi()) } } private fun addMoveToFullscreenChanges( wct: WindowContainerTransaction, - token: WindowContainerToken + taskInfo: RunningTaskInfo ) { - wct.setWindowingMode(token, WINDOWING_MODE_FULLSCREEN) - wct.setBounds(token, null) + val displayWindowingMode = taskInfo.configuration.windowConfiguration.displayWindowingMode + val targetWindowingMode = if (displayWindowingMode == WINDOWING_MODE_FULLSCREEN) { + // Display windowing is fullscreen, set to undefined and inherit it + WINDOWING_MODE_UNDEFINED + } else { + WINDOWING_MODE_FULLSCREEN + } + wct.setWindowingMode(taskInfo.token, targetWindowingMode) + wct.setBounds(taskInfo.token, null) if (isDesktopDensityOverrideSet()) { - wct.setDensityDpi(token, getFullscreenDensityDpi()) + wct.setDensityDpi(taskInfo.token, getFullscreenDensityDpi()) } } @@ -524,14 +679,19 @@ class DesktopTasksController( * Perform checks required on drag end. Move to fullscreen if drag ends in status bar area. * * @param taskInfo the task being dragged. - * @param position position of surface when drag ends + * @param position position of surface when drag ends. + * @param y the Y position of the motion event. + * @param windowDecor the window decoration for the task being dragged */ fun onDragPositioningEnd( taskInfo: RunningTaskInfo, - position: Point + position: Point, + y: Float, + windowDecor: DesktopModeWindowDecoration ) { val statusBarHeight = getStatusBarHeight(taskInfo) - if (position.y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) { + if (y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) { + windowDecor.incrementRelayoutBlock() moveToFullscreenWithAnimation(taskInfo, position) } } @@ -632,6 +792,12 @@ class DesktopTasksController( desktopModeTaskRepository.setTaskCornerListener(listener, callbackExecutor) } + private fun dump(pw: PrintWriter, prefix: String) { + val innerPrefix = "$prefix " + pw.println("${prefix}DesktopTasksController") + desktopModeTaskRepository.dump(pw, innerPrefix) + } + /** The interface for calls from outside the shell, within the host process. */ @ExternalThread private inner class DesktopModeImpl : DesktopMode { @@ -658,8 +824,51 @@ class DesktopTasksController( @BinderThread private class IDesktopModeImpl(private var controller: DesktopTasksController?) : IDesktopMode.Stub(), ExternalInterfaceBinder { + + private lateinit var remoteListener: + SingleInstanceRemoteListener<DesktopTasksController, IDesktopTaskListener> + + private val listener: VisibleTasksListener = object : VisibleTasksListener { + override fun onVisibilityChanged(displayId: Int, visible: Boolean) { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "IDesktopModeImpl: onVisibilityChanged display=%d visible=%b", + displayId, + visible + ) + remoteListener.call { l -> l.onVisibilityChanged(displayId, visible) } + } + + override fun onStashedChanged(displayId: Int, stashed: Boolean) { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "IDesktopModeImpl: onStashedChanged display=%d stashed=%b", + displayId, + stashed + ) + remoteListener.call { l -> l.onStashedChanged(displayId, stashed) } + } + } + + init { + remoteListener = + SingleInstanceRemoteListener<DesktopTasksController, IDesktopTaskListener>( + controller, + { c -> + c.desktopModeTaskRepository.addVisibleTasksListener( + listener, + c.mainExecutor + ) + }, + { c -> + c.desktopModeTaskRepository.removeVisibleTasksListener(listener) + } + ) + } + /** Invalidates this instance, preventing future calls from updating the controller. */ override fun invalidate() { + remoteListener.unregister() controller = null } @@ -670,6 +879,27 @@ class DesktopTasksController( ) { c -> c.showDesktopApps(displayId) } } + override fun stashDesktopApps(displayId: Int) { + ExecutorUtils.executeRemoteCallWithTaskPermission( + controller, + "stashDesktopApps" + ) { c -> c.stashDesktopApps(displayId) } + } + + override fun hideStashedDesktopApps(displayId: Int) { + ExecutorUtils.executeRemoteCallWithTaskPermission( + controller, + "hideStashedDesktopApps" + ) { c -> c.hideStashedDesktopApps(displayId) } + } + + override fun showDesktopApp(taskId: Int) { + ExecutorUtils.executeRemoteCallWithTaskPermission( + controller, + "showDesktopApp" + ) { c -> c.moveTaskToFront(taskId) } + } + override fun getVisibleTaskCount(displayId: Int): Int { val result = IntArray(1) ExecutorUtils.executeRemoteCallWithTaskPermission( @@ -680,6 +910,18 @@ class DesktopTasksController( ) return result[0] } + + override fun setTaskListener(listener: IDesktopTaskListener?) { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "IDesktopModeImpl: set task listener=%s", + listener ?: "null" + ) + ExecutorUtils.executeRemoteCallWithTaskPermission( + controller, + "setTaskListener" + ) { _ -> listener?.let { remoteListener.register(it) } ?: remoteListener.unregister() } + } } companion object { @@ -687,6 +929,14 @@ class DesktopTasksController( SystemProperties.getInt("persist.wm.debug.desktop_mode_density", 0) private val DESKTOP_DENSITY_ALLOWED_RANGE = (100..1000) + // Override default freeform task width when desktop mode is enabled. In dips. + private val DESKTOP_MODE_DEFAULT_WIDTH_DP = + SystemProperties.getInt("persist.wm.debug.desktop_mode.default_width", 840) + + // Override default freeform task height when desktop mode is enabled. In dips. + private val DESKTOP_MODE_DEFAULT_HEIGHT_DP = + SystemProperties.getInt("persist.wm.debug.desktop_mode.default_height", 630) + /** * Check if desktop density override is enabled */ 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 899d67267e69..ee3a080e7318 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 @@ -16,6 +16,8 @@ package com.android.wm.shell.desktopmode; +import com.android.wm.shell.desktopmode.IDesktopTaskListener; + /** * Interface that is exposed to remote callers to manipulate desktop mode features. */ @@ -24,6 +26,18 @@ interface IDesktopMode { /** Show apps on the desktop on the given display */ void showDesktopApps(int displayId); + /** Stash apps on the desktop to allow launching another app from home screen */ + void stashDesktopApps(int displayId); + + /** Hide apps that may be stashed */ + void hideStashedDesktopApps(int displayId); + + /** Bring task with the given id to front */ + oneway void showDesktopApp(int taskId); + /** Get count of visible desktop tasks on the given display */ int getVisibleTaskCount(int displayId); + + /** Set listener that will receive callbacks about updates to desktop tasks */ + oneway void setTaskListener(IDesktopTaskListener listener); }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl new file mode 100644 index 000000000000..39128a863ec9 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.desktopmode; + +/** + * Allows external processes to register a listener in WMShell to get updates about desktop task + * state. + */ +interface IDesktopTaskListener { + + /** Desktop task visibility has change. Visible if at least 1 task is visible. */ + oneway void onVisibilityChanged(int displayId, boolean visible); + + /** Desktop task stashed status has changed. */ + oneway void onStashedChanged(int displayId, boolean stashed); +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt new file mode 100644 index 000000000000..94788e45e2b6 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.desktopmode + +import android.animation.Animator +import android.animation.RectEvaluator +import android.animation.ValueAnimator +import android.graphics.Rect +import android.os.IBinder +import android.util.SparseArray +import android.view.SurfaceControl +import android.view.WindowManager.TRANSIT_CHANGE +import android.window.TransitionInfo +import android.window.TransitionRequestInfo +import android.window.WindowContainerTransaction +import androidx.core.animation.addListener +import com.android.wm.shell.transition.Transitions +import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE +import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration +import java.util.function.Supplier + +/** Handles the animation of quick resizing of desktop tasks. */ +class ToggleResizeDesktopTaskTransitionHandler( + private val transitions: Transitions, + private val transactionSupplier: Supplier<SurfaceControl.Transaction> +) : Transitions.TransitionHandler { + + private val rectEvaluator = RectEvaluator(Rect()) + private val taskToDecorationMap = SparseArray<DesktopModeWindowDecoration>() + + private var boundsAnimator: Animator? = null + + constructor( + transitions: Transitions + ) : this(transitions, Supplier { SurfaceControl.Transaction() }) + + /** Starts a quick resize transition. */ + fun startTransition( + wct: WindowContainerTransaction, + taskId: Int, + windowDecoration: DesktopModeWindowDecoration + ) { + // Pause relayout until the transition animation finishes. + windowDecoration.incrementRelayoutBlock() + transitions.startTransition(TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE, wct, this) + taskToDecorationMap.put(taskId, windowDecoration) + } + + override fun startAnimation( + transition: IBinder, + info: TransitionInfo, + startTransaction: SurfaceControl.Transaction, + finishTransaction: SurfaceControl.Transaction, + finishCallback: Transitions.TransitionFinishCallback + ): Boolean { + val change = findRelevantChange(info) + val leash = change.leash + val taskId = change.taskInfo.taskId + val startBounds = change.startAbsBounds + val endBounds = change.endAbsBounds + val windowDecor = + taskToDecorationMap.removeReturnOld(taskId) + ?: throw IllegalStateException("Window decoration not found for task $taskId") + + val tx = transactionSupplier.get() + boundsAnimator?.cancel() + boundsAnimator = + ValueAnimator.ofObject(rectEvaluator, startBounds, endBounds) + .setDuration(RESIZE_DURATION_MS) + .apply { + addListener( + onStart = { + startTransaction + .setPosition( + leash, + startBounds.left.toFloat(), + startBounds.top.toFloat() + ) + .setWindowCrop(leash, startBounds.width(), startBounds.height()) + .show(leash) + windowDecor.showResizeVeil(startTransaction, startBounds) + }, + onEnd = { + finishTransaction + .setPosition( + leash, + endBounds.left.toFloat(), + endBounds.top.toFloat() + ) + .setWindowCrop(leash, endBounds.width(), endBounds.height()) + .show(leash) + windowDecor.hideResizeVeil() + finishCallback.onTransitionFinished(null, null) + boundsAnimator = null + } + ) + addUpdateListener { anim -> + val rect = anim.animatedValue as Rect + tx.setPosition(leash, rect.left.toFloat(), rect.top.toFloat()) + .setWindowCrop(leash, rect.width(), rect.height()) + .show(leash) + windowDecor.updateResizeVeil(tx, rect) + } + start() + } + return true + } + + override fun handleRequest( + transition: IBinder, + request: TransitionRequestInfo + ): WindowContainerTransaction? { + return null + } + + private fun findRelevantChange(info: TransitionInfo): TransitionInfo.Change { + val matchingChanges = + info.changes.filter { c -> + !isWallpaper(c) && isValidTaskChange(c) && c.mode == TRANSIT_CHANGE + } + if (matchingChanges.size != 1) { + throw IllegalStateException( + "Expected 1 relevant change but found: ${matchingChanges.size}" + ) + } + return matchingChanges.first() + } + + private fun isWallpaper(change: TransitionInfo.Change): Boolean { + return (change.flags and TransitionInfo.FLAG_IS_WALLPAPER) != 0 + } + + private fun isValidTaskChange(change: TransitionInfo.Change): Boolean { + return change.taskInfo != null && change.taskInfo?.taskId != -1 + } + + companion object { + private const val RESIZE_DURATION_MS = 300L + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md index 99922fbc2d95..f9ea1d4e2a07 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md @@ -21,11 +21,17 @@ This code itself will not compile by itself, but the `protologtool` will preproc building to check the log state (is enabled) before printing the print format style log. **Notes** -- ProtoLogs currently only work from soong builds (ie. via make/mp). We need to reimplement the - tool for use with SysUI-studio +- ProtoLogs are only fully supported from soong builds (ie. via make/mp). In SysUI-studio it falls + back to log via Logcat - Non-text ProtoLogs are not currently supported with the Shell library (you can't view them with traces in Winscope) +### Kotlin + +Protolog tool does not yet have support for Kotlin code (see [b/168581922](https://b.corp.google.com/issues/168581922)). +For logging in Kotlin, use the [KtProtoLog](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt) +class which has a similar API to the Java ProtoLog class. + ### Enabling ProtoLog command line logging Run these commands to enable protologs for both WM Core and WM Shell to print to logcat. ```shell diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java index 04fc79acadbd..55e34fe3d836 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java @@ -19,9 +19,15 @@ package com.android.wm.shell.freeform; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; import android.app.ActivityManager; import android.app.WindowConfiguration; +import android.content.Context; +import android.graphics.Rect; import android.os.IBinder; +import android.util.ArrayMap; import android.view.SurfaceControl; import android.view.WindowManager; import android.window.TransitionInfo; @@ -31,6 +37,8 @@ import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.wm.shell.common.DisplayController; +import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.windowdecor.WindowDecorViewModel; @@ -39,23 +47,37 @@ import java.util.ArrayList; import java.util.List; /** - * The {@link Transitions.TransitionHandler} that handles freeform task maximizing and restoring - * transitions. + * The {@link Transitions.TransitionHandler} that handles freeform task maximizing, closing, and + * restoring transitions. */ public class FreeformTaskTransitionHandler implements Transitions.TransitionHandler, FreeformTaskTransitionStarter { - + private static final int CLOSE_ANIM_DURATION = 400; + private final Context mContext; private final Transitions mTransitions; private final WindowDecorViewModel mWindowDecorViewModel; + private final DisplayController mDisplayController; + private final ShellExecutor mMainExecutor; + private final ShellExecutor mAnimExecutor; private final List<IBinder> mPendingTransitionTokens = new ArrayList<>(); + private final ArrayMap<IBinder, ArrayList<Animator>> mAnimations = new ArrayMap<>(); + public FreeformTaskTransitionHandler( ShellInit shellInit, Transitions transitions, - WindowDecorViewModel windowDecorViewModel) { + Context context, + WindowDecorViewModel windowDecorViewModel, + DisplayController displayController, + ShellExecutor mainExecutor, + ShellExecutor animExecutor) { mTransitions = transitions; + mContext = context; mWindowDecorViewModel = windowDecorViewModel; + mDisplayController = displayController; + mMainExecutor = mainExecutor; + mAnimExecutor = animExecutor; if (Transitions.ENABLE_SHELL_TRANSITIONS) { shellInit.addInitCallback(this::onInit, this); } @@ -103,6 +125,14 @@ public class FreeformTaskTransitionHandler @NonNull SurfaceControl.Transaction finishT, @NonNull Transitions.TransitionFinishCallback finishCallback) { boolean transitionHandled = false; + final ArrayList<Animator> animations = new ArrayList<>(); + final Runnable onAnimFinish = () -> { + if (!animations.isEmpty()) return; + mMainExecutor.execute(() -> { + mAnimations.remove(transition); + finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */); + }); + }; for (TransitionInfo.Change change : info.getChanges()) { if ((change.getFlags() & TransitionInfo.FLAG_IS_WALLPAPER) != 0) { continue; @@ -121,21 +151,45 @@ public class FreeformTaskTransitionHandler case WindowManager.TRANSIT_TO_BACK: transitionHandled |= startMinimizeTransition(transition); break; + case WindowManager.TRANSIT_CLOSE: + if (change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_FREEFORM) { + transitionHandled |= startCloseTransition(transition, change, + finishT, animations, onAnimFinish); + } + break; } } - - mPendingTransitionTokens.remove(transition); - if (!transitionHandled) { return false; } - + mAnimations.put(transition, animations); + // startT must be applied before animations start. startT.apply(); - mTransitions.getMainExecutor().execute( - () -> finishCallback.onTransitionFinished(null, null)); + mAnimExecutor.execute(() -> { + for (Animator anim : animations) { + anim.start(); + } + }); + // Run this here in case no animators are created. + onAnimFinish.run(); + mPendingTransitionTokens.remove(transition); return true; } + @Override + public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ArrayList<Animator> animations = mAnimations.get(mergeTarget); + if (animations == null) return; + mAnimExecutor.execute(() -> { + for (Animator anim : animations) { + anim.end(); + } + }); + + } + private boolean startChangeTransition( IBinder transition, int type, @@ -165,6 +219,36 @@ public class FreeformTaskTransitionHandler return mPendingTransitionTokens.contains(transition); } + private boolean startCloseTransition(IBinder transition, TransitionInfo.Change change, + SurfaceControl.Transaction finishT, ArrayList<Animator> animations, + Runnable onAnimFinish) { + if (!mPendingTransitionTokens.contains(transition)) return false; + int screenHeight = mDisplayController + .getDisplayLayout(change.getTaskInfo().displayId).height(); + ValueAnimator animator = new ValueAnimator(); + animator.setDuration(CLOSE_ANIM_DURATION) + .setFloatValues(0f, 1f); + SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + SurfaceControl sc = change.getLeash(); + finishT.hide(sc); + Rect startBounds = new Rect(change.getTaskInfo().configuration.windowConfiguration + .getBounds()); + animator.addUpdateListener(animation -> { + t.setPosition(sc, startBounds.left, + startBounds.top + (animation.getAnimatedFraction() * screenHeight)); + t.apply(); + }); + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + animations.remove(animator); + onAnimFinish.run(); + } + }); + animations.add(animator); + return true; + } + @Nullable @Override public WindowContainerTransaction handleRequest(@NonNull IBinder transition, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/MainStage.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/MainStage.java index 89538cb394d4..e52235fda80f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/MainStage.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/MainStage.java @@ -24,6 +24,9 @@ import android.window.WindowContainerTransaction; import com.android.launcher3.icons.IconProvider; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.SyncTransactionQueue; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; + +import java.util.Optional; /** * Main stage for split-screen mode. When split-screen is active all standard activity types launch @@ -35,9 +38,10 @@ class MainStage extends StageTaskListener { MainStage(Context context, ShellTaskOrganizer taskOrganizer, int displayId, StageListenerCallbacks callbacks, SyncTransactionQueue syncQueue, - SurfaceSession surfaceSession, IconProvider iconProvider) { + SurfaceSession surfaceSession, IconProvider iconProvider, + Optional<WindowDecorViewModel> windowDecorViewModel) { super(context, taskOrganizer, displayId, callbacks, syncQueue, surfaceSession, - iconProvider); + iconProvider, windowDecorViewModel); } boolean isActive() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SideStage.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SideStage.java index 8639b36faf4c..9903113c5453 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SideStage.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SideStage.java @@ -25,6 +25,9 @@ import android.window.WindowContainerTransaction; import com.android.launcher3.icons.IconProvider; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.SyncTransactionQueue; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; + +import java.util.Optional; /** * Side stage for split-screen mode. Only tasks that are explicitly pinned to this stage show up @@ -37,9 +40,10 @@ class SideStage extends StageTaskListener { SideStage(Context context, ShellTaskOrganizer taskOrganizer, int displayId, StageListenerCallbacks callbacks, SyncTransactionQueue syncQueue, - SurfaceSession surfaceSession, IconProvider iconProvider) { + SurfaceSession surfaceSession, IconProvider iconProvider, + Optional<WindowDecorViewModel> windowDecorViewModel) { super(context, taskOrganizer, displayId, callbacks, syncQueue, surfaceSession, - iconProvider); + iconProvider, windowDecorViewModel); } boolean removeAllTasks(WindowContainerTransaction wct, boolean toTop) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index e7a367f1992d..e294229038f2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -76,6 +76,7 @@ import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.ExternalInterfaceBinder; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.RemoteCallable; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SingleInstanceRemoteListener; @@ -94,6 +95,7 @@ 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.windowdecor.WindowDecorViewModel; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -171,6 +173,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, private final TransactionPool mTransactionPool; private final IconProvider mIconProvider; private final Optional<RecentTasksController> mRecentTasksOptional; + private final LaunchAdjacentController mLaunchAdjacentController; + private final Optional<WindowDecorViewModel> mWindowDecorViewModel; private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler; private final String[] mAppsSupportMultiInstances; @@ -197,6 +201,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, TransactionPool transactionPool, IconProvider iconProvider, Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, + Optional<WindowDecorViewModel> windowDecorViewModel, ShellExecutor mainExecutor) { mShellCommandHandler = shellCommandHandler; mShellController = shellController; @@ -213,6 +219,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mTransactionPool = transactionPool; mIconProvider = iconProvider; mRecentTasksOptional = recentTasks; + mLaunchAdjacentController = launchAdjacentController; + mWindowDecorViewModel = windowDecorViewModel; mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this); // TODO(b/238217847): Temporarily add this check here until we can remove the dynamic // override for this controller from the base module @@ -242,6 +250,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, TransactionPool transactionPool, IconProvider iconProvider, RecentTasksController recentTasks, + LaunchAdjacentController launchAdjacentController, + WindowDecorViewModel windowDecorViewModel, ShellExecutor mainExecutor, StageCoordinator stageCoordinator) { mShellCommandHandler = shellCommandHandler; @@ -259,6 +269,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mTransactionPool = transactionPool; mIconProvider = iconProvider; mRecentTasksOptional = Optional.of(recentTasks); + mLaunchAdjacentController = launchAdjacentController; + mWindowDecorViewModel = Optional.of(windowDecorViewModel); mStageCoordinator = stageCoordinator; mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this); shellInit.addInitCallback(this::onInit, this); @@ -291,13 +303,15 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mStageCoordinator = createStageCoordinator(); } mDragAndDropController.ifPresent(controller -> controller.setSplitScreenController(this)); + mWindowDecorViewModel.ifPresent(viewModel -> viewModel.setSplitScreenController(this)); } protected StageCoordinator createStageCoordinator() { return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue, mTaskOrganizer, mDisplayController, mDisplayImeController, - mDisplayInsetsController, mTransitions, mTransactionPool, - mIconProvider, mMainExecutor, mRecentTasksOptional); + mDisplayInsetsController, mTransitions, mTransactionPool, mIconProvider, + mMainExecutor, mRecentTasksOptional, mLaunchAdjacentController, + mWindowDecorViewModel); } @Override 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 fd871ed8c8ce..54a8b6863c1a 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 @@ -122,6 +122,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ScreenshotUtils; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; @@ -139,6 +140,7 @@ import com.android.wm.shell.transition.LegacyTransitions; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.util.SplitBounds; import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import java.io.PrintWriter; import java.util.ArrayList; @@ -194,6 +196,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, // if user is opening another task(s). private final ArrayList<Integer> mPausingTasks = new ArrayList<>(); private final Optional<RecentTasksController> mRecentTasks; + private final LaunchAdjacentController mLaunchAdjacentController; + private final Optional<WindowDecorViewModel> mWindowDecorViewModel; private final Rect mTempRect1 = new Rect(); private final Rect mTempRect2 = new Rect(); @@ -271,7 +275,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, DisplayInsetsController displayInsetsController, Transitions transitions, TransactionPool transactionPool, IconProvider iconProvider, ShellExecutor mainExecutor, - Optional<RecentTasksController> recentTasks) { + Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, + Optional<WindowDecorViewModel> windowDecorViewModel) { mContext = context; mDisplayId = displayId; mSyncQueue = syncQueue; @@ -279,6 +285,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mLogger = new SplitscreenEventLogger(); mMainExecutor = mainExecutor; mRecentTasks = recentTasks; + mLaunchAdjacentController = launchAdjacentController; + mWindowDecorViewModel = windowDecorViewModel; taskOrganizer.createRootTask(displayId, WINDOWING_MODE_FULLSCREEN, this /* listener */); @@ -289,7 +297,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mMainStageListener, mSyncQueue, mSurfaceSession, - iconProvider); + iconProvider, + mWindowDecorViewModel); mSideStage = new SideStage( mContext, mTaskOrganizer, @@ -297,7 +306,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSideStageListener, mSyncQueue, mSurfaceSession, - iconProvider); + iconProvider, + mWindowDecorViewModel); mDisplayController = displayController; mDisplayImeController = displayImeController; mDisplayInsetsController = displayInsetsController; @@ -324,7 +334,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, DisplayInsetsController displayInsetsController, SplitLayout splitLayout, Transitions transitions, TransactionPool transactionPool, ShellExecutor mainExecutor, - Optional<RecentTasksController> recentTasks) { + Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, + Optional<WindowDecorViewModel> windowDecorViewModel) { mContext = context; mDisplayId = displayId; mSyncQueue = syncQueue; @@ -341,6 +353,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mLogger = new SplitscreenEventLogger(); mMainExecutor = mainExecutor; mRecentTasks = recentTasks; + mLaunchAdjacentController = launchAdjacentController; + mWindowDecorViewModel = windowDecorViewModel; mDisplayController.addDisplayWindowListener(this); transitions.addHandler(this); mSplitUnsupportedToast = Toast.makeText(mContext, @@ -1709,7 +1723,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, if (mRootTaskInfo == null || mRootTaskInfo.taskId != taskInfo.taskId) { throw new IllegalArgumentException(this + "\n Unknown task info changed: " + taskInfo); } - + mWindowDecorViewModel.ifPresent(viewModel -> viewModel.onTaskInfoChanged(taskInfo)); mRootTaskInfo = taskInfo; if (mSplitLayout != null && mSplitLayout.updateConfiguration(mRootTaskInfo.configuration) @@ -1757,7 +1771,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, wct.reparent(mSideStage.mRootTaskInfo.token, mRootTaskInfo.token, true); // Make the stages adjacent to each other so they occlude what's behind them. wct.setAdjacentRoots(mMainStage.mRootTaskInfo.token, mSideStage.mRootTaskInfo.token); - wct.setLaunchAdjacentFlagRoot(mSideStage.mRootTaskInfo.token); setRootForceTranslucent(true, wct); mSplitLayout.getInvisibleBounds(mTempRect1); wct.setBounds(mSideStage.mRootTaskInfo.token, mTempRect1); @@ -1765,6 +1778,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSyncQueue.runInSync(t -> { t.setPosition(mSideStage.mRootLeash, mTempRect1.left, mTempRect1.top); }); + mLaunchAdjacentController.setLaunchAdjacentRoot(mSideStage.mRootTaskInfo.token); } /** Callback when split roots have child task appeared under it, this is a little different from @@ -1794,9 +1808,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, private void onRootTaskVanished() { final WindowContainerTransaction wct = new WindowContainerTransaction(); - if (mRootTaskInfo != null) { - wct.clearLaunchAdjacentFlagRoot(mRootTaskInfo.token); - } + mLaunchAdjacentController.clearLaunchAdjacentRoot(); applyExitSplitScreen(null /* childrenToTop */, wct, EXIT_REASON_ROOT_TASK_VANISHED); mDisplayInsetsController.removeInsetsChangedListener(mDisplayId, mSplitLayout); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java index 60628e62ec11..e3ed5dd73de8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java @@ -51,8 +51,10 @@ import com.android.wm.shell.common.SurfaceUtils; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.split.SplitDecorManager; import com.android.wm.shell.splitscreen.SplitScreen.StageType; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import java.io.PrintWriter; +import java.util.Optional; import java.util.function.Predicate; /** @@ -87,6 +89,7 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { private final SurfaceSession mSurfaceSession; private final SyncTransactionQueue mSyncQueue; private final IconProvider mIconProvider; + private final Optional<WindowDecorViewModel> mWindowDecorViewModel; protected ActivityManager.RunningTaskInfo mRootTaskInfo; protected SurfaceControl mRootLeash; @@ -98,12 +101,14 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { StageTaskListener(Context context, ShellTaskOrganizer taskOrganizer, int displayId, StageListenerCallbacks callbacks, SyncTransactionQueue syncQueue, - SurfaceSession surfaceSession, IconProvider iconProvider) { + SurfaceSession surfaceSession, IconProvider iconProvider, + Optional<WindowDecorViewModel> windowDecorViewModel) { mContext = context; mCallbacks = callbacks; mSyncQueue = syncQueue; mSurfaceSession = surfaceSession; mIconProvider = iconProvider; + mWindowDecorViewModel = windowDecorViewModel; taskOrganizer.createRootTask(displayId, WINDOWING_MODE_MULTI_WINDOW, this); } @@ -200,6 +205,7 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { @Override @CallSuper public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) { + mWindowDecorViewModel.ifPresent(viewModel -> viewModel.onTaskInfoChanged(taskInfo)); if (mRootTaskInfo.taskId == taskInfo.taskId) { // Inflates split decor view only when the root task is visible. if (!ENABLE_SHELL_TRANSITIONS && mRootTaskInfo.isVisible != taskInfo.isVisible) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java index 27d520d81c41..a2301b133426 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java @@ -27,6 +27,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; @@ -58,6 +59,7 @@ public class TvSplitScreenController extends SplitScreenController { private final TransactionPool mTransactionPool; private final IconProvider mIconProvider; private final Optional<RecentTasksController> mRecentTasksOptional; + private final LaunchAdjacentController mLaunchAdjacentController; private final Handler mMainHandler; private final SystemWindows mSystemWindows; @@ -77,13 +79,15 @@ public class TvSplitScreenController extends SplitScreenController { TransactionPool transactionPool, IconProvider iconProvider, Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, ShellExecutor mainExecutor, Handler mainHandler, SystemWindows systemWindows) { super(context, shellInit, shellCommandHandler, shellController, shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController, displayImeController, displayInsetsController, dragAndDropController, transitions, transactionPool, - iconProvider, recentTasks, mainExecutor); + iconProvider, recentTasks, launchAdjacentController, Optional.empty(), + mainExecutor); mTaskOrganizer = shellTaskOrganizer; mSyncQueue = syncQueue; @@ -96,6 +100,7 @@ public class TvSplitScreenController extends SplitScreenController { mTransactionPool = transactionPool; mIconProvider = iconProvider; mRecentTasksOptional = recentTasks; + mLaunchAdjacentController = launchAdjacentController; mMainHandler = mainHandler; mSystemWindows = systemWindows; @@ -111,7 +116,7 @@ public class TvSplitScreenController extends SplitScreenController { mTaskOrganizer, mDisplayController, mDisplayImeController, mDisplayInsetsController, mTransitions, mTransactionPool, mIconProvider, mMainExecutor, mMainHandler, - mRecentTasksOptional, mSystemWindows); + mRecentTasksOptional, mLaunchAdjacentController, mSystemWindows); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvStageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvStageCoordinator.java index 4d563fbb7f04..79476919221e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvStageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvStageCoordinator.java @@ -24,6 +24,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SystemWindows; @@ -51,10 +52,11 @@ public class TvStageCoordinator extends StageCoordinator IconProvider iconProvider, ShellExecutor mainExecutor, Handler mainHandler, Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, SystemWindows systemWindows) { super(context, displayId, syncQueue, taskOrganizer, displayController, displayImeController, displayInsetsController, transitions, transactionPool, iconProvider, - mainExecutor, recentTasks); + mainExecutor, recentTasks, launchAdjacentController, Optional.empty()); mTvSplitMenuController = new TvSplitMenuController(context, this, systemWindows, mainHandler); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java index b25437d95a99..4176fe800eb5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java @@ -42,6 +42,9 @@ import android.window.WindowContainerTransaction; import android.window.WindowContainerTransactionCallback; import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.desktopmode.DesktopModeController; +import com.android.wm.shell.desktopmode.DesktopModeStatus; +import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.common.split.SplitScreenUtils; import com.android.wm.shell.keyguard.KeyguardTransitionHandler; import com.android.wm.shell.pip.PipTransitionController; @@ -68,6 +71,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, private RecentsTransitionHandler mRecentsHandler; private StageCoordinator mSplitHandler; private final KeyguardTransitionHandler mKeyguardHandler; + private DesktopModeController mDesktopModeController; + private DesktopTasksController mDesktopTasksController; private static class MixedTransition { static final int TYPE_ENTER_PIP_FROM_SPLIT = 1; @@ -84,6 +89,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, /** Keyguard exit/occlude/unocclude transition. */ static final int TYPE_KEYGUARD = 5; + /** Recents Transition while in desktop mode. */ + static final int TYPE_RECENTS_DURING_DESKTOP = 6; + /** The default animation for this mixed transition. */ static final int ANIM_TYPE_DEFAULT = 0; @@ -135,7 +143,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, Optional<SplitScreenController> splitScreenControllerOptional, Optional<PipTouchHandler> pipTouchHandlerOptional, Optional<RecentsTransitionHandler> recentsHandlerOptional, - KeyguardTransitionHandler keyguardHandler) { + KeyguardTransitionHandler keyguardHandler, + Optional<DesktopModeController> desktopModeControllerOptional, + Optional<DesktopTasksController> desktopTasksControllerOptional) { mPlayer = player; mKeyguardHandler = keyguardHandler; if (Transitions.ENABLE_SHELL_TRANSITIONS && pipTouchHandlerOptional.isPresent() @@ -152,6 +162,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, if (mRecentsHandler != null) { mRecentsHandler.addMixer(this); } + mDesktopModeController = desktopModeControllerOptional.orElse(null); + mDesktopTasksController = desktopTasksControllerOptional.orElse(null); }, this); } } @@ -221,7 +233,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, @Override public Transitions.TransitionHandler handleRecentsRequest(WindowContainerTransaction outWCT) { - if (mRecentsHandler != null && mSplitHandler.isSplitScreenVisible()) { + if (mRecentsHandler != null && (mSplitHandler.isSplitScreenVisible() + || DesktopModeStatus.isActive(mPlayer.getContext()))) { return this; } return null; @@ -236,6 +249,13 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, MixedTransition.TYPE_RECENTS_DURING_SPLIT, transition); mixed.mLeftoversHandler = mRecentsHandler; mActiveTransitions.add(mixed); + } else if (DesktopModeStatus.isActive(mPlayer.getContext())) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a recents request while " + + "desktop mode is active, so treat it as Mixed."); + final MixedTransition mixed = new MixedTransition( + MixedTransition.TYPE_RECENTS_DURING_DESKTOP, transition); + mixed.mLeftoversHandler = mRecentsHandler; + mActiveTransitions.add(mixed); } else { throw new IllegalStateException("Accepted a recents transition but don't know how to" + " handle it"); @@ -309,6 +329,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { return animateKeyguard(mixed, info, startTransaction, finishTransaction, finishCallback); + } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { + return animateRecentsDuringDesktop(mixed, info, startTransaction, finishTransaction, + finishCallback); } else { mActiveTransitions.remove(mixed); throw new IllegalStateException("Starting mixed animation without a known mixed type? " @@ -592,6 +615,30 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, return true; } + private boolean animateRecentsDuringDesktop(@NonNull final MixedTransition mixed, + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + boolean consumed = mRecentsHandler.startAnimation( + mixed.mTransition, info, startTransaction, finishTransaction, finishCallback); + if (!consumed) { + return false; + } + //Sync desktop mode state (proto 1) + if (mDesktopModeController != null) { + mDesktopModeController.syncSurfaceState(info, finishTransaction); + return true; + } + //Sync desktop mode state (proto 2) + if (mDesktopTasksController != null) { + mDesktopTasksController.syncSurfaceState(info, finishTransaction); + return true; + } + + return false; + } + /** Use to when split use intent to enter, check if this enter transition should be mixed or * not.*/ public boolean shouldSplitEnterMixed(PendingIntent intent) { @@ -646,6 +693,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, finishCallback); } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { mKeyguardHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); + } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { + mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, + finishCallback); } else { throw new IllegalStateException("Playing a mixed transition with unknown type? " + mixed.mType); @@ -671,6 +721,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, mixed.mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { mKeyguardHandler.onTransitionConsumed(transition, aborted, finishT); + } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { + mixed.mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index cdc82eadcd90..e42c6623cea0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -161,6 +161,10 @@ public class Transitions implements RemoteCallable<Transitions>, public static final int TRANSIT_CANCEL_ENTERING_DESKTOP_MODE = WindowManager.TRANSIT_FIRST_CUSTOM + 13; + /** Transition type to animate the toggle resize between the max and default desktop sizes. */ + public static final int TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE = + WindowManager.TRANSIT_FIRST_CUSTOM + 14; + private final WindowOrganizer mOrganizer; private final Context mContext; private final ShellExecutor mMainExecutor; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/FullscreenUnfoldTaskAnimator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/FullscreenUnfoldTaskAnimator.java index f81fc6fbea49..6bba0d1386fb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/FullscreenUnfoldTaskAnimator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/FullscreenUnfoldTaskAnimator.java @@ -110,7 +110,7 @@ public class FullscreenUnfoldTaskAnimator implements UnfoldTaskAnimator, for (int i = state.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = state.sourceAt(i); if (source.getType() == WindowInsets.Type.navigationBars() - && source.insetsRoundedCornerFrame()) { + && source.hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)) { return source; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/SplitTaskUnfoldAnimator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/SplitTaskUnfoldAnimator.java index a4cf149cc3b5..21994a997be5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/SplitTaskUnfoldAnimator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/SplitTaskUnfoldAnimator.java @@ -50,11 +50,11 @@ import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.unfold.UnfoldAnimationController; import com.android.wm.shell.unfold.UnfoldBackgroundController; +import dagger.Lazy; + import java.util.Optional; import java.util.concurrent.Executor; -import dagger.Lazy; - /** * This helper class contains logic that calculates scaling and cropping parameters * for the folding/unfolding animation. As an input it receives TaskInfo objects and @@ -149,7 +149,7 @@ public class SplitTaskUnfoldAnimator implements UnfoldTaskAnimator, for (int i = state.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = state.sourceAt(i); if (source.getType() == WindowInsets.Type.navigationBars() - && source.insetsRoundedCornerFrame()) { + && source.hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)) { return source; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java index 39fb7936747e..92c2a7c03ee4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java @@ -33,11 +33,14 @@ import android.window.TransitionInfo; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; +import androidx.annotation.Nullable; + import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; +import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.transition.Transitions; /** @@ -89,6 +92,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { } @Override + public void setSplitScreenController(SplitScreenController splitScreenController) {} + + @Override public boolean onTaskOpening( RunningTaskInfo taskInfo, SurfaceControl taskSurface, @@ -254,7 +260,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { * @return {@code true} if a drag is happening; or {@code false} if it is not */ @Override - public boolean handleMotionEvent(MotionEvent e) { + public boolean handleMotionEvent(@Nullable View v, MotionEvent e) { final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId); if (taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { return false; @@ -268,7 +274,10 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { return false; } case MotionEvent.ACTION_MOVE: { - int dragPointerIdx = e.findPointerIndex(mDragPointerId); + if (e.findPointerIndex(mDragPointerId) == -1) { + mDragPointerId = e.getPointerId(0); + } + final int dragPointerIdx = e.findPointerIndex(mDragPointerId); mDragPositioningCallback.onDragPositioningMove( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); mIsDragging = true; @@ -276,7 +285,10 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { - int dragPointerIdx = e.findPointerIndex(mDragPointerId); + if (e.findPointerIndex(mDragPointerId) == -1) { + mDragPointerId = e.getPointerId(0); + } + final int dragPointerIdx = e.findPointerIndex(mDragPointerId); mDragPositioningCallback.onDragPositioningEnd( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); final boolean wasDragging = mIsDragging; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java index 116af7094e13..cea0fcb2a9c3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java @@ -113,7 +113,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL mRelayoutParams.reset(); mRelayoutParams.mRunningTaskInfo = taskInfo; mRelayoutParams.mLayoutResId = R.layout.caption_window_decor; - mRelayoutParams.mCaptionHeightId = R.dimen.freeform_decor_caption_height; + mRelayoutParams.mCaptionHeightId = getCaptionHeightId(); mRelayoutParams.mShadowRadiusId = shadowRadiusID; mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; @@ -221,4 +221,9 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL closeDragResizeListener(); super.close(); } + + @Override + int getCaptionHeightId() { + return R.dimen.freeform_decor_caption_height; + } } 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 9fd57d7e1201..c93a11d85f7e 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 @@ -19,6 +19,7 @@ package com.android.wm.shell.windowdecor; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; @@ -42,6 +43,7 @@ import android.os.IBinder; import android.os.Looper; import android.util.SparseArray; import android.view.Choreographer; +import android.view.GestureDetector; import android.view.InputChannel; import android.view.InputEvent; import android.view.InputEventReceiver; @@ -53,6 +55,7 @@ import android.view.View; import android.view.WindowManager; import android.window.TransitionInfo; import android.window.WindowContainerToken; +import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -106,7 +109,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private final Supplier<SurfaceControl.Transaction> mTransactionFactory; private final Transitions mTransitions; - private Optional<SplitScreenController> mSplitScreenController; + private SplitScreenController mSplitScreenController; private ValueAnimator mDragToDesktopValueAnimator; private final Rect mDragToDesktopAnimationStartBounds = new Rect(); @@ -121,8 +124,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { SyncTransactionQueue syncQueue, Transitions transitions, Optional<DesktopModeController> desktopModeController, - Optional<DesktopTasksController> desktopTasksController, - Optional<SplitScreenController> splitScreenController) { + Optional<DesktopTasksController> desktopTasksController) { this( context, mainHandler, @@ -133,7 +135,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { transitions, desktopModeController, desktopTasksController, - splitScreenController, new DesktopModeWindowDecoration.Factory(), new InputMonitorFactory(), SurfaceControl.Transaction::new); @@ -150,7 +151,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { Transitions transitions, Optional<DesktopModeController> desktopModeController, Optional<DesktopTasksController> desktopTasksController, - Optional<SplitScreenController> splitScreenController, DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory, InputMonitorFactory inputMonitorFactory, Supplier<SurfaceControl.Transaction> transactionFactory) { @@ -160,7 +160,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mActivityTaskManager = mContext.getSystemService(ActivityTaskManager.class); mTaskOrganizer = taskOrganizer; mDisplayController = displayController; - mSplitScreenController = splitScreenController; mSyncQueue = syncQueue; mTransitions = transitions; mDesktopModeController = desktopModeController; @@ -177,6 +176,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } @Override + public void setSplitScreenController(SplitScreenController splitScreenController) { + mSplitScreenController = splitScreenController; + } + + @Override public boolean onTaskOpening( ActivityManager.RunningTaskInfo taskInfo, SurfaceControl taskSurface, @@ -193,7 +197,10 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @NonNull TransitionInfo info, @NonNull TransitionInfo.Change change) { if (change.getMode() == WindowManager.TRANSIT_CHANGE - && (info.getType() == Transitions.TRANSIT_ENTER_DESKTOP_MODE)) { + && (info.getType() == Transitions.TRANSIT_ENTER_DESKTOP_MODE + || info.getType() == Transitions.TRANSIT_CANCEL_ENTERING_DESKTOP_MODE + || info.getType() == Transitions.TRANSIT_EXIT_DESKTOP_MODE + || info.getType() == Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE)) { mWindowDecorByTaskId.get(change.getTaskInfo().taskId) .addTransitionPausingRelayout(transition); } @@ -236,7 +243,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT) { final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId); - if (!shouldShowWindowDecor(taskInfo)) { if (decoration != null) { destroyWindowDecoration(taskInfo); @@ -275,15 +281,17 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } } - private class DesktopModeTouchEventListener implements - View.OnClickListener, View.OnTouchListener, DragDetector.MotionEventHandler { + private class DesktopModeTouchEventListener extends GestureDetector.SimpleOnGestureListener + implements View.OnClickListener, View.OnTouchListener, DragDetector.MotionEventHandler { private final int mTaskId; private final WindowContainerToken mTaskToken; private final DragPositioningCallback mDragPositioningCallback; private final DragDetector mDragDetector; + private final GestureDetector mGestureDetector; private boolean mIsDragging; + private boolean mShouldClick; private int mDragPointerId = -1; private DesktopModeTouchEventListener( @@ -293,6 +301,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mTaskToken = taskInfo.token; mDragPositioningCallback = dragPositioningCallback; mDragDetector = new DragDetector(this); + mGestureDetector = new GestureDetector(mContext, this); } @Override @@ -301,14 +310,14 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { final int id = v.getId(); if (id == R.id.close_window || id == R.id.close_button) { mTaskOperations.closeTask(mTaskToken); - if (mSplitScreenController.isPresent() - && mSplitScreenController.get().isSplitScreenVisible()) { - int remainingTaskPosition = mTaskId == mSplitScreenController.get() + if (mSplitScreenController != null + && mSplitScreenController.isSplitScreenVisible()) { + int remainingTaskPosition = mTaskId == mSplitScreenController .getTaskInfo(SPLIT_POSITION_TOP_OR_LEFT).taskId ? SPLIT_POSITION_BOTTOM_OR_RIGHT : SPLIT_POSITION_TOP_OR_LEFT; - ActivityManager.RunningTaskInfo remainingTask = mSplitScreenController.get() + ActivityManager.RunningTaskInfo remainingTask = mSplitScreenController .getTaskInfo(remainingTaskPosition); - mSplitScreenController.get().moveTaskToFullscreen(remainingTask.taskId); + mSplitScreenController.moveTaskToFullscreen(remainingTask.taskId); } } else if (id == R.id.back_button) { mTaskOperations.injectBackKey(); @@ -321,7 +330,13 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } } else if (id == R.id.desktop_button) { mDesktopModeController.ifPresent(c -> c.setDesktopModeActive(true)); - mDesktopTasksController.ifPresent(c -> c.moveToDesktop(mTaskId)); + if (mDesktopTasksController.isPresent()) { + final WindowContainerTransaction wct = new WindowContainerTransaction(); + // App sometimes draws before the insets from WindowDecoration#relayout have + // been added, so they must be added here + mWindowDecorByTaskId.get(mTaskId).addCaptionInset(wct); + mDesktopTasksController.get().moveToDesktop(mTaskId, wct); + } decoration.closeHandleMenu(); } else if (id == R.id.fullscreen_button) { mDesktopModeController.ifPresent(c -> c.setDesktopModeActive(false)); @@ -347,7 +362,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return false; } moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId)); - return mDragDetector.onMotionEvent(e); + return mDragDetector.onMotionEvent(v, e); } private void moveTaskToFront(RunningTaskInfo taskInfo) { @@ -362,7 +377,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { * @return {@code true} if the motion event is handled. */ @Override - public boolean handleMotionEvent(MotionEvent e) { + public boolean handleMotionEvent(@Nullable View v, MotionEvent e) { final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId); if (DesktopModeStatus.isProto2Enabled() && taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { @@ -373,6 +388,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { == WINDOWING_MODE_FULLSCREEN) { return false; } + if (mGestureDetector.onTouchEvent(e)) { + return true; + } switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: { mDragPointerId = e.getPointerId(0); @@ -380,21 +398,38 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 0 /* ctrlType */, e.getRawX(0), e.getRawY(0)); mIsDragging = false; - return false; + mShouldClick = true; + return true; } case MotionEvent.ACTION_MOVE: { final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); + if (e.findPointerIndex(mDragPointerId) == -1) { + mDragPointerId = e.getPointerId(0); + } final int dragPointerIdx = e.findPointerIndex(mDragPointerId); mDesktopTasksController.ifPresent(c -> c.onDragPositioningMove(taskInfo, decoration.mTaskSurface, e.getRawY(dragPointerIdx))); mDragPositioningCallback.onDragPositioningMove( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); mIsDragging = true; + mShouldClick = false; return true; } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { + final boolean wasDragging = mIsDragging; + if (!wasDragging) { + if (mShouldClick && v != null) { + v.performClick(); + mShouldClick = false; + return true; + } + return false; + } + if (e.findPointerIndex(mDragPointerId) == -1) { + mDragPointerId = e.getPointerId(0); + } final int dragPointerIdx = e.findPointerIndex(mDragPointerId); // Position of the task is calculated by subtracting the raw location of the // motion event (the location of the motion relative to the display) by the @@ -405,14 +440,22 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mDragPositioningCallback.onDragPositioningEnd( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); mDesktopTasksController.ifPresent(c -> c.onDragPositioningEnd(taskInfo, - position)); - final boolean wasDragging = mIsDragging; + position, e.getRawY(), mWindowDecorByTaskId.get(mTaskId))); mIsDragging = false; - return wasDragging; + return true; } } return true; } + + @Override + public boolean onDoubleTap(@NonNull MotionEvent e) { + final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId); + mDesktopTasksController.ifPresent(c -> { + c.toggleDesktopTaskSize(taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId)); + }); + return true; + } } // InputEventReceiver to listen for touch input outside of caption bounds @@ -540,9 +583,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { relevantDecor.mTaskInfo.configuration.windowConfiguration.getBounds()); boolean dragFromStatusBarAllowed = false; if (DesktopModeStatus.isProto2Enabled()) { - // In proto2 any full screen task can be dragged to freeform - dragFromStatusBarAllowed = relevantDecor.mTaskInfo.getWindowingMode() - == WINDOWING_MODE_FULLSCREEN; + // In proto2 any full screen or multi-window task can be dragged to + // freeform. + final int windowingMode = relevantDecor.mTaskInfo.getWindowingMode(); + dragFromStatusBarAllowed = windowingMode == WINDOWING_MODE_FULLSCREEN + || windowingMode == WINDOWING_MODE_MULTI_WINDOW; } if (dragFromStatusBarAllowed && relevantDecor.checkTouchEventInHandle(ev)) { @@ -571,9 +616,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return; } else if (mDragToDesktopAnimationStarted) { Point position = new Point((int) ev.getX(), (int) ev.getY()); + relevantDecor.incrementRelayoutBlock(); mDesktopTasksController.ifPresent( - c -> c.cancelMoveToFreeform(relevantDecor.mTaskInfo, - position)); + c -> c.cancelMoveToFreeform(relevantDecor.mTaskInfo, position)); mDragToDesktopAnimationStarted = false; return; } @@ -699,8 +744,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @Nullable private DesktopModeWindowDecoration getRelevantWindowDecor(MotionEvent ev) { - if (mSplitScreenController.isPresent() - && mSplitScreenController.get().isSplitScreenVisible()) { + if (mSplitScreenController != null && mSplitScreenController.isSplitScreenVisible()) { // We can't look at focused task here as only one task will have focus. return getSplitScreenDecor(ev); } else { @@ -711,9 +755,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @Nullable private DesktopModeWindowDecoration getSplitScreenDecor(MotionEvent ev) { ActivityManager.RunningTaskInfo topOrLeftTask = - mSplitScreenController.get().getTaskInfo(SPLIT_POSITION_TOP_OR_LEFT); + mSplitScreenController.getTaskInfo(SPLIT_POSITION_TOP_OR_LEFT); ActivityManager.RunningTaskInfo bottomOrRightTask = - mSplitScreenController.get().getTaskInfo(SPLIT_POSITION_BOTTOM_OR_RIGHT); + mSplitScreenController.getTaskInfo(SPLIT_POSITION_BOTTOM_OR_RIGHT); if (topOrLeftTask != null && topOrLeftTask.getConfiguration() .windowConfiguration.getBounds().contains((int) ev.getX(), (int) ev.getY())) { return mWindowDecorByTaskId.get(topOrLeftTask.taskId); @@ -765,8 +809,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private boolean shouldShowWindowDecor(RunningTaskInfo taskInfo) { if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) return true; - if (mSplitScreenController.isPresent() - && mSplitScreenController.get().isTaskRootOrStageRoot(taskInfo.taskId)) { + if (mSplitScreenController != null + && mSplitScreenController.isTaskRootOrStageRoot(taskInfo.taskId)) { return false; } return DesktopModeStatus.isProto2Enabled() @@ -796,6 +840,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mMainChoreographer, mSyncQueue); mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration); + windowDecoration.createResizeVeil(); final DragPositioningCallback dragPositioningCallback = createDragPositioningCallback( windowDecoration, taskInfo); @@ -814,14 +859,18 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @NonNull DesktopModeWindowDecoration windowDecoration, @NonNull RunningTaskInfo taskInfo) { final int screenWidth = mDisplayController.getDisplayLayout(taskInfo.displayId).width(); - final Rect disallowedAreaForEndBounds = new Rect(0, 0, screenWidth, - getStatusBarHeight(taskInfo.displayId)); + final Rect disallowedAreaForEndBounds; + if (DesktopModeStatus.isProto2Enabled()) { + disallowedAreaForEndBounds = new Rect(0, 0, screenWidth, + getStatusBarHeight(taskInfo.displayId)); + } else { + disallowedAreaForEndBounds = null; + } if (!DesktopModeStatus.isVeiledResizeEnabled()) { return new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration, mDisplayController, disallowedAreaForEndBounds, mDragStartListener, mTransactionFactory); } else { - windowDecoration.createResizeVeil(); return new VeiledResizeTaskPositioner(mTaskOrganizer, windowDecoration, mDisplayController, disallowedAreaForEndBounds, mDragStartListener, mTransitions); 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 ce11b2604559..3ccb938867af 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 @@ -178,7 +178,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mRelayoutParams.reset(); mRelayoutParams.mRunningTaskInfo = taskInfo; mRelayoutParams.mLayoutResId = windowDecorLayoutId; - mRelayoutParams.mCaptionHeightId = R.dimen.freeform_decor_caption_height; + mRelayoutParams.mCaptionHeightId = getCaptionHeightId(); mRelayoutParams.mShadowRadiusId = shadowRadiusID; mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; @@ -294,23 +294,37 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } /** - * Fade in the resize veil + * Show the resize veil. */ - void showResizeVeil(Rect taskBounds) { + public void showResizeVeil(Rect taskBounds) { mResizeVeil.showVeil(mTaskSurface, taskBounds); } /** + * Show the resize veil. + */ + public void showResizeVeil(SurfaceControl.Transaction tx, Rect taskBounds) { + mResizeVeil.showVeil(tx, mTaskSurface, taskBounds, false /* fadeIn */); + } + + /** * Set new bounds for the resize veil */ - void updateResizeVeil(Rect newBounds) { + public void updateResizeVeil(Rect newBounds) { mResizeVeil.updateResizeVeil(newBounds); } /** + * Set new bounds for the resize veil + */ + public void updateResizeVeil(SurfaceControl.Transaction tx, Rect newBounds) { + mResizeVeil.updateResizeVeil(tx, newBounds); + } + + /** * Fade the resize veil out. */ - void hideResizeVeil() { + public void hideResizeVeil() { mResizeVeil.hideVeil(); } @@ -479,6 +493,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } } + @Override + int getCaptionHeightId() { + return R.dimen.freeform_decor_caption_height; + } + /** * Add transition to mTransitionsPausingRelayout */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragDetector.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragDetector.java index 65b5a7a17afe..da268988bac7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragDetector.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragDetector.java @@ -24,6 +24,9 @@ import static android.view.MotionEvent.ACTION_UP; import android.graphics.PointF; import android.view.MotionEvent; +import android.view.View; + +import androidx.annotation.Nullable; /** * A detector for touch inputs that differentiates between drag and click inputs. It receives a flow @@ -54,14 +57,24 @@ class DragDetector { * * @return the result returned by {@link #mEventHandler}, or the result when * {@link #mEventHandler} handles the previous down event if the event shouldn't be passed - */ + */ boolean onMotionEvent(MotionEvent ev) { + return onMotionEvent(null /* view */, ev); + } + + /** + * The receiver of the {@link MotionEvent} flow. + * + * @return the result returned by {@link #mEventHandler}, or the result when + * {@link #mEventHandler} handles the previous down event if the event shouldn't be passed + */ + boolean onMotionEvent(View v, MotionEvent ev) { final boolean isTouchScreen = (ev.getSource() & SOURCE_TOUCHSCREEN) == SOURCE_TOUCHSCREEN; if (!isTouchScreen) { // Only touches generate noisy moves, so mouse/trackpad events don't need to filtered // to take the slop threshold into consideration. - return mEventHandler.handleMotionEvent(ev); + return mEventHandler.handleMotionEvent(v, ev); } switch (ev.getActionMasked()) { case ACTION_DOWN: { @@ -69,12 +82,15 @@ class DragDetector { float rawX = ev.getRawX(0); float rawY = ev.getRawY(0); mInputDownPoint.set(rawX, rawY); - mResultOfDownAction = mEventHandler.handleMotionEvent(ev); + mResultOfDownAction = mEventHandler.handleMotionEvent(v, ev); return mResultOfDownAction; } case ACTION_MOVE: { + if (ev.findPointerIndex(mDragPointerId) == -1) { + mDragPointerId = ev.getPointerId(0); + } + final int dragPointerIndex = ev.findPointerIndex(mDragPointerId); if (!mIsDragEvent) { - int dragPointerIndex = ev.findPointerIndex(mDragPointerId); float dx = ev.getRawX(dragPointerIndex) - mInputDownPoint.x; float dy = ev.getRawY(dragPointerIndex) - mInputDownPoint.y; // Touches generate noisy moves, so only once the move is past the touch @@ -84,7 +100,7 @@ class DragDetector { // The event handler should only be notified about 'move' events if a drag has been // detected. if (mIsDragEvent) { - return mEventHandler.handleMotionEvent(ev); + return mEventHandler.handleMotionEvent(v, ev); } else { return mResultOfDownAction; } @@ -92,10 +108,10 @@ class DragDetector { case ACTION_UP: case ACTION_CANCEL: { resetState(); - return mEventHandler.handleMotionEvent(ev); + return mEventHandler.handleMotionEvent(v, ev); } default: - return mEventHandler.handleMotionEvent(ev); + return mEventHandler.handleMotionEvent(v, ev); } } @@ -111,6 +127,6 @@ class DragDetector { } interface MotionEventHandler { - boolean handleMotionEvent(MotionEvent ev); + boolean handleMotionEvent(@Nullable View v, MotionEvent ev); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java index 287d86187288..05a75887dfa0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java @@ -42,6 +42,7 @@ import android.view.InputEventReceiver; import android.view.MotionEvent; import android.view.PointerIcon; import android.view.SurfaceControl; +import android.view.View; import android.view.ViewConfiguration; import android.view.WindowManagerGlobal; @@ -303,7 +304,7 @@ class DragResizeInputListener implements AutoCloseable { } @Override - public boolean handleMotionEvent(MotionEvent e) { + public boolean handleMotionEvent(View v, MotionEvent e) { boolean result = false; // Check if this is a touch event vs mouse event. // Touch events are tracked in four corners. Other events are tracked in resize edges. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java index 82771095cd82..bfce72bcadf0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java @@ -102,11 +102,17 @@ public class ResizeVeil { } /** - * Animate veil's alpha to 1, fading it in. + * Shows the veil surface/view. + * + * @param t the transaction to apply in sync with the veil draw + * @param parentSurface the surface that the veil should be a child of + * @param taskBounds the bounds of the task that owns the veil + * @param fadeIn if true, the veil will fade-in with an animation, if false, it will be shown + * immediately */ - public void showVeil(SurfaceControl parentSurface, Rect taskBounds) { + public void showVeil(SurfaceControl.Transaction t, SurfaceControl parentSurface, + Rect taskBounds, boolean fadeIn) { // Parent surface can change, ensure it is up to date. - SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); if (!parentSurface.equals(mParentSurface)) { t.reparent(mVeilSurface, parentSurface); mParentSurface = parentSurface; @@ -115,22 +121,36 @@ public class ResizeVeil { int backgroundColorId = getBackgroundColorId(); mViewHost.getView().setBackgroundColor(mContext.getColor(backgroundColorId)); - final ValueAnimator animator = new ValueAnimator(); - animator.setFloatValues(0f, 1f); - animator.setDuration(RESIZE_ALPHA_DURATION); - animator.addUpdateListener(animation -> { - t.setAlpha(mVeilSurface, animator.getAnimatedFraction()); - t.apply(); - }); - relayout(taskBounds, t); - t.show(mVeilSurface) - .addTransactionCommittedListener(mContext.getMainExecutor(), () -> animator.start()) - .setAlpha(mVeilSurface, 0); + if (fadeIn) { + final ValueAnimator animator = new ValueAnimator(); + animator.setFloatValues(0f, 1f); + animator.setDuration(RESIZE_ALPHA_DURATION); + animator.addUpdateListener(animation -> { + t.setAlpha(mVeilSurface, animator.getAnimatedFraction()); + t.apply(); + }); + + t.show(mVeilSurface) + .addTransactionCommittedListener( + mContext.getMainExecutor(), () -> animator.start()) + .setAlpha(mVeilSurface, 0); + } else { + // Show the veil immediately at full opacity. + t.show(mVeilSurface).setAlpha(mVeilSurface, 1); + } mViewHost.getView().getViewRootImpl().applyTransactionOnDraw(t); } /** + * Animate veil's alpha to 1, fading it in. + */ + public void showVeil(SurfaceControl parentSurface, Rect taskBounds) { + SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); + showVeil(t, parentSurface, taskBounds, true /* fadeIn */); + } + + /** * Update veil bounds to match bounds changes. * @param newBounds bounds to update veil to. */ @@ -147,6 +167,16 @@ public class ResizeVeil { */ public void updateResizeVeil(Rect newBounds) { SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); + updateResizeVeil(t, newBounds); + } + + /** + * Calls relayout to update task and veil bounds. + * + * @param t a transaction to be applied in sync with the veil draw. + * @param newBounds bounds to update veil to. + */ + public void updateResizeVeil(SurfaceControl.Transaction t, Rect newBounds) { relayout(newBounds, t); mViewHost.getView().getViewRootImpl().applyTransactionOnDraw(t); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java index 58c78e6a5b9f..39b90218dce1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java @@ -55,7 +55,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, private final Rect mRepositionTaskBounds = new Rect(); // If a task move (not resize) finishes in this region, the positioner will not attempt to // finalize the bounds there using WCT#setBounds - private final Rect mDisallowedAreaForEndBounds = new Rect(); + private final Rect mDisallowedAreaForEndBounds; private final Supplier<SurfaceControl.Transaction> mTransactionSupplier; private int mCtrlType; @@ -77,7 +77,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, mDesktopWindowDecoration = windowDecoration; mDisplayController = displayController; mDragStartListener = dragStartListener; - mDisallowedAreaForEndBounds.set(disallowedAreaForEndBounds); + mDisallowedAreaForEndBounds = new Rect(disallowedAreaForEndBounds); mTransactionSupplier = supplier; mTransitions = transitions; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java index 9f03d9aec166..ae1a3d914be3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java @@ -22,6 +22,7 @@ import android.view.SurfaceControl; import android.window.TransitionInfo; import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; +import com.android.wm.shell.splitscreen.SplitScreenController; /** * The interface used by some {@link com.android.wm.shell.ShellTaskOrganizer.TaskListener} to help @@ -39,6 +40,11 @@ public interface WindowDecorViewModel { void setFreeformTaskTransitionStarter(FreeformTaskTransitionStarter transitionStarter); /** + * Sets the {@link SplitScreenController} if available. + */ + void setSplitScreenController(SplitScreenController splitScreenController); + + /** * Creates a window decoration for the given task. Can be {@code null} for Fullscreen tasks but * not Freeform ones. * diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index ac5ff2075901..4407f2ec3167 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -248,6 +248,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCaptionInsetsRect.bottom = mCaptionInsetsRect.top + captionHeight + params.mCaptionY; wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect); + wct.addInsetsSource(mTaskInfo.token, + mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures(), + mCaptionInsetsRect); } else { startT.hide(mCaptionContainerSurface); } @@ -264,6 +267,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> .setColor(mTaskSurface, mTmpColor) .show(mTaskSurface); finishT.setPosition(mTaskSurface, taskPosition.x, taskPosition.y) + .setShadowRadius(mTaskSurface, shadowRadius) .setWindowCrop(mTaskSurface, outResult.mWidth, outResult.mHeight); if (mTaskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) { startT.setCornerRadius(mTaskSurface, params.mCornerRadius); @@ -301,6 +305,10 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } } + int getCaptionHeightId() { + return Resources.ID_NULL; + } + /** * Obtains the {@link Display} instance for the display ID in {@link #mTaskInfo} if it exists or * registers {@link #mOnDisplaysChangedListener} if it doesn't. @@ -345,6 +353,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> final WindowContainerTransaction wct = mWindowContainerTransactionSupplier.get(); wct.removeInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar()); + wct.removeInsetsSource(mTaskInfo.token, + mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures()); mTaskOrganizer.applyTransaction(wct); } @@ -413,6 +423,21 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mSurfaceControlTransactionSupplier); } + /** + * Adds caption inset source to a WCT + */ + public void addCaptionInset(WindowContainerTransaction wct) { + final int captionHeightId = getCaptionHeightId(); + if (!ViewRootImpl.CAPTION_ON_SHELL || captionHeightId == Resources.ID_NULL) { + return; + } + + final int captionHeight = loadDimensionPixelSize(mContext.getResources(), captionHeightId); + final Rect captionInsets = new Rect(0, 0, 0, captionHeight); + wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar(), + captionInsets); + } + static class RelayoutParams { RunningTaskInfo mRunningTaskInfo; int mLayoutResId; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt index 514ea52cb8ae..d293cf73a0f7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt @@ -1,28 +1,35 @@ package com.android.wm.shell.windowdecor.viewholder import android.app.ActivityManager.RunningTaskInfo +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.content.Context import android.graphics.Color import android.view.View +import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS /** * Encapsulates the root [View] of a window decoration and its children to facilitate looking up * children (via findViewById) and updating to the latest data from [RunningTaskInfo]. */ internal abstract class DesktopModeWindowDecorationViewHolder(rootView: View) { - val context: Context = rootView.context + val context: Context = rootView.context - /** - * A signal to the view holder that new data is available and that the views should be updated - * to reflect it. - */ - abstract fun bindData(taskInfo: RunningTaskInfo) + /** + * A signal to the view holder that new data is available and that the views should be updated to + * reflect it. + */ + abstract fun bindData(taskInfo: RunningTaskInfo) - /** - * Whether the caption items should use the 'light' color variant so that there's good contrast - * with the caption background color. - */ - protected fun shouldUseLightCaptionColors(taskInfo: RunningTaskInfo): Boolean { - return Color.valueOf(taskInfo.taskDescription.statusBarColor).luminance() < 0.5 + /** + * Whether the caption items should use the 'light' color variant so that there's good contrast + * with the caption background color. + */ + protected fun shouldUseLightCaptionColors(taskInfo: RunningTaskInfo): Boolean { + return if (Color.alpha(taskInfo.taskDescription.statusBarColor) != 0 && + taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) { + Color.valueOf(taskInfo.taskDescription.statusBarColor).luminance() < 0.5 + } else { + taskInfo.taskDescription.statusBarAppearance and APPEARANCE_LIGHT_STATUS_BARS == 0 } + } } diff --git a/libs/WindowManager/Shell/tests/flicker/Android.bp b/libs/WindowManager/Shell/tests/flicker/Android.bp index b6696c70dbb1..e382a0f0aeda 100644 --- a/libs/WindowManager/Shell/tests/flicker/Android.bp +++ b/libs/WindowManager/Shell/tests/flicker/Android.bp @@ -23,14 +23,33 @@ package { default_applicable_licenses: ["frameworks_base_license"], } -android_test { - name: "WMShellFlickerTests", +filegroup { + name: "WMShellFlickerTestsBase-src", + srcs: ["src/com/android/wm/shell/flicker/*.kt"], +} + +filegroup { + name: "WMShellFlickerTestsBubbles-src", + srcs: ["src/**/bubble/*.kt"], +} + +filegroup { + name: "WMShellFlickerTestsPip-src", + srcs: ["src/**/pip/*.kt"], +} + +filegroup { + name: "WMShellFlickerTestsSplitScreen-src", srcs: [ - "src/**/*.java", - "src/**/*.kt", + "src/**/splitscreen/*.kt", + "src/**/splitscreen/benchmark/*.kt", ], - manifest: "AndroidManifest.xml", - test_config: "AndroidTest.xml", +} + +java_defaults { + name: "WMShellFlickerTestsDefault", + manifest: "manifests/AndroidManifest.xml", + test_config_template: "AndroidTestTemplate.xml", platform_apis: true, certificate: "platform", optimize: { @@ -40,16 +59,70 @@ android_test { libs: ["android.test.runner"], static_libs: [ "androidx.test.ext.junit", + "flickertestapplib", "flickerlib", - "flickerlib-apphelpers", "flickerlib-helpers", - "truth-prebuilt", - "app-helpers-core", + "platform-test-annotations", + "wm-flicker-common-app-helpers", + "wm-flicker-common-assertions", "launcher-helper-lib", "launcher-aosp-tapl", - "wm-flicker-common-assertions", - "wm-flicker-common-app-helpers", - "platform-test-annotations", - "flickertestapplib", + ], + data: [ + ":FlickerTestApp", + "trace_config/*", + ], +} + +android_test { + name: "WMShellFlickerTestsOther", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestOther.xml"], + package_name: "com.android.wm.shell.flicker", + instrumentation_target_package: "com.android.wm.shell.flicker", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + exclude_srcs: [ + ":WMShellFlickerTestsBubbles-src", + ":WMShellFlickerTestsPip-src", + ":WMShellFlickerTestsSplitScreen-src", + ], +} + +android_test { + name: "WMShellFlickerTestsBubbles", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestBubbles.xml"], + package_name: "com.android.wm.shell.flicker.bubbles", + instrumentation_target_package: "com.android.wm.shell.flicker.bubbles", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsBubbles-src", + ], +} + +android_test { + name: "WMShellFlickerTestsPip", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestPip.xml"], + package_name: "com.android.wm.shell.flicker.pip", + instrumentation_target_package: "com.android.wm.shell.flicker.pip", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsPip-src", + ], +} + +android_test { + name: "WMShellFlickerTestsSplitScreen", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"], + package_name: "com.android.wm.shell.flicker.splitscreen", + instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsSplitScreen-src", ], } diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml deleted file mode 100644 index b5937ae80f0a..000000000000 --- a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright 2020 Google Inc. All Rights Reserved. - --> -<configuration description="Runs WindowManager Shell Flicker Tests"> - <option name="test-tag" value="FlickerTests" /> - <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> - <!-- keeps the screen on during tests --> - <option name="screen-always-on" value="on" /> - <!-- prevents the phone from restarting --> - <option name="force-skip-system-props" value="true" /> - <!-- set WM tracing verbose level to all --> - <option name="run-command" value="cmd window tracing level all" /> - <!-- set WM tracing to frame (avoid incomplete states) --> - <option name="run-command" value="cmd window tracing frame" /> - <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests --> - <option name="run-command" value="pm disable com.google.android.internal.betterbug" /> - <!-- ensure lock screen mode is swipe --> - <option name="run-command" value="locksettings set-disabled false" /> - <!-- restart launcher to activate TAPL --> - <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" /> - <!-- Ensure output directory is empty at the start --> - <option name="run-command" value="rm -rf /sdcard/flicker" /> - <!-- Increase trace size: 20mb for WM and 80mb for SF --> - <option name="run-command" value="cmd window tracing size 20480" /> - <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920" /> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1" /> - <option name="run-command" value="settings put system show_touches 1" /> - <option name="run-command" value="settings put system pointer_location 1" /> - <option name="teardown-command" value="settings delete secure show_ime_with_hard_keyboard" /> - <option name="teardown-command" value="settings delete system show_touches" /> - <option name="teardown-command" value="settings delete system pointer_location" /> - <option name="teardown-command" value="cmd overlay enable com.android.internal.systemui.navbar.gestural" /> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> - <option name="cleanup-apks" value="true"/> - <option name="test-file-name" value="WMShellFlickerTests.apk"/> - <option name="test-file-name" value="FlickerTestApp.apk" /> - </target_preparer> - <test class="com.android.tradefed.testtype.AndroidJUnitTest"> - <option name="package" value="com.android.wm.shell.flicker"/> - <option name="shell-timeout" value="6600s" /> - <option name="test-timeout" value="6000s" /> - <option name="hidden-api-checks" value="false" /> - </test> - <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> - <option name="directory-keys" value="/sdcard/flicker" /> - <option name="collect-on-run-ended-only" value="true" /> - <option name="clean-up" value="true" /> - </metrics_collector> -</configuration> diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTestTemplate.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTestTemplate.xml new file mode 100644 index 000000000000..991d7b5480c4 --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/AndroidTestTemplate.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<configuration description="Runs WindowManager Shell Flicker Tests {MODULE}"> + <option name="test-tag" value="FlickerTests"/> + <!-- Needed for storing the perfetto trace files in the sdcard/test_results--> + <option name="isolated-storage" value="false"/> + + <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> + <!-- keeps the screen on during tests --> + <option name="screen-always-on" value="on"/> + <!-- prevents the phone from restarting --> + <option name="force-skip-system-props" value="true"/> + <!-- set WM tracing verbose level to all --> + <option name="run-command" value="cmd window tracing level all"/> + <!-- set WM tracing to frame (avoid incomplete states) --> + <option name="run-command" value="cmd window tracing frame"/> + <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests --> + <option name="run-command" value="pm disable com.google.android.internal.betterbug"/> + <!-- ensure lock screen mode is swipe --> + <option name="run-command" value="locksettings set-disabled false"/> + <!-- restart launcher to activate TAPL --> + <option name="run-command" + value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher"/> + <!-- Increase trace size: 20mb for WM and 80mb for SF --> + <option name="run-command" value="cmd window tracing size 20480"/> + <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920"/> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="test-user-token" value="%TEST_USER%"/> + <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/> + <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/> + <option name="run-command" value="settings put system show_touches 1"/> + <option name="run-command" value="settings put system pointer_location 1"/> + <option name="teardown-command" + value="settings delete secure show_ime_with_hard_keyboard"/> + <option name="teardown-command" value="settings delete system show_touches"/> + <option name="teardown-command" value="settings delete system pointer_location"/> + <option name="teardown-command" + value="cmd overlay enable com.android.internal.systemui.navbar.gestural"/> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true"/> + <option name="test-file-name" value="{MODULE}.apk"/> + <option name="test-file-name" value="FlickerTestApp.apk"/> + </target_preparer> + <!-- Needed for pushing the trace config file --> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="push-file" + key="trace_config.textproto" + value="/data/misc/perfetto-traces/trace_config.textproto" + /> + <!--Install the content provider automatically when we push some file in sdcard folder.--> + <!--Needed to avoid the installation during the test suite.--> + <option name="push-file" key="trace_config.textproto" value="/sdcard/sample.textproto"/> + </target_preparer> + <test class="com.android.tradefed.testtype.AndroidJUnitTest"> + <option name="package" value="{PACKAGE}"/> + <option name="shell-timeout" value="6600s"/> + <option name="test-timeout" value="6000s"/> + <option name="hidden-api-checks" value="false"/> + <option name="device-listeners" value="android.device.collectors.PerfettoListener"/> + <!-- PerfettoListener related arguments --> + <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true"/> + <option name="instrumentation-arg" + key="perfetto_config_file" + value="trace_config.textproto" + /> + <option name="instrumentation-arg" key="per_run" value="true"/> + </test> + <!-- Needed for pulling the collected trace config on to the host --> + <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> + <option name="pull-pattern-keys" value="perfetto_file_path"/> + <option name="directory-keys" + value="/data/user/0/com.android.wm.shell.flicker/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.wm.shell.flicker.bubbles/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.pip/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.splitscreen/files"/> + <option name="collect-on-run-ended-only" value="true"/> + <option name="clean-up" value="true"/> + </metrics_collector> +</configuration> diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifest.xml index 4721741611cf..4721741611cf 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml +++ b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifest.xml diff --git a/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestBubbles.xml b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestBubbles.xml new file mode 100644 index 000000000000..437871f1bb8f --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestBubbles.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.flicker.bubble"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.wm.shell.flicker.bubble" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestOther.xml b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestOther.xml new file mode 100644 index 000000000000..cf642f63a41d --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestOther.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.flicker"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.wm.shell.flicker" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestPip.xml b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestPip.xml new file mode 100644 index 000000000000..5a8155a66d30 --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestPip.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.flicker.pip"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.wm.shell.flicker.pip" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestSplitScreen.xml b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestSplitScreen.xml new file mode 100644 index 000000000000..887d8db3042f --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifestSplitScreen.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.flicker.splitscreen"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.wm.shell.flicker.splitscreen" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt index 61781565270b..3000008628fe 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt @@ -23,16 +23,15 @@ import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.helpers.LetterboxAppHelper -import android.tools.device.flicker.legacy.FlickerTestFactory import android.tools.device.flicker.legacy.IFlickerTestData import com.android.wm.shell.flicker.BaseTest import com.android.wm.shell.flicker.appWindowIsVisibleAtStart import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd +import com.android.wm.shell.flicker.appWindowKeepVisible import com.android.wm.shell.flicker.layerKeepVisible import org.junit.After import org.junit.Assume import org.junit.Before -import org.junit.runners.Parameterized abstract class BaseAppCompat(flicker: FlickerTest) : BaseTest(flicker) { protected val context: Context = instrumentation.context @@ -58,12 +57,13 @@ abstract class BaseAppCompat(flicker: FlickerTest) : BaseTest(flicker) { cmdHelper = CommandsHelper.getInstance(instrumentation) Assume.assumeTrue(tapl.isTablet && isIgnoreOrientationRequest()) letterboxStyle = mapLetterboxStyle() + resetLetterboxStyle() setLetterboxEducationEnabled(false) } @After fun after() { - resetLetterboxEducationEnabled() + resetLetterboxStyle() } private fun mapLetterboxStyle(): HashMap<String, String> { @@ -87,9 +87,8 @@ abstract class BaseAppCompat(flicker: FlickerTest) : BaseTest(flicker) { return letterboxStyle } - private fun resetLetterboxEducationEnabled() { - val enabled = getLetterboxStyle().getValue("Is education enabled") - cmdHelper.executeShellCommand("wm set-letterbox-style --isEducationEnabled $enabled") + private fun resetLetterboxStyle() { + cmdHelper.executeShellCommand("wm reset-letterbox-style") } private fun setLetterboxEducationEnabled(enabled: Boolean) { @@ -126,25 +125,21 @@ abstract class BaseAppCompat(flicker: FlickerTest) : BaseTest(flicker) { flicker.appWindowIsVisibleAtEnd(letterboxApp) } + fun assertLetterboxAppKeepVisible() { + assertLetterboxAppWindowKeepVisible() + assertLetterboxAppLayerKeepVisible() + } + fun assertAppLetterboxedAtEnd() = flicker.assertLayersEnd { isVisible(ComponentNameMatcher.LETTERBOX) } fun assertAppLetterboxedAtStart() = flicker.assertLayersStart { isVisible(ComponentNameMatcher.LETTERBOX) } + fun assertAppStaysLetterboxed() = + flicker.assertLayers { isVisible(ComponentNameMatcher.LETTERBOX) } + fun assertLetterboxAppLayerKeepVisible() = flicker.layerKeepVisible(letterboxApp) - companion object { - /** - * Creates the test configurations. - * - * See [FlickerTestFactory.rotationTests] for configuring screen orientation and - * navigation modes. - */ - @Parameterized.Parameters(name = "{0}") - @JvmStatic - fun getParams(): Collection<FlickerTest> { - return FlickerTestFactory.rotationTests() - } - } + fun assertLetterboxAppWindowKeepVisible() = flicker.appWindowKeepVisible(letterboxApp) } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt index c2141a370f10..3d83455932f5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt @@ -21,6 +21,7 @@ import android.tools.common.traces.component.ComponentNameMatcher import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory import androidx.test.filters.RequiresDevice import org.junit.Test import org.junit.runner.RunWith @@ -90,4 +91,18 @@ class OpenAppInSizeCompatModeTest(flicker: FlickerTest) : BaseAppCompat(flicker) .isInvisible(ComponentNameMatcher.ROTATION) } } + + companion object { + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.rotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.rotationTests() + } + } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RepositionFixedPortraitAppTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RepositionFixedPortraitAppTest.kt new file mode 100644 index 000000000000..c3355ede525e --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RepositionFixedPortraitAppTest.kt @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.appcompat + +import android.platform.test.annotations.Postsubmit +import android.tools.common.Rotation +import android.tools.device.flicker.junit.FlickerParametersRunnerFactory +import android.tools.device.flicker.legacy.FlickerBuilder +import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory +import android.tools.device.helpers.WindowUtils + +import androidx.test.filters.RequiresDevice +import org.junit.Test + +import org.junit.runner.RunWith +import org.junit.runners.Parameterized + +/** + * Test launching a fixed portrait letterboxed app in landscape and repositioning to the right. + * + * To run this test: `atest WMShellFlickerTests:RepositionFixedPortraitAppTest` + * Actions: + * ``` + * Launch a fixed portrait app in landscape to letterbox app + * Double tap to the right to reposition app and wait for app to move + * ``` + * + * Notes: + * ``` + * Some default assertions (e.g., nav bar, status bar and screen covered) + * are inherited [BaseTest] + * ``` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +class RepositionFixedPortraitAppTest(flicker: FlickerTest) : BaseAppCompat(flicker) { + + val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.startRotation).bounds + /** {@inheritDoc} */ + override val transition: FlickerBuilder.() -> Unit + get() = { + setup { + setStartRotation() + letterboxApp.launchViaIntent(wmHelper) + } + transitions { + letterboxApp.repositionHorizontally(displayBounds, true) + letterboxApp.waitForAppToMoveHorizontallyTo(wmHelper, displayBounds, true) + } + teardown { + letterboxApp.repositionHorizontally(displayBounds, false) + letterboxApp.exit(wmHelper) + } + } + + @Postsubmit + @Test + fun letterboxedAppHasRoundedCorners() = assertLetterboxAppAtEndHasRoundedCorners() + + @Postsubmit + @Test + fun letterboxAppLayerKeepVisible() = assertLetterboxAppLayerKeepVisible() + + @Postsubmit + @Test + fun appStaysLetterboxed() = assertAppStaysLetterboxed() + + @Postsubmit + @Test + fun appKeepVisible() = assertLetterboxAppKeepVisible() + + companion object { + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.nonRotationTests( + supportedRotations = listOf(Rotation.ROTATION_90) + ) + } + } +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RestartAppInSizeCompatModeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RestartAppInSizeCompatModeTest.kt index b0e1a42306df..c2057d23a2c4 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RestartAppInSizeCompatModeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/appcompat/RestartAppInSizeCompatModeTest.kt @@ -20,6 +20,7 @@ import android.platform.test.annotations.Postsubmit import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory import android.tools.device.helpers.WindowUtils import androidx.test.filters.RequiresDevice import org.junit.Test @@ -88,4 +89,18 @@ class RestartAppInSizeCompatModeTest(flicker: FlickerTest) : BaseAppCompat(flick val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.endRotation) flicker.assertLayersEnd { visibleRegion(letterboxApp).coversAtMost(displayBounds) } } + + companion object { + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.rotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.rotationTests() + } + } } diff --git a/libs/WindowManager/Shell/tests/flicker/trace_config/trace_config.textproto b/libs/WindowManager/Shell/tests/flicker/trace_config/trace_config.textproto new file mode 100644 index 000000000000..406ada97a07d --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/trace_config/trace_config.textproto @@ -0,0 +1,75 @@ +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# proto-message: TraceConfig + +# Enable periodic flushing of the trace buffer into the output file. +write_into_file: true + +# Writes the userspace buffer into the file every 1s. +file_write_period_ms: 2500 + +# See b/126487238 - we need to guarantee ordering of events. +flush_period_ms: 30000 + +# The trace buffers needs to be big enough to hold |file_write_period_ms| of +# trace data. The trace buffer sizing depends on the number of trace categories +# enabled and the device activity. + +# RSS events +buffers: { + size_kb: 63488 + fill_policy: RING_BUFFER +} + +data_sources { + config { + name: "linux.process_stats" + target_buffer: 0 + # polled per-process memory counters and process/thread names. + # If you don't want the polled counters, remove the "process_stats_config" + # section, but keep the data source itself as it still provides on-demand + # thread/process naming for ftrace data below. + process_stats_config { + scan_all_processes_on_start: true + } + } +} + +data_sources: { + config { + name: "linux.ftrace" + ftrace_config { + ftrace_events: "ftrace/print" + ftrace_events: "task/task_newtask" + ftrace_events: "task/task_rename" + atrace_categories: "ss" + atrace_categories: "wm" + atrace_categories: "am" + atrace_categories: "aidl" + atrace_categories: "input" + atrace_categories: "binder_driver" + atrace_categories: "sched_process_exit" + atrace_apps: "com.android.server.wm.flicker.testapp" + atrace_apps: "com.android.systemui" + atrace_apps: "com.android.wm.shell.flicker" + atrace_apps: "com.android.wm.shell.flicker.other" + atrace_apps: "com.android.wm.shell.flicker.bubbles" + atrace_apps: "com.android.wm.shell.flicker.pip" + atrace_apps: "com.android.wm.shell.flicker.splitscreen" + atrace_apps: "com.google.android.apps.nexuslauncher" + } + } +} + diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/MockToken.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/MockToken.java index 09d474d1f97c..a97c19f17412 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/MockToken.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/MockToken.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.desktopmode; +package com.android.wm.shell; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,16 +25,16 @@ import android.window.WindowContainerToken; /** * {@link WindowContainerToken} wrapper that supports a mock binder */ -class MockToken { +public class MockToken { private final WindowContainerToken mToken; - MockToken() { + public MockToken() { mToken = mock(WindowContainerToken.class); IBinder binder = mock(IBinder.class); when(mToken.asBinder()).thenReturn(binder); } - WindowContainerToken token() { + public WindowContainerToken token() { return mToken; } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleViewTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleViewTest.java new file mode 100644 index 000000000000..d38b848fbb4d --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/bar/BubbleBarHandleViewTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.bubbles.bar; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import android.graphics.drawable.ColorDrawable; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; + +import androidx.core.content.ContextCompat; +import androidx.test.filters.SmallTest; + +import com.android.wm.shell.R; +import com.android.wm.shell.ShellTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper +public class BubbleBarHandleViewTest extends ShellTestCase { + private BubbleBarHandleView mHandleView; + + @Before + public void setup() { + mHandleView = new BubbleBarHandleView(mContext); + } + + @Test + public void testUpdateHandleColor_lightBg() { + mHandleView.updateHandleColor(false /* isRegionDark */, false /* animated */); + + assertTrue(mHandleView.getClipToOutline()); + assertTrue(mHandleView.getBackground() instanceof ColorDrawable); + ColorDrawable bgDrawable = (ColorDrawable) mHandleView.getBackground(); + assertEquals(bgDrawable.getColor(), + ContextCompat.getColor(mContext, R.color.bubble_bar_expanded_view_handle_dark)); + } + + @Test + public void testUpdateHandleColor_darkBg() { + mHandleView.updateHandleColor(true /* isRegionDark */, false /* animated */); + + assertTrue(mHandleView.getClipToOutline()); + assertTrue(mHandleView.getBackground() instanceof ColorDrawable); + ColorDrawable bgDrawable = (ColorDrawable) mHandleView.getBackground(); + assertEquals(bgDrawable.getColor(), + ContextCompat.getColor(mContext, R.color.bubble_bar_expanded_view_handle_light)); + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/LaunchAdjacentControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/LaunchAdjacentControllerTest.kt new file mode 100644 index 000000000000..9dc816b65d2e --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/LaunchAdjacentControllerTest.kt @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.common + +import android.os.IBinder +import android.testing.AndroidTestingRunner +import android.window.WindowContainerTransaction +import android.window.WindowContainerTransaction.HierarchyOp +import androidx.test.filters.SmallTest +import com.android.wm.shell.MockToken +import com.android.wm.shell.ShellTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.atLeastOnce +import org.mockito.Mockito.clearInvocations +import org.mockito.Mockito.never +import org.mockito.Mockito.verify + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class LaunchAdjacentControllerTest : ShellTestCase() { + + private lateinit var controller: LaunchAdjacentController + + @Mock private lateinit var syncQueue: SyncTransactionQueue + + @Before + fun setUp() { + controller = LaunchAdjacentController(syncQueue) + } + + @Test + fun newInstance_enabledByDefault() { + assertThat(controller.launchAdjacentEnabled).isTrue() + } + + @Test + fun setLaunchAdjacentRoot_launchAdjacentEnabled_setsFlagRoot() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + val wct = getLatestTransactionOrFail() + assertThat(wct.getSetLaunchAdjacentFlagRootContainer()).isEqualTo(token.asBinder()) + } + + @Test + fun setLaunchAdjacentRoot_launchAdjacentDisabled_doesNotUpdateFlagRoot() { + val token = MockToken().token() + controller.launchAdjacentEnabled = false + controller.setLaunchAdjacentRoot(token) + verify(syncQueue, never()).queue(any()) + } + + @Test + fun clearLaunchAdjacentRoot_launchAdjacentEnabled_clearsFlagRoot() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + controller.clearLaunchAdjacentRoot() + val wct = getLatestTransactionOrFail() + assertThat(wct.getClearLaunchAdjacentFlagRootContainer()).isEqualTo(token.asBinder()) + } + + @Test + fun clearLaunchAdjacentRoot_launchAdjacentDisabled_clearsFlagRoot() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + controller.launchAdjacentEnabled = false + clearInvocations(syncQueue) + + controller.clearLaunchAdjacentRoot() + val wct = getLatestTransactionOrFail() + assertThat(wct.getClearLaunchAdjacentFlagRootContainer()).isEqualTo(token.asBinder()) + } + + @Test + fun setLaunchAdjacentEnabled_wasDisabledWithContainerSet_setsFlagRoot() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + controller.launchAdjacentEnabled = false + clearInvocations(syncQueue) + + controller.launchAdjacentEnabled = true + val wct = getLatestTransactionOrFail() + assertThat(wct.getSetLaunchAdjacentFlagRootContainer()).isEqualTo(token.asBinder()) + } + + @Test + fun setLaunchAdjacentEnabled_containerNotSet_doesNotUpdateFlagRoot() { + controller.launchAdjacentEnabled = false + controller.launchAdjacentEnabled = true + verify(syncQueue, never()).queue(any()) + } + + @Test + fun setLaunchAdjacentEnabled_multipleTimes_setsFlagRootOnce() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + controller.launchAdjacentEnabled = true + controller.launchAdjacentEnabled = true + // Only execute once + verify(syncQueue).queue(any()) + } + + @Test + fun setLaunchAdjacentDisabled_containerSet_clearsFlagRoot() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + controller.launchAdjacentEnabled = false + val wct = getLatestTransactionOrFail() + assertThat(wct.getClearLaunchAdjacentFlagRootContainer()).isEqualTo(token.asBinder()) + } + + @Test + fun setLaunchAdjacentDisabled_containerNotSet_doesNotUpdateFlagRoot() { + controller.launchAdjacentEnabled = false + verify(syncQueue, never()).queue(any()) + } + + @Test + fun setLaunchAdjacentDisabled_multipleTimes_setsFlagRootOnce() { + val token = MockToken().token() + controller.setLaunchAdjacentRoot(token) + clearInvocations(syncQueue) + controller.launchAdjacentEnabled = false + controller.launchAdjacentEnabled = false + // Only execute once + verify(syncQueue).queue(any()) + } + + private fun getLatestTransactionOrFail(): WindowContainerTransaction { + val arg = ArgumentCaptor.forClass(WindowContainerTransaction::class.java) + verify(syncQueue, atLeastOnce()).queue(arg.capture()) + return arg.allValues.last().also { assertThat(it).isNotNull() } + } +} + +private fun WindowContainerTransaction.getSetLaunchAdjacentFlagRootContainer(): IBinder { + return hierarchyOps + // Find the operation with the correct type + .filter { op -> op.type == HierarchyOp.HIERARCHY_OP_TYPE_SET_LAUNCH_ADJACENT_FLAG_ROOT } + // For set flag root operation, toTop is false + .filter { op -> !op.toTop } + .map { it.container } + .first() +} + +private fun WindowContainerTransaction.getClearLaunchAdjacentFlagRootContainer(): IBinder { + return hierarchyOps + // Find the operation with the correct type + .filter { op -> op.type == HierarchyOp.HIERARCHY_OP_TYPE_SET_LAUNCH_ADJACENT_FLAG_ROOT } + // For clear flag root operation, toTop is true + .filter { op -> op.toTop } + .map { it.container } + .first() +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/DividerViewTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/DividerViewTest.java new file mode 100644 index 000000000000..145c8f0ab8af --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/DividerViewTest.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.common.split; + +import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; + +import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CURSOR_HOVER_STATES_ENABLED; + +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import android.content.res.Configuration; +import android.graphics.Rect; +import android.os.SystemClock; +import android.provider.DeviceConfig; +import android.view.InputDevice; +import android.view.InsetsState; +import android.view.MotionEvent; + +import androidx.test.annotation.UiThreadTest; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.wm.shell.ShellTaskOrganizer; +import com.android.wm.shell.ShellTestCase; +import com.android.wm.shell.common.DisplayController; +import com.android.wm.shell.common.DisplayImeController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** Tests for {@link DividerView} */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class DividerViewTest extends ShellTestCase { + private @Mock SplitWindowManager.ParentContainerCallbacks mCallbacks; + private @Mock SplitLayout.SplitLayoutHandler mSplitLayoutHandler; + private @Mock DisplayController mDisplayController; + private @Mock DisplayImeController mDisplayImeController; + private @Mock ShellTaskOrganizer mTaskOrganizer; + private SplitLayout mSplitLayout; + private DividerView mDividerView; + + @Before + @UiThreadTest + public void setup() { + MockitoAnnotations.initMocks(this); + Configuration configuration = getConfiguration(); + mSplitLayout = new SplitLayout("TestSplitLayout", mContext, configuration, + mSplitLayoutHandler, mCallbacks, mDisplayController, mDisplayImeController, + mTaskOrganizer, SplitLayout.PARALLAX_NONE); + SplitWindowManager splitWindowManager = new SplitWindowManager("TestSplitWindowManager", + mContext, + configuration, mCallbacks); + splitWindowManager.init(mSplitLayout, new InsetsState()); + mDividerView = spy((DividerView) splitWindowManager.getDividerView()); + } + + @Test + @UiThreadTest + public void testHoverDividerView() { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CURSOR_HOVER_STATES_ENABLED, + "true", false); + + Rect dividerBounds = mSplitLayout.getDividerBounds(); + int x = dividerBounds.centerX(); + int y = dividerBounds.centerY(); + long downTime = SystemClock.uptimeMillis(); + mDividerView.onHoverEvent(getMotionEvent(downTime, MotionEvent.ACTION_HOVER_ENTER, x, y)); + + verify(mDividerView, times(1)).setHovering(); + + mDividerView.onHoverEvent(getMotionEvent(downTime, MotionEvent.ACTION_HOVER_EXIT, x, y)); + + verify(mDividerView, times(1)).releaseHovering(); + + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CURSOR_HOVER_STATES_ENABLED, + "false", false); + } + + private static MotionEvent getMotionEvent(long eventTime, int action, float x, float y) { + MotionEvent.PointerProperties properties = new MotionEvent.PointerProperties(); + properties.id = 0; + properties.toolType = MotionEvent.TOOL_TYPE_UNKNOWN; + + MotionEvent.PointerCoords coords = new MotionEvent.PointerCoords(); + coords.pressure = 1; + coords.size = 1; + coords.x = x; + coords.y = y; + + return MotionEvent.obtain(eventTime, eventTime, action, 1, + new MotionEvent.PointerProperties[]{properties}, + new MotionEvent.PointerCoords[]{coords}, 0, 0, 1.0f, 1.0f, 0, 0, + InputDevice.SOURCE_TOUCHSCREEN, 0); + } + + private static Configuration getConfiguration() { + final Configuration configuration = new Configuration(); + configuration.unset(); + configuration.orientation = ORIENTATION_LANDSCAPE; + configuration.windowConfiguration.setRotation(0); + configuration.windowConfiguration.setBounds(new Rect(0, 0, 1080, 2160)); + return configuration; + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java index d6387ee5ae13..605a762a395f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java @@ -59,6 +59,7 @@ import android.window.WindowContainerTransaction.HierarchyOp; import androidx.test.filters.SmallTest; import com.android.dx.mockito.inline.extended.StaticMockitoSession; +import com.android.wm.shell.MockToken; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt index 3bc2f0e8674e..3fe78efdf2b1 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt @@ -129,6 +129,18 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { } @Test + fun addListener_notifiesStashed() { + repo.setStashed(DEFAULT_DISPLAY, true) + val listener = TestVisibilityListener() + val executor = TestShellExecutor() + repo.addVisibleTasksListener(listener, executor) + executor.flushAll() + + assertThat(listener.stashedOnDefaultDisplay).isTrue() + assertThat(listener.stashedChangesOnDefaultDisplay).isEqualTo(1) + } + + @Test fun addListener_tasksOnDifferentDisplay_doesNotNotify() { repo.updateVisibleFreeformTasks(SECOND_DISPLAY, taskId = 1, visible = true) val listener = TestVisibilityListener() @@ -313,6 +325,65 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { assertThat(tasks.first()).isEqualTo(6) } + @Test + fun setStashed_stateIsUpdatedForTheDisplay() { + repo.setStashed(DEFAULT_DISPLAY, true) + assertThat(repo.isStashed(DEFAULT_DISPLAY)).isTrue() + assertThat(repo.isStashed(SECOND_DISPLAY)).isFalse() + + repo.setStashed(DEFAULT_DISPLAY, false) + assertThat(repo.isStashed(DEFAULT_DISPLAY)).isFalse() + } + + @Test + fun setStashed_notifyListener() { + val listener = TestVisibilityListener() + val executor = TestShellExecutor() + repo.addVisibleTasksListener(listener, executor) + repo.setStashed(DEFAULT_DISPLAY, true) + executor.flushAll() + assertThat(listener.stashedOnDefaultDisplay).isTrue() + assertThat(listener.stashedChangesOnDefaultDisplay).isEqualTo(1) + + repo.setStashed(DEFAULT_DISPLAY, false) + executor.flushAll() + assertThat(listener.stashedOnDefaultDisplay).isFalse() + assertThat(listener.stashedChangesOnDefaultDisplay).isEqualTo(2) + } + + @Test + fun setStashed_secondCallDoesNotNotify() { + val listener = TestVisibilityListener() + val executor = TestShellExecutor() + repo.addVisibleTasksListener(listener, executor) + repo.setStashed(DEFAULT_DISPLAY, true) + repo.setStashed(DEFAULT_DISPLAY, true) + executor.flushAll() + assertThat(listener.stashedChangesOnDefaultDisplay).isEqualTo(1) + } + + @Test + fun setStashed_tracksPerDisplay() { + val listener = TestVisibilityListener() + val executor = TestShellExecutor() + repo.addVisibleTasksListener(listener, executor) + + repo.setStashed(DEFAULT_DISPLAY, true) + executor.flushAll() + assertThat(listener.stashedOnDefaultDisplay).isTrue() + assertThat(listener.stashedOnSecondaryDisplay).isFalse() + + repo.setStashed(SECOND_DISPLAY, true) + executor.flushAll() + assertThat(listener.stashedOnDefaultDisplay).isTrue() + assertThat(listener.stashedOnSecondaryDisplay).isTrue() + + repo.setStashed(DEFAULT_DISPLAY, false) + executor.flushAll() + assertThat(listener.stashedOnDefaultDisplay).isFalse() + assertThat(listener.stashedOnSecondaryDisplay).isTrue() + } + class TestListener : DesktopModeTaskRepository.ActiveTasksListener { var activeChangesOnDefaultDisplay = 0 var activeChangesOnSecondaryDisplay = 0 @@ -332,6 +403,12 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { var visibleChangesOnDefaultDisplay = 0 var visibleChangesOnSecondaryDisplay = 0 + var stashedOnDefaultDisplay = false + var stashedOnSecondaryDisplay = false + + var stashedChangesOnDefaultDisplay = 0 + var stashedChangesOnSecondaryDisplay = 0 + override fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) { when (displayId) { DEFAULT_DISPLAY -> { @@ -345,6 +422,20 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { else -> fail("Visible task listener received unexpected display id: $displayId") } } + + override fun onStashedChanged(displayId: Int, stashed: Boolean) { + when (displayId) { + DEFAULT_DISPLAY -> { + stashedOnDefaultDisplay = stashed + stashedChangesOnDefaultDisplay++ + } + SECOND_DISPLAY -> { + stashedOnSecondaryDisplay = stashed + stashedChangesOnDefaultDisplay++ + } + else -> fail("Visible task listener received unexpected display id: $displayId") + } + } } companion object { 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 1335ebf105a6..1477cf7415cf 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 @@ -39,17 +39,20 @@ import androidx.test.filters.SmallTest import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.dx.mockito.inline.extended.ExtendedMockito.never import com.android.dx.mockito.inline.extended.StaticMockitoSession +import com.android.wm.shell.MockToken import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.ShellTestCase import com.android.wm.shell.TestRunningTaskInfoBuilder import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.common.DisplayController +import com.android.wm.shell.common.LaunchAdjacentController import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createHomeTask +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 @@ -77,6 +80,7 @@ import org.mockito.Mockito.`when` as whenever class DesktopTasksControllerTest : ShellTestCase() { @Mock lateinit var testExecutor: ShellExecutor + @Mock lateinit var shellCommandHandler: ShellCommandHandler @Mock lateinit var shellController: ShellController @Mock lateinit var displayController: DisplayController @Mock lateinit var shellTaskOrganizer: ShellTaskOrganizer @@ -85,12 +89,16 @@ class DesktopTasksControllerTest : ShellTestCase() { @Mock lateinit var transitions: Transitions @Mock lateinit var exitDesktopTransitionHandler: ExitDesktopTaskTransitionHandler @Mock lateinit var enterDesktopTransitionHandler: EnterDesktopTaskTransitionHandler + @Mock lateinit var mToggleResizeDesktopTaskTransitionHandler: + ToggleResizeDesktopTaskTransitionHandler + @Mock lateinit var launchAdjacentController: LaunchAdjacentController private lateinit var mockitoSession: StaticMockitoSession private lateinit var controller: DesktopTasksController private lateinit var shellInit: ShellInit private lateinit var desktopModeTaskRepository: DesktopModeTaskRepository + private val shellExecutor = TestShellExecutor() // Mock running tasks are registered here so we can get the list from mock shell task organizer private val runningTasks = mutableListOf<RunningTaskInfo>() @@ -114,6 +122,7 @@ class DesktopTasksControllerTest : ShellTestCase() { return DesktopTasksController( context, shellInit, + shellCommandHandler, shellController, displayController, shellTaskOrganizer, @@ -122,8 +131,10 @@ class DesktopTasksControllerTest : ShellTestCase() { transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler, + mToggleResizeDesktopTaskTransitionHandler, desktopModeTaskRepository, - TestShellExecutor() + launchAdjacentController, + shellExecutor ) } @@ -262,8 +273,9 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - fun moveToDesktop() { + fun moveToDesktop_displayFullscreen_windowingModeSetToFreeform() { val task = setUpFullscreenTask() + task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN controller.moveToDesktop(task) val wct = getLatestWct(expectTransition = TRANSIT_CHANGE) assertThat(wct.changes[task.token.asBinder()]?.windowingMode) @@ -271,6 +283,16 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun moveToDesktop_displayFreeform_windowingModeSetToUndefined() { + val task = setUpFullscreenTask() + task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM + controller.moveToDesktop(task) + val wct = getLatestWct(expectTransition = TRANSIT_CHANGE) + assertThat(wct.changes[task.token.asBinder()]?.windowingMode) + .isEqualTo(WINDOWING_MODE_UNDEFINED) + } + + @Test fun moveToDesktop_nonExistentTask_doesNothing() { controller.moveToDesktop(999) verifyWCTNotExecuted() @@ -317,12 +339,23 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - fun moveToFullscreen() { + fun moveToFullscreen_displayFullscreen_windowingModeSetToUndefined() { val task = setUpFreeformTask() + task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN controller.moveToFullscreen(task) val wct = getLatestWct(expectTransition = TRANSIT_CHANGE) assertThat(wct.changes[task.token.asBinder()]?.windowingMode) - .isEqualTo(WINDOWING_MODE_FULLSCREEN) + .isEqualTo(WINDOWING_MODE_UNDEFINED) + } + + @Test + fun moveToFullscreen_displayFreeform_windowingModeSetToFullscreen() { + val task = setUpFreeformTask() + task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM + controller.moveToFullscreen(task) + val wct = getLatestWct(expectTransition = TRANSIT_CHANGE) + assertThat(wct.changes[task.token.asBinder()]?.windowingMode) + .isEqualTo(WINDOWING_MODE_FULLSCREEN) } @Test @@ -345,6 +378,18 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun moveTaskToFront_postsWctWithReorderOp() { + val task1 = setUpFreeformTask() + setUpFreeformTask() + + controller.moveTaskToFront(task1) + + val wct = getLatestWct(expectTransition = TRANSIT_TO_FRONT) + assertThat(wct.hierarchyOps).hasSize(1) + wct.assertReorderAt(index = 0, task1) + } + + @Test fun moveToNextDisplay_noOtherDisplays() { whenever(rootTaskDisplayAreaOrganizer.displayIds).thenReturn(intArrayOf(DEFAULT_DISPLAY)) val task = setUpFreeformTask(displayId = DEFAULT_DISPLAY) @@ -451,6 +496,27 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun handleRequest_fullscreenTask_desktopStashed_returnWCTWithAllAppsBroughtToFront() { + assumeTrue(ENABLE_SHELL_TRANSITIONS) + + val stashedFreeformTask = setUpFreeformTask(DEFAULT_DISPLAY) + markTaskHidden(stashedFreeformTask) + + val fullscreenTask = createFullscreenTask(DEFAULT_DISPLAY) + + controller.stashDesktopApps(DEFAULT_DISPLAY) + + val result = controller.handleRequest(Binder(), createTransition(fullscreenTask)) + assertThat(result).isNotNull() + result!!.assertReorderSequence(stashedFreeformTask, fullscreenTask) + assertThat(result.changes[fullscreenTask.token.asBinder()]?.windowingMode) + .isEqualTo(WINDOWING_MODE_FREEFORM) + + // Stashed state should be cleared + assertThat(desktopModeTaskRepository.isStashed(DEFAULT_DISPLAY)).isFalse() + } + + @Test fun handleRequest_freeformTask_freeformVisible_returnNull() { assumeTrue(ENABLE_SHELL_TRANSITIONS) @@ -501,6 +567,25 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun handleRequest_freeformTask_desktopStashed_returnWCTWithAllAppsBroughtToFront() { + assumeTrue(ENABLE_SHELL_TRANSITIONS) + + val stashedFreeformTask = setUpFreeformTask(DEFAULT_DISPLAY) + markTaskHidden(stashedFreeformTask) + + val freeformTask = createFreeformTask(DEFAULT_DISPLAY) + + controller.stashDesktopApps(DEFAULT_DISPLAY) + + val result = controller.handleRequest(Binder(), createTransition(freeformTask)) + assertThat(result).isNotNull() + result?.assertReorderSequence(stashedFreeformTask, freeformTask) + + // Stashed state should be cleared + assertThat(desktopModeTaskRepository.isStashed(DEFAULT_DISPLAY)).isFalse() + } + + @Test fun handleRequest_notOpenOrToFrontTransition_returnNull() { assumeTrue(ENABLE_SHELL_TRANSITIONS) @@ -539,6 +624,46 @@ class DesktopTasksControllerTest : ShellTestCase() { assertThat(controller.handleRequest(Binder(), createTransition(task))).isNull() } + @Test + fun stashDesktopApps_stateUpdates() { + controller.stashDesktopApps(DEFAULT_DISPLAY) + + assertThat(desktopModeTaskRepository.isStashed(DEFAULT_DISPLAY)).isTrue() + assertThat(desktopModeTaskRepository.isStashed(SECOND_DISPLAY)).isFalse() + } + + @Test + fun hideStashedDesktopApps_stateUpdates() { + desktopModeTaskRepository.setStashed(DEFAULT_DISPLAY, true) + desktopModeTaskRepository.setStashed(SECOND_DISPLAY, true) + controller.hideStashedDesktopApps(DEFAULT_DISPLAY) + + assertThat(desktopModeTaskRepository.isStashed(DEFAULT_DISPLAY)).isFalse() + // Check that second display is not affected + assertThat(desktopModeTaskRepository.isStashed(SECOND_DISPLAY)).isTrue() + } + + @Test + fun desktopTasksVisibilityChange_visible_setLaunchAdjacentDisabled() { + val task = setUpFreeformTask() + clearInvocations(launchAdjacentController) + + markTaskVisible(task) + shellExecutor.flushAll() + verify(launchAdjacentController).launchAdjacentEnabled = false + } + + @Test + fun desktopTasksVisibilityChange_invisible_setLaunchAdjacentEnabled() { + val task = setUpFreeformTask() + markTaskVisible(task) + clearInvocations(launchAdjacentController) + + markTaskHidden(task) + shellExecutor.flushAll() + verify(launchAdjacentController).launchAdjacentEnabled = true + } + private fun setUpFreeformTask(displayId: Int = DEFAULT_DISPLAY): RunningTaskInfo { val task = createFreeformTask(displayId) whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(task) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTestHelpers.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTestHelpers.kt index cf1ff3214d87..29a757c19d98 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTestHelpers.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTestHelpers.kt @@ -22,6 +22,7 @@ import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.view.Display.DEFAULT_DISPLAY +import com.android.wm.shell.MockToken import com.android.wm.shell.TestRunningTaskInfoBuilder class DesktopTestHelpers { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/MainStageTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/MainStageTests.java index 68cb57c14d8c..b1befc46f383 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/MainStageTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/MainStageTests.java @@ -41,6 +41,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Optional; + /** Tests for {@link MainStage} */ @SmallTest @RunWith(AndroidJUnit4.class) @@ -61,7 +63,7 @@ public class MainStageTests extends ShellTestCase { MockitoAnnotations.initMocks(this); mRootTaskInfo = new TestRunningTaskInfoBuilder().build(); mMainStage = new MainStage(mContext, mTaskOrganizer, DEFAULT_DISPLAY, mCallbacks, - mSyncQueue, mSurfaceSession, mIconProvider); + mSyncQueue, mSurfaceSession, mIconProvider, Optional.empty()); mMainStage.onTaskAppeared(mRootTaskInfo, mRootLeash); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SideStageTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SideStageTests.java index 3b42a48b5a40..549bd3fcabfb 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SideStageTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SideStageTests.java @@ -46,6 +46,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import java.util.Optional; + /** Tests for {@link SideStage} */ @SmallTest @RunWith(AndroidJUnit4.class) @@ -66,7 +68,7 @@ public class SideStageTests extends ShellTestCase { MockitoAnnotations.initMocks(this); mRootTask = new TestRunningTaskInfoBuilder().build(); mSideStage = new SideStage(mContext, mTaskOrganizer, DEFAULT_DISPLAY, mCallbacks, - mSyncQueue, mSurfaceSession, mIconProvider); + mSyncQueue, mSurfaceSession, mIconProvider, Optional.empty()); mSideStage.onTaskAppeared(mRootTask, mRootLeash); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java index fb17d8799bda..e8a1e91acd4d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java @@ -61,6 +61,7 @@ import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.DisplayLayout; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.TransactionPool; @@ -71,6 +72,7 @@ import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.sysui.ShellSharedConstants; import com.android.wm.shell.transition.Transitions; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import org.junit.Before; import org.junit.Test; @@ -102,6 +104,8 @@ public class SplitScreenControllerTests extends ShellTestCase { @Mock IconProvider mIconProvider; @Mock StageCoordinator mStageCoordinator; @Mock RecentTasksController mRecentTasks; + @Mock LaunchAdjacentController mLaunchAdjacentController; + @Mock WindowDecorViewModel mWindowDecorViewModel; @Captor ArgumentCaptor<Intent> mIntentCaptor; private ShellController mShellController; @@ -117,7 +121,8 @@ public class SplitScreenControllerTests extends ShellTestCase { mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, mRootTDAOrganizer, mDisplayController, mDisplayImeController, mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, - mIconProvider, mRecentTasks, mMainExecutor, mStageCoordinator)); + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mMainExecutor, mStageCoordinator)); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java index 4e446c684d86..a3009a55198f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java @@ -31,12 +31,14 @@ import com.android.wm.shell.TestRunningTaskInfoBuilder; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.common.split.SplitLayout; import com.android.wm.shell.recents.RecentTasksController; import com.android.wm.shell.transition.Transitions; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import java.util.Optional; @@ -76,10 +78,13 @@ public class SplitTestUtils { DisplayInsetsController insetsController, SplitLayout splitLayout, Transitions transitions, TransactionPool transactionPool, ShellExecutor mainExecutor, - Optional<RecentTasksController> recentTasks) { + Optional<RecentTasksController> recentTasks, + LaunchAdjacentController launchAdjacentController, + Optional<WindowDecorViewModel> windowDecorViewModel) { super(context, displayId, syncQueue, taskOrganizer, mainStage, sideStage, displayController, imeController, insetsController, splitLayout, - transitions, transactionPool, mainExecutor, recentTasks); + transitions, transactionPool, mainExecutor, recentTasks, + launchAdjacentController, windowDecorViewModel); // Prepare root task for testing. mRootTask = new TestRunningTaskInfoBuilder().build(); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java index 3b05651f884b..b00a60c593e6 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java @@ -70,12 +70,14 @@ import com.android.wm.shell.TransitionInfoBuilder; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.common.split.SplitDecorManager; import com.android.wm.shell.common.split.SplitLayout; import com.android.wm.shell.transition.Transitions; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import org.junit.Before; import org.junit.Test; @@ -100,7 +102,9 @@ public class SplitTransitionTests extends ShellTestCase { @Mock private Transitions mTransitions; @Mock private SurfaceSession mSurfaceSession; @Mock private IconProvider mIconProvider; + @Mock private WindowDecorViewModel mWindowDecorViewModel; @Mock private ShellExecutor mMainExecutor; + @Mock private LaunchAdjacentController mLaunchAdjacentController; private SplitLayout mSplitLayout; private MainStage mMainStage; private SideStage mSideStage; @@ -121,16 +125,17 @@ public class SplitTransitionTests extends ShellTestCase { mSplitLayout = SplitTestUtils.createMockSplitLayout(); mMainStage = spy(new MainStage(mContext, mTaskOrganizer, DEFAULT_DISPLAY, mock( StageTaskListener.StageListenerCallbacks.class), mSyncQueue, mSurfaceSession, - mIconProvider)); + mIconProvider, Optional.of(mWindowDecorViewModel))); mMainStage.onTaskAppeared(new TestRunningTaskInfoBuilder().build(), createMockSurface()); mSideStage = spy(new SideStage(mContext, mTaskOrganizer, DEFAULT_DISPLAY, mock( StageTaskListener.StageListenerCallbacks.class), mSyncQueue, mSurfaceSession, - mIconProvider)); + mIconProvider, Optional.of(mWindowDecorViewModel))); mSideStage.onTaskAppeared(new TestRunningTaskInfoBuilder().build(), createMockSurface()); mStageCoordinator = new SplitTestUtils.TestStageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue, mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mDisplayImeController, mDisplayInsetsController, mSplitLayout, mTransitions, - mTransactionPool, mMainExecutor, Optional.empty()); + mTransactionPool, mMainExecutor, Optional.empty(), + mLaunchAdjacentController, Optional.empty()); mSplitScreenTransitions = mStageCoordinator.getSplitTransitions(); doAnswer((Answer<IBinder>) invocation -> mock(IBinder.class)) .when(mTransitions).startTransition(anyInt(), any(), any()); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java index 2dcdc74e8ae7..e59d09cd1ee1 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java @@ -65,6 +65,7 @@ import com.android.wm.shell.TestShellExecutor; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayImeController; import com.android.wm.shell.common.DisplayInsetsController; +import com.android.wm.shell.common.LaunchAdjacentController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.TransactionPool; @@ -107,6 +108,8 @@ public class StageCoordinatorTests extends ShellTestCase { private DisplayInsetsController mDisplayInsetsController; @Mock private TransactionPool mTransactionPool; + @Mock + private LaunchAdjacentController mLaunchAdjacentController; private final Rect mBounds1 = new Rect(10, 20, 30, 40); private final Rect mBounds2 = new Rect(5, 10, 15, 20); @@ -130,7 +133,7 @@ public class StageCoordinatorTests extends ShellTestCase { mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue, mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mDisplayImeController, mDisplayInsetsController, mSplitLayout, mTransitions, mTransactionPool, - mMainExecutor, Optional.empty())); + mMainExecutor, Optional.empty(), mLaunchAdjacentController, Optional.empty())); mDividerLeash = new SurfaceControl.Builder(mSurfaceSession).setName("fakeDivider").build(); when(mSplitLayout.getBounds1()).thenReturn(mBounds1); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java index 1a1bebd28aef..df1e2e16f485 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java @@ -43,6 +43,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestRunningTaskInfoBuilder; import com.android.wm.shell.common.SyncTransactionQueue; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; import org.junit.Before; import org.junit.Test; @@ -52,6 +53,8 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Optional; + /** * Tests for {@link StageTaskListener} * Build/Install/Run: @@ -71,6 +74,8 @@ public final class StageTaskListenerTests extends ShellTestCase { private SyncTransactionQueue mSyncQueue; @Mock private IconProvider mIconProvider; + @Mock + private WindowDecorViewModel mWindowDecorViewModel; @Captor private ArgumentCaptor<SyncTransactionQueue.TransactionRunnable> mRunnableCaptor; private SurfaceSession mSurfaceSession = new SurfaceSession(); @@ -89,7 +94,8 @@ public final class StageTaskListenerTests extends ShellTestCase { mCallbacks, mSyncQueue, mSurfaceSession, - mIconProvider); + mIconProvider, + Optional.of(mWindowDecorViewModel)); mRootTask = new TestRunningTaskInfoBuilder().build(); mRootTask.parentTaskId = INVALID_TASK_ID; mSurfaceControl = new SurfaceControl.Builder(mSurfaceSession).setName("test").build(); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.java index 41bab95b7dd4..23158eac94de 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.java @@ -53,7 +53,6 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.desktopmode.DesktopModeController; import com.android.wm.shell.desktopmode.DesktopTasksController; -import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.transition.Transitions; import org.junit.Before; @@ -82,7 +81,6 @@ public class DesktopModeWindowDecorViewModelTests extends ShellTestCase { @Mock private ShellTaskOrganizer mTaskOrganizer; @Mock private DisplayController mDisplayController; @Mock private DisplayLayout mDisplayLayout; - @Mock private SplitScreenController mSplitScreenController; @Mock private SyncTransactionQueue mSyncQueue; @Mock private DesktopModeController mDesktopModeController; @Mock private DesktopTasksController mDesktopTasksController; @@ -111,7 +109,6 @@ public class DesktopModeWindowDecorViewModelTests extends ShellTestCase { mTransitions, Optional.of(mDesktopModeController), Optional.of(mDesktopTasksController), - Optional.of(mSplitScreenController), mDesktopModeWindowDecorFactory, mMockInputMonitorFactory, mTransactionFactory diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragDetectorTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragDetectorTest.kt index 8f84008e8d2d..3fbab0f9e2bb 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragDetectorTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragDetectorTest.kt @@ -55,7 +55,7 @@ class DragDetectorTest { fun setUp() { MockitoAnnotations.initMocks(this) - `when`(eventHandler.handleMotionEvent(any())).thenReturn(true) + `when`(eventHandler.handleMotionEvent(any(), any())).thenReturn(true) dragDetector = DragDetector(eventHandler) dragDetector.setTouchSlop(SLOP) @@ -72,13 +72,13 @@ class DragDetectorTest { @Test fun testNoMove_passesDownAndUp() { assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_DOWN))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_DOWN && it.x == X && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_UP))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_UP && it.x == X && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) @@ -86,12 +86,12 @@ class DragDetectorTest { @Test fun testMoveInSlop_touch_passesDownAndUp() { - `when`(eventHandler.handleMotionEvent(argThat { + `when`(eventHandler.handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_DOWN })).thenReturn(false) assertFalse(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_DOWN))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_DOWN && it.x == X && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) @@ -99,12 +99,12 @@ class DragDetectorTest { val newX = X + SLOP - 1 assertFalse( dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_MOVE, newX, Y))) - verify(eventHandler, never()).handleMotionEvent(argThat { + verify(eventHandler, never()).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_MOVE }) assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_UP, newX, Y))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_UP && it.x == newX && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) @@ -112,13 +112,13 @@ class DragDetectorTest { @Test fun testMoveInSlop_mouse_passesDownMoveAndUp() { - `when`(eventHandler.handleMotionEvent(argThat { + `when`(eventHandler.handleMotionEvent(any(), argThat { it.action == MotionEvent.ACTION_DOWN })).thenReturn(false) assertFalse(dragDetector.onMotionEvent( createMotionEvent(MotionEvent.ACTION_DOWN, isTouch = false))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_DOWN && it.x == X && it.y == Y && it.source == InputDevice.SOURCE_MOUSE }) @@ -126,14 +126,14 @@ class DragDetectorTest { val newX = X + SLOP - 1 assertTrue(dragDetector.onMotionEvent( createMotionEvent(MotionEvent.ACTION_MOVE, newX, Y, isTouch = false))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_MOVE && it.x == newX && it.y == Y && it.source == InputDevice.SOURCE_MOUSE }) assertTrue(dragDetector.onMotionEvent( createMotionEvent(MotionEvent.ACTION_UP, newX, Y, isTouch = false))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_UP && it.x == newX && it.y == Y && it.source == InputDevice.SOURCE_MOUSE }) @@ -141,25 +141,25 @@ class DragDetectorTest { @Test fun testMoveBeyondSlop_passesDownMoveAndUp() { - `when`(eventHandler.handleMotionEvent(argThat { + `when`(eventHandler.handleMotionEvent(any(), argThat { it.action == MotionEvent.ACTION_DOWN })).thenReturn(false) assertFalse(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_DOWN))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_DOWN && it.x == X && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) val newX = X + SLOP + 1 assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_MOVE, newX, Y))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_MOVE && it.x == newX && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_UP, newX, Y))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_UP && it.x == newX && it.y == Y && it.source == InputDevice.SOURCE_TOUCHSCREEN }) @@ -167,12 +167,12 @@ class DragDetectorTest { @Test fun testPassesHoverEnter() { - `when`(eventHandler.handleMotionEvent(argThat { + `when`(eventHandler.handleMotionEvent(any(), argThat { it.action == MotionEvent.ACTION_HOVER_ENTER })).thenReturn(false) assertFalse(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_HOVER_ENTER))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_HOVER_ENTER && it.x == X && it.y == Y }) } @@ -180,7 +180,7 @@ class DragDetectorTest { @Test fun testPassesHoverMove() { assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_HOVER_MOVE))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_HOVER_MOVE && it.x == X && it.y == Y }) } @@ -188,7 +188,7 @@ class DragDetectorTest { @Test fun testPassesHoverExit() { assertTrue(dragDetector.onMotionEvent(createMotionEvent(MotionEvent.ACTION_HOVER_EXIT))) - verify(eventHandler).handleMotionEvent(argThat { + verify(eventHandler).handleMotionEvent(any(), argThat { return@argThat it.action == MotionEvent.ACTION_HOVER_EXIT && it.x == X && it.y == Y }) } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 5a2326b9c393..7fc1c99bb44e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -57,7 +57,6 @@ import android.window.SurfaceSyncGroup; import android.window.WindowContainerTransaction; import androidx.test.filters.SmallTest; -import androidx.test.platform.app.InstrumentationRegistry; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; @@ -316,7 +315,8 @@ public class WindowDecorationTests extends ShellTestCase { releaseOrder.verify(t).remove(captionContainerSurface); releaseOrder.verify(t).remove(decorContainerSurface); releaseOrder.verify(t).apply(); - verify(mMockWindowContainerTransaction) + // Expect to remove two insets sources, the caption insets and the mandatory gesture insets. + verify(mMockWindowContainerTransaction, Mockito.times(2)) .removeInsetsSource(eq(taskInfo.token), any(), anyInt(), anyInt()); } @@ -410,15 +410,17 @@ public class WindowDecorationTests extends ShellTestCase { verify(additionalWindowSurfaceBuilder).build(); verify(mMockSurfaceControlAddWindowT).setPosition(additionalWindowSurface, 0, 0); final int width = WindowDecoration.loadDimensionPixelSize( - mContext.getResources(), mCaptionMenuWidthId); + windowDecor.mDecorWindowContext.getResources(), mCaptionMenuWidthId); final int height = WindowDecoration.loadDimensionPixelSize( - mContext.getResources(), mRelayoutParams.mCaptionHeightId); + windowDecor.mDecorWindowContext.getResources(), mRelayoutParams.mCaptionHeightId); verify(mMockSurfaceControlAddWindowT).setWindowCrop(additionalWindowSurface, width, height); - final int shadowRadius = WindowDecoration.loadDimensionPixelSize(mContext.getResources(), + final int shadowRadius = WindowDecoration.loadDimensionPixelSize( + windowDecor.mDecorWindowContext.getResources(), mCaptionMenuShadowRadiusId); verify(mMockSurfaceControlAddWindowT) .setShadowRadius(additionalWindowSurface, shadowRadius); - final int cornerRadius = WindowDecoration.loadDimensionPixelSize(mContext.getResources(), + final int cornerRadius = WindowDecoration.loadDimensionPixelSize( + windowDecor.mDecorWindowContext.getResources(), mCaptionMenuCornerRadiusId); verify(mMockSurfaceControlAddWindowT) .setCornerRadius(additionalWindowSurface, cornerRadius); @@ -513,8 +515,7 @@ public class WindowDecorationTests extends ShellTestCase { private TestWindowDecoration createWindowDecoration( ActivityManager.RunningTaskInfo taskInfo, SurfaceControl testSurface) { - return new TestWindowDecoration(InstrumentationRegistry.getInstrumentation().getContext(), - mMockDisplayController, mMockShellTaskOrganizer, + return new TestWindowDecoration(mContext, mMockDisplayController, mMockShellTaskOrganizer, taskInfo, testSurface, new MockObjectSupplier<>(mMockSurfaceControlBuilders, () -> createMockSurfaceControlBuilder(mock(SurfaceControl.class))), diff --git a/packages/CarrierDefaultApp/assets/slice_purchase_test.html b/packages/CarrierDefaultApp/assets/slice_purchase_test.html index 67d218413e74..917276b9ce65 100644 --- a/packages/CarrierDefaultApp/assets/slice_purchase_test.html +++ b/packages/CarrierDefaultApp/assets/slice_purchase_test.html @@ -20,7 +20,7 @@ <meta charset="UTF-8"> <meta name="description" content=" This is a HTML page that calls and verifies responses from the @JavascriptInterface functions of - SlicePurchaseWebInterface. Test slice purchase application behavior using ADB shell commands and + DataBoostWebServiceFlow. Test slice purchase application behavior using ADB shell commands and the APIs below: FROM TERMINAL: @@ -65,8 +65,8 @@ <p id="requested_capability"></p> <h2>Notify purchase successful</h2> - <button type="button" onclick="testNotifyPurchaseSuccessful(60000)"> - Notify purchase successful for 1 minute + <button type="button" onclick="testNotifyPurchaseSuccessful()"> + Notify purchase successful </button> <p id="purchase_successful"></p> @@ -75,5 +75,11 @@ Notify purchase failed </button> <p id="purchase_failed"></p> + + <h2>Dismiss flow</h2> + <button type="button" onclick="testDismissFlow()"> + Dismiss flow + </button> + <p id="dismiss_flow"></p> </body> </html> diff --git a/packages/CarrierDefaultApp/assets/slice_purchase_test.js b/packages/CarrierDefaultApp/assets/slice_purchase_test.js index 02c4feac7ee4..be397a115921 100644 --- a/packages/CarrierDefaultApp/assets/slice_purchase_test.js +++ b/packages/CarrierDefaultApp/assets/slice_purchase_test.js @@ -15,19 +15,25 @@ */ function testGetRequestedCapability() { - let capability = SlicePurchaseWebInterface.getRequestedCapability(); + let capability = DataBoostWebServiceFlow.getRequestedCapability(); document.getElementById("requested_capability").innerHTML = "Premium capability requested: " + capability; } -function testNotifyPurchaseSuccessful(duration_ms_long = 0) { - SlicePurchaseWebInterface.notifyPurchaseSuccessful(duration_ms_long); +function testNotifyPurchaseSuccessful() { + DataBoostWebServiceFlow.notifyPurchaseSuccessful(); document.getElementById("purchase_successful").innerHTML = - "Notified purchase success for duration: " + duration_ms_long; + "Notified purchase successful."; } function testNotifyPurchaseFailed(failure_code = 0, failure_reason = "unknown") { - SlicePurchaseWebInterface.notifyPurchaseFailed(failure_code, failure_reason); + DataBoostWebServiceFlow.notifyPurchaseFailed(failure_code, failure_reason); document.getElementById("purchase_failed").innerHTML = "Notified purchase failed."; } + +function testDismissFlow() { + DataBoostWebServiceFlow.dismissFlow(); + document.getElementById("dismiss_flow").innerHTML = + "Called dismiss flow."; +} diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseWebInterface.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/DataBoostWebServiceFlow.java index 8547898df678..4500a220523d 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseWebInterface.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/DataBoostWebServiceFlow.java @@ -24,13 +24,13 @@ import android.webkit.JavascriptInterface; import com.android.phone.slice.SlicePurchaseController; /** - * Slice purchase web interface class allowing carrier websites to send responses back to the + * Data boost web service flow interface allowing carrier websites to send responses back to the * slice purchase application using JavaScript. */ -public class SlicePurchaseWebInterface { +public class DataBoostWebServiceFlow { @NonNull SlicePurchaseActivity mActivity; - public SlicePurchaseWebInterface(@NonNull SlicePurchaseActivity activity) { + public DataBoostWebServiceFlow(@NonNull SlicePurchaseActivity activity) { mActivity = activity; } @@ -41,7 +41,7 @@ public class SlicePurchaseWebInterface { * This can be called using the JavaScript below: * <script type="text/javascript"> * function getRequestedCapability(duration) { - * SlicePurchaseWebInterface.getRequestedCapability(); + * DataBoostWebServiceFlow.getRequestedCapability(); * } * </script> */ @@ -57,16 +57,14 @@ public class SlicePurchaseWebInterface { * * This can be called using the JavaScript below: * <script type="text/javascript"> - * function notifyPurchaseSuccessful(duration_ms_long = 0) { - * SlicePurchaseWebInterface.notifyPurchaseSuccessful(duration_ms_long); + * function notifyPurchaseSuccessful() { + * DataBoostWebServiceFlow.notifyPurchaseSuccessful(); * } * </script> - * - * @param duration The duration for which the premium capability is purchased in milliseconds. */ @JavascriptInterface - public void notifyPurchaseSuccessful(long duration) { - mActivity.onPurchaseSuccessful(duration); + public void notifyPurchaseSuccessful() { + mActivity.onPurchaseSuccessful(); } /** @@ -76,7 +74,7 @@ public class SlicePurchaseWebInterface { * This can be called using the JavaScript below: * <script type="text/javascript"> * function notifyPurchaseFailed(failure_code = 0, failure_reason = "unknown") { - * SlicePurchaseWebInterface.notifyPurchaseFailed(); + * DataBoostWebServiceFlow.notifyPurchaseFailed(); * } * </script> * @@ -90,4 +88,21 @@ public class SlicePurchaseWebInterface { @Nullable String failureReason) { mActivity.onPurchaseFailed(failureCode, failureReason); } + + /** + * Interface method allowing the carrier website to notify the slice purchase application that + * the service flow ended prematurely. This can be due to user action, an error in the + * web sheet logic, or an error on the network side. + * + * This can be called using the JavaScript below: + * <script type="text/javascript"> + * function dismissFlow() { + * DataBoostWebServiceFlow.dismissFlow(); + * } + * </script> + */ + @JavascriptInterface + public void dismissFlow() { + mActivity.onDismissFlow(); + } } diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java index 946185a3c420..2530257d629a 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java @@ -27,26 +27,25 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; +import android.webkit.CookieManager; import android.webkit.WebView; import com.android.phone.slice.SlicePurchaseController; import java.net.URL; -import java.util.concurrent.TimeUnit; /** * Activity that launches when the user clicks on the performance boost notification. * This will open a {@link WebView} for the carrier website to allow the user to complete the * premium capability purchase. * The carrier website can get the requested premium capability using the JavaScript interface - * method {@code SlicePurchaseWebInterface.getRequestedCapability()}. + * method {@code DataBoostWebServiceFlow.getRequestedCapability()}. * If the purchase is successful, the carrier website shall notify the slice purchase application * using the JavaScript interface method - * {@code SlicePurchaseWebInterface.notifyPurchaseSuccessful(duration)}, where {@code duration} is - * the optional duration of the performance boost. + * {@code DataBoostWebServiceFlow.notifyPurchaseSuccessful()}. * If the purchase was not successful, the carrier website shall notify the slice purchase * application using the JavaScript interface method - * {@code SlicePurchaseWebInterface.notifyPurchaseFailed(code, reason)}, where {@code code} is the + * {@code DataBoostWebServiceFlow.notifyPurchaseFailed(code, reason)}, where {@code code} is the * {@link SlicePurchaseController.FailureCode} indicating the reason for failure and {@code reason} * is the human-readable reason for failure if the failure code is * {@link SlicePurchaseController#FAILURE_CODE_UNKNOWN}. @@ -118,15 +117,11 @@ public class SlicePurchaseActivity extends Activity { setupWebView(); } - protected void onPurchaseSuccessful(long duration) { + protected void onPurchaseSuccessful() { logd("onPurchaseSuccessful: Carrier website indicated successfully purchased premium " - + "capability " + TelephonyManager.convertPremiumCapabilityToString(mCapability) - + (duration > 0 ? " for " + TimeUnit.MILLISECONDS.toMinutes(duration) + " minutes." - : ".")); - Intent intent = new Intent(); - intent.putExtra(SlicePurchaseController.EXTRA_PURCHASE_DURATION, duration); - SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponseWithData(mApplicationContext, - mIntent, SlicePurchaseController.EXTRA_INTENT_SUCCESS, intent); + + "capability " + TelephonyManager.convertPremiumCapabilityToString(mCapability)); + SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse( + mIntent, SlicePurchaseController.EXTRA_INTENT_SUCCESS); finishAndRemoveTask(); } @@ -143,6 +138,14 @@ public class SlicePurchaseActivity extends Activity { finishAndRemoveTask(); } + protected void onDismissFlow() { + logd("onDismissFlow: Dismiss flow called while purchasing premium capability " + + TelephonyManager.convertPremiumCapabilityToString(mCapability)); + SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse( + mIntent, SlicePurchaseController.EXTRA_INTENT_REQUEST_FAILED); + finishAndRemoveTask(); + } + @Override public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) { // Pressing back in the WebView will go to the previous page instead of closing @@ -174,11 +177,17 @@ public class SlicePurchaseActivity extends Activity { // Create WebView mWebView = new WebView(this); + // Clear any cookies and state that might be saved from previous sessions + CookieManager.getInstance().removeAllCookies(null); + CookieManager.getInstance().flush(); + mWebView.clearCache(true); + mWebView.clearHistory(); + // Enable JavaScript for the carrier purchase website to send results back to // the slice purchase application. mWebView.getSettings().setJavaScriptEnabled(true); mWebView.addJavascriptInterface( - new SlicePurchaseWebInterface(this), "SlicePurchaseWebInterface"); + new DataBoostWebServiceFlow(this), "DataBoostWebServiceFlow"); // Display WebView setContentView(mWebView); diff --git a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java index daf0b42dbd7c..cc103fa98e65 100644 --- a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java +++ b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/SlicePurchaseActivityTest.java @@ -53,7 +53,9 @@ public class SlicePurchaseActivityTest extends ActivityUnitTestCase<SlicePurchas private static final int PHONE_ID = 0; @Mock PendingIntent mPendingIntent; + @Mock PendingIntent mSuccessfulIntent; @Mock PendingIntent mCanceledIntent; + @Mock PendingIntent mRequestFailedIntent; @Mock CarrierConfigManager mCarrierConfigManager; @Mock NotificationManager mNotificationManager; @Mock PersistableBundle mPersistableBundle; @@ -107,25 +109,28 @@ public class SlicePurchaseActivityTest extends ActivityUnitTestCase<SlicePurchas doReturn(true).when(mCanceledIntent).isBroadcast(); doReturn(mCanceledIntent).when(spiedIntent).getParcelableExtra( eq(SlicePurchaseController.EXTRA_INTENT_CANCELED), eq(PendingIntent.class)); + doReturn(TelephonyManager.PHONE_PROCESS_NAME).when(mSuccessfulIntent).getCreatorPackage(); + doReturn(true).when(mSuccessfulIntent).isBroadcast(); + doReturn(mSuccessfulIntent).when(spiedIntent).getParcelableExtra( + eq(SlicePurchaseController.EXTRA_INTENT_SUCCESS), eq(PendingIntent.class)); + doReturn(TelephonyManager.PHONE_PROCESS_NAME).when(mRequestFailedIntent) + .getCreatorPackage(); + doReturn(true).when(mRequestFailedIntent).isBroadcast(); + doReturn(mRequestFailedIntent).when(spiedIntent).getParcelableExtra( + eq(SlicePurchaseController.EXTRA_INTENT_REQUEST_FAILED), eq(PendingIntent.class)); mSlicePurchaseActivity = startActivity(spiedIntent, null, null); } @Test public void testOnPurchaseSuccessful() throws Exception { - int duration = 5 * 60 * 1000; // 5 minutes - int invalidDuration = -1; - mSlicePurchaseActivity.onPurchaseSuccessful(duration); - ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mPendingIntent).send(eq(mContext), eq(0), intentCaptor.capture()); - Intent intent = intentCaptor.getValue(); - assertEquals(duration, intent.getLongExtra( - SlicePurchaseController.EXTRA_PURCHASE_DURATION, invalidDuration)); + mSlicePurchaseActivity.onPurchaseSuccessful(); + verify(mSuccessfulIntent).send(); } @Test public void testOnPurchaseFailed() throws Exception { - int failureCode = SlicePurchaseController.FAILURE_CODE_SERVER_UNREACHABLE; + int failureCode = SlicePurchaseController.FAILURE_CODE_CARRIER_URL_UNAVAILABLE; String failureReason = "Server unreachable"; mSlicePurchaseActivity.onPurchaseFailed(failureCode, failureReason); ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); @@ -142,4 +147,10 @@ public class SlicePurchaseActivityTest extends ActivityUnitTestCase<SlicePurchas mSlicePurchaseActivity.onDestroy(); verify(mCanceledIntent).send(); } + + @Test + public void testOnDismissFlow() throws Exception { + mSlicePurchaseActivity.onDismissFlow(); + verify(mRequestFailedIntent).send(); + } } diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index aae30dfe6223..a0b34690696f 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -144,7 +144,7 @@ android:visibility="gone" android:duplicateParentState="true" android:clickable="false" - android:text="@string/consent_no" /> + android:text="@string/consent_cancel" /> </LinearLayout> diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index 2502bbf7b40b..7a6fad4b6d51 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -20,7 +20,7 @@ <string name="app_label">Companion Device Manager</string> <!-- Title of the device association confirmation dialog. --> - <string name="confirmation_title">Allow <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> to access <strong><xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g></strong>?</string> + <string name="confirmation_title">Allow the app <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> to access <strong><xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g></strong>?</string> <!-- ================= DEVICE_PROFILE_WATCH and null profile ================= --> @@ -28,13 +28,13 @@ <string name="profile_name_watch">watch</string> <!-- Title of the device selection dialog. --> - <string name="chooser_title">Choose a <xliff:g id="profile_name" example="watch">%1$s</xliff:g> to be managed by <strong><xliff:g id="app_name" example="Android Wear">%2$s</xliff:g></strong></string> + <string name="chooser_title_non_profile">Choose a device to be managed by <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong></string> - <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile (type) [CHAR LIMIT=NONE] --> - <string name="summary_watch">This app is needed to manage your <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions.</string> + <!-- Tile of the multiple devices' dialog. --> + <string name="chooser_title">Choose a <xliff:g id="profile_name" example="watch">%1$s</xliff:g> to set up</string> - <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile for singleDevice(type) [CHAR LIMIT=NONE] --> - <string name="summary_watch_single_device">This app will be allowed to sync info, like the name of someone calling, and access these permissions on your <xliff:g id="device_type" example="phone">%1$s</xliff:g></string> + <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile [CHAR LIMIT=NONE] --> + <string name="summary_watch">This app will be allowed to sync info, like the name of someone calling, and access these permissions on your <xliff:g id="device_name" example="phone">%1$s</xliff:g></string> <!-- ================= DEVICE_PROFILE_GLASSES ================= --> @@ -42,13 +42,10 @@ <string name="confirmation_title_glasses">Allow <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> to manage <strong><xliff:g id="device_name" example="Glasses">%2$s</xliff:g></strong>?</string> <!-- The name of the "glasses" device type [CHAR LIMIT=30] --> - <string name="profile_name_glasses">glasses</string> + <string name="profile_name_glasses">device</string> - <!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile (type) [CHAR LIMIT=NONE] --> - <string name="summary_glasses_multi_device">This app is needed to manage <xliff:g id="device_name" example="My Glasses">%1$s</xliff:g>. <xliff:g id="app_name" example="Glasses">%2$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions.</string> - - <!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile for singleDevice(type) [CHAR LIMIT=NONE] --> - <string name="summary_glasses_single_device">This app will be allowed to access these permissions on your <xliff:g id="device_type" example="phone">%1$s</xliff:g></string> + <!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile [CHAR LIMIT=NONE] --> + <string name="summary_glasses">This app will be allowed to access these permissions on your <xliff:g id="device_name" example="phone">%1$s</xliff:g></string> <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= --> @@ -97,9 +94,6 @@ <string name="profile_name_generic">device</string> <!-- Description of the privileges the application will get if associated with the companion device of unspecified profile (type) [CHAR LIMIT=NONE] --> - <string name="summary_generic_single_device">This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="device_name" example="My Watch">%1$s</xliff:g></string> - - <!-- Description of the privileges the application will get if associated with the companion device of unspecified profile (type) [CHAR LIMIT=NONE] --> <string name="summary_generic">This app will be able to sync info, like the name of someone calling, between your phone and the chosen device</string> <!-- ================= Buttons ================= --> @@ -110,6 +104,9 @@ <!-- Negative button for the device-app association consent dialog [CHAR LIMIT=30] --> <string name="consent_no">Don\u2019t allow</string> + <!-- Cancel button for the device chooser dialog [CHAR LIMIT=30] --> + <string name="consent_cancel">Cancel</string> + <!-- Back button for the helper consent dialog [CHAR LIMIT=30] --> <string name="consent_back">Back</string> diff --git a/packages/CompanionDeviceManager/res/values/styles.xml b/packages/CompanionDeviceManager/res/values/styles.xml index e85190be0e1e..222877bbe9e9 100644 --- a/packages/CompanionDeviceManager/res/values/styles.xml +++ b/packages/CompanionDeviceManager/res/values/styles.xml @@ -69,11 +69,13 @@ <style name="PositiveButton" parent="@android:style/Widget.Material.Button.Borderless.Colored"> - <item name="android:layout_width">300dp</item> - <item name="android:layout_height">56dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginBottom">2dp</item> <item name="android:textAllCaps">false</item> <item name="android:textSize">14sp</item> + <item name="android:layout_marginStart">32dp</item> + <item name="android:layout_marginEnd">32dp</item> <item name="android:textColor">@android:color/system_neutral1_900</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item> <item name="android:background">@drawable/btn_positive_bottom</item> @@ -81,11 +83,13 @@ <style name="NegativeButton" parent="@android:style/Widget.Material.Button.Borderless.Colored"> - <item name="android:layout_width">300dp</item> - <item name="android:layout_height">56dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginTop">2dp</item> <item name="android:textAllCaps">false</item> <item name="android:textSize">14sp</item> + <item name="android:layout_marginStart">32dp</item> + <item name="android:layout_marginEnd">32dp</item> <item name="android:textColor">@android:color/system_neutral1_900</item> <item name="android:layout_marginTop">4dp</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item> diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 4154029b6d41..97016f5384f6 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -27,10 +27,8 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService.DiscoveryState; import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService.DiscoveryState.FINISHED_TIMEOUT; -import static com.android.companiondevicemanager.CompanionDeviceResources.MULTI_DEVICES_SUMMARIES; import static com.android.companiondevicemanager.CompanionDeviceResources.PERMISSION_TYPES; import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILES_NAME; -import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILES_NAME_MULTI; import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILE_ICON; import static com.android.companiondevicemanager.CompanionDeviceResources.SUMMARIES; import static com.android.companiondevicemanager.CompanionDeviceResources.SUPPORTED_PROFILES; @@ -121,6 +119,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements private IAssociationRequestCallback mAppCallback; private ResultReceiver mCdmServiceReceiver; + // Present for application's name. + private CharSequence mAppLabel; + // Always present widgets. private TextView mTitle; private TextView mSummary; @@ -165,8 +166,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements private @Nullable RecyclerView mDeviceListRecyclerView; private @Nullable DeviceListAdapter mDeviceAdapter; - - // The recycler view is only shown for selfManaged and singleDevice association request. + // The recycler view is shown for non-null profile association request. private @Nullable RecyclerView mPermissionListRecyclerView; private @Nullable PermissionListAdapter mPermissionListAdapter; @@ -178,8 +178,6 @@ public class CompanionDeviceActivity extends FragmentActivity implements // onActivityResult() after the association is created. private @Nullable DeviceFilterPair<?> mSelectedDevice; - private @Nullable List<Integer> mPermissionTypes; - private LinearLayoutManager mPermissionsLayoutManager = new LinearLayoutManager(this); @Override @@ -302,6 +300,8 @@ public class CompanionDeviceActivity extends FragmentActivity implements setContentView(R.layout.activity_confirmation); + mAppLabel = appLabel; + mConstraintList = findViewById(R.id.constraint_list); mAssociationConfirmationDialog = findViewById(R.id.association_confirmation); mVendorHeader = findViewById(R.id.vendor_header); @@ -322,7 +322,6 @@ public class CompanionDeviceActivity extends FragmentActivity implements mMultipleDeviceSpinner = findViewById(R.id.spinner_multiple_device); mSingleDeviceSpinner = findViewById(R.id.spinner_single_device); - mDeviceAdapter = new DeviceListAdapter(this, this::onListItemClick); mPermissionListRecyclerView = findViewById(R.id.permission_list); mPermissionListAdapter = new PermissionListAdapter(this); @@ -468,8 +467,6 @@ public class CompanionDeviceActivity extends FragmentActivity implements throw new RuntimeException("Unsupported profile " + deviceProfile); } - mPermissionTypes = new ArrayList<>(); - try { vendorIcon = getVendorHeaderIcon(this, packageName, userId); vendorName = getVendorHeaderName(this, packageName, userId); @@ -486,17 +483,13 @@ public class CompanionDeviceActivity extends FragmentActivity implements } title = getHtmlFromResources(this, TITLES.get(deviceProfile), deviceName); - mPermissionTypes.addAll(PERMISSION_TYPES.get(deviceProfile)); + setupPermissionList(deviceProfile); // Summary is not needed for selfManaged dialog. mSummary.setVisibility(View.GONE); - - setupPermissionList(); - mTitle.setText(title); mVendorHeaderName.setText(vendorName); mVendorHeader.setVisibility(View.VISIBLE); - mVendorHeader.setVisibility(View.VISIBLE); mProfileIcon.setVisibility(View.GONE); mDeviceListRecyclerView.setVisibility(View.GONE); // Top and bottom borders should be gone for selfManaged dialog. @@ -509,7 +502,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements final String deviceProfile = mRequest.getDeviceProfile(); - mPermissionTypes = new ArrayList<>(); + if (!SUPPORTED_PROFILES.contains(deviceProfile)) { + throw new RuntimeException("Unsupported profile " + deviceProfile); + } CompanionDeviceDiscoveryService.getScanResult().observe(this, deviceFilterPairs -> updateSingleDeviceUi( @@ -529,75 +524,40 @@ public class CompanionDeviceActivity extends FragmentActivity implements if (deviceFilterPairs.isEmpty()) return; mSelectedDevice = requireNonNull(deviceFilterPairs.get(0)); - // No need to show user consent dialog if it is a singleDevice - // and isSkipPrompt(true) AssociationRequest. - // See AssociationRequestsProcessor#mayAssociateWithoutPrompt. - if (mRequest.isSkipPrompt()) { - mSingleDeviceSpinner.setVisibility(View.GONE); - onUserSelectedDevice(mSelectedDevice); - return; - } - - final String deviceName = mSelectedDevice.getDisplayName(); - final Spanned title; - final Spanned summary; - final Drawable profileIcon; - if (!SUPPORTED_PROFILES.contains(deviceProfile)) { - throw new RuntimeException("Unsupported profile " + deviceProfile); - } + final Drawable profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile)); - if (deviceProfile == null) { - summary = getHtmlFromResources(this, SUMMARIES.get(null), deviceName); - mConstraintList.setVisibility(View.GONE); - } else { - summary = getHtmlFromResources( - this, SUMMARIES.get(deviceProfile), getString(R.string.device_type)); - mPermissionTypes.addAll(PERMISSION_TYPES.get(deviceProfile)); - setupPermissionList(); - } - - title = getHtmlFromResources(this, TITLES.get(deviceProfile), appLabel, deviceName); - profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile)); + updatePermissionUi(); - mTitle.setText(title); - mSummary.setText(summary); mProfileIcon.setImageDrawable(profileIcon); - mSingleDeviceSpinner.setVisibility(View.GONE); mAssociationConfirmationDialog.setVisibility(View.VISIBLE); + mSingleDeviceSpinner.setVisibility(View.GONE); } private void initUiForMultipleDevices(CharSequence appLabel) { if (DEBUG) Log.i(TAG, "initUiFor_MultipleDevices()"); - final String deviceProfile = mRequest.getDeviceProfile(); - - final String profileName; - final String profileNameMulti; - final Spanned summary; final Drawable profileIcon; - final int summaryResourceId; + final Spanned title; + final String deviceProfile = mRequest.getDeviceProfile(); if (!SUPPORTED_PROFILES.contains(deviceProfile)) { throw new RuntimeException("Unsupported profile " + deviceProfile); } - profileName = getString(PROFILES_NAME.get(deviceProfile)); - profileNameMulti = getString(PROFILES_NAME_MULTI.get(deviceProfile)); profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile)); - summaryResourceId = MULTI_DEVICES_SUMMARIES.get(deviceProfile); if (deviceProfile == null) { - summary = getHtmlFromResources(this, summaryResourceId); + title = getHtmlFromResources(this, R.string.chooser_title_non_profile, appLabel); + mButtonNotAllowMultipleDevices.setText(R.string.consent_no); } else { - summary = getHtmlFromResources(this, summaryResourceId, profileName, appLabel); + title = getHtmlFromResources(this, + R.string.chooser_title, getString(PROFILES_NAME.get(deviceProfile))); } - final Spanned title = getHtmlFromResources( - this, R.string.chooser_title, profileNameMulti, appLabel); + mDeviceAdapter = new DeviceListAdapter(this, this::onDeviceClicked); mTitle.setText(title); - mSummary.setText(summary); mProfileIcon.setImageDrawable(profileIcon); mDeviceListRecyclerView.setAdapter(mDeviceAdapter); @@ -613,6 +573,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements mDeviceAdapter.setDevices(deviceFilterPairs); }); + mSummary.setVisibility(View.GONE); // "Remove" consent button: users would need to click on the list item. mButtonAllow.setVisibility(View.GONE); mButtonNotAllow.setVisibility(View.GONE); @@ -623,11 +584,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements mMultipleDeviceSpinner.setVisibility(View.VISIBLE); } - private void onListItemClick(int position) { - if (DEBUG) Log.d(TAG, "onListItemClick() " + position); - + private void onDeviceClicked(int position) { final DeviceFilterPair<?> selectedDevice = mDeviceAdapter.getItem(position); - + // To prevent double tap on the selected device. if (mSelectedDevice != null) { if (DEBUG) Log.w(TAG, "Already selected."); return; @@ -637,7 +596,47 @@ public class CompanionDeviceActivity extends FragmentActivity implements mSelectedDevice = requireNonNull(selectedDevice); - onUserSelectedDevice(selectedDevice); + Log.d(TAG, "onDeviceClicked(): " + mSelectedDevice.toShortString()); + + updatePermissionUi(); + + mSummary.setVisibility(View.VISIBLE); + mButtonAllow.setVisibility(View.VISIBLE); + mButtonNotAllow.setVisibility(View.VISIBLE); + mDeviceListRecyclerView.setVisibility(View.GONE); + mNotAllowMultipleDevicesLayout.setVisibility(View.GONE); + } + + private void updatePermissionUi() { + final String deviceProfile = mRequest.getDeviceProfile(); + final int summaryResourceId = SUMMARIES.get(deviceProfile); + final String remoteDeviceName = mSelectedDevice.getDisplayName(); + final Spanned title = getHtmlFromResources( + this, TITLES.get(deviceProfile), mAppLabel, remoteDeviceName); + final Spanned summary; + + // No need to show permission consent dialog if it is a isSkipPrompt(true) + // AssociationRequest. See AssociationRequestsProcessor#mayAssociateWithoutPrompt. + if (mRequest.isSkipPrompt()) { + mSingleDeviceSpinner.setVisibility(View.GONE); + onUserSelectedDevice(mSelectedDevice); + return; + } + + if (deviceProfile == null && mRequest.isSingleDevice()) { + summary = getHtmlFromResources(this, summaryResourceId, remoteDeviceName); + mConstraintList.setVisibility(View.GONE); + } else if (deviceProfile == null) { + onUserSelectedDevice(mSelectedDevice); + return; + } else { + summary = getHtmlFromResources( + this, summaryResourceId, getString(R.string.device_type)); + setupPermissionList(deviceProfile); + } + + mTitle.setText(title); + mSummary.setText(summary); } private void onPositiveButtonClick(View v) { @@ -680,8 +679,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements // initiate the layoutManager for the recyclerview, add listeners for monitoring the scrolling // and when mPermissionListRecyclerView is fully populated. // Lastly, disable the Allow and Don't allow buttons. - private void setupPermissionList() { - mPermissionListAdapter.setPermissionType(mPermissionTypes); + private void setupPermissionList(String deviceProfile) { + final List<Integer> permissionTypes = new ArrayList<>(PERMISSION_TYPES.get(deviceProfile)); + mPermissionListAdapter.setPermissionType(permissionTypes); mPermissionListRecyclerView.setAdapter(mPermissionListAdapter); mPermissionListRecyclerView.setLayoutManager(mPermissionsLayoutManager); diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java index 7aed13960b08..060c03213bcd 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java @@ -86,21 +86,11 @@ final class CompanionDeviceResources { static final Map<String, Integer> SUMMARIES; static { final Map<String, Integer> map = new ArrayMap<>(); - map.put(DEVICE_PROFILE_WATCH, R.string.summary_watch_single_device); - map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses_single_device); - map.put(null, R.string.summary_generic_single_device); - - SUMMARIES = unmodifiableMap(map); - } - - static final Map<String, Integer> MULTI_DEVICES_SUMMARIES; - static { - final Map<String, Integer> map = new ArrayMap<>(); map.put(DEVICE_PROFILE_WATCH, R.string.summary_watch); - map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses_multi_device); + map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses); map.put(null, R.string.summary_generic); - MULTI_DEVICES_SUMMARIES = unmodifiableMap(map); + SUMMARIES = unmodifiableMap(map); } static final Map<String, Integer> PROFILES_NAME; diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java b/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java index 7b17cbdd3a1e..19d74b33e034 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java @@ -16,6 +16,8 @@ package com.android.packageinstaller; +import static android.content.Intent.CATEGORY_LAUNCHER; + import static com.android.packageinstaller.PackageInstallerActivity.EXTRA_STAGED_SESSION_ID; import android.app.Activity; @@ -45,6 +47,9 @@ public class DeleteStagedFileOnResult extends Activity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { setResult(resultCode, data); finish(); + if (data != null && data.hasCategory(CATEGORY_LAUNCHER)) { + startActivity(data); + } } @Override diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java index 73c03a57cade..ff991d2f7ee3 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java @@ -17,7 +17,6 @@ package com.android.packageinstaller; import android.app.Activity; -import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -123,11 +122,7 @@ public class InstallSuccess extends AlertActivity { Button launchButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE); if (enabled) { launchButton.setOnClickListener(view -> { - try { - startActivity(mLaunchIntent); - } catch (ActivityNotFoundException | SecurityException e) { - Log.e(LOG_TAG, "Could not start activity", e); - } + setResult(Activity.RESULT_OK, mLaunchIntent); finish(); }); } else { diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java index d1541569bc55..e071c111d617 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -16,8 +16,9 @@ */ package com.android.packageinstaller; +import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.content.Intent.FLAG_ACTIVITY_NO_HISTORY; -import static android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT; +import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; import android.Manifest; @@ -789,7 +790,8 @@ public class PackageInstallerActivity extends AlertActivity { } new Handler(Looper.getMainLooper()).postDelayed(() -> { if (!isDestroyed()) { - startActivity(getIntent().addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT)); + startActivity(getIntent().addFlags( + FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP)); } }, 500); diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts new file mode 100644 index 000000000000..64b67d7fe4f1 --- /dev/null +++ b/packages/SettingsLib/Spa/build.gradle.kts @@ -0,0 +1,66 @@ +/* + * Copyright 2022 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. + */ + +import com.android.build.gradle.BaseExtension +import com.android.build.gradle.api.AndroidBasePlugin +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false +} + +allprojects { + extra["jetpackComposeVersion"] = "1.4.0-beta01" +} + +subprojects { + plugins.withType<AndroidBasePlugin> { + configure<BaseExtension> { + compileSdkVersion(33) + + defaultConfig { + minSdk = 21 + targetSdk = 34 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + } + } + + afterEvaluate { + plugins.withType<AndroidBasePlugin> { + configure<BaseExtension> { + if (buildFeatures.compose == true) { + composeOptions { + kotlinCompilerExtensionVersion = "1.4.4" + } + } + } + } + } + + tasks.withType<KotlinCompile> { + kotlinOptions { + jvmTarget = "17" + freeCompilerArgs = listOf("-Xjvm-default=all") + } + } +} diff --git a/packages/SettingsLib/Spa/gallery/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle deleted file mode 100644 index 212aa7b7851d..000000000000 --- a/packages/SettingsLib/Spa/gallery/build.gradle +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2022 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. - */ - -plugins { - id 'com.android.application' - id 'kotlin-android' -} - -android { - namespace 'com.android.settingslib.spa.gallery' - compileSdk TARGET_SDK - buildToolsVersion = BUILD_TOOLS_VERSION - - defaultConfig { - applicationId "com.android.settingslib.spa.gallery" - minSdk MIN_SDK - targetSdk TARGET_SDK - versionCode 1 - versionName "1.0" - } - - sourceSets { - main { - kotlin { - srcDir "src" - } - res.srcDirs = ["res"] - manifest.srcFile "AndroidManifest.xml" - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion jetpack_compose_compiler_version - } -} - -dependencies { - implementation project(":spa") -} diff --git a/packages/SettingsLib/Spa/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle.kts index e68ef85cd43d..7f689c16b7ed 100644 --- a/packages/SettingsLib/Spa/build.gradle +++ b/packages/SettingsLib/Spa/gallery/build.gradle.kts @@ -14,27 +14,32 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -buildscript { - ext { - BUILD_TOOLS_VERSION = "30.0.3" - MIN_SDK = 21 - TARGET_SDK = 33 - jetpack_compose_version = '1.4.0-beta01' - jetpack_compose_compiler_version = '1.4.4' - } -} plugins { - id 'com.android.application' version '8.0.0' apply false - id 'com.android.library' version '8.0.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) } -subprojects { - tasks.withType(KotlinCompile).configureEach { - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = ["-Xjvm-default=all"] + +android { + namespace = "com.android.settingslib.spa.gallery" + + defaultConfig { + applicationId = "com.android.settingslib.spa.gallery" + versionCode = 1 + versionName = "1.0" + } + + sourceSets { + sourceSets.getByName("main") { + java.setSrcDirs(listOf("src")) + res.setSrcDirs(listOf("res")) + manifest.srcFile("AndroidManifest.xml") } } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(project(":spa")) } diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml new file mode 100644 index 000000000000..9a16df8c834c --- /dev/null +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml @@ -0,0 +1,30 @@ +# +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +[versions] +agp = "8.0.2" +dexmaker-mockito = "2.28.3" +kotlin = "1.8.10" +truth = "1.1" + +[libraries] +dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" } +truth = { module = "com.google.truth:truth", version.ref = "truth" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index ed85e33ca8a6..33f49e33a47e 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties @@ -14,9 +14,8 @@ # limitations under the License. # -#Thu Jul 14 10:36:06 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/SettingsLib/Spa/settings.gradle b/packages/SettingsLib/Spa/settings.gradle.kts index 1c5a1ceda34a..9909781b0623 100644 --- a/packages/SettingsLib/Spa/settings.gradle +++ b/packages/SettingsLib/Spa/settings.gradle.kts @@ -16,20 +16,27 @@ pluginManagement { repositories { - gradlePluginPortal() google() mavenCentral() + gradlePluginPortal() } } dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + rulesMode.set(RulesMode.FAIL_ON_PROJECT_RULES) + repositories { google() mavenCentral() - maven { url "https://jitpack.io"} + maven { + url = uri("https://jitpack.io") + content { + includeGroup("com.github.PhilJay") + } + } } } rootProject.name = "SpaLib" -include ':spa' -include ':gallery' -include ':testutils' +include(":spa") +include(":gallery") +include(":testutils") diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle deleted file mode 100644 index a591366cd63f..000000000000 --- a/packages/SettingsLib/Spa/spa/build.gradle +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2022 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. - */ - -plugins { - id 'com.android.library' - id 'kotlin-android' -} - -android { - namespace 'com.android.settingslib.spa' - compileSdk TARGET_SDK - buildToolsVersion = BUILD_TOOLS_VERSION - - defaultConfig { - minSdk MIN_SDK - targetSdk TARGET_SDK - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - sourceSets { - main { - kotlin { - srcDir "src" - } - res.srcDirs = ["res"] - manifest.srcFile "AndroidManifest.xml" - } - androidTest { - kotlin { - srcDir "../tests/src" - } - res.srcDirs = ["../tests/res"] - manifest.srcFile "../tests/AndroidManifest.xml" - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion jetpack_compose_compiler_version - } - buildTypes { - debug { - testCoverageEnabled = true - } - } -} - -dependencies { - api "androidx.appcompat:appcompat:1.7.0-alpha02" - api "androidx.slice:slice-builders:1.1.0-alpha02" - api "androidx.slice:slice-core:1.1.0-alpha02" - api "androidx.slice:slice-view:1.1.0-alpha02" - api "androidx.compose.material3:material3:1.1.0-alpha06" - api "androidx.compose.material:material-icons-extended:$jetpack_compose_version" - api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version" - api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version" - api "androidx.lifecycle:lifecycle-livedata-ktx" - api "androidx.lifecycle:lifecycle-runtime-compose" - api "androidx.navigation:navigation-compose:2.6.0-alpha08" - api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha" - api "com.google.android.material:material:1.7.0-alpha03" - debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version" - implementation "com.airbnb.android:lottie-compose:5.2.0" - - androidTestImplementation project(":testutils") - androidTestImplementation 'androidx.lifecycle:lifecycle-runtime-testing' - androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.3" -} - -task coverageReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest") { - group = "Reporting" - description = "Generate Jacoco coverage reports after running tests." - - sourceDirectories.from = files("src") - classDirectories.from = fileTree( - dir: "$buildDir/tmp/kotlin-classes/debug", - excludes: [ - "com/android/settingslib/spa/debug/**", - - // Excludes files forked from AndroidX. - "com/android/settingslib/spa/widget/scaffold/CustomizedAppBar*", - "com/android/settingslib/spa/widget/scaffold/TopAppBarColors*", - - // Excludes files forked from Accompanist. - "com/android/settingslib/spa/framework/compose/DrawablePainter*", - - // Excludes inline functions, which is not covered in Jacoco reports. - "com/android/settingslib/spa/framework/util/Collections*", - "com/android/settingslib/spa/framework/util/Flows*", - - // Excludes debug functions - "com/android/settingslib/spa/framework/compose/TimeMeasurer*", - - // Excludes slice demo presenter & provider - "com/android/settingslib/spa/slice/presenter/Demo*", - "com/android/settingslib/spa/slice/provider/Demo*", - ], - ) - executionData.from = fileTree(dir: "$buildDir/outputs/code_coverage/debugAndroidTest/connected") -} diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts new file mode 100644 index 000000000000..fac63361fc1e --- /dev/null +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -0,0 +1,110 @@ +/* + * Copyright 2022 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. + */ + +plugins { + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.kotlin.android.get().pluginId) + jacoco +} + +val jetpackComposeVersion: String? by extra + +android { + namespace = "com.android.settingslib.spa" + + defaultConfig { + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + sourceSets { + sourceSets.getByName("main") { + kotlin.setSrcDirs(listOf("src")) + res.setSrcDirs(listOf("res")) + manifest.srcFile("AndroidManifest.xml") + } + sourceSets.getByName("androidTest") { + kotlin.setSrcDirs(listOf("../tests/src")) + res.setSrcDirs(listOf("../tests/res")) + manifest.srcFile("../tests/AndroidManifest.xml") + } + } + buildFeatures { + compose = true + } + buildTypes { + getByName("debug") { + enableAndroidTestCoverage = true + } + } +} + +dependencies { + api("androidx.appcompat:appcompat:1.7.0-alpha02") + api("androidx.slice:slice-builders:1.1.0-alpha02") + api("androidx.slice:slice-core:1.1.0-alpha02") + api("androidx.slice:slice-view:1.1.0-alpha02") + api("androidx.compose.material3:material3:1.1.0-alpha06") + api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion") + api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion") + api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion") + api("androidx.lifecycle:lifecycle-livedata-ktx") + api("androidx.lifecycle:lifecycle-runtime-compose") + api("androidx.navigation:navigation-compose:2.6.0-alpha08") + api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") + api("com.google.android.material:material:1.7.0-alpha03") + debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion") + implementation("com.airbnb.android:lottie-compose:5.2.0") + + androidTestImplementation(project(":testutils")) + androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing") +} + +tasks.register<JacocoReport>("coverageReport") { + group = "Reporting" + description = "Generate Jacoco coverage reports after running tests." + dependsOn("connectedDebugAndroidTest") + sourceDirectories.setFrom(files("src")) + classDirectories.setFrom( + fileTree(layout.buildDirectory.dir("tmp/kotlin-classes/debug")) { + setExcludes( + listOf( + "com/android/settingslib/spa/debug/**", + + // Excludes files forked from AndroidX. + "com/android/settingslib/spa/widget/scaffold/CustomizedAppBar*", + "com/android/settingslib/spa/widget/scaffold/TopAppBarColors*", + + // Excludes files forked from Accompanist. + "com/android/settingslib/spa/framework/compose/DrawablePainter*", + + // Excludes inline functions, which is not covered in Jacoco reports. + "com/android/settingslib/spa/framework/util/Collections*", + "com/android/settingslib/spa/framework/util/Flows*", + + // Excludes debug functions + "com/android/settingslib/spa/framework/compose/TimeMeasurer*", + + // Excludes slice demo presenter & provider + "com/android/settingslib/spa/slice/presenter/Demo*", + "com/android/settingslib/spa/slice/provider/Demo*", + ) + ) + } + ) + executionData.setFrom( + fileTree(layout.buildDirectory.dir("outputs/code_coverage/debugAndroidTest/connected")) + ) +} diff --git a/packages/SettingsLib/Spa/testutils/build.gradle b/packages/SettingsLib/Spa/testutils/build.gradle deleted file mode 100644 index 23a9add79d50..000000000000 --- a/packages/SettingsLib/Spa/testutils/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2022 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. - */ - -plugins { - id 'com.android.library' - id 'kotlin-android' -} - -android { - namespace 'com.android.settingslib.spa.testutils' - compileSdk TARGET_SDK - buildToolsVersion = BUILD_TOOLS_VERSION - - defaultConfig { - minSdk MIN_SDK - targetSdk TARGET_SDK - } - - sourceSets { - main { - kotlin { - srcDir "src" - } - manifest.srcFile "AndroidManifest.xml" - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion jetpack_compose_compiler_version - } -} - -dependencies { - api project(":spa") - - api "androidx.arch.core:core-testing:2.2.0-alpha01" - api "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version" - api "com.google.truth:truth:1.1.3" - api "org.mockito:mockito-core:2.21.0" - debugApi "androidx.compose.ui:ui-test-manifest:$jetpack_compose_version" -} diff --git a/packages/SettingsLib/Spa/testutils/build.gradle.kts b/packages/SettingsLib/Spa/testutils/build.gradle.kts new file mode 100644 index 000000000000..c3df9bc80628 --- /dev/null +++ b/packages/SettingsLib/Spa/testutils/build.gradle.kts @@ -0,0 +1,46 @@ +/* + * Copyright 2022 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. + */ + +plugins { + id(libs.plugins.android.library.get().pluginId) + id(libs.plugins.kotlin.android.get().pluginId) +} + +val jetpackComposeVersion: String? by extra + +android { + namespace = "com.android.settingslib.spa.testutils" + + sourceSets { + sourceSets.getByName("main") { + java.setSrcDirs(listOf("src")) + manifest.srcFile("AndroidManifest.xml") + } + } + buildFeatures { + compose = true + } +} + +dependencies { + api(project(":spa")) + + api("androidx.arch.core:core-testing:2.2.0-alpha01") + api("androidx.compose.ui:ui-test-junit4:$jetpackComposeVersion") + api(libs.truth) + api(libs.dexmaker.mockito) + debugApi("androidx.compose.ui:ui-test-manifest:$jetpackComposeVersion") +} diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt index 2b38b4cefe3e..8e0cf894bb28 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt @@ -34,11 +34,11 @@ import kotlinx.coroutines.runBlocking /** * The repository to load the App List data. */ -internal interface AppListRepository { +interface AppListRepository { /** Loads the list of [ApplicationInfo]. */ suspend fun loadApps( userId: Int, - showInstantApps: Boolean = false, + loadInstantApps: Boolean = false, matchAnyUserForAdmin: Boolean = false, ): List<ApplicationInfo> @@ -50,6 +50,9 @@ internal interface AppListRepository { /** Gets the system app package names. */ fun getSystemPackageNamesBlocking(userId: Int): Set<String> + + /** Loads the list of [ApplicationInfo], and filter base on `isSystemApp`. */ + suspend fun loadAndFilterApps(userId: Int, isSystemApp: Boolean): List<ApplicationInfo> } /** @@ -62,13 +65,13 @@ object AppListRepositoryUtil { AppListRepositoryImpl(context).getSystemPackageNamesBlocking(userId) } -internal class AppListRepositoryImpl(private val context: Context) : AppListRepository { +class AppListRepositoryImpl(private val context: Context) : AppListRepository { private val packageManager = context.packageManager private val userManager = context.userManager override suspend fun loadApps( userId: Int, - showInstantApps: Boolean, + loadInstantApps: Boolean, matchAnyUserForAdmin: Boolean, ): List<ApplicationInfo> = coroutineScope { val hiddenSystemModulesDeferred = async { @@ -86,7 +89,7 @@ internal class AppListRepositoryImpl(private val context: Context) : AppListRepo val hiddenSystemModules = hiddenSystemModulesDeferred.await() val hideWhenDisabledPackages = hideWhenDisabledPackagesDeferred.await() installedApplicationsAsUser.filter { app -> - app.isInAppList(showInstantApps, hiddenSystemModules, hideWhenDisabledPackages) + app.isInAppList(loadInstantApps, hiddenSystemModules, hideWhenDisabledPackages) } } @@ -136,17 +139,17 @@ internal class AppListRepositoryImpl(private val context: Context) : AppListRepo ): Flow<(app: ApplicationInfo) -> Boolean> = userIdFlow.combine(showSystemFlow, ::showSystemPredicate) - override fun getSystemPackageNamesBlocking(userId: Int) = - runBlocking { getSystemPackageNames(userId) } + override fun getSystemPackageNamesBlocking(userId: Int) = runBlocking { + loadAndFilterApps(userId = userId, isSystemApp = true).map { it.packageName }.toSet() + } - private suspend fun getSystemPackageNames(userId: Int): Set<String> = - coroutineScope { - val loadAppsDeferred = async { loadApps(userId) } - val homeOrLauncherPackages = loadHomeOrLauncherPackages(userId) - val showSystemPredicate = - { app: ApplicationInfo -> isSystemApp(app, homeOrLauncherPackages) } - loadAppsDeferred.await().filter(showSystemPredicate).map { it.packageName }.toSet() + override suspend fun loadAndFilterApps(userId: Int, isSystemApp: Boolean) = coroutineScope { + val loadAppsDeferred = async { loadApps(userId) } + val homeOrLauncherPackages = loadHomeOrLauncherPackages(userId) + loadAppsDeferred.await().filter { app -> + isSystemApp(app, homeOrLauncherPackages) == isSystemApp } + } private suspend fun showSystemPredicate( userId: Int, diff --git a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt index 302f78081626..375ed60e17cf 100644 --- a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt +++ b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt @@ -108,7 +108,7 @@ class AppListRepositoryTest { val appList = repository.loadApps( userId = ADMIN_USER_ID, - showInstantApps = false, + loadInstantApps = false, ) assertThat(appList).containsExactly(NORMAL_APP) @@ -120,7 +120,7 @@ class AppListRepositoryTest { val appList = repository.loadApps( userId = ADMIN_USER_ID, - showInstantApps = true, + loadInstantApps = true, ) assertThat(appList).containsExactly(NORMAL_APP, INSTANT_APP) @@ -325,6 +325,21 @@ class AppListRepositoryTest { assertThat(systemPackageNames).containsExactly(SYSTEM_APP.packageName) } + @Test + fun loadAndFilterApps_loadNonSystemApp_returnExpectedValues() = runTest { + mockInstalledApplications( + apps = listOf( + NORMAL_APP, INSTANT_APP, SYSTEM_APP, UPDATED_SYSTEM_APP, HOME_APP, IN_LAUNCHER_APP + ), + userId = ADMIN_USER_ID, + ) + + val appList = repository.loadAndFilterApps(userId = ADMIN_USER_ID, isSystemApp = false) + + assertThat(appList) + .containsExactly(NORMAL_APP, UPDATED_SYSTEM_APP, HOME_APP, IN_LAUNCHER_APP) + } + private suspend fun getShowSystemPredicate(showSystem: Boolean) = repository.showSystemPredicate( userIdFlow = flowOf(ADMIN_USER_ID), diff --git a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListViewModelTest.kt b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListViewModelTest.kt index 6889e5d21ac0..9b224976e080 100644 --- a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListViewModelTest.kt +++ b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListViewModelTest.kt @@ -87,7 +87,7 @@ class AppListViewModelTest { private object FakeAppListRepository : AppListRepository { override suspend fun loadApps( userId: Int, - showInstantApps: Boolean, + loadInstantApps: Boolean, matchAnyUserForAdmin: Boolean, ) = listOf(APP) @@ -97,6 +97,9 @@ class AppListViewModelTest { ): Flow<(app: ApplicationInfo) -> Boolean> = flowOf { true } override fun getSystemPackageNamesBlocking(userId: Int): Set<String> = emptySet() + + override suspend fun loadAndFilterApps(userId: Int, isSystemApp: Boolean) = + emptyList<ApplicationInfo>() } private object FakeAppRepository : AppRepository { diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index b44c0e0799b2..cc2cf4844468 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -241,12 +241,12 @@ <!-- Bluetooth settings. Similar to bluetooth_profile_a2dp_high_quality, but used when the device supports high quality audio but we don't know which codec that will be used. --> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec">HD audio</string> - <!-- Bluetooth settings. The user-visible string that is used whenever referring to the Hearing Aid profile. --> - <string name="bluetooth_profile_hearing_aid">Hearing Aids</string> + <!-- Bluetooth settings. The user-visible string that is used whenever referring to the Hearing aid profile. --> + <string name="bluetooth_profile_hearing_aid">Hearing aids</string> <!-- Bluetooth settings. The user-visible string that is used whenever referring to the LE audio profile. --> <string name="bluetooth_profile_le_audio">LE Audio</string> - <!-- Bluetooth settings. Connection options screen. The summary for the Hearing Aid checkbox preference when Hearing Aid is connected. --> - <string name="bluetooth_hearing_aid_profile_summary_connected">Connected to Hearing Aids</string> + <!-- Bluetooth settings. Connection options screen. The summary for the Hearing aid checkbox preference when hearing aid is connected. --> + <string name="bluetooth_hearing_aid_profile_summary_connected">Connected to hearing aids</string> <!-- Bluetooth settings. Connection options screen. The summary for the LE audio checkbox preference when LE audio is connected. --> <string name="bluetooth_le_audio_profile_summary_connected">Connected to LE audio</string> @@ -287,8 +287,8 @@ for the HID checkbox preference that describes how checking it will set the HID profile as preferred. --> <string name="bluetooth_hid_profile_summary_use_for">Use for input</string> - <!-- Bluetooth settings. Connection options screen. The summary for the Hearing Aid checkbox preference that describes how checking it will set the Hearing Aid profile as preferred. --> - <string name="bluetooth_hearing_aid_profile_summary_use_for">Use for Hearing Aids</string> + <!-- Bluetooth settings. Connection options screen. The summary for the Hearing aid checkbox preference that describes how checking it will set the hearing aid related profile as preferred. --> + <string name="bluetooth_hearing_aid_profile_summary_use_for">Use for hearing aids</string> <!-- Bluetooth settings. Connection options screen. The summary for the LE_AUDIO checkbox preference that describes how checking it will set the LE_AUDIO profile as preferred. --> <string name="bluetooth_le_audio_profile_summary_use_for">Use for LE_AUDIO</string> @@ -827,6 +827,11 @@ <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] --> <string name="show_touches_summary">Show visual feedback for taps</string> + <!-- UI debug setting: show key presses? [CHAR LIMIT=25] --> + <string name="show_key_presses">Show key presses</string> + <!-- UI debug setting: show physical key presses summary [CHAR LIMIT=50] --> + <string name="show_key_presses_summary">Show visual feedback for physical key presses</string> + <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] --> <string name="show_screen_updates">Show surface updates</string> <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] --> diff --git a/packages/SettingsLib/search/Android.bp b/packages/SettingsLib/search/Android.bp index cfff519705f2..918d696fa481 100644 --- a/packages/SettingsLib/search/Android.bp +++ b/packages/SettingsLib/search/Android.bp @@ -7,8 +7,18 @@ package { default_applicable_licenses: ["frameworks_base_license"], } +java_library { + name: "SettingsLib-search-interface", + visibility: ["//visibility:private"], + srcs: ["interface-src/**/*.java"], + host_supported: true, +} + android_library { name: "SettingsLib-search", + static_libs: [ + "SettingsLib-search-interface", + ], srcs: ["src/**/*.java"], sdk_version: "system_current", @@ -19,12 +29,10 @@ java_plugin { name: "SettingsLib-annotation-processor", processor_class: "com.android.settingslib.search.IndexableProcessor", static_libs: [ + "SettingsLib-search-interface", "javapoet", ], - srcs: [ - "processor-src/**/*.java", - "src/com/android/settingslib/search/SearchIndexable.java", - ], + srcs: ["processor-src/**/*.java"], java_resource_dirs: ["resources"], } diff --git a/packages/SettingsLib/search/common.mk b/packages/SettingsLib/search/common.mk deleted file mode 100644 index 05226db5cb91..000000000000 --- a/packages/SettingsLib/search/common.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Include this file to generate SearchIndexableResourcesImpl - -LOCAL_ANNOTATION_PROCESSORS += \ - SettingsLib-annotation-processor - -LOCAL_ANNOTATION_PROCESSOR_CLASSES += \ - com.android.settingslib.search.IndexableProcessor - -LOCAL_STATIC_JAVA_LIBRARIES += \ - SettingsLib-search diff --git a/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexable.java b/packages/SettingsLib/search/interface-src/com/android/settingslib/search/SearchIndexable.java index 638fa3e98138..174f33709b02 100644 --- a/packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexable.java +++ b/packages/SettingsLib/search/interface-src/com/android/settingslib/search/SearchIndexable.java @@ -27,7 +27,7 @@ public @interface SearchIndexable { /** * Bitfield for the form factors this class should be considered indexable for. * Default is {@link #ALL}. - * + * <p> * TODO: actually use this value somehow */ int forTarget() default ALL; @@ -35,27 +35,27 @@ public @interface SearchIndexable { /** * Indicates that the class should be considered indexable for Mobile. */ - int MOBILE = 1<<0; + int MOBILE = 1 << 0; /** * Indicates that the class should be considered indexable for TV. */ - int TV = 1<<1; + int TV = 1 << 1; /** * Indicates that the class should be considered indexable for Wear. */ - int WEAR = 1<<2; + int WEAR = 1 << 2; /** * Indicates that the class should be considered indexable for Auto. */ - int AUTO = 1<<3; + int AUTO = 1 << 3; /** * Indicates that the class should be considered indexable for ARC++. */ - int ARC = 1<<4; + int ARC = 1 << 4; /** * Indicates that the class should be considered indexable for all targets. diff --git a/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java b/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java index e92157e7c867..fa43915deb6a 100644 --- a/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java +++ b/packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java @@ -34,6 +34,7 @@ import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedOptions; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; @@ -48,10 +49,11 @@ import javax.tools.Diagnostic.Kind; * subclasses. */ @SupportedSourceVersion(SourceVersion.RELEASE_17) +@SupportedOptions(IndexableProcessor.PACKAGE_KEY) @SupportedAnnotationTypes({"com.android.settingslib.search.SearchIndexable"}) public class IndexableProcessor extends AbstractProcessor { - private static final String PACKAGE = "com.android.settingslib.search"; + private static final String SETTINGSLIB_SEARCH_PACKAGE = "com.android.settingslib.search"; private static final String CLASS_BASE = "SearchIndexableResourcesBase"; private static final String CLASS_MOBILE = "SearchIndexableResourcesMobile"; private static final String CLASS_TV = "SearchIndexableResourcesTv"; @@ -59,6 +61,9 @@ public class IndexableProcessor extends AbstractProcessor { private static final String CLASS_AUTO = "SearchIndexableResourcesAuto"; private static final String CLASS_ARC = "SearchIndexableResourcesArc"; + static final String PACKAGE_KEY = "com.android.settingslib.search.processor.package"; + + private String mPackage; private Filer mFiler; private Messager mMessager; private boolean mRanOnce; @@ -72,7 +77,8 @@ public class IndexableProcessor extends AbstractProcessor { } mRanOnce = true; - final ClassName searchIndexableData = ClassName.get(PACKAGE, "SearchIndexableData"); + final ClassName searchIndexableData = + ClassName.get(SETTINGSLIB_SEARCH_PACKAGE, "SearchIndexableData"); final FieldSpec providers = FieldSpec.builder( ParameterizedTypeName.get( @@ -130,7 +136,7 @@ public class IndexableProcessor extends AbstractProcessor { builder = arcConstructorBuilder; } builder.addCode( - "$N(new SearchIndexableData($L.class, $L" + "$N(new com.android.settingslib.search.SearchIndexableData($L.class, $L" + ".SEARCH_INDEX_DATA_PROVIDER));\n", addIndex, className, className); } else { @@ -150,50 +156,51 @@ public class IndexableProcessor extends AbstractProcessor { final TypeSpec baseClass = TypeSpec.classBuilder(CLASS_BASE) .addModifiers(Modifier.PUBLIC) - .addSuperinterface(ClassName.get(PACKAGE, "SearchIndexableResources")) + .addSuperinterface( + ClassName.get(SETTINGSLIB_SEARCH_PACKAGE, "SearchIndexableResources")) .addField(providers) .addMethod(baseConstructorBuilder.build()) .addMethod(addIndex) .addMethod(getProviderValues) .build(); - final JavaFile searchIndexableResourcesBase = JavaFile.builder(PACKAGE, baseClass).build(); + final JavaFile searchIndexableResourcesBase = JavaFile.builder(mPackage, baseClass).build(); - final JavaFile searchIndexableResourcesMobile = JavaFile.builder(PACKAGE, + final JavaFile searchIndexableResourcesMobile = JavaFile.builder(mPackage, TypeSpec.classBuilder(CLASS_MOBILE) .addModifiers(Modifier.PUBLIC) - .superclass(ClassName.get(PACKAGE, baseClass.name)) + .superclass(ClassName.get(mPackage, baseClass.name)) .addMethod(mobileConstructorBuilder.build()) .build()) .build(); - final JavaFile searchIndexableResourcesTv = JavaFile.builder(PACKAGE, + final JavaFile searchIndexableResourcesTv = JavaFile.builder(mPackage, TypeSpec.classBuilder(CLASS_TV) .addModifiers(Modifier.PUBLIC) - .superclass(ClassName.get(PACKAGE, baseClass.name)) + .superclass(ClassName.get(mPackage, baseClass.name)) .addMethod(tvConstructorBuilder.build()) .build()) .build(); - final JavaFile searchIndexableResourcesWear = JavaFile.builder(PACKAGE, + final JavaFile searchIndexableResourcesWear = JavaFile.builder(mPackage, TypeSpec.classBuilder(CLASS_WEAR) .addModifiers(Modifier.PUBLIC) - .superclass(ClassName.get(PACKAGE, baseClass.name)) + .superclass(ClassName.get(mPackage, baseClass.name)) .addMethod(wearConstructorBuilder.build()) .build()) .build(); - final JavaFile searchIndexableResourcesAuto = JavaFile.builder(PACKAGE, + final JavaFile searchIndexableResourcesAuto = JavaFile.builder(mPackage, TypeSpec.classBuilder(CLASS_AUTO) .addModifiers(Modifier.PUBLIC) - .superclass(ClassName.get(PACKAGE, baseClass.name)) + .superclass(ClassName.get(mPackage, baseClass.name)) .addMethod(autoConstructorBuilder.build()) .build()) .build(); - final JavaFile searchIndexableResourcesArc = JavaFile.builder(PACKAGE, + final JavaFile searchIndexableResourcesArc = JavaFile.builder(mPackage, TypeSpec.classBuilder(CLASS_ARC) .addModifiers(Modifier.PUBLIC) - .superclass(ClassName.get(PACKAGE, baseClass.name)) + .superclass(ClassName.get(mPackage, baseClass.name)) .addMethod(arcConstructorBuilder.build()) .build()) .build(); @@ -214,6 +221,8 @@ public class IndexableProcessor extends AbstractProcessor { @Override public synchronized void init(ProcessingEnvironment processingEnvironment) { super.init(processingEnvironment); + mPackage = processingEnvironment.getOptions() + .getOrDefault(PACKAGE_KEY, SETTINGSLIB_SEARCH_PACKAGE); mFiler = processingEnvironment.getFiler(); mMessager = processingEnvironment.getMessager(); } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 873b434aa4fd..dd8eb3b3f3fb 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -590,6 +590,7 @@ public class SettingsBackupTest { Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS, Settings.Global.AUTO_REVOKE_PARAMETERS, Settings.Global.ENABLE_RADIO_BUG_DETECTION, + Settings.Global.REPAIR_MODE_ACTIVE, Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD, Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD, Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT, @@ -724,6 +725,7 @@ public class SettingsBackupTest { Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, Settings.Secure.CONTENT_CAPTURE_ENABLED, Settings.Secure.DEFAULT_INPUT_METHOD, + Settings.Secure.DEFAULT_NOTE_TASK_PROFILE, Settings.Secure.DEVICE_PAIRED, Settings.Secure.DIALER_DEFAULT_APPLICATION, Settings.Secure.DISABLED_PRINT_SERVICES, diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 7df3dfb89d96..a443b5c4aa60 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -250,17 +250,17 @@ filegroup { "tests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt", "tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt", // domain - "tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt", + "tests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt", + "tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt", + "tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt", "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt", "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt", "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt", "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt", "tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt", - "tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt", - "tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt", // ui + "tests/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModelTest.kt", "tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt", - "tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt", "tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt", "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt", "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt", diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 0aa121dfcc49..2c0d73a3b682 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -176,6 +176,7 @@ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT"/> + <uses-permission android:name="android.permission.USE_EXACT_ALARM"/> <!-- Assist --> <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" /> @@ -369,7 +370,7 @@ android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" tools:replace="android:appComponentFactory" - android:appComponentFactory=".SystemUIAppComponentFactory"> + android:appComponentFactory=".PhoneSystemUIAppComponentFactory"> <!-- Keep theme in sync with SystemUIApplication.onCreate(). Setting the theme on the application does not affect views inflated by services. The application theme is set again from onCreate to take effect for those views. --> @@ -451,12 +452,14 @@ android:noHistory="true" /> <service android:name=".screenshot.appclips.AppClipsScreenshotHelperService" - android:permission="com.android.systemui.permission.SELF" - android:exported="false" /> + android:exported="false" + android:singleUser="true" + android:permission="com.android.systemui.permission.SELF" /> <service android:name=".screenshot.appclips.AppClipsService" - android:permission="android.permission.LAUNCH_CAPTURE_CONTENT_ACTIVITY_FOR_NOTE" - android:exported="true" /> + android:exported="true" + android:singleUser="true" + android:permission="android.permission.LAUNCH_CAPTURE_CONTENT_ACTIVITY_FOR_NOTE" /> <service android:name=".screenrecord.RecordingService" android:foregroundServiceType="systemExempted"/> @@ -814,7 +817,8 @@ <service android:name=".dreams.DreamOverlayService" android:enabled="false" - android:exported="true" /> + android:exported="true" + android:singleUser="true" /> <activity android:name=".keyguard.WorkLockActivity" android:label="@string/accessibility_desc_work_lock" @@ -992,6 +996,11 @@ <service android:name=".notetask.NoteTaskControllerUpdateService" /> + <service android:name=".notetask.NoteTaskBubblesController$NoteTaskBubblesService" + android:exported="false" + android:singleUser="true" + android:permission="com.android.systemui.permission.SELF" /> + <activity android:name=".notetask.shortcut.LaunchNoteTaskActivity" android:exported="true" @@ -1004,20 +1013,10 @@ </intent-filter> </activity> - <!-- LaunchNoteTaskManagedProfileProxyActivity MUST NOT be exported because it allows caller - to specify an Android user when launching the default notes app. --> - <activity - android:name=".notetask.shortcut.LaunchNoteTaskManagedProfileProxyActivity" - android:exported="false" - android:enabled="true" - android:excludeFromRecents="true" - android:theme="@android:style/Theme.NoDisplay" /> - <activity android:name=".notetask.LaunchNotesRoleSettingsTrampolineActivity" android:exported="true" android:excludeFromRecents="true" - android:resizeableActivity="false" android:theme="@android:style/Theme.NoDisplay" > <intent-filter> <action android:name="com.android.systemui.action.MANAGE_NOTES_ROLE_FROM_QUICK_AFFORDANCE" /> diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt index 48dd08f206c1..dbfa192f5ec4 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -36,6 +36,7 @@ import android.widget.FrameLayout import com.android.app.animation.Interpolators import com.android.internal.jank.InteractionJankMonitor import com.android.internal.jank.InteractionJankMonitor.CujType +import com.android.systemui.animation.view.LaunchableFrameLayout import com.android.systemui.util.registerAnimationOnBackInvoked import kotlin.math.roundToInt diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt index 2eb503b43cc5..7538f188fb81 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt @@ -14,11 +14,13 @@ * limitations under the License. */ -package com.android.systemui.animation +package com.android.systemui.animation.view import android.content.Context import android.util.AttributeSet import android.widget.FrameLayout +import com.android.systemui.animation.LaunchableView +import com.android.systemui.animation.LaunchableViewDelegate /** A [FrameLayout] that also implements [LaunchableView]. */ open class LaunchableFrameLayout : FrameLayout, LaunchableView { diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/Easings.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/Easings.kt index 8fe1f48dcaee..4fe9f89830f6 100644 --- a/packages/SystemUI/compose/core/src/com/android/compose/animation/Easings.kt +++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/Easings.kt @@ -27,37 +27,52 @@ import com.android.app.animation.InterpolatorsAndroidX object Easings { /** The standard interpolator that should be used on every normal animation */ - val StandardEasing = fromInterpolator(InterpolatorsAndroidX.STANDARD) + val Standard = fromInterpolator(InterpolatorsAndroidX.STANDARD) /** * The standard accelerating interpolator that should be used on every regular movement of * content that is disappearing e.g. when moving off screen. */ - val StandardAccelerateEasing = fromInterpolator(InterpolatorsAndroidX.STANDARD_ACCELERATE) + val StandardAccelerate = fromInterpolator(InterpolatorsAndroidX.STANDARD_ACCELERATE) /** * The standard decelerating interpolator that should be used on every regular movement of * content that is appearing e.g. when coming from off screen. */ - val StandardDecelerateEasing = fromInterpolator(InterpolatorsAndroidX.STANDARD_DECELERATE) + val StandardDecelerate = fromInterpolator(InterpolatorsAndroidX.STANDARD_DECELERATE) /** The default emphasized interpolator. Used for hero / emphasized movement of content. */ - val EmphasizedEasing = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED) + val Emphasized = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED) /** * The accelerated emphasized interpolator. Used for hero / emphasized movement of content that * is disappearing e.g. when moving off screen. */ - val EmphasizedAccelerateEasing = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED_ACCELERATE) + val EmphasizedAccelerate = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED_ACCELERATE) /** * The decelerating emphasized interpolator. Used for hero / emphasized movement of content that * is appearing e.g. when coming from off screen */ - val EmphasizedDecelerateEasing = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED_DECELERATE) + val EmphasizedDecelerate = fromInterpolator(InterpolatorsAndroidX.EMPHASIZED_DECELERATE) /** The linear interpolator. */ - val LinearEasing = fromInterpolator(InterpolatorsAndroidX.LINEAR) + val Linear = fromInterpolator(InterpolatorsAndroidX.LINEAR) + + /** The default legacy interpolator as defined in Material 1. Also known as FAST_OUT_SLOW_IN. */ + val Legacy = fromInterpolator(InterpolatorsAndroidX.LEGACY) + + /** + * The default legacy accelerating interpolator as defined in Material 1. Also known as + * FAST_OUT_LINEAR_IN. + */ + val LegacyAccelerate = fromInterpolator(InterpolatorsAndroidX.LEGACY_ACCELERATE) + + /** + * T The default legacy decelerating interpolator as defined in Material 1. Also known as + * LINEAR_OUT_SLOW_IN. + */ + val LegacyDecelerate = fromInterpolator(InterpolatorsAndroidX.LEGACY_DECELERATE) private fun fromInterpolator(source: Interpolator) = Easing { x -> source.getInterpolation(x) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt index 88441146ad23..b3d2e350ed50 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt @@ -131,7 +131,7 @@ internal fun PatternBouncer( animationSpec = tween( durationMillis = SELECTED_DOT_REACTION_ANIMATION_DURATION_MS, - easing = Easings.StandardAccelerateEasing, + easing = Easings.StandardAccelerate, ), ) } else { @@ -140,7 +140,7 @@ internal fun PatternBouncer( animationSpec = tween( durationMillis = SELECTED_DOT_RETRACT_ANIMATION_DURATION_MS, - easing = Easings.StandardDecelerateEasing, + easing = Easings.StandardDecelerate, ), ) } @@ -333,7 +333,7 @@ private suspend fun showFailureAnimation( FAILURE_ANIMATION_DOT_SHRINK_ANIMATION_DURATION_MS, delayMillis = rowIndex * FAILURE_ANIMATION_DOT_SHRINK_STAGGER_DELAY_MS, - easing = Easings.LinearEasing, + easing = Easings.Linear, ), ) @@ -343,7 +343,7 @@ private suspend fun showFailureAnimation( tween( durationMillis = FAILURE_ANIMATION_DOT_REVERT_ANIMATION_DURATION, - easing = Easings.StandardEasing, + easing = Easings.Standard, ), ) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt index 968e5ab8ad8c..f80143499928 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt @@ -19,23 +19,19 @@ package com.android.systemui.bouncer.ui.composable import android.view.HapticFeedbackConstants -import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.animateColorAsState -import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.AnimationSpec -import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.MutableTransitionState +import androidx.compose.animation.core.Transition +import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.keyframes +import androidx.compose.animation.core.snap import androidx.compose.animation.core.tween -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.scaleIn -import androidx.compose.animation.scaleOut -import androidx.compose.animation.slideInHorizontally -import androidx.compose.animation.slideOutHorizontally -import androidx.compose.foundation.background +import androidx.compose.animation.core.updateTransition +import androidx.compose.foundation.Canvas import androidx.compose.foundation.gestures.detectTapGestures -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -43,35 +39,40 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.runtime.key import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.Layout import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.android.compose.animation.Easings import com.android.compose.grid.VerticalGrid import com.android.systemui.R +import com.android.systemui.bouncer.ui.viewmodel.EnteredKey import com.android.systemui.bouncer.ui.viewmodel.PinBouncerViewModel import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.common.ui.compose.Icon import com.android.systemui.compose.modifiers.thenIf -import kotlin.math.max import kotlin.time.Duration.Companion.milliseconds import kotlin.time.DurationUnit import kotlinx.coroutines.async @@ -86,8 +87,6 @@ internal fun PinBouncer( // Report that the UI is shown to let the view-model run some logic. LaunchedEffect(Unit) { viewModel.onShown() } - // The length of the PIN input received so far, so we know how many dots to render. - val pinLength: Pair<Int, Int> by viewModel.pinLengths.collectAsState() val isInputEnabled: Boolean by viewModel.isInputEnabled.collectAsState() val animateFailure: Boolean by viewModel.animateFailure.collectAsState() @@ -103,30 +102,7 @@ internal fun PinBouncer( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier, ) { - Row( - horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.heightIn(min = 16.dp).animateContentSize(), - ) { - // TODO(b/281871687): add support for dot shapes. - val (previousPinLength, currentPinLength) = pinLength - val dotCount = max(previousPinLength, currentPinLength) + 1 - repeat(dotCount) { index -> - AnimatedVisibility( - visible = index < currentPinLength, - enter = fadeIn() + scaleIn() + slideInHorizontally(), - exit = fadeOut() + scaleOut() + slideOutHorizontally(), - ) { - Box( - modifier = - Modifier.size(16.dp) - .background( - MaterialTheme.colorScheme.onSurfaceVariant, - CircleShape, - ) - ) - } - } - } + PinInputDisplay(viewModel) Spacer(Modifier.height(100.dp)) @@ -187,6 +163,148 @@ internal fun PinBouncer( } @Composable +private fun PinInputDisplay(viewModel: PinBouncerViewModel) { + val currentPinEntries: List<EnteredKey> by viewModel.pinEntries.collectAsState() + + // visiblePinEntries keeps pins removed from currentPinEntries in the composition until their + // disappear-animation completed. The list is sorted by the natural ordering of EnteredKey, + // which is guaranteed to produce the original edit order, since the model only modifies entries + // at the end. + val visiblePinEntries = remember { SnapshotStateList<EnteredKey>() } + currentPinEntries.forEach { + val index = visiblePinEntries.binarySearch(it) + if (index < 0) { + val insertionPoint = -(index + 1) + visiblePinEntries.add(insertionPoint, it) + } + } + + Row( + modifier = + Modifier.heightIn(min = entryShapeSize) + // Pins overflowing horizontally should still be shown as scrolling. + .wrapContentSize(unbounded = true), + ) { + visiblePinEntries.forEachIndexed { index, entry -> + key(entry) { + val visibility = remember { + MutableTransitionState<EntryVisibility>(EntryVisibility.Hidden) + } + visibility.targetState = + when { + currentPinEntries.isEmpty() && visiblePinEntries.size > 1 -> + EntryVisibility.BulkHidden(index, visiblePinEntries.size) + currentPinEntries.contains(entry) -> EntryVisibility.Shown + else -> EntryVisibility.Hidden + } + + ObscuredInputEntry(updateTransition(visibility, label = "Pin Entry $entry")) + + LaunchedEffect(entry) { + // Remove entry from visiblePinEntries once the hide transition completed. + snapshotFlow { + visibility.currentState == visibility.targetState && + visibility.targetState != EntryVisibility.Shown + } + .collect { isRemoved -> + if (isRemoved) { + visiblePinEntries.remove(entry) + } + } + } + } + } + } +} + +private sealed class EntryVisibility { + object Shown : EntryVisibility() + + object Hidden : EntryVisibility() + + /** + * Same as [Hidden], but applies when multiple entries are hidden simultaneously, without + * collapsing during the hide. + */ + data class BulkHidden(val staggerIndex: Int, val totalEntryCount: Int) : EntryVisibility() +} + +@Composable +private fun ObscuredInputEntry(transition: Transition<EntryVisibility>) { + // spec: http://shortn/_DEhE3Xl2bi + val shapePadding = 6.dp + val shapeOvershootSize = 22.dp + val dismissStaggerDelayMs = 33 + val dismissDurationMs = 450 + val expansionDurationMs = 250 + val shapeExpandDurationMs = 83 + val shapeRetractDurationMs = 167 + val shapeCollapseDurationMs = 200 + + val animatedEntryWidth by + transition.animateDp( + transitionSpec = { + when (val target = targetState) { + is EntryVisibility.BulkHidden -> + // only collapse horizontal space once all entries are removed + snap(dismissDurationMs + dismissStaggerDelayMs * target.totalEntryCount) + else -> tween(expansionDurationMs, easing = Easings.Standard) + } + }, + label = "entry space" + ) { state -> + if (state == EntryVisibility.Shown) entryShapeSize + (shapePadding * 2) else 0.dp + } + + val animatedShapeSize by + transition.animateDp( + transitionSpec = { + when { + EntryVisibility.Hidden isTransitioningTo EntryVisibility.Shown -> + keyframes { + durationMillis = shapeExpandDurationMs + shapeRetractDurationMs + 0.dp at 0 with Easings.Linear + shapeOvershootSize at shapeExpandDurationMs with Easings.Legacy + } + targetState is EntryVisibility.BulkHidden -> { + val target = targetState as EntryVisibility.BulkHidden + tween( + dismissDurationMs, + delayMillis = target.staggerIndex * dismissStaggerDelayMs, + easing = Easings.Legacy, + ) + } + else -> tween(shapeCollapseDurationMs, easing = Easings.StandardDecelerate) + } + }, + label = "shape size" + ) { state -> + when (state) { + EntryVisibility.Shown -> entryShapeSize + else -> 0.dp + } + } + + val dotColor = MaterialTheme.colorScheme.onSurfaceVariant + Layout( + content = { + // TODO(b/282730134): add support for dot shapes. + Canvas(Modifier) { drawCircle(dotColor) } + } + ) { measurables, _ -> + val shapeSizePx = animatedShapeSize.roundToPx() + val placeable = measurables.single().measure(Constraints.fixed(shapeSizePx, shapeSizePx)) + + layout(animatedEntryWidth.roundToPx(), entryShapeSize.roundToPx()) { + placeable.place( + ((animatedEntryWidth - animatedShapeSize) / 2f).roundToPx(), + ((entryShapeSize - animatedShapeSize) / 2f).roundToPx() + ) + } + } +} + +@Composable private fun PinDigit( digit: Int, contentColor: Color, @@ -310,11 +428,13 @@ private fun showFailureAnimation() { // TODO(b/282730134): implement. } +private val entryShapeSize = 16.dp + private val pinButtonSize = 84.dp // Pin button motion spec: http://shortn/_9TTIG6SoEa private val pinButtonPressedDuration = 100.milliseconds -private val pinButtonPressedEasing = LinearEasing +private val pinButtonPressedEasing = Easings.Linear private val pinButtonHoldTime = 33.milliseconds private val pinButtonReleasedDuration = 420.milliseconds -private val pinButtonReleasedEasing = Easings.StandardEasing +private val pinButtonReleasedEasing = Easings.Standard diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java index 2baeaf67df93..9cc87fde122f 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java @@ -133,6 +133,9 @@ public interface ActivityStarter { boolean willAnimateOnKeyguard, @Nullable String customMessage); + /** Whether we should animate an activity launch. */ + boolean shouldAnimateLaunch(boolean isActivityIntent); + interface Callback { void onActivityStarted(int resultCode); } diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index a8ed84393cfb..b534fcec2a85 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -1,13 +1,7 @@ -include proguard_common.flags --keep class com.android.systemui.statusbar.tv.TvStatusBar -keep class com.android.systemui.SystemUIInitializerImpl { *; } --keep class com.android.systemui.tv.TvSystemUIInitializer { - *; -} - --keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.DaggerReferenceGlobalRootComponent** { !synthetic *; } --keep,allowoptimization,allowaccessmodification class com.android.systemui.tv.DaggerTvGlobalRootComponent** { !synthetic *; }
\ No newline at end of file +-keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.DaggerReferenceGlobalRootComponent** { !synthetic *; }
\ No newline at end of file diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml index 3412a303c2a6..2fc1d2ec5807 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml @@ -29,7 +29,7 @@ > <include layout="@layout/keyguard_bouncer_message_area"/> - <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView + <com.android.systemui.bouncer.ui.BouncerMessageView android:id="@+id/bouncer_message_view" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml index 78a7c171ab14..d9011c26dfd7 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml @@ -33,7 +33,7 @@ android:clipToPadding="false"> <include layout="@layout/keyguard_bouncer_message_area"/> - <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView + <com.android.systemui.bouncer.ui.BouncerMessageView android:id="@+id/bouncer_message_view" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml index 01c5443e9355..c7d2d81ded36 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml @@ -29,7 +29,7 @@ androidprv:layout_maxWidth="@dimen/keyguard_security_width"> <include layout="@layout/keyguard_bouncer_message_area"/> -<com.android.systemui.keyguard.bouncer.ui.BouncerMessageView +<com.android.systemui.bouncer.ui.BouncerMessageView android:id="@+id/bouncer_message_view" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index a3a7135dabad..66c57fc2a9ac 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -23,7 +23,7 @@ android:outlineProvider="none" > <LinearLayout - android:id="@+id/keyguard_indication_area" + android:id="@id/keyguard_indication_area" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom" @@ -31,7 +31,7 @@ android:orientation="vertical"> <com.android.systemui.statusbar.phone.KeyguardIndicationTextView - android:id="@+id/keyguard_indication_text" + android:id="@id/keyguard_indication_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" @@ -41,13 +41,12 @@ android:accessibilityLiveRegion="polite"/> <com.android.systemui.statusbar.phone.KeyguardIndicationTextView - android:id="@+id/keyguard_indication_text_bottom" + android:id="@id/keyguard_indication_text_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:minHeight="48dp" + android:minHeight="@dimen/keyguard_indication_text_min_height" android:layout_gravity="center_horizontal" - android:layout_centerHorizontal="true" android:paddingStart="@dimen/keyguard_indication_text_padding" android:paddingEnd="@dimen/keyguard_indication_text_padding" android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" diff --git a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml index 07c428b5dd7a..61943112f9e9 100644 --- a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml +++ b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml @@ -24,7 +24,7 @@ android:layout_gravity="end"> <!-- We add a background behind the UserAvatarView with the same color and with a circular shape so that this view can be expanded into a Dialog or an Activity. --> - <com.android.systemui.animation.LaunchableFrameLayout + <com.android.systemui.animation.view.LaunchableFrameLayout android:id="@+id/kg_multi_user_avatar_with_background" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -42,5 +42,5 @@ systemui:framePadding="0dp" systemui:frameWidth="0dp"> </com.android.systemui.statusbar.phone.UserAvatarView> - </com.android.systemui.animation.LaunchableFrameLayout> + </com.android.systemui.animation.view.LaunchableFrameLayout> </FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/scene_window_root.xml b/packages/SystemUI/res/layout/scene_window_root.xml new file mode 100644 index 000000000000..0dcd15b429c1 --- /dev/null +++ b/packages/SystemUI/res/layout/scene_window_root.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2023, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<!-- The root view of the scene window. --> +<com.android.systemui.scene.ui.view.SceneWindowRootView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:sysui="http://schemas.android.com/apk/res-auto" + android:id="@+id/scene_window_root" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + <include layout="@layout/super_notification_shade" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</com.android.systemui.scene.ui.view.SceneWindowRootView> diff --git a/packages/SystemUI/res/layout/super_notification_shade.xml b/packages/SystemUI/res/layout/super_notification_shade.xml index d9fe949bb327..6601e63fa034 100644 --- a/packages/SystemUI/res/layout/super_notification_shade.xml +++ b/packages/SystemUI/res/layout/super_notification_shade.xml @@ -21,6 +21,7 @@ <com.android.systemui.shade.NotificationShadeWindowView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:sysui="http://schemas.android.com/apk/res-auto" + android:id="@+id/legacy_window_root" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> @@ -69,6 +70,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <!-- Root for all keyguard content. It was previously located within the shade. --> + <com.android.systemui.keyguard.ui.view.KeyguardRootView + android:id="@id/keyguard_root_view" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <include layout="@layout/brightness_mirror_container" /> <com.android.systemui.scrim.ScrimView diff --git a/packages/SystemUI/res/layout/window_magnification_settings_view.xml b/packages/SystemUI/res/layout/window_magnification_settings_view.xml index a8febe79acae..efdb0a360031 100644 --- a/packages/SystemUI/res/layout/window_magnification_settings_view.xml +++ b/packages/SystemUI/res/layout/window_magnification_settings_view.xml @@ -147,10 +147,12 @@ android:id="@+id/magnifier_zoom_slider" android:layout_width="match_parent" android:layout_height="wrap_content" - app:max="6" app:progress="0" app:iconStartContentDescription="@string/accessibility_control_zoom_out" - app:iconEndContentDescription="@string/accessibility_control_zoom_in"/> + app:iconEndContentDescription="@string/accessibility_control_zoom_in" + app:tickMark="@android:color/transparent" + app:seekBarChangeMagnitude="10" + /> <Button android:id="@+id/magnifier_done_button" diff --git a/packages/SystemUI/res/values-television/config.xml b/packages/SystemUI/res/values-television/config.xml index 0ca154e06787..2ace86f919aa 100644 --- a/packages/SystemUI/res/values-television/config.xml +++ b/packages/SystemUI/res/values-television/config.xml @@ -20,11 +20,6 @@ <!-- These resources are around just to allow their values to be customized for different hardware and product builds. --> <resources> - <!-- SystemUIFactory component --> - <string name="config_systemUIFactoryComponent" translatable="false"> - com.android.systemui.tv.TvSystemUIInitializer - </string> - <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. --> <integer name="recents_svelte_level">3</integer> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index bd86e51ccf8f..3a1d1a8cbf9d 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -216,6 +216,8 @@ <attr name="progress" format="integer" /> <attr name="iconStartContentDescription" format="reference" /> <attr name="iconEndContentDescription" format="reference" /> + <attr name="tickMark" format="reference" /> + <attr name="seekBarChangeMagnitude" format="integer" /> </declare-styleable> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 166bd2ac4439..421f41f60d85 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -302,9 +302,6 @@ <!-- Determines whether the shell features all run on another thread. --> <bool name="config_enableShellMainThread">true</bool> - <!-- SystemUIFactory component --> - <string name="config_systemUIFactoryComponent" translatable="false">com.android.systemui.SystemUIInitializerImpl</string> - <!-- QS tile shape store width. negative implies fill configuration instead of stroke--> <dimen name="config_qsTileStrokeWidthActive">-1dp</dimen> <dimen name="config_qsTileStrokeWidthInactive">-1dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 4f768cc39b40..da6417d142d0 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -275,6 +275,9 @@ <!-- The padding at start and end of indication text shown on AOD --> <dimen name="keyguard_indication_text_padding">16dp</dimen> + <!-- The min height on the indication text shown on AOD --> + <dimen name="keyguard_indication_text_min_height">48dp</dimen> + <!-- Shadows under the clock, date and other keyguard text fields --> <dimen name="keyguard_shadow_radius">5</dimen> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index e5c946156e46..d651a2159721 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -206,5 +206,9 @@ <!-- keyboard backlight indicator--> <item type="id" name="backlight_icon" /> -</resources> + <item type="id" name="keyguard_root_view" /> + <item type="id" name="keyguard_indication_area" /> + <item type="id" name="keyguard_indication_text" /> + <item type="id" name="keyguard_indication_text_bottom" /> +</resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 663efea1944b..25f3d224dc4d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -613,8 +613,8 @@ <string name="quick_settings_bluetooth_secondary_label_headset">Headset</string> <!-- QuickSettings: Bluetooth secondary label for an input/IO device being connected [CHAR LIMIT=20]--> <string name="quick_settings_bluetooth_secondary_label_input">Input</string> - <!-- QuickSettings: Bluetooth secondary label for a Hearing Aids device being connected [CHAR LIMIT=20]--> - <string name="quick_settings_bluetooth_secondary_label_hearing_aids">Hearing Aids</string> + <!-- QuickSettings: Bluetooth secondary label for a Hearing aids device being connected [CHAR LIMIT=20]--> + <string name="quick_settings_bluetooth_secondary_label_hearing_aids">Hearing aids</string> <!-- QuickSettings: Bluetooth secondary label shown when bluetooth is being enabled [CHAR LIMIT=NONE] --> <string name="quick_settings_bluetooth_secondary_label_transient">Turning on…</string> <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] --> @@ -2390,6 +2390,8 @@ <string name="magnification_mode_switch_state_window">Magnify part of screen</string> <!-- Click action label for magnification settings panel. [CHAR LIMIT=NONE] --> <string name="magnification_open_settings_click_label">Open magnification settings</string> + <!-- Click action label for magnification settings panel. [CHAR LIMIT=NONE] --> + <string name="magnification_close_settings_click_label">Close magnification settings</string> <!-- Label of the corner of a rectangle that you can tap and drag to resize the magnification area. [CHAR LIMIT=NONE] --> <string name="magnification_drag_corner_to_resize">Drag corner to resize</string> @@ -2815,6 +2817,8 @@ <!-- Secondary label for alarm tile when there is no next alarm information [CHAR LIMIT=20] --> <string name="qs_alarm_tile_no_alarm">No alarm set</string> + <!-- Accessibility label for a11y action to show the bouncer (pin/pattern/password) screen lock [CHAR LIMIT=NONE] --> + <string name="accessibility_bouncer">enter screen lock</string> <!-- Accessibility label for fingerprint sensor [CHAR LIMIT=NONE] --> <string name="accessibility_fingerprint_label">Fingerprint sensor</string> <!-- Accessibility action for tapping on an affordance that will bring up the user's @@ -2971,9 +2975,11 @@ <xliff:g id="weather_condition" example="Partly cloudy">%1$s</xliff:g>, <xliff:g id="temperature" example="7°C">%2$s</xliff:g> </string> - <!-- TODO(b/259369672): Replace with final resource. --> <!-- [CHAR LIMIT=30] Label used to open Note Task --> - <string name="note_task_button_label">Notetaking</string> + <string name="note_task_button_label">Note-taking</string> + + <!-- [CHAR LIMIT=25] Long label used by Note Task Shortcut --> + <string name="note_task_shortcut_long_label">Note-taking, <xliff:g id="note_taking_app" example="Note-taking App">%1$s</xliff:g></string> <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, media app is broadcasting --> <string name="broadcasting_description_is_broadcasting">Broadcasting</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/condition/Monitor.java b/packages/SystemUI/shared/src/com/android/systemui/shared/condition/Monitor.java index 1f61c64dd057..97d6099227e7 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/condition/Monitor.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/condition/Monitor.java @@ -215,7 +215,7 @@ public class Monitor { mSubscriptions.put(token, state); // Add and associate conditions. - normalizedCondition.getConditions().stream().forEach(condition -> { + normalizedCondition.getConditions().forEach(condition -> { if (!mConditions.containsKey(condition)) { mConditions.put(condition, new ArraySet<>()); condition.addCallback(mConditionCallback); @@ -321,7 +321,6 @@ public class Monitor { private final Callback mCallback; private final Subscription mNestedSubscription; private final ArraySet<Condition> mConditions; - private final ArraySet<Condition> mPreconditions; /** * Default constructor specifying the {@link Callback} for the {@link Subscription}. @@ -337,8 +336,7 @@ public class Monitor { private Builder(Subscription nestedSubscription, Callback callback) { mNestedSubscription = nestedSubscription; mCallback = callback; - mConditions = new ArraySet(); - mPreconditions = new ArraySet(); + mConditions = new ArraySet<>(); } /** @@ -352,29 +350,6 @@ public class Monitor { } /** - * Adds a set of {@link Condition} to be a precondition for {@link Subscription}. - * - * @return The updated {@link Builder}. - */ - public Builder addPreconditions(Set<Condition> condition) { - if (condition == null) { - return this; - } - mPreconditions.addAll(condition); - return this; - } - - /** - * Adds a {@link Condition} to be a precondition for {@link Subscription}. - * - * @return The updated {@link Builder}. - */ - public Builder addPrecondition(Condition condition) { - mPreconditions.add(condition); - return this; - } - - /** * Adds a set of {@link Condition} to be associated with the {@link Subscription}. * * @return The updated {@link Builder}. @@ -394,11 +369,7 @@ public class Monitor { * @return The resulting {@link Subscription}. */ public Subscription build() { - final Subscription subscription = - new Subscription(mConditions, mCallback, mNestedSubscription); - return !mPreconditions.isEmpty() - ? new Subscription(mPreconditions, null, subscription) - : subscription; + return new Subscription(mConditions, mCallback, mNestedSubscription); } } } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl index 117cf78a4fe3..4b31498e659b 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl @@ -48,7 +48,7 @@ interface ISystemUiProxy { * * Normal gesture: DOWN, MOVE/POINTER_DOWN/POINTER_UP)*, UP or CANCLE */ - oneway void onStatusBarMotionEvent(in MotionEvent event) = 9; + oneway void onStatusBarTouchEvent(in MotionEvent event) = 9; /** * Proxies the assistant gesture's progress started from navigation bar. @@ -125,5 +125,15 @@ interface ISystemUiProxy { */ oneway void takeScreenshot(in ScreenshotRequest request) = 51; - // Next id = 52 + /** + * Dispatches trackpad status bar motion event to the notification shade. Currently these events + * are from the input monitor in {@link TouchInteractionService}. This is different from + * {@link #onStatusBarTouchEvent} above in that, this directly dispatches motion events to the + * notification shade, while {@link #onStatusBarTouchEvent} relies on setting the launcher + * window slippery to allow the frameworks to route those events after passing the initial + * threshold. + */ + oneway void onStatusBarTrackpadEvent(in MotionEvent event) = 52; + + // Next id = 53 } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt index 9a0044761504..0fbeb1a054a7 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt @@ -202,8 +202,6 @@ constructor( fun calculateScreenLocation(sampledView: View): RectF? { - if (!sampledView.isLaidOut) return null - val screenLocation = tmpScreenLocation /** * The method getLocationOnScreen is used to obtain the view coordinates relative to its @@ -219,6 +217,10 @@ constructor( samplingBounds.right = left + sampledView.width samplingBounds.bottom = top + sampledView.height + // ensure never go out of bounds + if (samplingBounds.right > displaySize.x) samplingBounds.right = displaySize.x + if (samplingBounds.bottom > displaySize.y) samplingBounds.bottom = displaySize.y + return RectF(samplingBounds) } @@ -263,6 +265,8 @@ constructor( (colors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) != WallpaperColors.HINT_SUPPORTS_DARK_TEXT ) + if (DEBUG) + Log.d(TAG, "onColorsChanged() | region darkness = $regionDarkness for region $area") updateForegroundColor() } diff --git a/packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt b/packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt index 084295343bb0..78a5c98f45c8 100644 --- a/packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt +++ b/packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt @@ -26,7 +26,7 @@ import android.util.AttributeSet import android.view.View import com.android.app.animation.Interpolators import com.android.settingslib.Utils -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.TITLE +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.TITLE /** Displays security messages for the keyguard bouncer. */ open class BouncerKeyguardMessageArea(context: Context?, attrs: AttributeSet?) : diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index 8ea4c31a5ac9..84a2c25999a0 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -15,18 +15,18 @@ */ package com.android.keyguard -import android.app.WallpaperManager import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter import android.content.res.Resources import android.text.format.DateFormat -import android.util.TypedValue import android.util.Log +import android.util.TypedValue import android.view.View import android.view.View.OnAttachStateChangeListener import android.view.ViewTreeObserver +import android.widget.FrameLayout import androidx.annotation.VisibleForTesting import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle @@ -99,6 +99,28 @@ constructor( if (!regionSamplingEnabled) { updateColors() + } else { + clock?.let { + smallRegionSampler = createRegionSampler( + it.smallClock.view, + mainExecutor, + bgExecutor, + regionSamplingEnabled, + isLockscreen = true, + ::updateColors + )?.apply { startRegionSampler() } + + largeRegionSampler = createRegionSampler( + it.largeClock.view, + mainExecutor, + bgExecutor, + regionSamplingEnabled, + isLockscreen = true, + ::updateColors + )?.apply { startRegionSampler() } + + updateColors() + } } updateFontSizes() updateTimeListeners() @@ -110,8 +132,25 @@ constructor( } value.smallClock.view.addOnAttachStateChangeListener( object : OnAttachStateChangeListener { - override fun onViewAttachedToWindow(p0: View?) { + var pastVisibility: Int? = null + override fun onViewAttachedToWindow(view: View?) { value.events.onTimeFormatChanged(DateFormat.is24HourFormat(context)) + if (view != null) { + val smallClockFrame = view.parent as FrameLayout + pastVisibility = smallClockFrame.visibility + smallClockFrame.viewTreeObserver.addOnGlobalLayoutListener( + ViewTreeObserver.OnGlobalLayoutListener { + val currentVisibility = smallClockFrame.visibility + if (pastVisibility != currentVisibility) { + pastVisibility = currentVisibility + // when small clock visible, recalculate bounds and sample + if (currentVisibility == View.VISIBLE) { + smallRegionSampler?.stopRegionSampler() + smallRegionSampler?.startRegionSampler() + } + } + }) + } } override fun onViewDetachedFromWindow(p0: View?) { @@ -141,21 +180,19 @@ constructor( private fun updateColors() { - val wallpaperManager = WallpaperManager.getInstance(context) if (regionSamplingEnabled) { - regionSampler?.let { regionSampler -> - clock?.let { clock -> - if (regionSampler.sampledView == clock.smallClock.view) { - smallClockIsDark = regionSampler.currentRegionDarkness().isDark - clock.smallClock.events.onRegionDarknessChanged(smallClockIsDark) - return@updateColors - } else if (regionSampler.sampledView == clock.largeClock.view) { - largeClockIsDark = regionSampler.currentRegionDarkness().isDark - clock.largeClock.events.onRegionDarknessChanged(largeClockIsDark) - return@updateColors - } + clock?.let { clock -> + smallRegionSampler?.let { + smallClockIsDark = it.currentRegionDarkness().isDark + clock.smallClock.events.onRegionDarknessChanged(smallClockIsDark) + } + + largeRegionSampler?.let { + largeClockIsDark = it.currentRegionDarkness().isDark + clock.largeClock.events.onRegionDarknessChanged(largeClockIsDark) } } + return } val isLightTheme = TypedValue() @@ -168,23 +205,6 @@ constructor( largeClock.events.onRegionDarknessChanged(largeClockIsDark) } } - - private fun updateRegionSampler(sampledRegion: View) { - regionSampler?.stopRegionSampler() - regionSampler = - createRegionSampler( - sampledRegion, - mainExecutor, - bgExecutor, - regionSamplingEnabled, - isLockscreen = true, - ::updateColors - ) - ?.apply { startRegionSampler() } - - updateColors() - } - protected open fun createRegionSampler( sampledView: View, mainExecutor: Executor?, @@ -202,7 +222,10 @@ constructor( ) { updateColors() } } - var regionSampler: RegionSampler? = null + var smallRegionSampler: RegionSampler? = null + private set + var largeRegionSampler: RegionSampler? = null + private set var smallTimeListener: TimeListener? = null var largeTimeListener: TimeListener? = null val shouldTimeListenerRun: Boolean @@ -319,7 +342,8 @@ constructor( configurationController.removeCallback(configListener) batteryController.removeCallback(batteryCallback) keyguardUpdateMonitor.removeCallback(keyguardUpdateMonitorCallback) - regionSampler?.stopRegionSampler() + smallRegionSampler?.stopRegionSampler() + largeRegionSampler?.stopRegionSampler() smallTimeListener?.stop() largeTimeListener?.stop() } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java index e057188851f6..7acfbf64ce02 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java @@ -140,6 +140,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey long elapsedRealtime = SystemClock.elapsedRealtime(); long secondsInFuture = (long) Math.ceil( (elapsedRealtimeDeadline - elapsedRealtime) / 1000.0); + getKeyguardSecurityCallback().onAttemptLockoutStart(secondsInFuture); mCountdownTimer = new CountDownTimer(secondsInFuture * 1000, 1000) { @Override diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index 376e27c6cf44..360f755623f7 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -303,9 +303,10 @@ public class KeyguardClockSwitch extends RelativeLayout { if (!animate) { out.setAlpha(0f); out.setTranslationY(clockOutYTranslation); + out.setVisibility(INVISIBLE); in.setAlpha(1f); in.setTranslationY(clockInYTranslation); - in.setVisibility(View.VISIBLE); + in.setVisibility(VISIBLE); mStatusArea.setScaleX(statusAreaClockScale); mStatusArea.setScaleY(statusAreaClockScale); mStatusArea.setTranslateXFromClockDesign(statusAreaClockTranslateX); @@ -323,7 +324,10 @@ public class KeyguardClockSwitch extends RelativeLayout { ObjectAnimator.ofFloat(out, TRANSLATION_Y, clockOutYTranslation)); mClockOutAnim.addListener(new AnimatorListenerAdapter() { public void onAnimationEnd(Animator animation) { - mClockOutAnim = null; + if (mClockOutAnim == animation) { + out.setVisibility(INVISIBLE); + mClockOutAnim = null; + } } }); @@ -338,7 +342,9 @@ public class KeyguardClockSwitch extends RelativeLayout { mClockInAnim.setStartDelay(CLOCK_IN_START_DELAY_MILLIS); mClockInAnim.addListener(new AnimatorListenerAdapter() { public void onAnimationEnd(Animator animation) { - mClockInAnim = null; + if (mClockInAnim == animation) { + mClockInAnim = null; + } } }); @@ -359,7 +365,9 @@ public class KeyguardClockSwitch extends RelativeLayout { statusAreaClockTranslateY)); mStatusAreaAnim.addListener(new AnimatorListenerAdapter() { public void onAnimationEnd(Animator animation) { - mStatusAreaAnim = null; + if (mStatusAreaAnim == animation) { + mStatusAreaAnim = null; + } } }); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 41c1eda42e83..62a2f90a0378 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -437,10 +437,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS int clockHeight = clock.getLargeClock().getView().getHeight(); return frameHeight / 2 + clockHeight / 2 + mKeyguardLargeClockTopMargin / -2; } else { - // This is only called if we've never shown the large clock as the frame is inflated - // with 'gone', but then the visibility is never set when it is animated away by - // KeyguardClockSwitch, instead it is removed from the view hierarchy. - // TODO(b/261755021): Cleanup Large Frame Visibility int clockHeight = clock.getSmallClock().getView().getHeight(); return clockHeight + statusBarHeaderHeight + mKeyguardSmallClockTopMargin; } @@ -458,15 +454,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS if (mLargeClockFrame.getVisibility() == View.VISIBLE) { return clock.getLargeClock().getView().getHeight(); } else { - // Is not called except in certain edge cases, see comment in getClockBottom - // TODO(b/261755021): Cleanup Large Frame Visibility return clock.getSmallClock().getView().getHeight(); } } boolean isClockTopAligned() { - // Returns false except certain edge cases, see comment in getClockBottom - // TODO(b/261755021): Cleanup Large Frame Visibility return mLargeClockFrame.getVisibility() != View.VISIBLE; } @@ -545,9 +537,13 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS if (clock != null) { clock.dump(pw); } - final RegionSampler regionSampler = mClockEventController.getRegionSampler(); - if (regionSampler != null) { - regionSampler.dump(pw); + final RegionSampler smallRegionSampler = mClockEventController.getSmallRegionSampler(); + if (smallRegionSampler != null) { + smallRegionSampler.dump(pw); + } + final RegionSampler largeRegionSampler = mClockEventController.getLargeRegionSampler(); + if (largeRegionSampler != null) { + largeRegionSampler.dump(pw); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java index 3c05299f7a95..20e465693108 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java @@ -17,6 +17,7 @@ package com.android.keyguard; import android.annotation.CallSuper; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -33,6 +34,10 @@ import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; +import com.android.systemui.bouncer.ui.BouncerMessageView; +import com.android.systemui.bouncer.ui.binder.BouncerMessageViewBinder; +import com.android.systemui.log.BouncerLogger; import com.android.systemui.statusbar.policy.DevicePostureController; import com.android.systemui.util.ViewController; import com.android.systemui.util.concurrency.DelayableExecutor; @@ -168,6 +173,24 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> /** Determines the message to show in the bouncer when it first appears. */ protected abstract int getInitialMessageResId(); + /** + * Binds the {@link KeyguardInputView#getBouncerMessageView()} view with the provided context. + */ + public void bindMessageView( + @NonNull BouncerMessageInteractor bouncerMessageInteractor, + KeyguardMessageAreaController.Factory messageAreaControllerFactory, + BouncerLogger bouncerLogger, + FeatureFlags featureFlags) { + BouncerMessageView bouncerMessageView = (BouncerMessageView) mView.getBouncerMessageView(); + if (bouncerMessageView != null) { + BouncerMessageViewBinder.bind(bouncerMessageView, + bouncerMessageInteractor, + messageAreaControllerFactory, + bouncerLogger, + featureFlags); + } + } + /** Factory for a {@link KeyguardInputViewController}. */ public static class Factory { private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java index 64b1c502b2c3..bcf8e98a8106 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java @@ -365,6 +365,7 @@ public class KeyguardPatternViewController final long elapsedRealtime = SystemClock.elapsedRealtime(); final long secondsInFuture = (long) Math.ceil( (elapsedRealtimeDeadline - elapsedRealtime) / 1000.0); + getKeyguardSecurityCallback().onAttemptLockoutStart(secondsInFuture); mCountdownTimer = new CountDownTimer(secondsInFuture * 1000, 1000) { @Override diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java index bf9c3bbddc30..2878df2fe03f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java @@ -87,6 +87,11 @@ public interface KeyguardSecurityCallback { default void onUserInput() { } + /** + * Invoked when the auth input is disabled for specified number of seconds. + * @param seconds Number of seconds for which the auth input is disabled. + */ + default void onAttemptLockoutStart(long seconds) {} /** * Dismisses keyguard and go to unlocked state. diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index b5e54209dab2..c1344e001d0c 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -74,6 +74,7 @@ import com.android.systemui.classifier.FalsingA11yDelegate; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.ActivityStarter; @@ -116,6 +117,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard private final Optional<SideFpsController> mSideFpsController; private final FalsingA11yDelegate mFalsingA11yDelegate; private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor; + private final BouncerMessageInteractor mBouncerMessageInteractor; private int mTranslationY; // Whether the volume keys should be handled by keyguard. If true, then // they will be handled here for specific media types such as music, otherwise @@ -178,6 +180,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard @Override public void onUserInput() { + mBouncerMessageInteractor.onPrimaryBouncerUserInput(); mKeyguardFaceAuthInteractor.onPrimaryBouncerUserInput(); mUpdateMonitor.cancelFaceAuth(); } @@ -207,7 +210,15 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard } @Override + public void onAttemptLockoutStart(long seconds) { + mBouncerMessageInteractor.onPrimaryAuthLockedOut(seconds); + } + + @Override public void reportUnlockAttempt(int userId, boolean success, int timeoutMs) { + if (timeoutMs == 0 && !success) { + mBouncerMessageInteractor.onPrimaryAuthIncorrectAttempt(); + } int bouncerSide = SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__SIDE__DEFAULT; if (mView.isSidedSecurityMode()) { bouncerSide = mView.isSecurityLeftAligned() @@ -392,7 +403,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard TelephonyManager telephonyManager, ViewMediatorCallback viewMediatorCallback, AudioManager audioManager, - KeyguardFaceAuthInteractor keyguardFaceAuthInteractor + KeyguardFaceAuthInteractor keyguardFaceAuthInteractor, + BouncerMessageInteractor bouncerMessageInteractor ) { super(view); mLockPatternUtils = lockPatternUtils; @@ -418,6 +430,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard mViewMediatorCallback = viewMediatorCallback; mAudioManager = audioManager; mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor; + mBouncerMessageInteractor = bouncerMessageInteractor; } @Override @@ -438,6 +451,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard // Update ViewMediator with the current input method requirements mViewMediatorCallback.setNeedsInput(needsInput()); mView.setOnKeyListener(mOnKeyListener); + showPrimarySecurityScreen(false); } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimInputView.kt b/packages/SystemUI/src/com/android/keyguard/KeyguardSimInputView.kt index 1461dbef5049..7c8d91fdaba8 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimInputView.kt +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimInputView.kt @@ -22,7 +22,7 @@ import android.widget.ImageView import androidx.core.graphics.drawable.DrawableCompat import com.android.settingslib.Utils import com.android.systemui.R -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.EMERGENCY_BUTTON +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.EMERGENCY_BUTTON abstract class KeyguardSimInputView(context: Context, attrs: AttributeSet) : KeyguardPinBasedInputView(context, attrs) { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index c7e817e5781a..92967114ff8a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -155,6 +155,8 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpsysTableLogger; +import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.domain.interactor.FaceAuthenticationListener; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.keyguard.shared.constants.TrustAgentUiEvent; @@ -380,6 +382,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private final ActiveUnlockConfig mActiveUnlockConfig; private final IDreamManager mDreamManager; private final TelephonyManager mTelephonyManager; + private final FeatureFlags mFeatureFlags; @Nullable private final FingerprintManager mFpm; @Nullable @@ -1462,14 +1465,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab ErrorAuthenticationStatus error = (ErrorAuthenticationStatus) status; handleFaceError(error.getMsgId(), error.getMsg()); } else if (status instanceof FailedAuthenticationStatus) { - if (isFaceLockedOut()) { - // TODO b/270090188: remove this hack when biometrics fixes this issue. - // FailedAuthenticationStatus is emitted after ErrorAuthenticationStatus - // for lockout error is received - mLogger.d("onAuthenticationFailed called after" - + " face has been locked out"); - return; - } handleFaceAuthFailed(); } else if (status instanceof HelpAuthenticationStatus) { HelpAuthenticationStatus helpMsg = (HelpAuthenticationStatus) status; @@ -1980,13 +1975,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @Override public void onAuthenticationFailed() { - if (isFaceLockedOut()) { - // TODO b/270090188: remove this hack when biometrics fixes this issue. - // onAuthenticationFailed is called after onAuthenticationError - // for lockout error is received - mLogger.d("onAuthenticationFailed called after face has been locked out"); - return; - } handleFaceAuthFailed(); } @@ -2305,7 +2293,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @Nullable BiometricManager biometricManager, FaceWakeUpTriggersConfig faceWakeUpTriggersConfig, DevicePostureController devicePostureController, - Optional<FingerprintInteractiveToAuthProvider> interactiveToAuthProvider) { + Optional<FingerprintInteractiveToAuthProvider> interactiveToAuthProvider, + FeatureFlags featureFlags) { mContext = context; mSubscriptionManager = subscriptionManager; mUserTracker = userTracker; @@ -2337,6 +2326,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mPackageManager = packageManager; mFpm = fingerprintManager; mFaceManager = faceManager; + mFeatureFlags = featureFlags; mActiveUnlockConfig.setKeyguardUpdateMonitor(this); mFaceAcquiredInfoIgnoreList = Arrays.stream( mContext.getResources().getIntArray( @@ -3028,7 +3018,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab || shouldListenForFingerprintAssistant || (mKeyguardOccluded && mIsDreaming) || (mKeyguardOccluded && userDoesNotHaveTrust && mKeyguardShowing - && (mOccludingAppRequestingFp || isUdfps || mAlternateBouncerShowing)); + && (mOccludingAppRequestingFp + || isUdfps + || mAlternateBouncerShowing + || mFeatureFlags.isEnabled(Flags.FP_LISTEN_OCCLUDING_APPS) + ) + ); // Only listen if this KeyguardUpdateMonitor belongs to the system user. There is an // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware. @@ -3185,6 +3180,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab || (posture == mConfigFaceAuthSupportedPosture); } + /** + * If the current device posture allows face auth to run. + */ + public boolean doesCurrentPostureAllowFaceAuth() { + return doesPostureAllowFaceAuth(mPostureState); + } + private void logListenerModelData(@NonNull KeyguardListenModel model) { mLogger.logKeyguardListenerModel(model); if (model instanceof KeyguardFingerprintListenModel) { diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java b/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java index 7d76f12880df..a04a48db5d7a 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java @@ -16,11 +16,11 @@ package com.android.keyguard; import static com.android.settingslib.Utils.getColorAttrDefaultColor; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND_PRESSED; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BUTTON; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_PRESSED; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND_PRESSED; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BUTTON; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_PRESSED; import static com.android.systemui.util.ColorUtilKt.getPrivateAttrColorIfUnset; import android.animation.AnimatorSet; diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java index ebd234fd0846..3f1741a67a76 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java @@ -15,8 +15,8 @@ */ package com.android.keyguard; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BUTTON; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BUTTON; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; import android.content.Context; import android.content.res.ColorStateList; diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java index e22fc300ede5..edc298cde032 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java @@ -15,7 +15,7 @@ */ package com.android.keyguard; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY; import android.content.Context; import android.content.res.Configuration; diff --git a/packages/SystemUI/src/com/android/keyguard/PinShapeHintingView.java b/packages/SystemUI/src/com/android/keyguard/PinShapeHintingView.java index 32f06dcdbf20..7c129b4c8905 100644 --- a/packages/SystemUI/src/com/android/keyguard/PinShapeHintingView.java +++ b/packages/SystemUI/src/com/android/keyguard/PinShapeHintingView.java @@ -16,7 +16,7 @@ package com.android.keyguard; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.PIN_SHAPES; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.PIN_SHAPES; import android.content.Context; import android.graphics.drawable.AnimatedVectorDrawable; diff --git a/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java b/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java index 500910c910c3..56c0953cd822 100644 --- a/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java +++ b/packages/SystemUI/src/com/android/keyguard/PinShapeNonHintingView.java @@ -16,7 +16,7 @@ package com.android.keyguard; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.PIN_SHAPES; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.PIN_SHAPES; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java index 154b0ed2c4d1..b57c2b58f3ef 100644 --- a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java +++ b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java @@ -20,7 +20,7 @@ import android.view.ViewGroup; import com.android.keyguard.KeyguardSecurityContainerController; import com.android.systemui.dagger.qualifiers.RootView; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import dagger.BindsInstance; import dagger.Subcomponent; diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java index 38f252a221eb..893239ba7ecb 100644 --- a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java +++ b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java @@ -28,7 +28,7 @@ import com.android.keyguard.KeyguardSecurityViewFlipper; import com.android.systemui.R; import com.android.systemui.biometrics.SideFpsController; import com.android.systemui.dagger.qualifiers.RootView; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import java.util.Optional; diff --git a/packages/SystemUI/src/com/android/systemui/PhoneSystemUIAppComponentFactory.kt b/packages/SystemUI/src/com/android/systemui/PhoneSystemUIAppComponentFactory.kt new file mode 100644 index 000000000000..f06cb4104e1c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/PhoneSystemUIAppComponentFactory.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui + +import android.content.Context + +class PhoneSystemUIAppComponentFactory : SystemUIAppComponentFactoryBase() { + override fun createSystemUIInitializer(context: Context) = SystemUIInitializerImpl(context) +} diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java deleted file mode 100644 index 527ce127820e..000000000000 --- a/packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2019 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; - -import android.content.Context; - -/** - * Starts up SystemUI using the AOSP {@link SystemUIInitializerImpl}. - * - * This initializer relies on reflection to start everything up and should be considered deprecated. - * Instead, create your own {@link SystemUIAppComponentFactoryBase}, specify it in your - * AndroidManifest.xml and construct your own {@link SystemUIInitializer} directly. - * - * @deprecated Define your own SystemUIAppComponentFactoryBase implementation and use that. This - * implementation may be changed or removed in future releases. - */ -@Deprecated -public class SystemUIAppComponentFactory extends SystemUIAppComponentFactoryBase { - @Override - protected SystemUIInitializer createSystemUIInitializer(Context context) { - return SystemUIInitializerFactory.createWithContext(context); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index 70c39df2a610..453d1d117d0d 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -54,7 +54,7 @@ import javax.inject.Provider; * Application class for SystemUI. */ public class SystemUIApplication extends Application implements - SystemUIAppComponentFactory.ContextInitializer { + SystemUIAppComponentFactoryBase.ContextInitializer { public static final String TAG = "SystemUIService"; private static final boolean DEBUG = false; @@ -66,7 +66,7 @@ public class SystemUIApplication extends Application implements */ private CoreStartable[] mServices; private boolean mServicesStarted; - private SystemUIAppComponentFactory.ContextAvailableCallback mContextAvailableCallback; + private SystemUIAppComponentFactoryBase.ContextAvailableCallback mContextAvailableCallback; private SysUIComponent mSysUIComponent; private SystemUIInitializer mInitializer; @@ -366,7 +366,7 @@ public class SystemUIApplication extends Application implements @Override public void setContextAvailableCallback( - SystemUIAppComponentFactory.ContextAvailableCallback callback) { + SystemUIAppComponentFactoryBase.ContextAvailableCallback callback) { mContextAvailableCallback = callback; } diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIInitializerFactory.kt b/packages/SystemUI/src/com/android/systemui/SystemUIInitializerFactory.kt deleted file mode 100644 index b9454e8c3be8..000000000000 --- a/packages/SystemUI/src/com/android/systemui/SystemUIInitializerFactory.kt +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2022 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 - -import android.annotation.SuppressLint -import android.content.Context -import android.util.Log -import com.android.internal.annotations.VisibleForTesting -import com.android.systemui.util.Assert - -/** - * Factory to reflectively lookup a [SystemUIInitializer] to start SystemUI with. - */ -@Deprecated("Provide your own {@link SystemUIAppComponentFactoryBase} that doesn't need this.") -object SystemUIInitializerFactory { - private const val TAG = "SysUIInitializerFactory" - @SuppressLint("StaticFieldLeak") - private var initializer: SystemUIInitializer? = null - - /** - * Instantiate a [SystemUIInitializer] reflectively. - */ - @JvmStatic - fun createWithContext(context: Context): SystemUIInitializer { - return createFromConfig(context) - } - - /** - * Instantiate a [SystemUIInitializer] reflectively. - */ - @JvmStatic - private fun createFromConfig(context: Context): SystemUIInitializer { - Assert.isMainThread() - - return createFromConfigNoAssert(context) - } - - @JvmStatic - @VisibleForTesting - fun createFromConfigNoAssert(context: Context): SystemUIInitializer { - - return initializer ?: run { - val className = context.getString(R.string.config_systemUIFactoryComponent) - if (className.isEmpty()) { - throw RuntimeException("No SystemUIFactory component configured") - } - try { - val cls = context.classLoader.loadClass(className) - val constructor = cls.getConstructor(Context::class.java) - (constructor.newInstance(context) as SystemUIInitializer).apply { - initializer = this - } - } catch (t: Throwable) { - Log.w(TAG, "Error creating SystemUIInitializer component: $className", t) - throw t - } - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java index 50e03992df49..6cf9eff1da2f 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java @@ -30,8 +30,10 @@ import com.android.internal.os.BinderInternal; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpHandler; +import com.android.systemui.dump.LogBufferEulogizer; import com.android.systemui.dump.LogBufferFreezer; import com.android.systemui.dump.SystemUIAuxiliaryDumpService; +import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager; import com.android.systemui.statusbar.policy.BatteryStateNotifier; import java.io.FileDescriptor; @@ -44,22 +46,29 @@ public class SystemUIService extends Service { private final Handler mMainHandler; private final DumpHandler mDumpHandler; private final BroadcastDispatcher mBroadcastDispatcher; + private final LogBufferEulogizer mLogBufferEulogizer; private final LogBufferFreezer mLogBufferFreezer; private final BatteryStateNotifier mBatteryStateNotifier; + private final UncaughtExceptionPreHandlerManager mUncaughtExceptionPreHandlerManager; + @Inject public SystemUIService( @Main Handler mainHandler, DumpHandler dumpHandler, BroadcastDispatcher broadcastDispatcher, + LogBufferEulogizer logBufferEulogizer, LogBufferFreezer logBufferFreezer, - BatteryStateNotifier batteryStateNotifier) { + BatteryStateNotifier batteryStateNotifier, + UncaughtExceptionPreHandlerManager uncaughtExceptionPreHandlerManager) { super(); mMainHandler = mainHandler; mDumpHandler = dumpHandler; mBroadcastDispatcher = broadcastDispatcher; + mLogBufferEulogizer = logBufferEulogizer; mLogBufferFreezer = logBufferFreezer; mBatteryStateNotifier = batteryStateNotifier; + mUncaughtExceptionPreHandlerManager = uncaughtExceptionPreHandlerManager; } @Override @@ -71,7 +80,10 @@ public class SystemUIService extends Service { // Finish initializing dump logic mLogBufferFreezer.attach(mBroadcastDispatcher); - mDumpHandler.init(); + + // Attempt to dump all LogBuffers for any uncaught exception + mUncaughtExceptionPreHandlerManager.registerHandler( + (thread, throwable) -> mLogBufferEulogizer.record(throwable)); // If configured, set up a battery notification if (getResources().getBoolean(R.bool.config_showNotificationForUnknownBatteryState)) { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java index c3bb423e5e4e..fd3c15889822 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java @@ -87,14 +87,15 @@ public class MagnificationSettingsController implements ComponentCallbacks { } /** - * Shows magnification settings panel {@link WindowMagnificationSettings}. + * Toggles the visibility of magnification settings panel {@link WindowMagnificationSettings}. + * We show the panel if it is not visible. Otherwise, hide the panel. */ - void showMagnificationSettings() { + void toggleSettingsPanelVisibility() { if (!mWindowMagnificationSettings.isSettingPanelShowing()) { onConfigurationChanged(mContext.getResources().getConfiguration()); mContext.registerComponentCallbacks(this); } - mWindowMagnificationSettings.showSettingPanel(); + mWindowMagnificationSettings.toggleSettingsPanelVisibility(); } void closeMagnificationSettings() { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java index 4158390ec953..2f6a68c3ff8d 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java @@ -329,7 +329,9 @@ public class SystemActions implements CoreStartable { // binder calls final Optional<CentralSurfaces> centralSurfacesOptional = mCentralSurfacesOptionalLazy.get(); - if (centralSurfacesOptional.map(CentralSurfaces::isPanelExpanded).orElse(false) + if (centralSurfacesOptional.isPresent() + && centralSurfacesOptional.get().getShadeViewController() != null + && centralSurfacesOptional.get().getShadeViewController().isPanelExpanded() && !centralSurfacesOptional.get().isKeyguardShowing()) { if (!mDismissNotificationShadeActionRegistered) { mA11yManager.registerSystemAction( @@ -485,13 +487,11 @@ public class SystemActions implements CoreStartable { } private void handleNotifications() { - mCentralSurfacesOptionalLazy.get().ifPresent( - CentralSurfaces::animateExpandNotificationsPanel); + mShadeController.animateExpandShade(); } private void handleQuickSettings() { - mCentralSurfacesOptionalLazy.get().ifPresent( - centralSurfaces -> centralSurfaces.animateExpandSettingsPanel(null)); + mShadeController.animateExpandQs(); } private void handlePowerDialog() { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java index e2b85fa0ac00..2a14dc894d43 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java @@ -171,7 +171,7 @@ public class WindowMagnification implements CoreStartable, CommandQueue.Callback mModeSwitchesController.setClickListenerDelegate( displayId -> mHandler.post(() -> { - showMagnificationSettingsPanel(displayId); + toggleSettingsPanelVisibility(displayId); })); } @@ -254,11 +254,11 @@ public class WindowMagnification implements CoreStartable, CommandQueue.Callback } @MainThread - void showMagnificationSettingsPanel(int displayId) { + void toggleSettingsPanelVisibility(int displayId) { final MagnificationSettingsController magnificationSettingsController = mMagnificationSettingsSupplier.get(displayId); if (magnificationSettingsController != null) { - magnificationSettingsController.showMagnificationSettings(); + magnificationSettingsController.toggleSettingsPanelVisibility(); } } @@ -335,7 +335,7 @@ public class WindowMagnification implements CoreStartable, CommandQueue.Callback @Override public void onClickSettingsButton(int displayId) { mHandler.post(() -> { - showMagnificationSettingsPanel(displayId); + toggleSettingsPanelVisibility(displayId); }); } }; diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index a67f706777d9..e7eab7e462e1 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -76,6 +76,7 @@ import android.widget.ImageView; import androidx.core.math.MathUtils; +import com.android.internal.accessibility.common.MagnificationConstants; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.systemui.R; @@ -101,7 +102,9 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold // Delay to avoid updating state description too frequently. private static final int UPDATE_STATE_DESCRIPTION_DELAY_MS = 100; // It should be consistent with the value defined in WindowMagnificationGestureHandler. - private static final Range<Float> A11Y_ACTION_SCALE_RANGE = new Range<>(1.0f, 8.0f); + private static final Range<Float> A11Y_ACTION_SCALE_RANGE = new Range<>( + MagnificationConstants.SCALE_MIN_VALUE, + MagnificationConstants.SCALE_MAX_VALUE); private static final float A11Y_CHANGE_SCALE_DIFFERENCE = 1.0f; private static final float ANIMATION_BOUNCE_EFFECT_SCALE = 1.05f; private final SparseArray<Float> mMagnificationSizeScaleOptions = new SparseArray<>(); @@ -221,6 +224,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold private boolean mAllowDiagonalScrolling = false; private boolean mEditSizeEnable = false; + private boolean mSettingsPanelVisibility = false; @Nullable private final MirrorWindowControl mMirrorWindowControl; @@ -1399,6 +1403,8 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold return; } + mSettingsPanelVisibility = settingsPanelIsShown; + mDragView.setBackground(mContext.getResources().getDrawable(settingsPanelIsShown ? R.drawable.accessibility_window_magnification_drag_handle_background_change : R.drawable.accessibility_window_magnification_drag_handle_background)); @@ -1439,12 +1445,19 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold private class MirrorWindowA11yDelegate extends View.AccessibilityDelegate { + private CharSequence getClickAccessibilityActionLabel() { + return mSettingsPanelVisibility + ? mContext.getResources().getString( + R.string.magnification_close_settings_click_label) + : mContext.getResources().getString( + R.string.magnification_open_settings_click_label); + } + @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(host, info); final AccessibilityAction clickAction = new AccessibilityAction( - AccessibilityAction.ACTION_CLICK.getId(), mContext.getResources().getString( - R.string.magnification_open_settings_click_label)); + AccessibilityAction.ACTION_CLICK.getId(), getClickAccessibilityActionLabel()); info.addAction(clickAction); info.setClickable(true); info.addAction( diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java index 3b1d695e3dad..b086912bd904 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java @@ -22,6 +22,9 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; +import static com.android.internal.accessibility.common.MagnificationConstants.SCALE_MAX_VALUE; +import static com.android.internal.accessibility.common.MagnificationConstants.SCALE_MIN_VALUE; + import android.annotation.IntDef; import android.content.BroadcastReceiver; import android.content.Context; @@ -79,14 +82,16 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest private final Runnable mWindowInsetChangeRunnable; private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider; - private final LayoutParams mParams; + @VisibleForTesting + final LayoutParams mParams; @VisibleForTesting final Rect mDraggableWindowBounds = new Rect(); private boolean mIsVisible = false; private final MagnificationGestureDetector mGestureDetector; private boolean mSingleTapDetected = false; - private SeekBarWithIconButtonsView mZoomSeekbar; + @VisibleForTesting + SeekBarWithIconButtonsView mZoomSeekbar; private LinearLayout mAllowDiagonalScrollingView; private TextView mAllowDiagonalScrollingTitle; private Switch mAllowDiagonalScrollingSwitch; @@ -101,11 +106,15 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest private ImageButton mFullScreenButton; private int mLastSelectedButtonIndex = MagnificationSize.NONE; private boolean mAllowDiagonalScrolling = false; - private static final float A11Y_CHANGE_SCALE_DIFFERENCE = 1.0f; - private static final float A11Y_SCALE_MIN_VALUE = 1.0f; + /** + * Amount by which magnification scale changes compared to seekbar in settings. + * magnitude = 10 means, for every 1 scale increase, 10 progress increase in seekbar. + */ + private int mSeekBarMagnitude; private WindowMagnificationSettingsCallback mCallback; private ContentObserver mMagnificationCapabilityObserver; + private ContentObserver mMagnificationScaleObserver; @Retention(RetentionPolicy.SOURCE) @IntDef({ @@ -155,18 +164,26 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest }); } }; + mMagnificationScaleObserver = new ContentObserver( + mContext.getMainThreadHandler()) { + @Override + public void onChange(boolean selfChange) { + setScaleSeekbar(getMagnificationScale()); + } + }; } private class ZoomSeekbarChangeListener implements SeekBar.OnSeekBarChangeListener { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - float scale = progress * A11Y_CHANGE_SCALE_DIFFERENCE + A11Y_SCALE_MIN_VALUE; + float scale = (progress / (float) mSeekBarMagnitude) + SCALE_MIN_VALUE; // Update persisted scale only when scale >= PERSISTED_SCALE_MIN_VALUE const. // We assume if the scale is lower than the PERSISTED_SCALE_MIN_VALUE, there will be // no obvious magnification effect. if (scale >= MagnificationConstants.PERSISTED_SCALE_MIN_VALUE) { - Settings.Secure.putFloatForUser(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, scale, + mSecureSettings.putFloatForUser( + Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, + scale, UserHandle.USER_CURRENT); } mCallback.onMagnifierScale(scale); @@ -300,6 +317,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest // Unregister observer before removing view mSecureSettings.unregisterContentObserver(mMagnificationCapabilityObserver); + mSecureSettings.unregisterContentObserver(mMagnificationScaleObserver); mWindowManager.removeView(mSettingView); mIsVisible = false; if (resetPosition) { @@ -311,6 +329,14 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mCallback.onSettingsPanelVisibilityChanged(/* shown= */ false); } + public void toggleSettingsPanelVisibility() { + if (!mIsVisible) { + showSettingPanel(); + } else { + hideSettingPanel(); + } + } + public void showSettingPanel() { showSettingPanel(true); } @@ -320,7 +346,13 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest } public void setScaleSeekbar(float scale) { - setSeekbarProgress(scale); + int index = (int) ((scale - SCALE_MIN_VALUE) * mSeekBarMagnitude); + if (index < 0) { + index = 0; + } else if (index > mZoomSeekbar.getMax()) { + index = mZoomSeekbar.getMax(); + } + mZoomSeekbar.setProgress(index); } private void transitToMagnificationMode(int mode) { @@ -337,6 +369,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest private void showSettingPanel(boolean resetPosition) { if (!mIsVisible) { updateUIControlsIfNeeded(); + setScaleSeekbar(getMagnificationScale()); if (resetPosition) { mDraggableWindowBounds.set(getDraggableWindowBounds()); mParams.x = mDraggableWindowBounds.right; @@ -349,6 +382,10 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY, mMagnificationCapabilityObserver, UserHandle.USER_CURRENT); + mSecureSettings.registerContentObserverForUser( + Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, + mMagnificationScaleObserver, + UserHandle.USER_CURRENT); // Exclude magnification switch button from system gesture area. setSystemGestureExclusion(); @@ -381,9 +418,15 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest UserHandle.USER_CURRENT); } + private float getMagnificationScale() { + return mSecureSettings.getFloatForUser( + Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, + SCALE_MIN_VALUE, + UserHandle.USER_CURRENT); + } + private void updateUIControlsIfNeeded() { int capability = getMagnificationCapability(); - int selectedButtonIndex = mLastSelectedButtonIndex; switch (capability) { case ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW: @@ -444,14 +487,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest } }; - private void setSeekbarProgress(float scale) { - int index = (int) ((scale - A11Y_SCALE_MIN_VALUE) / A11Y_CHANGE_SCALE_DIFFERENCE); - if (index < 0) { - index = 0; - } - mZoomSeekbar.setProgress(index); - } - void inflateView() { mSettingView = (LinearLayout) View.inflate(mContext, R.layout.window_magnification_settings_view, null); @@ -473,10 +508,13 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mSettingView.findViewById(R.id.magnifier_horizontal_lock_title); mZoomSeekbar = mSettingView.findViewById(R.id.magnifier_zoom_slider); + mZoomSeekbar.setMax((int) (mZoomSeekbar.getChangeMagnitude() + * (SCALE_MAX_VALUE - SCALE_MIN_VALUE))); + mSeekBarMagnitude = mZoomSeekbar.getChangeMagnitude(); float scale = mSecureSettings.getFloatForUser( Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, 0, UserHandle.USER_CURRENT); - setSeekbarProgress(scale); + setScaleSeekbar(scale); mZoomSeekbar.setOnSeekBarChangeListener(new ZoomSeekbarChangeListener()); mAllowDiagonalScrollingView = @@ -521,7 +559,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest // CONFIG_FONT_SCALE: font size change // CONFIG_LOCALE: language change // CONFIG_DENSITY: display size change - mParams.accessibilityTitle = getAccessibilityWindowTitle(mContext); boolean showSettingPanelAfterConfigChange = mIsVisible; @@ -533,16 +570,13 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest return; } - if ((configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0) { - final Rect previousDraggableBounds = new Rect(mDraggableWindowBounds); + if ((configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0 + || (configDiff & ActivityInfo.CONFIG_SCREEN_SIZE) != 0) { mDraggableWindowBounds.set(getDraggableWindowBounds()); - // Keep the Y position with the same height ratio before the window bounds and - // draggable bounds are changed. - final float windowHeightFraction = (float) (mParams.y - previousDraggableBounds.top) - / previousDraggableBounds.height(); - mParams.y = (int) (windowHeightFraction * mDraggableWindowBounds.height()) - + mDraggableWindowBounds.top; - return; + // reset the panel position to the right-bottom corner + mParams.x = mDraggableWindowBounds.right; + mParams.y = mDraggableWindowBounds.bottom; + updateButtonViewLayoutIfNeeded(); } } @@ -554,7 +588,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mDraggableWindowBounds.set(newBounds); } - private void updateButtonViewLayoutIfNeeded() { + @VisibleForTesting + void updateButtonViewLayoutIfNeeded() { if (mIsVisible) { mParams.x = MathUtils.constrain(mParams.x, mDraggableWindowBounds.left, mDraggableWindowBounds.right); @@ -595,7 +630,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest @VisibleForTesting void setDiagonalScrolling(boolean enabled) { - Settings.Secure.putIntForUser(mContext.getContentResolver(), + mSecureSettings.putIntForUser( Settings.Secure.ACCESSIBILITY_ALLOW_DIAGONAL_SCROLLING, enabled ? 1 : 0, UserHandle.USER_CURRENT); diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 665a398a3c15..2b83e6b05bbc 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -105,6 +105,8 @@ public class AssistManager { AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS; public static final int INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS = AssistUtils.INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS; + public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS = + AssistUtils.INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS; public static final int DISMISS_REASON_INVOCATION_CANCELLED = 1; public static final int DISMISS_REASON_TAP = 2; diff --git a/packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt b/packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt index c684dc54c6fd..c4ebee2a9197 100644 --- a/packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt @@ -77,7 +77,7 @@ class AuthenticationRepositoryImpl @Inject constructor() : AuthenticationReposit override val isUnlocked: StateFlow<Boolean> = _isUnlocked.asStateFlow() private val _authenticationMethod = - MutableStateFlow<AuthenticationMethodModel>(AuthenticationMethodModel.PIN(1234)) + MutableStateFlow<AuthenticationMethodModel>(AuthenticationMethodModel.Pin(1234)) override val authenticationMethod: StateFlow<AuthenticationMethodModel> = _authenticationMethod.asStateFlow() diff --git a/packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt b/packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt index 3984627a181d..dd9dcbedd6fc 100644 --- a/packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.authentication.domain.interactor +import android.app.admin.DevicePolicyManager import com.android.systemui.authentication.data.repository.AuthenticationRepository import com.android.systemui.authentication.shared.model.AuthenticationMethodModel import com.android.systemui.dagger.SysUISingleton @@ -129,7 +130,7 @@ constructor( fun authenticate(input: List<Any>): Boolean { val isSuccessful = when (val authMethod = this.authenticationMethod.value) { - is AuthenticationMethodModel.PIN -> input.asCode() == authMethod.code + is AuthenticationMethodModel.Pin -> input.asCode() == authMethod.code is AuthenticationMethodModel.Password -> input.asPassword() == authMethod.password is AuthenticationMethodModel.Pattern -> input.asPattern() == authMethod.coordinates else -> true @@ -177,15 +178,21 @@ constructor( /** * Returns a PIN code from the given list. It's assumed the given list elements are all - * [Int]. + * [Int] in the range [0-9]. */ - private fun List<Any>.asCode(): Int? { - if (isEmpty()) { + private fun List<Any>.asCode(): Long? { + if (isEmpty() || size > DevicePolicyManager.MAX_PASSWORD_LENGTH) { return null } - var code = 0 - map { it as Int }.forEach { integer -> code = code * 10 + integer } + var code = 0L + map { + require(it is Int && it in 0..9) { + "Pin is required to be Int in range [0..9], but got $it" + } + it + } + .forEach { integer -> code = code * 10 + integer } return code } diff --git a/packages/SystemUI/src/com/android/systemui/authentication/shared/model/AuthenticationMethodModel.kt b/packages/SystemUI/src/com/android/systemui/authentication/shared/model/AuthenticationMethodModel.kt index 6f008c3017b9..e4fbf9af35ea 100644 --- a/packages/SystemUI/src/com/android/systemui/authentication/shared/model/AuthenticationMethodModel.kt +++ b/packages/SystemUI/src/com/android/systemui/authentication/shared/model/AuthenticationMethodModel.kt @@ -32,7 +32,13 @@ sealed class AuthenticationMethodModel( /** The most basic authentication method. The lock screen can be swiped away when displayed. */ object Swipe : AuthenticationMethodModel(isSecure = false) - data class PIN(val code: Int) : AuthenticationMethodModel(isSecure = true) + /** + * Authentication method using a PIN. + * + * In practice, a pin is restricted to 16 decimal digits , see + * [android.app.admin.DevicePolicyManager.MAX_PASSWORD_LENGTH] + */ + data class Pin(val code: Long) : AuthenticationMethodModel(isSecure = true) data class Password(val password: String) : AuthenticationMethodModel(isSecure = true) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 8d51375ed2ce..e58876a2632c 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -201,7 +201,9 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, final TaskStackListener mTaskStackListener = new TaskStackListener() { @Override public void onTaskStackChanged() { - mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground); + if (!isOwnerInForeground()) { + mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground); + } } }; @@ -239,33 +241,39 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, } } + private boolean isOwnerInForeground() { + if (mCurrentDialog != null) { + final String clientPackage = mCurrentDialog.getOpPackageName(); + final List<ActivityManager.RunningTaskInfo> runningTasks = + mActivityTaskManager.getTasks(1); + if (!runningTasks.isEmpty()) { + final String topPackage = runningTasks.get(0).topActivity.getPackageName(); + if (!topPackage.contentEquals(clientPackage) + && !Utils.isSystem(mContext, clientPackage)) { + Log.w(TAG, "Evicting client due to: " + topPackage); + return false; + } + } + } + return true; + } + private void cancelIfOwnerIsNotInForeground() { mExecution.assertIsMainThread(); if (mCurrentDialog != null) { try { - final String clientPackage = mCurrentDialog.getOpPackageName(); - Log.w(TAG, "Task stack changed, current client: " + clientPackage); - final List<ActivityManager.RunningTaskInfo> runningTasks = - mActivityTaskManager.getTasks(1); - if (!runningTasks.isEmpty()) { - final String topPackage = runningTasks.get(0).topActivity.getPackageName(); - if (!topPackage.contentEquals(clientPackage) - && !Utils.isSystem(mContext, clientPackage)) { - Log.e(TAG, "Evicting client due to: " + topPackage); - mCurrentDialog.dismissWithoutCallback(true /* animate */); - mCurrentDialog = null; - - for (Callback cb : mCallbacks) { - cb.onBiometricPromptDismissed(); - } + mCurrentDialog.dismissWithoutCallback(true /* animate */); + mCurrentDialog = null; - if (mReceiver != null) { - mReceiver.onDialogDismissed( - BiometricPrompt.DISMISSED_REASON_USER_CANCEL, - null /* credentialAttestation */); - mReceiver = null; - } - } + for (Callback cb : mCallbacks) { + cb.onBiometricPromptDismissed(); + } + + if (mReceiver != null) { + mReceiver.onDialogDismissed( + BiometricPrompt.DISMISSED_REASON_USER_CANCEL, + null /* credentialAttestation */); + mReceiver = null; } } catch (RemoteException e) { Log.e(TAG, "Remote exception", e); @@ -1257,10 +1265,11 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, cb.onBiometricPromptShown(); } mCurrentDialog = newDialog; - mCurrentDialog.show(mWindowManager, savedState); - if (!promptInfo.isAllowBackgroundAuthentication()) { - mHandler.post(this::cancelIfOwnerIsNotInForeground); + if (!promptInfo.isAllowBackgroundAuthentication() && !isOwnerInForeground()) { + cancelIfOwnerIsNotInForeground(); + } else { + mCurrentDialog.show(mWindowManager, savedState); } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt index d48b9c339d15..9d0cde18a6ef 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt @@ -54,11 +54,11 @@ import com.android.internal.annotations.VisibleForTesting import com.android.systemui.Dumpable import com.android.systemui.R import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.util.boundsOnScreen import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.traceSection diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index 2eb533029cf5..a91499af30d8 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -82,9 +82,9 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.ScreenLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -173,6 +173,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { @NonNull private final SecureSettings mSecureSettings; @NonNull private final UdfpsUtils mUdfpsUtils; @NonNull private final InputManager mInputManager; + @NonNull private final UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate; private final boolean mIgnoreRefreshRate; // Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple @@ -272,7 +273,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { mUdfpsDisplayMode, mSecureSettings, requestId, reason, callback, (view, event, fromUdfpsView) -> onTouch(requestId, event, fromUdfpsView), mActivityLaunchAnimator, mFeatureFlags, - mPrimaryBouncerInteractor, mAlternateBouncerInteractor, mUdfpsUtils))); + mPrimaryBouncerInteractor, mAlternateBouncerInteractor, mUdfpsUtils, + mUdfpsKeyguardAccessibilityDelegate))); } @Override @@ -825,7 +827,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { @NonNull SecureSettings secureSettings, @NonNull InputManager inputManager, @NonNull UdfpsUtils udfpsUtils, - @NonNull KeyguardFaceAuthInteractor keyguardFaceAuthInteractor) { + @NonNull KeyguardFaceAuthInteractor keyguardFaceAuthInteractor, + @NonNull UdfpsKeyguardAccessibilityDelegate udfpsKeyguardAccessibilityDelegate) { mContext = context; mExecution = execution; mVibrator = vibrator; @@ -871,6 +874,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { mSecureSettings = secureSettings; mUdfpsUtils = udfpsUtils; mInputManager = inputManager; + mUdfpsKeyguardAccessibilityDelegate = udfpsKeyguardAccessibilityDelegate; mTouchProcessor = mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION) ? singlePointerTouchProcessor : null; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt index cabe9008ab47..e5421471931f 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt @@ -53,8 +53,8 @@ import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.statusbar.LockscreenShadeTransitionController @@ -103,7 +103,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor( private val primaryBouncerInteractor: PrimaryBouncerInteractor, private val alternateBouncerInteractor: AlternateBouncerInteractor, private val isDebuggable: Boolean = Build.IS_DEBUGGABLE, - private val udfpsUtils: UdfpsUtils + private val udfpsUtils: UdfpsUtils, + private val udfpsKeyguardAccessibilityDelegate: UdfpsKeyguardAccessibilityDelegate, ) { /** The view, when [isShowing], or null. */ var overlayView: UdfpsView? = null @@ -261,6 +262,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( featureFlags, primaryBouncerInteractor, alternateBouncerInteractor, + udfpsKeyguardAccessibilityDelegate, ) } REASON_AUTH_BP -> { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegate.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegate.kt new file mode 100644 index 000000000000..fb7b56e12996 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegate.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.biometrics + +import android.content.res.Resources +import android.os.Bundle +import android.view.View +import android.view.accessibility.AccessibilityNodeInfo +import com.android.systemui.R +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager +import javax.inject.Inject + +@SysUISingleton +class UdfpsKeyguardAccessibilityDelegate +@Inject +constructor( + @Main private val resources: Resources, + private val keyguardViewManager: StatusBarKeyguardViewManager, +) : View.AccessibilityDelegate() { + override fun onInitializeAccessibilityNodeInfo(host: View?, info: AccessibilityNodeInfo) { + super.onInitializeAccessibilityNodeInfo(host, info) + val clickAction = + AccessibilityNodeInfo.AccessibilityAction( + AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK.id, + resources.getString(R.string.accessibility_bouncer) + ) + info.addAction(clickAction) + } + + override fun performAccessibilityAction(host: View?, action: Int, args: Bundle?): Boolean { + // when an a11y service is enabled, double tapping on the fingerprint sensor should + // show the primary bouncer + return if (action == AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK.id) { + keyguardViewManager.showPrimaryBouncer(/* scrimmed */ true) + true + } else super.performAccessibilityAction(host, action, args) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt index 3fc3e82b6b5a..9bafeeca24a8 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt @@ -20,6 +20,7 @@ import android.animation.ValueAnimator import android.content.res.Configuration import android.util.MathUtils import android.view.MotionEvent +import android.view.View import androidx.annotation.VisibleForTesting import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle @@ -28,11 +29,11 @@ import com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerPr import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.R import com.android.systemui.animation.ActivityLaunchAnimator +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionListener @@ -71,6 +72,7 @@ constructor( featureFlags: FeatureFlags, private val primaryBouncerInteractor: PrimaryBouncerInteractor, private val alternateBouncerInteractor: AlternateBouncerInteractor, + private val udfpsKeyguardAccessibilityDelegate: UdfpsKeyguardAccessibilityDelegate, ) : UdfpsAnimationViewController<UdfpsKeyguardViewLegacy>( view, @@ -300,7 +302,10 @@ constructor( lockScreenShadeTransitionController.mUdfpsKeyguardViewControllerLegacy = this activityLaunchAnimator.addListener(activityLaunchAnimatorListener) view.mUseExpandedOverlay = useExpandedOverlay - view.startIconAsyncInflate() + view.startIconAsyncInflate { + (view.findViewById(R.id.udfps_animation_view_internal) as View).accessibilityDelegate = + udfpsKeyguardAccessibilityDelegate + } } override fun onViewDetached() { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacy.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacy.java index 056d692a3641..b916810c57d0 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacy.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacy.java @@ -79,6 +79,7 @@ public class UdfpsKeyguardViewLegacy extends UdfpsAnimationView { private float mInterpolatedDarkAmount; private int mAnimationType = ANIMATION_NONE; private boolean mFullyInflated; + private Runnable mOnFinishInflateRunnable; public UdfpsKeyguardViewLegacy(Context context, @Nullable AttributeSet attrs) { super(context, attrs); @@ -90,7 +91,12 @@ public class UdfpsKeyguardViewLegacy extends UdfpsAnimationView { .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y); } - public void startIconAsyncInflate() { + /** + * Inflate internal udfps view on a background thread and call the onFinishRunnable + * when inflation is finished. + */ + public void startIconAsyncInflate(Runnable onFinishInflate) { + mOnFinishInflateRunnable = onFinishInflate; // inflate Lottie views on a background thread in case it takes a while to inflate AsyncLayoutInflater inflater = new AsyncLayoutInflater(mContext); inflater.inflate(R.layout.udfps_keyguard_view_internal, this, @@ -330,6 +336,7 @@ public class UdfpsKeyguardViewLegacy extends UdfpsAnimationView { frameInfo -> new PorterDuffColorFilter(mTextColorPrimary, PorterDuff.Mode.SRC_ATOP) ); + mOnFinishInflateRunnable.run(); } }; } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/data/factory/BouncerMessageFactory.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/factory/BouncerMessageFactory.kt index 4085dab39300..3206c0043d5c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/data/factory/BouncerMessageFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/factory/BouncerMessageFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.data.factory +package com.android.systemui.bouncer.data.factory import android.annotation.IntDef import com.android.keyguard.KeyguardSecurityModel @@ -73,9 +73,9 @@ import com.android.systemui.R.string.kg_wrong_input_try_fp_suggestion import com.android.systemui.R.string.kg_wrong_password_try_again import com.android.systemui.R.string.kg_wrong_pattern_try_again import com.android.systemui.R.string.kg_wrong_pin_try_again +import com.android.systemui.bouncer.shared.model.BouncerMessageModel +import com.android.systemui.bouncer.shared.model.Message import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel -import com.android.systemui.keyguard.bouncer.shared.model.Message import javax.inject.Inject @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/data/repository/BouncerMessageRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerMessageRepository.kt index c4400bcb6b21..7e420cfcea75 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/data/repository/BouncerMessageRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerMessageRepository.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.data.repository +package com.android.systemui.bouncer.data.repository import android.hardware.biometrics.BiometricSourceType import android.hardware.biometrics.BiometricSourceType.FACE @@ -33,11 +33,11 @@ import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRE import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitorCallback +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.keyguard.bouncer.data.factory.BouncerMessageFactory -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.TrustRepository diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/data/repo/BouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt index 49a0a3c1e965..ff896fa51350 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/data/repo/BouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.bouncer.data.repo +package com.android.systemui.bouncer.data.repository import com.android.systemui.bouncer.shared.model.AuthenticationThrottledModel import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt index 5d15e69f0162..918e1680fc66 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt @@ -14,14 +14,14 @@ * limitations under the License */ -package com.android.systemui.keyguard.data.repository +package com.android.systemui.bouncer.data.repository import android.os.Build import android.util.Log +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel import com.android.systemui.log.dagger.BouncerTableLog import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.log.table.logDiffsForTable diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt index 148d4255636c..2abdb849cd9a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.time.SystemClock diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt index 1d2fce7d8b05..c833defdc444 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt @@ -21,7 +21,7 @@ import androidx.annotation.VisibleForTesting import com.android.systemui.R import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor import com.android.systemui.authentication.shared.model.AuthenticationMethodModel -import com.android.systemui.bouncer.data.repo.BouncerRepository +import com.android.systemui.bouncer.data.repository.BouncerRepository import com.android.systemui.bouncer.shared.model.AuthenticationThrottledModel import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.scene.domain.interactor.SceneInteractor @@ -197,7 +197,7 @@ constructor( private fun promptMessage(authMethod: AuthenticationMethodModel): String { return when (authMethod) { - is AuthenticationMethodModel.PIN -> + is AuthenticationMethodModel.Pin -> applicationContext.getString(R.string.keyguard_enter_your_pin) is AuthenticationMethodModel.Password -> applicationContext.getString(R.string.keyguard_enter_your_password) @@ -209,7 +209,7 @@ constructor( private fun errorMessage(authMethod: AuthenticationMethodModel): String { return when (authMethod) { - is AuthenticationMethodModel.PIN -> applicationContext.getString(R.string.kg_wrong_pin) + is AuthenticationMethodModel.Pin -> applicationContext.getString(R.string.kg_wrong_pin) is AuthenticationMethodModel.Password -> applicationContext.getString(R.string.kg_wrong_password) is AuthenticationMethodModel.Pattern -> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageAuditLogger.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageAuditLogger.kt index 56f81fca0221..497747f59034 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageAuditLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageAuditLogger.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.os.Build import android.util.Log import com.android.systemui.CoreStartable +import com.android.systemui.bouncer.data.repository.BouncerMessageRepository +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.keyguard.bouncer.data.repository.BouncerMessageRepository -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt index 1754d934ee3a..d06dd8e1c124 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.os.CountDownTimer import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_DEFAULT import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_INCORRECT_PRIMARY_AUTH_INPUT import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PRIMARY_AUTH_LOCKED_OUT +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.data.repository.BouncerMessageRepository +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags.REVAMPED_BOUNCER_MESSAGES -import com.android.systemui.keyguard.bouncer.data.factory.BouncerMessageFactory -import com.android.systemui.keyguard.bouncer.data.repository.BouncerMessageRepository -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel import com.android.systemui.user.data.repository.UserRepository import javax.inject.Inject import kotlin.math.roundToInt diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractor.kt index 3099a497bf45..5fbe99ad2902 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractor.kt @@ -14,12 +14,12 @@ * limitations under the License */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.view.View +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE import com.android.systemui.util.ListenerSet import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt index 54bc349cc4ac..7c90735fc0fc 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.content.Context import android.content.res.ColorStateList @@ -29,6 +29,11 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.DejankUtils import com.android.systemui.R +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel +import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.classifier.FalsingCollector import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -36,24 +41,18 @@ import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.TrustRepository -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel import com.android.systemui.plugins.ActivityStarter import com.android.systemui.shared.system.SysUiStatsLog import com.android.systemui.statusbar.policy.KeyguardStateController +import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import javax.inject.Inject /** * Encapsulates business logic for interacting with the lock-screen primary (pin/pattern/password) @@ -77,8 +76,8 @@ constructor( private val featureFlags: FeatureFlags, @Application private val applicationScope: CoroutineScope, ) { - private val passiveAuthBouncerDelay = context.resources.getInteger( - R.integer.primary_bouncer_passive_auth_delay).toLong() + private val passiveAuthBouncerDelay = + context.resources.getInteger(R.integer.primary_bouncer_passive_auth_delay).toLong() /** Runnable to show the primary bouncer. */ val showRunnable = Runnable { repository.setPrimaryShow(true) @@ -390,14 +389,17 @@ constructor( /** Whether we want to wait to show the bouncer in case passive auth succeeds. */ private fun usePrimaryBouncerPassiveAuthDelay(): Boolean { - val canRunFaceAuth = keyguardStateController.isFaceAuthEnabled && - keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE) - val canRunActiveUnlock = currentUserActiveUnlockRunning && + val canRunFaceAuth = + keyguardStateController.isFaceAuthEnabled && + keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE) && + keyguardUpdateMonitor.doesCurrentPostureAllowFaceAuth() + val canRunActiveUnlock = + currentUserActiveUnlockRunning && keyguardUpdateMonitor.canTriggerActiveUnlockBasedOnDeviceState() return featureFlags.isEnabled(Flags.DELAY_BOUNCER) && - !needsFullscreenBouncer() && - (canRunFaceAuth || canRunActiveUnlock) + !needsFullscreenBouncer() && + (canRunFaceAuth || canRunActiveUnlock) } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt b/packages/SystemUI/src/com/android/systemui/bouncer/shared/constants/KeyguardBouncerConstants.kt index c45faf0ba961..9f1781177f7a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/shared/constants/KeyguardBouncerConstants.kt @@ -12,10 +12,9 @@ * 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.keyguard.shared.constants +package com.android.systemui.bouncer.shared.constants object KeyguardBouncerConstants { /** diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/BouncerCallbackActionsModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerCallbackActionsModel.kt index 81cf5b41ea71..afddd39aba33 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/BouncerCallbackActionsModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerCallbackActionsModel.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.shared.model +package com.android.systemui.bouncer.shared.model import com.android.systemui.plugins.ActivityStarter diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/shared/model/BouncerMessageModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerMessageModel.kt index 46e88733ae6c..0e9e96213340 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/shared/model/BouncerMessageModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerMessageModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.shared.model +package com.android.systemui.bouncer.shared.model import android.content.res.ColorStateList diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/BouncerShowMessageModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerShowMessageModel.kt index 05cdeaaa106d..187857289069 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/BouncerShowMessageModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/shared/model/BouncerShowMessageModel.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.shared.model +package com.android.systemui.bouncer.shared.model import android.content.res.ColorStateList diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/ui/BouncerMessageView.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt index 4dc52ff46707..47fac2b4269d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/bouncer/ui/BouncerMessageView.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.ui +package com.android.systemui.bouncer.ui import android.content.Context import android.util.AttributeSet diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/BouncerView.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerView.kt index 871a3ff63214..dc0032162d3c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/BouncerView.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerView.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.data +package com.android.systemui.bouncer.ui import android.view.KeyEvent import android.window.OnBackAnimationCallback diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/BouncerViewModule.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt index 390c54e0350a..0cbfb68b6e93 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/BouncerViewModule.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.data +package com.android.systemui.bouncer.ui import dagger.Binds import dagger.Module diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/BouncerMessageViewBinder.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/BouncerMessageViewBinder.kt new file mode 100644 index 000000000000..5a59012a74b8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/BouncerMessageViewBinder.kt @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.bouncer.ui.binder + +import android.text.TextUtils +import android.util.PluralsMessageFormatter +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.repeatOnLifecycle +import com.android.keyguard.BouncerKeyguardMessageArea +import com.android.keyguard.KeyguardMessageArea +import com.android.keyguard.KeyguardMessageAreaController +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor +import com.android.systemui.bouncer.shared.model.Message +import com.android.systemui.bouncer.ui.BouncerMessageView +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.log.BouncerLogger +import kotlinx.coroutines.launch + +object BouncerMessageViewBinder { + @JvmStatic + fun bind( + view: BouncerMessageView, + interactor: BouncerMessageInteractor, + factory: KeyguardMessageAreaController.Factory, + bouncerLogger: BouncerLogger, + featureFlags: FeatureFlags + ) { + view.repeatWhenAttached { + if (!featureFlags.isEnabled(Flags.REVAMPED_BOUNCER_MESSAGES)) { + view.primaryMessageView?.disable() + view.secondaryMessageView?.disable() + return@repeatWhenAttached + } + view.init(factory) + view.primaryMessage?.setIsVisible(true) + view.secondaryMessage?.setIsVisible(true) + repeatOnLifecycle(Lifecycle.State.STARTED) { + bouncerLogger.startBouncerMessageInteractor() + launch { + interactor.bouncerMessage.collect { + bouncerLogger.bouncerMessageUpdated(it) + updateView( + view.primaryMessage, + view.primaryMessageView, + message = it?.message, + allowTruncation = true, + ) + updateView( + view.secondaryMessage, + view.secondaryMessageView, + message = it?.secondaryMessage, + allowTruncation = false, + ) + view.requestLayout() + } + } + } + } + } + + private fun updateView( + controller: KeyguardMessageAreaController<KeyguardMessageArea>?, + view: BouncerKeyguardMessageArea?, + message: Message?, + allowTruncation: Boolean = false, + ) { + if (view == null || controller == null) return + if (message?.message != null || message?.messageResId != null) { + controller.setIsVisible(true) + var newMessage = message.message ?: "" + if (message.messageResId != null && message.messageResId != 0) { + newMessage = view.resources.getString(message.messageResId) + if (message.formatterArgs != null) { + newMessage = + PluralsMessageFormatter.format( + view.resources, + message.formatterArgs, + message.messageResId + ) + } + } + controller.setMessage(newMessage, message.animate) + } else { + controller.setIsVisible(false) + controller.setMessage(0) + } + message?.colorState?.let { controller.setNextMessageColor(it) } + view.ellipsize = + if (allowTruncation) TextUtils.TruncateAt.END else TextUtils.TruncateAt.MARQUEE + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt index c1aefc7bcbd7..34e934bec003 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.ui.binder +package com.android.systemui.bouncer.ui.binder import android.view.KeyEvent import android.view.View @@ -22,16 +22,20 @@ import android.view.ViewGroup import android.window.OnBackAnimationCallback import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.keyguard.KeyguardMessageAreaController import com.android.keyguard.KeyguardSecurityContainerController import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardSecurityView import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.dagger.KeyguardBouncerComponent -import com.android.systemui.keyguard.data.BouncerViewDelegate -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE -import com.android.systemui.keyguard.ui.viewmodel.KeyguardBouncerViewModel +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE +import com.android.systemui.bouncer.ui.BouncerViewDelegate +import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel +import com.android.systemui.flags.FeatureFlags import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.log.BouncerLogger import com.android.systemui.plugins.ActivityStarter import kotlinx.coroutines.awaitCancellation import kotlinx.coroutines.flow.filter @@ -44,7 +48,11 @@ object KeyguardBouncerViewBinder { view: ViewGroup, viewModel: KeyguardBouncerViewModel, primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel, - componentFactory: KeyguardBouncerComponent.Factory + componentFactory: KeyguardBouncerComponent.Factory, + messageAreaControllerFactory: KeyguardMessageAreaController.Factory, + bouncerMessageInteractor: BouncerMessageInteractor, + bouncerLogger: BouncerLogger, + featureFlags: FeatureFlags, ) { // Builds the KeyguardSecurityContainerController from bouncer view group. val securityContainerController: KeyguardSecurityContainerController = @@ -125,8 +133,16 @@ object KeyguardBouncerViewBinder { securityContainerController.onResume( KeyguardSecurityView.SCREEN_ON ) + bouncerLogger.bindingBouncerMessageView() + it.bindMessageView( + bouncerMessageInteractor, + messageAreaControllerFactory, + bouncerLogger, + featureFlags + ) } } else { + bouncerMessageInteractor.onBouncerBeingHidden() securityContainerController.onBouncerVisibilityChanged( /* isVisible= */ false ) diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt index 984d9ab1c1be..527fe6ec847d 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt @@ -126,7 +126,7 @@ constructor( .map { model -> model?.let { when (interactor.authenticationMethod.value) { - is AuthenticationMethodModel.PIN -> + is AuthenticationMethodModel.Pin -> R.string.kg_too_many_failed_pin_attempts_dialog_message is AuthenticationMethodModel.Password -> R.string.kg_too_many_failed_password_attempts_dialog_message @@ -165,7 +165,7 @@ constructor( authMethod: AuthenticationMethodModel, ): AuthMethodBouncerViewModel? { return when (authMethod) { - is AuthenticationMethodModel.PIN -> pin + is AuthenticationMethodModel.Pin -> pin is AuthenticationMethodModel.Password -> password is AuthenticationMethodModel.Pattern -> pattern else -> null diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModel.kt index 9602888ced58..6ba84399585d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModel.kt @@ -14,13 +14,13 @@ * limitations under the License */ -package com.android.systemui.keyguard.ui.viewmodel +package com.android.systemui.bouncer.ui.viewmodel import android.view.View -import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.BouncerViewDelegate -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel +import com.android.systemui.bouncer.ui.BouncerView +import com.android.systemui.bouncer.ui.BouncerViewDelegate import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt index 5c0fd92e7299..94d3d193e9cc 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt @@ -16,18 +16,10 @@ package com.android.systemui.bouncer.ui.viewmodel -import androidx.annotation.VisibleForTesting import com.android.systemui.bouncer.domain.interactor.BouncerInteractor -import com.android.systemui.util.kotlin.pairwise import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.stateIn -import kotlinx.coroutines.launch /** Holds UI state and handles user input for the PIN code bouncer UI. */ class PinBouncerViewModel( @@ -39,21 +31,8 @@ class PinBouncerViewModel( isInputEnabled = isInputEnabled, ) { - private val entered = MutableStateFlow<List<Int>>(emptyList()) - /** - * The length of the PIN digits that were input so far, two values are supplied the previous and - * the current. - */ - val pinLengths: StateFlow<Pair<Int, Int>> = - entered - .pairwise() - .map { it.previousValue.size to it.newValue.size } - .stateIn( - scope = applicationScope, - started = SharingStarted.WhileSubscribed(), - initialValue = 0 to 0, - ) - private var resetPinJob: Job? = null + private val mutablePinEntries = MutableStateFlow<List<EnteredKey>>(emptyList()) + val pinEntries: StateFlow<List<EnteredKey>> = mutablePinEntries /** Notifies that the UI has been shown to the user. */ fun onShown() { @@ -62,47 +41,48 @@ class PinBouncerViewModel( /** Notifies that the user clicked on a PIN button with the given digit value. */ fun onPinButtonClicked(input: Int) { - resetPinJob?.cancel() - resetPinJob = null - - if (entered.value.isEmpty()) { + if (mutablePinEntries.value.isEmpty()) { interactor.clearMessage() } - entered.value += input + mutablePinEntries.value += EnteredKey(input) } /** Notifies that the user clicked the backspace button. */ fun onBackspaceButtonClicked() { - if (entered.value.isEmpty()) { + if (mutablePinEntries.value.isEmpty()) { return } - - entered.value = entered.value.toMutableList().apply { removeLast() } + mutablePinEntries.value = mutablePinEntries.value.toMutableList().apply { removeLast() } } /** Notifies that the user long-pressed the backspace button. */ fun onBackspaceButtonLongPressed() { - resetPinJob?.cancel() - resetPinJob = - applicationScope.launch { - while (entered.value.isNotEmpty()) { - onBackspaceButtonClicked() - delay(BACKSPACE_LONG_PRESS_DELAY_MS) - } - } + mutablePinEntries.value = emptyList() } /** Notifies that the user clicked the "enter" button. */ fun onAuthenticateButtonClicked() { - if (!interactor.authenticate(entered.value)) { + if (!interactor.authenticate(mutablePinEntries.value.map { it.input })) { showFailureAnimation() } - entered.value = emptyList() + mutablePinEntries.value = emptyList() } +} - companion object { - @VisibleForTesting const val BACKSPACE_LONG_PRESS_DELAY_MS = 80L - } +private var nextSequenceNumber = 1 + +/** + * The pin bouncer [input] as digits 0-9, together with a [sequenceNumber] to indicate the ordering. + * + * Since the model only allows appending/removing [EnteredKey]s from the end, the [sequenceNumber] + * is strictly increasing in input order of the pin, but not guaranteed to be monotonic or start at + * a specific number. + */ +data class EnteredKey +internal constructor(val input: Int, val sequenceNumber: Int = nextSequenceNumber++) : + Comparable<EnteredKey> { + override fun compareTo(other: EnteredKey): Int = + compareValuesBy(this, other, EnteredKey::sequenceNumber) } diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/view/SeekBarWithIconButtonsView.java b/packages/SystemUI/src/com/android/systemui/common/ui/view/SeekBarWithIconButtonsView.java index de3a9901b8c4..4538a6ca7954 100644 --- a/packages/SystemUI/src/com/android/systemui/common/ui/view/SeekBarWithIconButtonsView.java +++ b/packages/SystemUI/src/com/android/systemui/common/ui/view/SeekBarWithIconButtonsView.java @@ -27,6 +27,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.SeekBar; +import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; /** @@ -37,12 +38,14 @@ public class SeekBarWithIconButtonsView extends LinearLayout { private static final int DEFAULT_SEEKBAR_MAX = 6; private static final int DEFAULT_SEEKBAR_PROGRESS = 0; + private static final int DEFAULT_SEEKBAR_TICK_MARK = 0; private ViewGroup mIconStartFrame; private ViewGroup mIconEndFrame; private ImageView mIconStart; private ImageView mIconEnd; private SeekBar mSeekbar; + private int mSeekBarChangeMagnitude = 1; private SeekBarChangeListener mSeekBarListener = new SeekBarChangeListener(); private String[] mStateLabels = null; @@ -102,6 +105,15 @@ public class SeekBarWithIconButtonsView extends LinearLayout { context.getString(iconEndFrameContentDescriptionId); mIconEndFrame.setContentDescription(contentDescription); } + int tickMarkId = typedArray.getResourceId( + R.styleable.SeekBarWithIconButtonsView_Layout_tickMark, + DEFAULT_SEEKBAR_TICK_MARK); + if (tickMarkId != DEFAULT_SEEKBAR_TICK_MARK) { + mSeekbar.setTickMark(getResources().getDrawable(tickMarkId)); + } + mSeekBarChangeMagnitude = typedArray.getInt( + R.styleable.SeekBarWithIconButtonsView_Layout_seekBarChangeMagnitude, + /* defValue= */ 1); } else { mSeekbar.setMax(DEFAULT_SEEKBAR_MAX); setProgress(DEFAULT_SEEKBAR_PROGRESS); @@ -112,7 +124,7 @@ public class SeekBarWithIconButtonsView extends LinearLayout { mIconStartFrame.setOnClickListener((view) -> { final int progress = mSeekbar.getProgress(); if (progress > 0) { - mSeekbar.setProgress(progress - 1); + mSeekbar.setProgress(progress - mSeekBarChangeMagnitude); setIconViewAndFrameEnabled(mIconStart, mSeekbar.getProgress() > 0); } }); @@ -120,7 +132,7 @@ public class SeekBarWithIconButtonsView extends LinearLayout { mIconEndFrame.setOnClickListener((view) -> { final int progress = mSeekbar.getProgress(); if (progress < mSeekbar.getMax()) { - mSeekbar.setProgress(progress + 1); + mSeekbar.setProgress(progress + mSeekBarChangeMagnitude); setIconViewAndFrameEnabled(mIconEnd, mSeekbar.getProgress() < mSeekbar.getMax()); } }); @@ -183,6 +195,20 @@ public class SeekBarWithIconButtonsView extends LinearLayout { } /** + * Gets max to the seekbar in the layout. + */ + public int getMax() { + return mSeekbar.getMax(); + } + + /** + * @return the magnitude by which seekbar progress changes when start and end icons are clicked. + */ + public int getChangeMagnitude() { + return mSeekBarChangeMagnitude; + } + + /** * Sets progress to the seekbar in the layout. * If the progress is smaller than or equals to 0, the IconStart will be disabled. If the * progress is larger than or equals to Max, the IconEnd will be disabled. The seekbar progress @@ -193,6 +219,11 @@ public class SeekBarWithIconButtonsView extends LinearLayout { updateIconViewIfNeeded(progress); } + @VisibleForTesting + public int getProgress() { + return mSeekbar.getProgress(); + } + private class SeekBarChangeListener implements SeekBar.OnSeekBarChangeListener { private SeekBar.OnSeekBarChangeListener mOnSeekBarChangeListener = null; diff --git a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt index 18bd46756660..ccbde011334d 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt @@ -312,6 +312,7 @@ open class ControlsBindingControllerImpl @Inject constructor( Log.d(TAG, "Canceling loadSubscribtion") it.invoke() } + callback.error("Load cancelled") } override fun onSubscribe(token: IBinder, subs: IControlsSubscription) { diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt index 25634f009fc7..76002d3f9693 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt @@ -34,6 +34,7 @@ import com.android.systemui.globalactions.GlobalActionsComponent import com.android.systemui.keyboard.KeyboardUI import com.android.systemui.keyboard.PhysicalKeyboardCoreStartable import com.android.systemui.keyguard.KeyguardViewMediator +import com.android.systemui.keyguard.KeyguardViewConfigurator import com.android.systemui.keyguard.data.quickaffordance.MuteQuickAffordanceCoreStartable import com.android.systemui.log.SessionTracker import com.android.systemui.media.RingtonePlayer @@ -295,4 +296,9 @@ abstract class SystemUICoreStartableModule { @IntoMap @ClassKey(AssistantAttentionMonitor::class) abstract fun bindAssistantAttentionMonitor(sysui: AssistantAttentionMonitor): CoreStartable + + @Binds + @IntoMap + @ClassKey(KeyguardViewConfigurator::class) + abstract fun bindKeyguardViewConfigurator(impl: KeyguardViewConfigurator): CoreStartable } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 5bcf32a9ebdb..4ff16b8f29e3 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -53,7 +53,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.FlagsModule; import com.android.systemui.keyboard.KeyboardModule; -import com.android.systemui.keyguard.data.BouncerViewModule; +import com.android.systemui.bouncer.ui.BouncerViewModule; import com.android.systemui.log.dagger.LogModule; import com.android.systemui.log.dagger.MonitorLog; import com.android.systemui.log.table.TableLogBuffer; diff --git a/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java index b71871ebdb55..d70c57fda2e1 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java @@ -16,12 +16,11 @@ package com.android.systemui.dagger; -import android.content.Context; import android.os.HandlerThread; import androidx.annotation.Nullable; -import com.android.systemui.SystemUIInitializerFactory; +import com.android.systemui.SystemUIInitializer; import com.android.systemui.tv.TvWMComponent; import com.android.wm.shell.back.BackAnimation; import com.android.wm.shell.bubbles.Bubbles; @@ -49,7 +48,7 @@ import java.util.Optional; /** * Dagger Subcomponent for WindowManager. This class explicitly describes the interfaces exported * from the WM component into the SysUI component (in - * {@link SystemUIInitializerFactory#init(Context, boolean)}), and references the specific dependencies + * {@link SystemUIInitializer#init(boolean)}), and references the specific dependencies * provided by its particular device/form-factor SystemUI implementation. * * ie. {@link WMComponent} includes {@link WMShellModule} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt index c5e7e0d99286..ee046c27d72e 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt @@ -34,13 +34,11 @@ import com.android.systemui.complication.ComplicationLayoutParams.POSITION_TOP import com.android.systemui.complication.ComplicationLayoutParams.Position import com.android.systemui.dreams.dagger.DreamOverlayModule import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel -import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.DREAM_ANIMATION_DURATION import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.statusbar.BlurUtils import com.android.systemui.statusbar.CrossFadeHelper import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener -import com.android.systemui.util.concurrency.DelayableExecutor import javax.inject.Inject import javax.inject.Named import kotlinx.coroutines.flow.MutableStateFlow @@ -129,6 +127,12 @@ constructor( ) } } + + launch { + transitionViewModel.transitionEnded.collect { _ -> + mOverlayStateController.setExitAnimationsRunning(false) + } + } } configController.removeCallback(configCallback) @@ -251,9 +255,9 @@ constructor( } /** Starts the dream content and dream overlay exit animations. */ - fun wakeUp(doneCallback: Runnable, executor: DelayableExecutor) { + fun wakeUp() { cancelAnimations() - executor.executeDelayed(doneCallback, DREAM_ANIMATION_DURATION.inWholeMilliseconds) + mOverlayStateController.setExitAnimationsRunning(true) } /** Cancels the dream content and dream overlay animations, if they're currently running. */ diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index c22019e96d74..78ac45325072 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -31,8 +31,6 @@ import android.util.MathUtils; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.NonNull; - import com.android.app.animation.Interpolators; import com.android.dream.lowlight.LowLightTransitionCoordinator; import com.android.systemui.R; @@ -41,12 +39,11 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.dagger.DreamOverlayModule; import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.statusbar.BlurUtils; import com.android.systemui.util.ViewController; -import com.android.systemui.util.concurrency.DelayableExecutor; import java.util.Arrays; @@ -302,20 +299,15 @@ public class DreamOverlayContainerViewController extends /** * Handle the dream waking up and run any necessary animations. - * - * @param onAnimationEnd Callback to trigger once animations are finished. - * @param callbackExecutor Executor to execute the callback on. */ - public void wakeUp(@NonNull Runnable onAnimationEnd, - @NonNull DelayableExecutor callbackExecutor) { + public void wakeUp() { // When swiping causes wakeup, do not run any animations as the dream should exit as soon // as possible. if (mWakingUpFromSwipe) { - onAnimationEnd.run(); return; } - mDreamOverlayAnimationsController.wakeUp(onAnimationEnd, callbackExecutor); + mDreamOverlayAnimationsController.wakeUp(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index 1da7900e985b..553405f2c944 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -116,6 +116,17 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ } }; + private final DreamOverlayStateController.Callback mExitAnimationFinishedCallback = + new DreamOverlayStateController.Callback() { + @Override + public void onStateChanged() { + if (!mStateController.areExitAnimationsRunning()) { + mStateController.removeCallback(mExitAnimationFinishedCallback); + resetCurrentDreamOverlayLocked(); + } + } + }; + private final DreamOverlayStateController mStateController; @VisibleForTesting @@ -257,10 +268,10 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ } @Override - public void onWakeUp(@NonNull Runnable onCompletedCallback) { + public void onWakeUp() { if (mDreamOverlayContainerViewController != null) { mDreamOverlayCallbackController.onWakeUp(); - mDreamOverlayContainerViewController.wakeUp(onCompletedCallback, mExecutor); + mDreamOverlayContainerViewController.wakeUp(); } } @@ -283,6 +294,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ mWindow.clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); mWindow.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE); + mWindow.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS); mWindow.requestFeature(Window.FEATURE_NO_TITLE); // Hide all insets when the dream is showing mWindow.getDecorView().getWindowInsetsController().hide(WindowInsets.Type.systemBars()); @@ -329,6 +341,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ } private void resetCurrentDreamOverlayLocked() { + if (mStateController.areExitAnimationsRunning()) { + mStateController.addCallback(mExitAnimationFinishedCallback); + return; + } + if (mStarted && mWindow != null) { try { mWindowManager.removeView(mWindow.getDecorView()); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java index b141db15ea0f..c2421dcbc6ca 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java @@ -19,7 +19,6 @@ package com.android.systemui.dreams; import static com.android.systemui.dreams.dagger.DreamModule.DREAM_OVERLAY_ENABLED; import android.service.dreams.DreamService; -import android.util.Log; import androidx.annotation.NonNull; @@ -52,7 +51,6 @@ import javax.inject.Named; public class DreamOverlayStateController implements CallbackController<DreamOverlayStateController.Callback> { private static final String TAG = "DreamOverlayStateCtlr"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); public static final int STATE_DREAM_OVERLAY_ACTIVE = 1 << 0; public static final int STATE_LOW_LIGHT_ACTIVE = 1 << 1; @@ -110,13 +108,17 @@ public class DreamOverlayStateController implements private final int mSupportedTypes; + private final DreamLogger mLogger; + @VisibleForTesting @Inject public DreamOverlayStateController(@Main Executor executor, @Named(DREAM_OVERLAY_ENABLED) boolean overlayEnabled, - FeatureFlags featureFlags) { + FeatureFlags featureFlags, + DreamLogger dreamLogger) { mExecutor = executor; mOverlayEnabled = overlayEnabled; + mLogger = dreamLogger; mFeatureFlags = featureFlags; if (mFeatureFlags.isEnabled(Flags.ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS)) { mSupportedTypes = Complication.COMPLICATION_TYPE_NONE @@ -124,9 +126,7 @@ public class DreamOverlayStateController implements } else { mSupportedTypes = Complication.COMPLICATION_TYPE_NONE; } - if (DEBUG) { - Log.d(TAG, "Dream overlay enabled:" + mOverlayEnabled); - } + mLogger.d(TAG, "Dream overlay enabled: " + mOverlayEnabled); } /** @@ -134,18 +134,14 @@ public class DreamOverlayStateController implements */ public void addComplication(Complication complication) { if (!mOverlayEnabled) { - if (DEBUG) { - Log.d(TAG, - "Ignoring adding complication due to overlay disabled:" + complication); - } + mLogger.d(TAG, + "Ignoring adding complication due to overlay disabled: " + complication); return; } mExecutor.execute(() -> { if (mComplications.add(complication)) { - if (DEBUG) { - Log.d(TAG, "addComplication: added " + complication); - } + mLogger.d(TAG, "Added dream complication: " + complication); mCallbacks.stream().forEach(callback -> callback.onComplicationsChanged()); } }); @@ -156,18 +152,14 @@ public class DreamOverlayStateController implements */ public void removeComplication(Complication complication) { if (!mOverlayEnabled) { - if (DEBUG) { - Log.d(TAG, - "Ignoring removing complication due to overlay disabled:" + complication); - } + mLogger.d(TAG, + "Ignoring removing complication due to overlay disabled: " + complication); return; } mExecutor.execute(() -> { if (mComplications.remove(complication)) { - if (DEBUG) { - Log.d(TAG, "removeComplication: removed " + complication); - } + mLogger.d(TAG, "Removed dream complication: " + complication); mCallbacks.stream().forEach(callback -> callback.onComplicationsChanged()); } }); @@ -313,6 +305,7 @@ public class DreamOverlayStateController implements * @param active {@code true} if overlay is active, {@code false} otherwise. */ public void setOverlayActive(boolean active) { + mLogger.d(TAG, "Dream overlay active: " + active); modifyState(active ? OP_SET_STATE : OP_CLEAR_STATE, STATE_DREAM_OVERLAY_ACTIVE); } @@ -321,6 +314,8 @@ public class DreamOverlayStateController implements * @param active {@code true} if low light mode is active, {@code false} otherwise. */ public void setLowLightActive(boolean active) { + mLogger.d(TAG, "Low light mode active: " + active); + if (isLowLightActive() && !active) { // Notify that we're exiting low light only on the transition from active to not active. mCallbacks.forEach(Callback::onExitLowLight); @@ -351,6 +346,7 @@ public class DreamOverlayStateController implements * @param hasAttention {@code true} if has the user's attention, {@code false} otherwise. */ public void setHasAssistantAttention(boolean hasAttention) { + mLogger.d(TAG, "Dream overlay has Assistant attention: " + hasAttention); modifyState(hasAttention ? OP_SET_STATE : OP_CLEAR_STATE, STATE_HAS_ASSISTANT_ATTENTION); } @@ -359,6 +355,7 @@ public class DreamOverlayStateController implements * @param visible {@code true} if the status bar is visible, {@code false} otherwise. */ public void setDreamOverlayStatusBarVisible(boolean visible) { + mLogger.d(TAG, "Dream overlay status bar visible: " + visible); modifyState( visible ? OP_SET_STATE : OP_CLEAR_STATE, STATE_DREAM_OVERLAY_STATUS_BAR_VISIBLE); } @@ -376,6 +373,7 @@ public class DreamOverlayStateController implements */ public void setAvailableComplicationTypes(@Complication.ComplicationType int types) { mExecutor.execute(() -> { + mLogger.d(TAG, "Available complication types: " + types); mAvailableComplicationTypes = types; mCallbacks.forEach(Callback::onAvailableComplicationTypesChanged); }); @@ -393,6 +391,7 @@ public class DreamOverlayStateController implements */ public void setShouldShowComplications(boolean shouldShowComplications) { mExecutor.execute(() -> { + mLogger.d(TAG, "Should show complications: " + shouldShowComplications); mShouldShowComplications = shouldShowComplications; mCallbacks.forEach(Callback::onAvailableComplicationTypesChanged); }); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarView.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarView.java index 7c1bfeda30b2..1865c38632e5 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarView.java @@ -141,6 +141,20 @@ public class DreamOverlayStatusBarView extends ConstraintLayout { mExtraSystemStatusViewGroup = findViewById(R.id.dream_overlay_extra_items); } + protected static String getLoggableStatusIconType(@StatusIconType int type) { + return switch (type) { + case STATUS_ICON_NOTIFICATIONS -> "notifications"; + case STATUS_ICON_WIFI_UNAVAILABLE -> "wifi_unavailable"; + case STATUS_ICON_ALARM_SET -> "alarm_set"; + case STATUS_ICON_CAMERA_DISABLED -> "camera_disabled"; + case STATUS_ICON_MIC_DISABLED -> "mic_disabled"; + case STATUS_ICON_MIC_CAMERA_DISABLED -> "mic_camera_disabled"; + case STATUS_ICON_PRIORITY_MODE_ON -> "priority_mode_on"; + case STATUS_ICON_ASSISTANT_ATTENTION_ACTIVE -> "assistant_attention_active"; + default -> type + "(unknown)"; + }; + } + void showIcon(@StatusIconType int iconType, boolean show, @Nullable String contentDescription) { View icon = mStatusIcons.get(iconType); if (icon == null) { diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java index c954f98ad36e..3a284083e844 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java @@ -61,6 +61,8 @@ import javax.inject.Inject; */ @DreamOverlayComponent.DreamOverlayScope public class DreamOverlayStatusBarViewController extends ViewController<DreamOverlayStatusBarView> { + private static final String TAG = "DreamStatusBarCtrl"; + private final ConnectivityManager mConnectivityManager; private final TouchInsetManager.TouchInsetSession mTouchInsetSession; private final NextAlarmController mNextAlarmController; @@ -78,6 +80,7 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve private final Executor mMainExecutor; private final List<DreamOverlayStatusBarItemsProvider.StatusBarItem> mExtraStatusBarItems = new ArrayList<>(); + private final DreamLogger mLogger; private boolean mIsAttached; @@ -157,7 +160,8 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve StatusBarWindowStateController statusBarWindowStateController, DreamOverlayStatusBarItemsProvider statusBarItemsProvider, DreamOverlayStateController dreamOverlayStateController, - UserTracker userTracker) { + UserTracker userTracker, + DreamLogger dreamLogger) { super(view); mResources = resources; mMainExecutor = mainExecutor; @@ -173,6 +177,7 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve mZenModeController = zenModeController; mDreamOverlayStateController = dreamOverlayStateController; mUserTracker = userTracker; + mLogger = dreamLogger; // 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. @@ -341,6 +346,8 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve @Nullable String contentDescription) { mMainExecutor.execute(() -> { if (mIsAttached) { + mLogger.d(TAG, (show ? "Showing" : "Hiding") + " dream status bar item: " + + DreamOverlayStatusBarView.getLoggableStatusIconType(iconType)); mView.showIcon(iconType, show, contentDescription); } }); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java index 570132e111eb..1cd37749e2c3 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java @@ -35,9 +35,11 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; +import com.android.internal.widget.LockPatternUtils; +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; import com.android.systemui.dreams.touch.scrim.ScrimController; import com.android.systemui.dreams.touch.scrim.ScrimManager; -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; +import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -76,6 +78,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { private static final String TAG = "BouncerSwipeTouchHandler"; private final NotificationShadeWindowController mNotificationShadeWindowController; + private final LockPatternUtils mLockPatternUtils; + private final UserTracker mUserTracker; private final float mBouncerZoneScreenPercentage; private final ScrimManager mScrimManager; @@ -151,6 +155,11 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { return true; } + // Don't set expansion if the user doesn't have a pin/password set. + if (!mLockPatternUtils.isSecure(mUserTracker.getUserId())) { + return true; + } + // For consistency, we adopt the expansion definition found in the // PanelViewController. In this case, expansion refers to the view above the // bouncer. As that view's expansion shrinks, the bouncer appears. The bouncer @@ -204,6 +213,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { NotificationShadeWindowController notificationShadeWindowController, ValueAnimatorCreator valueAnimatorCreator, VelocityTrackerFactory velocityTrackerFactory, + LockPatternUtils lockPatternUtils, + UserTracker userTracker, @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_OPENING) FlingAnimationUtils flingAnimationUtils, @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_CLOSING) @@ -213,6 +224,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { mCentralSurfaces = centralSurfaces; mScrimManager = scrimManager; mNotificationShadeWindowController = notificationShadeWindowController; + mLockPatternUtils = lockPatternUtils; + mUserTracker = userTracker; mBouncerZoneScreenPercentage = swipeRegionPercentage; mFlingAnimationUtils = flingAnimationUtils; mFlingAnimationUtilsClosing = flingAnimationUtilsClosing; @@ -347,6 +360,11 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { return; } + // Don't set expansion if the user doesn't have a pin/password set. + if (!mLockPatternUtils.isSecure(mUserTracker.getUserId())) { + return; + } + // The animation utils deal in pixel units, rather than expansion height. final float viewHeight = mTouchSession.getBounds().height(); final float currentHeight = viewHeight * mCurrentExpansion; diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt index 4b03fd334cb5..75284fc18149 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt @@ -20,12 +20,16 @@ import android.content.Context import android.os.SystemClock import android.os.Trace import com.android.systemui.CoreStartable +import com.android.systemui.ProtoDumpable import com.android.systemui.R import com.android.systemui.dump.DumpHandler.Companion.PRIORITY_ARG_CRITICAL import com.android.systemui.dump.DumpHandler.Companion.PRIORITY_ARG_NORMAL +import com.android.systemui.dump.DumpsysEntry.DumpableEntry +import com.android.systemui.dump.DumpsysEntry.LogBufferEntry +import com.android.systemui.dump.DumpsysEntry.TableLogBufferEntry import com.android.systemui.dump.nano.SystemUIProtoDump import com.android.systemui.log.LogBuffer -import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager +import com.android.systemui.log.table.TableLogBuffer import com.google.protobuf.nano.MessageNano import java.io.BufferedOutputStream import java.io.FileDescriptor @@ -39,11 +43,11 @@ import javax.inject.Provider * * Dump output is split into two sections, CRITICAL and NORMAL. In general, the CRITICAL section * contains all dumpables that were registered to the [DumpManager], while the NORMAL sections - * contains all [LogBuffer]s (due to their length). + * contains all [LogBuffer]s and [TableLogBuffer]s (due to their length). * - * The CRITICAL and NORMAL sections can be found within a bug report by searching for - * "SERVICE com.android.systemui/.SystemUIService" and - * "SERVICE com.android.systemui/.dump.SystemUIAuxiliaryDumpService", respectively. + * The CRITICAL and NORMAL sections can be found within a bug report by searching for "SERVICE + * com.android.systemui/.SystemUIService" and "SERVICE + * com.android.systemui/.dump.SystemUIAuxiliaryDumpService", respectively. * * Finally, some or all of the dump can be triggered on-demand via adb (see below). * @@ -72,6 +76,7 @@ import javax.inject.Provider * # To dump all dumpables or all buffers: * $ <invocation> dumpables * $ <invocation> buffers + * $ <invocation> tables * * # Finally, the following will simulate what we dump during the CRITICAL and NORMAL sections of a * # bug report: @@ -83,37 +88,26 @@ import javax.inject.Provider * $ <invocation> --help * ``` */ -class DumpHandler @Inject constructor( +class DumpHandler +@Inject +constructor( private val context: Context, private val dumpManager: DumpManager, private val logBufferEulogizer: LogBufferEulogizer, private val startables: MutableMap<Class<*>, Provider<CoreStartable>>, - private val uncaughtExceptionPreHandlerManager: UncaughtExceptionPreHandlerManager ) { - /** - * Registers an uncaught exception handler - */ - fun init() { - uncaughtExceptionPreHandlerManager.registerHandler { _, e -> - if (e is Exception) { - logBufferEulogizer.record(e) - } - } - } - - /** - * Dump the diagnostics! Behavior can be controlled via [args]. - */ + /** Dump the diagnostics! Behavior can be controlled via [args]. */ fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<String>) { Trace.beginSection("DumpManager#dump()") val start = SystemClock.uptimeMillis() - val parsedArgs = try { - parseArgs(args) - } catch (e: ArgParseException) { - pw.println(e.message) - return - } + val parsedArgs = + try { + parseArgs(args) + } catch (e: ArgParseException) { + pw.println(e.message) + return + } when { parsedArgs.dumpPriority == PRIORITY_ARG_CRITICAL -> dumpCritical(pw, parsedArgs) @@ -134,6 +128,7 @@ class DumpHandler @Inject constructor( "bugreport-normal" -> dumpNormal(pw, args) "dumpables" -> dumpDumpables(pw, args) "buffers" -> dumpBuffers(pw, args) + "tables" -> dumpTables(pw, args) "config" -> dumpConfig(pw) "help" -> dumpHelp(pw) else -> { @@ -147,44 +142,65 @@ class DumpHandler @Inject constructor( } private fun dumpCritical(pw: PrintWriter, args: ParsedArgs) { - dumpManager.dumpCritical(pw, args.rawArgs) + val targets = dumpManager.getDumpables() + for (target in targets) { + if (target.priority == DumpPriority.CRITICAL) { + dumpDumpable(target, pw, args.rawArgs) + } + } dumpConfig(pw) } private fun dumpNormal(pw: PrintWriter, args: ParsedArgs) { - dumpManager.dumpNormal(pw, args.rawArgs, args.tailLength) - logBufferEulogizer.readEulogyIfPresent(pw) - } + val targets = dumpManager.getDumpables() + for (target in targets) { + if (target.priority == DumpPriority.NORMAL) { + dumpDumpable(target, pw, args.rawArgs) + } + } - private fun dumpDumpables(pw: PrintWriter, args: ParsedArgs) { - if (args.listOnly) { - dumpManager.listDumpables(pw) - } else { - dumpManager.dumpDumpables(pw, args.rawArgs) + val buffers = dumpManager.getLogBuffers() + for (buffer in buffers) { + dumpBuffer(buffer, pw, args.tailLength) } + + val tableBuffers = dumpManager.getTableLogBuffers() + for (table in tableBuffers) { + dumpTableBuffer(table, pw, args.rawArgs) + } + + logBufferEulogizer.readEulogyIfPresent(pw) } - private fun dumpBuffers(pw: PrintWriter, args: ParsedArgs) { - if (args.listOnly) { - dumpManager.listBuffers(pw) - } else { - dumpManager.dumpBuffers(pw, args.tailLength) + private fun dumpDumpables(pw: PrintWriter, args: ParsedArgs) = + dumpManager.getDumpables().listOrDumpEntries(pw, args) + + private fun dumpBuffers(pw: PrintWriter, args: ParsedArgs) = + dumpManager.getLogBuffers().listOrDumpEntries(pw, args) + + private fun dumpTables(pw: PrintWriter, args: ParsedArgs) = + dumpManager.getTableLogBuffers().listOrDumpEntries(pw, args) + + private fun listTargetNames(targets: Collection<DumpsysEntry>, pw: PrintWriter) { + for (target in targets) { + pw.println(target.name) } } - private fun dumpProtoTargets( - targets: List<String>, - fd: FileDescriptor, - args: ParsedArgs - ) { + private fun dumpProtoTargets(targets: List<String>, fd: FileDescriptor, args: ParsedArgs) { val systemUIProto = SystemUIProtoDump() + val dumpables = dumpManager.getDumpables() if (targets.isNotEmpty()) { for (target in targets) { - dumpManager.dumpProtoTarget(target, systemUIProto, args.rawArgs) + findBestProtoTargetMatch(dumpables, target)?.dumpProto(systemUIProto, args.rawArgs) } } else { - dumpManager.dumpProtoDumpables(systemUIProto, args.rawArgs) + // Dump all protos + for (dumpable in dumpables) { + (dumpable.dumpable as? ProtoDumpable)?.dumpProto(systemUIProto, args.rawArgs) + } } + val buffer = BufferedOutputStream(FileOutputStream(fd)) buffer.use { it.write(MessageNano.toByteArray(systemUIProto)) @@ -192,36 +208,70 @@ class DumpHandler @Inject constructor( } } - private fun dumpTargets( - targets: List<String>, - pw: PrintWriter, - args: ParsedArgs - ) { + // Attempts to dump the target list to the given PrintWriter. Since the arguments come in as + // a list of strings, we use the [findBestTargetMatch] method to determine the most-correct + // target with the given search string. + private fun dumpTargets(targets: List<String>, pw: PrintWriter, args: ParsedArgs) { if (targets.isNotEmpty()) { - for (target in targets) { - dumpManager.dumpTarget(target, pw, args.rawArgs, args.tailLength) + val dumpables = dumpManager.getDumpables() + val buffers = dumpManager.getLogBuffers() + val tableBuffers = dumpManager.getTableLogBuffers() + + targets.forEach { target -> + findTargetInCollection(target, dumpables, buffers, tableBuffers)?.dump(pw, args) } } else { if (args.listOnly) { + val dumpables = dumpManager.getDumpables() + val buffers = dumpManager.getLogBuffers() + pw.println("Dumpables:") - dumpManager.listDumpables(pw) + listTargetNames(dumpables, pw) pw.println() pw.println("Buffers:") - dumpManager.listBuffers(pw) + listTargetNames(buffers, pw) } else { pw.println("Nothing to dump :(") } } } + private fun findTargetInCollection( + target: String, + dumpables: Collection<DumpableEntry>, + logBuffers: Collection<LogBufferEntry>, + tableBuffers: Collection<TableLogBufferEntry>, + ) = + sequence { + findBestTargetMatch(dumpables, target)?.let { yield(it) } + findBestTargetMatch(logBuffers, target)?.let { yield(it) } + findBestTargetMatch(tableBuffers, target)?.let { yield(it) } + } + .sortedBy { it.name } + .minByOrNull { it.name.length } + + private fun dumpDumpable(entry: DumpableEntry, pw: PrintWriter, args: Array<String>) { + pw.preamble(entry) + entry.dumpable.dump(pw, args) + } + + private fun dumpBuffer(entry: LogBufferEntry, pw: PrintWriter, tailLength: Int) { + pw.preamble(entry) + entry.buffer.dump(pw, tailLength) + } + + private fun dumpTableBuffer(buffer: TableLogBufferEntry, pw: PrintWriter, args: Array<String>) { + pw.preamble(buffer) + buffer.table.dump(pw, args) + } + private fun dumpConfig(pw: PrintWriter) { pw.println("SystemUiServiceComponents configuration:") pw.print("vendor component: ") pw.println(context.resources.getString(R.string.config_systemUIVendorServiceComponent)) - val services: MutableList<String> = startables.keys - .map({ cls: Class<*> -> cls.simpleName }) - .toMutableList() + val services: MutableList<String> = + startables.keys.map({ cls: Class<*> -> cls.simpleName }).toMutableList() services.add(context.resources.getString(R.string.config_systemUIVendorServiceComponent)) dumpServiceList(pw, "global", services.toTypedArray()) @@ -265,6 +315,7 @@ class DumpHandler @Inject constructor( pw.println("Special commands:") pw.println("$ <invocation> dumpables") pw.println("$ <invocation> buffers") + pw.println("$ <invocation> tables") pw.println("$ <invocation> bugreport-critical") pw.println("$ <invocation> bugreport-normal") pw.println("$ <invocation> config") @@ -274,6 +325,7 @@ class DumpHandler @Inject constructor( pw.println("$ <invocation> --list") pw.println("$ <invocation> dumpables --list") pw.println("$ <invocation> buffers --list") + pw.println("$ <invocation> tables --list") pw.println() pw.println("Show only the most recent N lines of buffers") @@ -291,24 +343,26 @@ class DumpHandler @Inject constructor( iterator.remove() when (arg) { PRIORITY_ARG -> { - pArgs.dumpPriority = readArgument(iterator, PRIORITY_ARG) { - if (PRIORITY_OPTIONS.contains(it)) { - it - } else { - throw IllegalArgumentException() + pArgs.dumpPriority = + readArgument(iterator, PRIORITY_ARG) { + if (PRIORITY_OPTIONS.contains(it)) { + it + } else { + throw IllegalArgumentException() + } } - } } PROTO -> pArgs.proto = true - "-t", "--tail" -> { - pArgs.tailLength = readArgument(iterator, arg) { - it.toInt() - } + "-t", + "--tail" -> { + pArgs.tailLength = readArgument(iterator, arg) { it.toInt() } } - "-l", "--list" -> { + "-l", + "--list" -> { pArgs.listOnly = true } - "-h", "--help" -> { + "-h", + "--help" -> { pArgs.command = "help" } // This flag is passed as part of the proto dump in Bug reports, we can ignore @@ -345,29 +399,131 @@ class DumpHandler @Inject constructor( } } + private fun DumpsysEntry.dump(pw: PrintWriter, args: ParsedArgs) = + when (this) { + is DumpableEntry -> dumpDumpable(this, pw, args.rawArgs) + is LogBufferEntry -> dumpBuffer(this, pw, args.tailLength) + is TableLogBufferEntry -> dumpTableBuffer(this, pw, args.rawArgs) + } + + private fun Collection<DumpsysEntry>.listOrDumpEntries(pw: PrintWriter, args: ParsedArgs) = + if (args.listOnly) { + listTargetNames(this, pw) + } else { + forEach { it.dump(pw, args) } + } + companion object { const val PRIORITY_ARG = "--dump-priority" const val PRIORITY_ARG_CRITICAL = "CRITICAL" const val PRIORITY_ARG_NORMAL = "NORMAL" const val PROTO = "--proto" + + /** + * Important: do not change this divider without updating any bug report processing tools + * (e.g. ABT), since this divider is used to determine boundaries for bug report views + */ + const val DUMPSYS_DUMPABLE_DIVIDER = + "----------------------------------------------------------------------------" + + /** + * Important: do not change this divider without updating any bug report processing tools + * (e.g. ABT), since this divider is used to determine boundaries for bug report views + */ + const val DUMPSYS_BUFFER_DIVIDER = + "============================================================================" + + private fun findBestTargetMatch(c: Collection<DumpsysEntry>, target: String) = + c.asSequence().filter { it.name.endsWith(target) }.minByOrNull { it.name.length } + + private fun findBestProtoTargetMatch( + c: Collection<DumpableEntry>, + target: String + ): ProtoDumpable? = + c.asSequence() + .filter { it.name.endsWith(target) } + .filter { it.dumpable is ProtoDumpable } + .minByOrNull { it.name.length } + ?.dumpable as? ProtoDumpable + + private fun PrintWriter.preamble(entry: DumpsysEntry) = + when (entry) { + // Historically TableLogBuffer was not separate from dumpables, so they have the + // same header + is DumpableEntry, + is TableLogBufferEntry -> { + println() + println(entry.name) + println(DUMPSYS_DUMPABLE_DIVIDER) + } + is LogBufferEntry -> { + println() + println() + println("BUFFER ${entry.name}:") + println(DUMPSYS_BUFFER_DIVIDER) + } + } + + /** + * Zero-arg utility to write a [DumpableEntry] to the given [PrintWriter] in a + * dumpsys-appropriate format. + */ + private fun dumpDumpable(entry: DumpableEntry, pw: PrintWriter) { + pw.preamble(entry) + entry.dumpable.dump(pw, arrayOf()) + } + + /** + * Zero-arg utility to write a [LogBufferEntry] to the given [PrintWriter] in a + * dumpsys-appropriate format. + */ + private fun dumpBuffer(entry: LogBufferEntry, pw: PrintWriter) { + pw.preamble(entry) + entry.buffer.dump(pw, 0) + } + + /** + * Zero-arg utility to write a [TableLogBufferEntry] to the given [PrintWriter] in a + * dumpsys-appropriate format. + */ + private fun dumpTableBuffer(entry: TableLogBufferEntry, pw: PrintWriter) { + pw.preamble(entry) + entry.table.dump(pw, arrayOf()) + } + + /** + * Zero-arg utility to write a [DumpsysEntry] to the given [PrintWriter] in a + * dumpsys-appropriate format. + */ + fun DumpsysEntry.dump(pw: PrintWriter) { + when (this) { + is DumpableEntry -> dumpDumpable(this, pw) + is LogBufferEntry -> dumpBuffer(this, pw) + is TableLogBufferEntry -> dumpTableBuffer(this, pw) + } + } + + /** Format [entries] in a dumpsys-appropriate way, using [pw] */ + fun dumpEntries(entries: Collection<DumpsysEntry>, pw: PrintWriter) { + entries.forEach { it.dump(pw) } + } } } private val PRIORITY_OPTIONS = arrayOf(PRIORITY_ARG_CRITICAL, PRIORITY_ARG_NORMAL) -private val COMMANDS = arrayOf( +private val COMMANDS = + arrayOf( "bugreport-critical", "bugreport-normal", "buffers", "dumpables", + "tables", "config", "help" -) + ) -private class ParsedArgs( - val rawArgs: Array<String>, - val nonFlagArgs: List<String> -) { +private class ParsedArgs(val rawArgs: Array<String>, val nonFlagArgs: List<String>) { var dumpPriority: String? = null var tailLength: Int = 0 var command: String? = null diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt index 2d57633e47a8..c924df6da263 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt @@ -18,9 +18,11 @@ package com.android.systemui.dump import com.android.systemui.Dumpable import com.android.systemui.ProtoDumpable -import com.android.systemui.dump.nano.SystemUIProtoDump +import com.android.systemui.dump.DumpsysEntry.DumpableEntry +import com.android.systemui.dump.DumpsysEntry.LogBufferEntry +import com.android.systemui.dump.DumpsysEntry.TableLogBufferEntry import com.android.systemui.log.LogBuffer -import java.io.PrintWriter +import com.android.systemui.log.table.TableLogBuffer import java.util.TreeMap import javax.inject.Inject import javax.inject.Singleton @@ -37,8 +39,9 @@ import javax.inject.Singleton @Singleton open class DumpManager @Inject constructor() { // NOTE: Using TreeMap ensures that iteration is in a predictable & alphabetical order. - private val dumpables: MutableMap<String, RegisteredDumpable<Dumpable>> = TreeMap() - private val buffers: MutableMap<String, RegisteredDumpable<LogBuffer>> = TreeMap() + private val dumpables: MutableMap<String, DumpableEntry> = TreeMap() + private val buffers: MutableMap<String, LogBufferEntry> = TreeMap() + private val tableLogBuffers: MutableMap<String, TableLogBufferEntry> = TreeMap() /** See [registerCriticalDumpable]. */ fun registerCriticalDumpable(module: Dumpable) { @@ -77,14 +80,14 @@ open class DumpManager @Inject constructor() { * Register a dumpable to be called during a bug report. * * @param name The name to register the dumpable under. This is typically the qualified class - * name of the thing being dumped (getClass().getName()), but can be anything as long as it - * doesn't clash with an existing registration. + * name of the thing being dumped (getClass().getName()), but can be anything as long as it + * doesn't clash with an existing registration. * @param priority the priority level of this dumpable, which affects at what point in the bug - * report this gets dump. By default, the dumpable will be called during the CRITICAL section of - * the bug report, so don't dump an excessive amount of stuff here. + * report this gets dump. By default, the dumpable will be called during the CRITICAL section + * of the bug report, so don't dump an excessive amount of stuff here. * * TODO(b/259973758): Replace all calls to this method with calls to [registerCriticalDumpable] - * or [registerNormalDumpable] instead. + * or [registerNormalDumpable] instead. */ @Synchronized @JvmOverloads @@ -98,7 +101,7 @@ open class DumpManager @Inject constructor() { throw IllegalArgumentException("'$name' is already registered") } - dumpables[name] = RegisteredDumpable(name, module, priority) + dumpables[name] = DumpableEntry(module, name, priority) } /** @@ -110,217 +113,62 @@ open class DumpManager @Inject constructor() { registerDumpable(module::class.java.simpleName, module) } - /** - * Unregisters a previously-registered dumpable. - */ + /** Unregisters a previously-registered dumpable. */ @Synchronized fun unregisterDumpable(name: String) { dumpables.remove(name) } - /** - * Register a [LogBuffer] to be dumped during a bug report. - */ + /** Register a [LogBuffer] to be dumped during a bug report. */ @Synchronized fun registerBuffer(name: String, buffer: LogBuffer) { if (!canAssignToNameLocked(name, buffer)) { throw IllegalArgumentException("'$name' is already registered") } - // All buffers must be priority NORMAL, not CRITICAL, because they often contain a lot of - // data. - buffers[name] = RegisteredDumpable(name, buffer, DumpPriority.NORMAL) - } - - /** - * Dumps the alphabetically first, shortest-named dumpable or buffer whose registered name ends - * with [target]. - */ - @Synchronized - fun dumpTarget( - target: String, - pw: PrintWriter, - args: Array<String>, - tailLength: Int, - ) { - sequence { - findBestTargetMatch(dumpables, target)?.let { - yield(it.name to { dumpDumpable(it, pw, args) }) - } - findBestTargetMatch(buffers, target)?.let { - yield(it.name to { dumpBuffer(it, pw, tailLength) }) - } - }.sortedBy { it.first }.minByOrNull { it.first.length }?.second?.invoke() - } - - @Synchronized - fun dumpProtoTarget( - target: String, - protoDump: SystemUIProtoDump, - args: Array<String> - ) { - findBestProtoTargetMatch(dumpables, target)?.let { - dumpProtoDumpable(it, protoDump, args) - } + buffers[name] = LogBufferEntry(buffer, name) } + /** Register a [TableLogBuffer] to be dumped during a bugreport */ @Synchronized - fun dumpProtoDumpables( - systemUIProtoDump: SystemUIProtoDump, - args: Array<String> - ) { - for (dumpable in dumpables.values) { - if (dumpable.dumpable is ProtoDumpable) { - dumpProtoDumpable( - dumpable.dumpable, - systemUIProtoDump, - args - ) - } - } - } - - /** - * Dumps all registered dumpables with critical priority to [pw] - */ - @Synchronized - fun dumpCritical(pw: PrintWriter, args: Array<String>) { - for (dumpable in dumpables.values) { - if (dumpable.priority == DumpPriority.CRITICAL) { - dumpDumpable(dumpable, pw, args) - } - } - } - - /** - * To [pw], dumps (1) all registered dumpables with normal priority; and (2) all [LogBuffer]s. - */ - @Synchronized - fun dumpNormal(pw: PrintWriter, args: Array<String>, tailLength: Int = 0) { - for (dumpable in dumpables.values) { - if (dumpable.priority == DumpPriority.NORMAL) { - dumpDumpable(dumpable, pw, args) - } - } - - for (buffer in buffers.values) { - dumpBuffer(buffer, pw, tailLength) + fun registerTableLogBuffer(name: String, buffer: TableLogBuffer) { + if (!canAssignToNameLocked(name, buffer)) { + throw IllegalArgumentException("'$name' is already registered") } - } - /** - * Dump all the instances of [Dumpable]. - */ - @Synchronized - fun dumpDumpables(pw: PrintWriter, args: Array<String>) { - for (module in dumpables.values) { - dumpDumpable(module, pw, args) - } + // All buffers must be priority NORMAL, not CRITICAL, because they often contain a lot of + // data. + tableLogBuffers[name] = TableLogBufferEntry(buffer, name) } - /** - * Dumps the names of all registered dumpables (one per line) - */ - @Synchronized - fun listDumpables(pw: PrintWriter) { - for (module in dumpables.values) { - pw.println(module.name) - } - } + @Synchronized fun getDumpables(): Collection<DumpableEntry> = dumpables.values.toList() - /** - * Dumps all registered [LogBuffer]s to [pw] - */ - @Synchronized - fun dumpBuffers(pw: PrintWriter, tailLength: Int) { - for (buffer in buffers.values) { - dumpBuffer(buffer, pw, tailLength) - } - } + @Synchronized fun getLogBuffers(): Collection<LogBufferEntry> = buffers.values.toList() - /** - * Dumps the names of all registered buffers (one per line) - */ @Synchronized - fun listBuffers(pw: PrintWriter) { - for (buffer in buffers.values) { - pw.println(buffer.name) - } - } + fun getTableLogBuffers(): Collection<TableLogBufferEntry> = tableLogBuffers.values.toList() @Synchronized fun freezeBuffers() { for (buffer in buffers.values) { - buffer.dumpable.freeze() + buffer.buffer.freeze() } } @Synchronized fun unfreezeBuffers() { for (buffer in buffers.values) { - buffer.dumpable.unfreeze() + buffer.buffer.unfreeze() } } - private fun dumpDumpable( - dumpable: RegisteredDumpable<Dumpable>, - pw: PrintWriter, - args: Array<String> - ) { - pw.println() - pw.println("${dumpable.name}:") - pw.println("----------------------------------------------------------------------------") - dumpable.dumpable.dump(pw, args) - } - - private fun dumpBuffer( - buffer: RegisteredDumpable<LogBuffer>, - pw: PrintWriter, - tailLength: Int - ) { - pw.println() - pw.println() - pw.println("BUFFER ${buffer.name}:") - pw.println("============================================================================") - buffer.dumpable.dump(pw, tailLength) - } - - private fun dumpProtoDumpable( - protoDumpable: ProtoDumpable, - systemUIProtoDump: SystemUIProtoDump, - args: Array<String> - ) { - protoDumpable.dumpProto(systemUIProtoDump, args) - } - private fun canAssignToNameLocked(name: String, newDumpable: Any): Boolean { - val existingDumpable = dumpables[name]?.dumpable ?: buffers[name]?.dumpable + val existingDumpable = + dumpables[name]?.dumpable ?: buffers[name]?.buffer ?: tableLogBuffers[name]?.table return existingDumpable == null || newDumpable == existingDumpable } - - private fun <V : Any> findBestTargetMatch(map: Map<String, V>, target: String): V? = map - .asSequence() - .filter { it.key.endsWith(target) } - .minByOrNull { it.key.length } - ?.value - - private fun findBestProtoTargetMatch( - map: Map<String, RegisteredDumpable<Dumpable>>, - target: String - ): ProtoDumpable? = map - .asSequence() - .filter { it.key.endsWith(target) } - .filter { it.value.dumpable is ProtoDumpable } - .minByOrNull { it.key.length } - ?.value?.dumpable as? ProtoDumpable } -private data class RegisteredDumpable<T>( - val name: String, - val dumpable: T, - val priority: DumpPriority, -) - /** * The priority level for a given dumpable, which affects at what point in the bug report this gets * dumped. diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpsysEntry.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpsysEntry.kt new file mode 100644 index 000000000000..cd3e1bb7acac --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpsysEntry.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dump + +import com.android.systemui.Dumpable +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.table.TableLogBuffer + +/** + * A DumpsysEntry is a named, registered entry tracked by [DumpManager] which can be addressed and + * used both in a bugreport / dumpsys invocation or in an individual CLI implementation. + * + * The idea here is that we define every type that [DumpManager] knows about and defines the minimum + * shared interface between each type. So far, just [name] and [priority]. This way, [DumpManager] + * can just store them in separate maps and do the minimal amount of work to discriminate between + * them. + * + * Individual consumers can request these participants in a list via the relevant get* methods on + * [DumpManager] + */ +sealed interface DumpsysEntry { + val name: String + val priority: DumpPriority + + data class DumpableEntry( + val dumpable: Dumpable, + override val name: String, + override val priority: DumpPriority, + ) : DumpsysEntry + + data class LogBufferEntry( + val buffer: LogBuffer, + override val name: String, + ) : DumpsysEntry { + // All buffers must be priority NORMAL, not CRITICAL, because they often contain a lot of + // data. + override val priority: DumpPriority = DumpPriority.NORMAL + } + + data class TableLogBufferEntry( + val table: TableLogBuffer, + override val name: String, + ) : DumpsysEntry { + // All buffers must be priority NORMAL, not CRITICAL, because they often contain a lot of + // data. + override val priority: DumpPriority = DumpPriority.NORMAL + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt index 2d5c9ae2e641..bd43302a8bb5 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt @@ -20,6 +20,7 @@ import android.content.Context import android.icu.text.SimpleDateFormat import android.util.Log import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dump.DumpHandler.Companion.dumpEntries import com.android.systemui.log.LogBuffer import com.android.systemui.util.io.Files import com.android.systemui.util.time.SystemClock @@ -48,20 +49,21 @@ class LogBufferEulogizer( private val files: Files, private val logPath: Path, private val minWriteGap: Long, - private val maxLogAgeToDump: Long + private val maxLogAgeToDump: Long, ) { - @Inject constructor( + @Inject + constructor( context: Context, dumpManager: DumpManager, systemClock: SystemClock, - files: Files + files: Files, ) : this( dumpManager, systemClock, files, Paths.get(context.filesDir.toPath().toString(), "log_buffers.txt"), MIN_WRITE_GAP, - MAX_AGE_TO_DUMP + MAX_AGE_TO_DUMP, ) /** @@ -70,7 +72,7 @@ class LogBufferEulogizer( * The file will be prefaced by the [reason], which will then be returned (presumably so it can * be thrown). */ - fun <T : Exception> record(reason: T): T { + fun <T : Throwable> record(reason: T): T { val start = systemClock.uptimeMillis() var duration = 0L @@ -91,7 +93,8 @@ class LogBufferEulogizer( pw.println() pw.println("Dump triggered by exception:") reason.printStackTrace(pw) - dumpManager.dumpBuffers(pw, 0) + val buffers = dumpManager.getLogBuffers() + dumpEntries(buffers, pw) duration = systemClock.uptimeMillis() - start pw.println() pw.println("Buffer eulogy took ${duration}ms") @@ -105,16 +108,17 @@ class LogBufferEulogizer( return reason } - /** - * If a eulogy file is present, writes its contents to [pw]. - */ + /** If a eulogy file is present, writes its contents to [pw]. */ fun readEulogyIfPresent(pw: PrintWriter) { try { val millisSinceLastWrite = getMillisSinceLastWrite(logPath) if (millisSinceLastWrite > maxLogAgeToDump) { - Log.i(TAG, "Not eulogizing buffers; they are " + + Log.i( + TAG, + "Not eulogizing buffers; they are " + TimeUnit.HOURS.convert(millisSinceLastWrite, TimeUnit.MILLISECONDS) + - " hours old") + " hours old" + ) return } @@ -122,9 +126,7 @@ class LogBufferEulogizer( pw.println() pw.println() pw.println("=============== BUFFERS FROM MOST RECENT CRASH ===============") - s.forEach { line -> - pw.println(line) - } + s.forEach { line -> pw.println(line) } } } catch (e: IOException) { // File doesn't exist, okay @@ -134,12 +136,13 @@ class LogBufferEulogizer( } private fun getMillisSinceLastWrite(path: Path): Long { - val stats = try { - files.readAttributes(path, BasicFileAttributes::class.java) - } catch (e: IOException) { - // File doesn't exist - null - } + val stats = + try { + files.readAttributes(path, BasicFileAttributes::class.java) + } catch (e: IOException) { + // File doesn't exist + null + } return systemClock.currentTimeMillis() - (stats?.lastModifiedTime()?.toMillis() ?: 0) } } @@ -147,4 +150,4 @@ class LogBufferEulogizer( private const val TAG = "BufferEulogizer" private val MIN_WRITE_GAP = TimeUnit.MINUTES.toMillis(5) private val MAX_AGE_TO_DUMP = TimeUnit.HOURS.toMillis(48) -private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US)
\ No newline at end of file +private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index fbfde8e11ede..9d0caad9ffef 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -72,10 +72,6 @@ object Flags { val NOTIFICATION_MEMORY_LOGGING_ENABLED = unreleasedFlag(119, "notification_memory_logging_enabled") - @JvmField - val SIMPLIFIED_APPEAR_FRACTION = - releasedFlag(259395680, "simplified_appear_fraction") - // TODO(b/257315550): Tracking Bug val NO_HUN_FOR_OLD_WHEN = releasedFlag(118, "no_hun_for_old_when") @@ -251,7 +247,7 @@ object Flags { /** Whether to delay showing bouncer UI when face auth or active unlock are enrolled. */ // TODO(b/279794160): Tracking bug. @JvmField - val DELAY_BOUNCER = unreleasedFlag(235, "delay_bouncer") + val DELAY_BOUNCER = unreleasedFlag(235, "delay_bouncer", teamfood = true) /** Migrate the indication area to the new keyguard root view. */ // TODO(b/280067944): Tracking bug. @@ -359,7 +355,8 @@ object Flags { // TODO(b/280426085): Tracking Bug @JvmField - val NEW_BLUETOOTH_REPOSITORY = unreleasedFlag(612, "new_bluetooth_repository") + val NEW_BLUETOOTH_REPOSITORY = + unreleasedFlag(612, "new_bluetooth_repository", teamfood = true) // 700 - dialer/calls // TODO(b/254512734): Tracking Bug @@ -441,9 +438,6 @@ object Flags { // TODO(b/254512758): Tracking Bug @JvmField val ROUNDED_BOX_RIPPLE = releasedFlag(1002, "rounded_box_ripple") - // TODO(b/265045965): Tracking Bug - val SHOW_LOWLIGHT_ON_DIRECT_BOOT = releasedFlag(1003, "show_lowlight_on_direct_boot") - // TODO(b/273509374): Tracking Bug @JvmField val ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS = releasedFlag(1006, @@ -538,7 +532,7 @@ object Flags { // TODO(b/273443374): Tracking Bug @Keep @JvmField val LOCKSCREEN_LIVE_WALLPAPER = - sysPropBooleanFlag(1117, "persist.wm.debug.lockscreen_live_wallpaper", default = false) + sysPropBooleanFlag(1117, "persist.wm.debug.lockscreen_live_wallpaper", default = true) // TODO(b/281648899): Tracking bug @Keep @@ -573,7 +567,7 @@ object Flags { // TODO(b/270987164): Tracking Bug @JvmField - val TRACKPAD_GESTURE_FEATURES = unreleasedFlag(1205, "trackpad_gesture_features", teamfood = true) + val TRACKPAD_GESTURE_FEATURES = releasedFlag(1205, "trackpad_gesture_features") // TODO(b/263826204): Tracking Bug @JvmField @@ -632,6 +626,9 @@ object Flags { // TODO(b/265944639): Tracking Bug @JvmField val DUAL_SHADE = unreleasedFlag(1801, "dual_shade") + // TODO(b/283300105): Tracking Bug + @JvmField val SCENE_CONTAINER = unreleasedFlag(1802, "scene_container") + // 1900 @JvmField val NOTE_TASKS = releasedFlag(1900, "keycode_flag") @@ -706,23 +703,17 @@ object Flags { // TODO(b/259428678): Tracking Bug @JvmField - val KEYBOARD_BACKLIGHT_INDICATOR = - unreleasedFlag(2601, "keyboard_backlight_indicator", teamfood = true) + val KEYBOARD_BACKLIGHT_INDICATOR = releasedFlag(2601, "keyboard_backlight_indicator") // TODO(b/277192623): Tracking Bug @JvmField val KEYBOARD_EDUCATION = unreleasedFlag(2603, "keyboard_education", teamfood = false) - // TODO(b/272036292): Tracking Bug - @JvmField - val LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION = - releasedFlag(2602, "large_shade_granular_alpha_interpolation") - // TODO(b/277201412): Tracking Bug @JvmField val SPLIT_SHADE_SUBPIXEL_OPTIMIZATION = - unreleasedFlag(2805, "split_shade_subpixel_optimization", teamfood = true) + releasedFlag(2805, "split_shade_subpixel_optimization") // TODO(b/278761837): Tracking Bug @JvmField diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java index 280710755ff6..52483646f01e 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java @@ -125,6 +125,7 @@ import com.android.systemui.plugins.GlobalActions.GlobalActionsManager; import com.android.systemui.plugins.GlobalActionsPanelPlugin; import com.android.systemui.scrim.ScrimDrawable; import com.android.systemui.settings.UserTracker; +import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -250,6 +251,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene protected Handler mMainHandler; private int mSmallestScreenWidthDp; private final Optional<CentralSurfaces> mCentralSurfacesOptional; + private final ShadeController mShadeController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final DialogLaunchAnimator mDialogLaunchAnimator; @@ -360,6 +362,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Main Handler handler, PackageManager packageManager, Optional<CentralSurfaces> centralSurfacesOptional, + ShadeController shadeController, KeyguardUpdateMonitor keyguardUpdateMonitor, DialogLaunchAnimator dialogLaunchAnimator) { mContext = context; @@ -392,6 +395,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mMainHandler = handler; mSmallestScreenWidthDp = resources.getConfiguration().smallestScreenWidthDp; mCentralSurfacesOptional = centralSurfacesOptional; + mShadeController = shadeController; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mDialogLaunchAnimator = dialogLaunchAnimator; @@ -700,7 +704,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mAdapter, mOverflowAdapter, mSysuiColorExtractor, mStatusBarService, mLightBarController, mNotificationShadeWindowController, this::onRefresh, mKeyguardShowing, - mPowerAdapter, mUiEventLogger, mCentralSurfacesOptional, mKeyguardUpdateMonitor, + mPowerAdapter, mUiEventLogger, mCentralSurfacesOptional, + mShadeController, + mKeyguardUpdateMonitor, mLockPatternUtils); dialog.setOnDismissListener(this); @@ -908,7 +914,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mUiEventLogger.log(GlobalActionsEvent.GA_EMERGENCY_DIALER_PRESS); if (mTelecomManager != null) { // Close shade so user sees the activity - mCentralSurfacesOptional.ifPresent(CentralSurfaces::collapseShade); + mShadeController.cancelExpansionAndCollapseShade(); Intent intent = mTelecomManager.createLaunchEmergencyDialerIntent( null /* number */); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK @@ -2205,6 +2211,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene private UiEventLogger mUiEventLogger; private GestureDetector mGestureDetector; private Optional<CentralSurfaces> mCentralSurfacesOptional; + private final ShadeController mShadeController; private KeyguardUpdateMonitor mKeyguardUpdateMonitor; private LockPatternUtils mLockPatternUtils; private float mWindowDimAmount; @@ -2278,6 +2285,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene Runnable onRefreshCallback, boolean keyguardShowing, MyPowerOptionsAdapter powerAdapter, UiEventLogger uiEventLogger, Optional<CentralSurfaces> centralSurfacesOptional, + ShadeController shadeController, KeyguardUpdateMonitor keyguardUpdateMonitor, LockPatternUtils lockPatternUtils) { // We set dismissOnDeviceLock to false because we have a custom broadcast receiver to @@ -2295,6 +2303,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mKeyguardShowing = keyguardShowing; mUiEventLogger = uiEventLogger; mCentralSurfacesOptional = centralSurfacesOptional; + mShadeController = shadeController; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mLockPatternUtils = lockPatternUtils; mGestureDetector = new GestureDetector(mContext, mGestureListener); @@ -2342,12 +2351,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mUiEventLogger.log(GlobalActionsEvent.GA_CLOSE_TAP_OUTSIDE); if (mCentralSurfacesOptional.map(CentralSurfaces::isKeyguardShowing).orElse(false)) { // match existing lockscreen behavior to open QS when swiping from status bar - mCentralSurfacesOptional.ifPresent( - centralSurfaces -> centralSurfaces.animateExpandSettingsPanel(null)); + mShadeController.animateExpandQs(); } else { // otherwise, swiping down should expand notification shade - mCentralSurfacesOptional.ifPresent( - centralSurfaces -> centralSurfaces.animateExpandNotificationsPanel()); + mShadeController.animateExpandShade(); } dismiss(); } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java index 757afb616fd1..67c85bd94bd7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardLifecyclesDispatcher.java @@ -16,11 +16,19 @@ package com.android.systemui.keyguard; +import android.annotation.IntDef; import android.os.Handler; +import android.os.Looper; import android.os.Message; -import android.os.Trace; +import android.os.TraceNameSupplier; + +import androidx.annotation.NonNull; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import javax.inject.Inject; @@ -29,7 +37,6 @@ import javax.inject.Inject; */ @SysUISingleton public class KeyguardLifecyclesDispatcher { - static final int SCREEN_TURNING_ON = 0; static final int SCREEN_TURNED_ON = 1; static final int SCREEN_TURNING_OFF = 2; @@ -39,19 +46,46 @@ public class KeyguardLifecyclesDispatcher { static final int FINISHED_WAKING_UP = 5; static final int STARTED_GOING_TO_SLEEP = 6; static final int FINISHED_GOING_TO_SLEEP = 7; - private static final String TAG = "KeyguardLifecyclesDispatcher"; - private final ScreenLifecycle mScreenLifecycle; - private final WakefulnessLifecycle mWakefulnessLifecycle; + @IntDef({ + SCREEN_TURNING_ON, + SCREEN_TURNED_ON, + SCREEN_TURNING_OFF, + SCREEN_TURNED_OFF, + STARTED_WAKING_UP, + FINISHED_WAKING_UP, + STARTED_GOING_TO_SLEEP, + FINISHED_GOING_TO_SLEEP, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface KeyguardLifecycleMessageType { + } + + private static String getNameOfMessage(@KeyguardLifecycleMessageType int what) { + return switch (what) { + case SCREEN_TURNING_ON -> "SCREEN_TURNING_ON"; + case SCREEN_TURNED_ON -> "SCREEN_TURNED_ON"; + case SCREEN_TURNING_OFF -> "SCREEN_TURNING_OFF"; + case SCREEN_TURNED_OFF -> "SCREEN_TURNED_OFF"; + case STARTED_WAKING_UP -> "STARTED_WAKING_UP"; + case FINISHED_WAKING_UP -> "FINISHED_WAKING_UP"; + case STARTED_GOING_TO_SLEEP -> "STARTED_GOING_TO_SLEEP"; + case FINISHED_GOING_TO_SLEEP -> "FINISHED_GOING_TO_SLEEP"; + default -> "UNKNOWN"; + }; + } + + private final Handler mHandler; @Inject - public KeyguardLifecyclesDispatcher(ScreenLifecycle screenLifecycle, + public KeyguardLifecyclesDispatcher( + @Main Looper mainLooper, + ScreenLifecycle screenLifecycle, WakefulnessLifecycle wakefulnessLifecycle) { - mScreenLifecycle = screenLifecycle; - mWakefulnessLifecycle = wakefulnessLifecycle; + mHandler = new KeyguardLifecycleHandler(mainLooper, screenLifecycle, wakefulnessLifecycle); } - void dispatch(int what) { + void dispatch(@KeyguardLifecycleMessageType int what) { mHandler.obtainMessage(what).sendToTarget(); } @@ -60,7 +94,7 @@ public class KeyguardLifecyclesDispatcher { * @param pmReason Reason this message was triggered - this should be a value from either * {@link PowerManager.WakeReason} or {@link PowerManager.GoToSleepReason}. */ - void dispatch(int what, int pmReason) { + void dispatch(@KeyguardLifecycleMessageType int what, int pmReason) { final Message message = mHandler.obtainMessage(what); message.arg1 = pmReason; message.sendToTarget(); @@ -70,44 +104,48 @@ public class KeyguardLifecyclesDispatcher { * @param what Message to send. * @param object Object to send with the message */ - void dispatch(int what, Object object) { + void dispatch(@KeyguardLifecycleMessageType int what, Object object) { mHandler.obtainMessage(what, object).sendToTarget(); } - private Handler mHandler = new Handler() { + private static class KeyguardLifecycleHandler extends Handler { + private static final String TAG = "KeyguardLifecycleHandler"; + private final ScreenLifecycle mScreenLifecycle; + private final WakefulnessLifecycle mWakefulnessLifecycle; + + public KeyguardLifecycleHandler(Looper looper, + ScreenLifecycle screenLifecycle, + WakefulnessLifecycle wakefulnessLifecycle) { + super(looper); + mScreenLifecycle = screenLifecycle; + mWakefulnessLifecycle = wakefulnessLifecycle; + } + + @NonNull @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case SCREEN_TURNING_ON: - Trace.beginSection("KeyguardLifecyclesDispatcher#SCREEN_TURNING_ON"); - mScreenLifecycle.dispatchScreenTurningOn(); - Trace.endSection(); - break; - case SCREEN_TURNED_ON: - mScreenLifecycle.dispatchScreenTurnedOn(); - break; - case SCREEN_TURNING_OFF: - mScreenLifecycle.dispatchScreenTurningOff(); - break; - case SCREEN_TURNED_OFF: - mScreenLifecycle.dispatchScreenTurnedOff(); - break; - case STARTED_WAKING_UP: - mWakefulnessLifecycle.dispatchStartedWakingUp(msg.arg1 /* pmReason */); - break; - case FINISHED_WAKING_UP: - mWakefulnessLifecycle.dispatchFinishedWakingUp(); - break; - case STARTED_GOING_TO_SLEEP: - mWakefulnessLifecycle.dispatchStartedGoingToSleep(msg.arg1 /* pmReason */); - break; - case FINISHED_GOING_TO_SLEEP: - mWakefulnessLifecycle.dispatchFinishedGoingToSleep(); - break; - default: - throw new IllegalArgumentException("Unknown message: " + msg); + public String getTraceName(@NonNull Message msg) { + if (msg.getCallback() instanceof TraceNameSupplier || msg.getCallback() != null) { + return super.getTraceName(msg); } + return TAG + "#" + getNameOfMessage(msg.what); } - }; + @Override + public void handleMessage(@NonNull Message msg) { + switch (msg.what) { + case SCREEN_TURNING_ON -> mScreenLifecycle.dispatchScreenTurningOn(); + case SCREEN_TURNED_ON -> mScreenLifecycle.dispatchScreenTurnedOn(); + case SCREEN_TURNING_OFF -> mScreenLifecycle.dispatchScreenTurningOff(); + case SCREEN_TURNED_OFF -> mScreenLifecycle.dispatchScreenTurnedOff(); + case STARTED_WAKING_UP -> + mWakefulnessLifecycle.dispatchStartedWakingUp(msg.arg1 /* pmReason */); + case FINISHED_WAKING_UP -> mWakefulnessLifecycle.dispatchFinishedWakingUp(); + case STARTED_GOING_TO_SLEEP -> + mWakefulnessLifecycle.dispatchStartedGoingToSleep(msg.arg1 /* pmReason */); + case FINISHED_GOING_TO_SLEEP -> + mWakefulnessLifecycle.dispatchFinishedGoingToSleep(); + default -> throw new IllegalArgumentException("Unknown message: " + msg); + } + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java index 573de9737eb8..051131433143 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java @@ -49,7 +49,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.R; -import com.android.systemui.SystemUIAppComponentFactory; +import com.android.systemui.SystemUIAppComponentFactoryBase; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.NotificationMediaManager; @@ -72,13 +72,13 @@ import javax.inject.Inject; /** * Simple Slice provider that shows the current date. * - * Injection is handled by {@link SystemUIAppComponentFactory} + + * Injection is handled by {@link SystemUIAppComponentFactoryBase} + * {@link com.android.systemui.dagger.GlobalRootComponent#inject(KeyguardSliceProvider)}. */ public class KeyguardSliceProvider extends SliceProvider implements NextAlarmController.NextAlarmChangeCallback, ZenModeController.Callback, NotificationMediaManager.MediaListener, StatusBarStateController.StateListener, - SystemUIAppComponentFactory.ContextInitializer { + SystemUIAppComponentFactoryBase.ContextInitializer { private static final String TAG = "KgdSliceProvider"; @@ -148,7 +148,7 @@ public class KeyguardSliceProvider extends SliceProvider implements protected boolean mDozing; private int mStatusBarState; private boolean mMediaIsVisible; - private SystemUIAppComponentFactory.ContextAvailableCallback mContextAvailableCallback; + private SystemUIAppComponentFactoryBase.ContextAvailableCallback mContextAvailableCallback; @Inject WakeLockLogger mWakeLockLogger; @@ -533,7 +533,7 @@ public class KeyguardSliceProvider extends SliceProvider implements @Override public void setContextAvailableCallback( - SystemUIAppComponentFactory.ContextAvailableCallback callback) { + SystemUIAppComponentFactoryBase.ContextAvailableCallback callback) { mContextAvailableCallback = callback; } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index 68e72c58972b..364614421567 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -906,10 +906,7 @@ class KeyguardUnlockAnimationController @Inject constructor( } fun setWallpaperAppearAmount(amount: Float) { - val animationAlpha = when { - !powerManager.isInteractive -> 0f - else -> amount - } + val animationAlpha = amount wallpaperTargets?.forEach { wallpaper -> // SyncRtSurfaceTransactionApplier cannot apply transaction when the target view is diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt new file mode 100644 index 000000000000..05c23aefe974 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard + +import android.view.View +import android.view.ViewGroup +import com.android.systemui.CoreStartable +import com.android.systemui.R +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.ui.binder.KeyguardIndicationAreaBinder +import com.android.systemui.keyguard.ui.view.KeyguardRootView +import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel +import com.android.systemui.shade.NotificationShadeWindowView +import com.android.systemui.statusbar.KeyguardIndicationController +import javax.inject.Inject +import kotlinx.coroutines.DisposableHandle + +/** Binds keyguard views on startup, and also exposes methods to allow rebinding if views change */ +@SysUISingleton +class KeyguardViewConfigurator +@Inject +constructor( + private val keyguardRootView: KeyguardRootView, + private val keyguardIndicationAreaViewModel: KeyguardIndicationAreaViewModel, + private val notificationShadeWindowView: NotificationShadeWindowView, + private val featureFlags: FeatureFlags, + private val indicationController: KeyguardIndicationController, +) : CoreStartable { + + private var indicationAreaHandle: DisposableHandle? = null + + override fun start() { + bindIndicationArea( + notificationShadeWindowView.requireViewById(R.id.notification_panel) as ViewGroup + ) + } + + fun bindIndicationArea(legacyParent: ViewGroup) { + indicationAreaHandle?.dispose() + + // At startup, 2 views with the ID `R.id.keyguard_indication_area` will be available. + // Disable one of them + if (featureFlags.isEnabled(Flags.MIGRATE_INDICATION_AREA)) { + legacyParent.requireViewById<View>(R.id.keyguard_indication_area).let { + legacyParent.removeView(it) + } + } else { + keyguardRootView.findViewById<View?>(R.id.keyguard_indication_area)?.let { + keyguardRootView.removeView(it) + } + } + + indicationAreaHandle = + KeyguardIndicationAreaBinder.bind( + notificationShadeWindowView, + keyguardIndicationAreaViewModel, + indicationController + ) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 0e0cf74ba463..ec14b6a40fee 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -17,7 +17,10 @@ package com.android.systemui.keyguard; import static android.app.StatusBarManager.SESSION_KEYGUARD; +import static android.provider.Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT; +import static android.provider.Settings.System.LOCKSCREEN_SOUNDS_ENABLED; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; +import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_TO_LAUNCHER_CLEAR_SNAPSHOT; import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; @@ -34,8 +37,8 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE; import static com.android.systemui.DejankUtils.whitelistIpcs; -import static com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.LOCKSCREEN_ANIMATION_DURATION_MS; import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS; +import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -71,7 +74,6 @@ import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.SystemClock; import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; @@ -87,9 +89,11 @@ import android.util.SparseIntArray; import android.view.IRemoteAnimationFinishedCallback; import android.view.IRemoteAnimationRunner; import android.view.RemoteAnimationTarget; +import android.view.SurfaceControl.Transaction; import android.view.SyncRtSurfaceTransactionApplier; import android.view.View; import android.view.ViewGroup; +import android.view.ViewRootImpl; import android.view.WindowManager; import android.view.WindowManagerPolicyConstants; import android.view.animation.Animation; @@ -127,12 +131,14 @@ import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.LaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.classifier.FalsingCollector; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.dagger.KeyguardModule; +import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel; import com.android.systemui.log.SessionTracker; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -154,6 +160,9 @@ import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.util.DeviceConfigProxy; +import com.android.systemui.util.settings.SecureSettings; +import com.android.systemui.util.settings.SystemSettings; +import com.android.systemui.util.time.SystemClock; import com.android.wm.shell.keyguard.KeyguardTransitions; import dagger.Lazy; @@ -162,6 +171,9 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.concurrent.Executor; +import java.util.function.Consumer; + +import kotlinx.coroutines.CoroutineDispatcher; /** * Mediates requests related to the keyguard. This includes queries about the @@ -214,7 +226,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private final static String TAG = "KeyguardViewMediator"; - private static final String DELAYED_KEYGUARD_ACTION = + public static final String DELAYED_KEYGUARD_ACTION = "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"; private static final String DELAYED_LOCK_PROFILE_ACTION = "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_LOCK"; @@ -249,7 +261,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, * turning on the keyguard (i.e, the user has this much time to turn * the screen back on without having to face the keyguard). */ - private static final int KEYGUARD_LOCK_AFTER_DELAY_DEFAULT = 5000; + public static final int KEYGUARD_LOCK_AFTER_DELAY_DEFAULT = 5000; /** * How long we'll wait for the {@link ViewMediatorCallback#keyguardDoneDrawing()} @@ -306,6 +318,9 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, /** UserSwitcherController for creating guest user on boot complete */ private final UserSwitcherController mUserSwitcherController; + private final SecureSettings mSecureSettings; + private final SystemSettings mSystemSettings; + private final SystemClock mSystemClock; /** * Used to keep the device awake while to ensure the keyguard finishes opening before @@ -435,11 +450,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private final int mDreamOpenAnimationDuration; /** - * The duration in milliseconds of the dream close animation. - */ - private final int mDreamCloseAnimationDuration; - - /** * The animation used for hiding keyguard. This is used to fetch the animation timings if * WindowManager is not providing us with them. */ @@ -1128,49 +1138,57 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, return; } - final RemoteAnimationTarget primary = apps[0]; + mRemoteAnimationTarget = apps[0]; final boolean isDream = (apps[0].taskInfo != null && apps[0].taskInfo.topActivityType == WindowConfiguration.ACTIVITY_TYPE_DREAM); - final SyncRtSurfaceTransactionApplier applier = - new SyncRtSurfaceTransactionApplier( - mKeyguardViewControllerLazy.get().getViewRootImpl().getView()); + final View localView = mKeyguardViewControllerLazy.get() + .getViewRootImpl().getView(); + final SyncRtSurfaceTransactionApplier applier = + new SyncRtSurfaceTransactionApplier(localView); mContext.getMainExecutor().execute(() -> { if (mUnoccludeAnimator != null) { mUnoccludeAnimator.cancel(); } + if (isDream) { + initAlphaForAnimationTargets(wallpapers); + getRemoteSurfaceAlphaApplier().accept(0.0f); + mDreamingToLockscreenTransitionViewModel.get() + .startTransition(); + return; + } + mUnoccludeAnimator = ValueAnimator.ofFloat(1f, 0f); - mUnoccludeAnimator.setDuration(isDream ? mDreamCloseAnimationDuration - : UNOCCLUDE_ANIMATION_DURATION); + mUnoccludeAnimator.setDuration(UNOCCLUDE_ANIMATION_DURATION); mUnoccludeAnimator.setInterpolator(Interpolators.TOUCH_RESPONSE); mUnoccludeAnimator.addUpdateListener( animation -> { final float animatedValue = (float) animation.getAnimatedValue(); - final float surfaceHeight = primary.screenSpaceBounds.height(); + final float surfaceHeight = + mRemoteAnimationTarget.screenSpaceBounds.height(); // Fade for all types of activities. SyncRtSurfaceTransactionApplier.SurfaceParams.Builder paramsBuilder = new SyncRtSurfaceTransactionApplier.SurfaceParams - .Builder(primary.leash) + .Builder(mRemoteAnimationTarget.leash) .withAlpha(animatedValue); - // Set translate if the occluding activity isn't Dream. - if (!isDream) { - mUnoccludeMatrix.setTranslate( - 0f, - (1f - animatedValue) - * surfaceHeight - * UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT); - - paramsBuilder.withMatrix(mUnoccludeMatrix).withCornerRadius( - mWindowCornerRadius); - } + + mUnoccludeMatrix.setTranslate( + 0f, + (1f - animatedValue) + * surfaceHeight + * UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT); + + paramsBuilder.withMatrix(mUnoccludeMatrix).withCornerRadius( + mWindowCornerRadius); + applier.scheduleApply(paramsBuilder.build()); }); mUnoccludeAnimator.addListener(new AnimatorListenerAdapter() { @@ -1192,6 +1210,34 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } }; + private static void initAlphaForAnimationTargets( + @android.annotation.NonNull RemoteAnimationTarget[] targets + ) { + for (RemoteAnimationTarget target : targets) { + if (target.mode != MODE_OPENING) continue; + + try (Transaction t = new Transaction()) { + t.setAlpha(target.leash, 1.f); + t.apply(); + } + } + } + + private Consumer<Float> getRemoteSurfaceAlphaApplier() { + return (Float alpha) -> { + if (mRemoteAnimationTarget == null) return; + final View localView = mKeyguardViewControllerLazy.get().getViewRootImpl().getView(); + final SyncRtSurfaceTransactionApplier applier = + new SyncRtSurfaceTransactionApplier(localView); + SyncRtSurfaceTransactionApplier.SurfaceParams + params = + new SyncRtSurfaceTransactionApplier.SurfaceParams + .Builder(mRemoteAnimationTarget.leash) + .withAlpha(alpha).build(); + applier.scheduleApply(params); + }; + } + private DeviceConfigProxy mDeviceConfig; private DozeParameters mDozeParameters; @@ -1221,6 +1267,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private FeatureFlags mFeatureFlags; private final UiEventLogger mUiEventLogger; private final SessionTracker mSessionTracker; + private final CoroutineDispatcher mMainDispatcher; + private final Lazy<DreamingToLockscreenTransitionViewModel> + mDreamingToLockscreenTransitionViewModel; + private RemoteAnimationTarget mRemoteAnimationTarget; /** * Injected constructor. See {@link KeyguardModule}. @@ -1256,7 +1306,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy, Lazy<ActivityLaunchAnimator> activityLaunchAnimator, Lazy<ScrimController> scrimControllerLazy, - FeatureFlags featureFlags) { + FeatureFlags featureFlags, + SecureSettings secureSettings, + SystemSettings systemSettings, + SystemClock systemClock, + @Main CoroutineDispatcher mainDispatcher, + Lazy<DreamingToLockscreenTransitionViewModel> dreamingToLockscreenTransitionViewModel) { mContext = context; mUserTracker = userTracker; mFalsingCollector = falsingCollector; @@ -1270,6 +1325,9 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mPM = powerManager; mTrustManager = trustManager; mUserSwitcherController = userSwitcherController; + mSecureSettings = secureSettings; + mSystemSettings = systemSettings; + mSystemClock = systemClock; mStatusBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); mKeyguardDisplayManager = keyguardDisplayManager; @@ -1311,15 +1369,17 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mWindowCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context); mDreamOpenAnimationDuration = (int) DREAMING_ANIMATION_DURATION_MS; - mDreamCloseAnimationDuration = (int) LOCKSCREEN_ANIMATION_DURATION_MS; mFeatureFlags = featureFlags; mUiEventLogger = uiEventLogger; mSessionTracker = sessionTracker; + + mMainDispatcher = mainDispatcher; + mDreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel; } public void userActivity() { - mPM.userActivity(SystemClock.uptimeMillis(), false); + mPM.userActivity(mSystemClock.uptimeMillis(), false); } private void setupLocked() { @@ -1434,6 +1494,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mUpdateMonitor.registerCallback(mUpdateCallback); adjustStatusBarLocked(); mDreamOverlayStateController.addCallback(mDreamOverlayStateCallback); + + ViewRootImpl viewRootImpl = mKeyguardViewControllerLazy.get().getViewRootImpl(); + if (viewRootImpl != null) { + collectFlow(viewRootImpl.getView(), + mDreamingToLockscreenTransitionViewModel.get().getDreamOverlayAlpha(), + getRemoteSurfaceAlphaApplier(), mMainDispatcher); + } } // Most services aren't available until the system reaches the ready state, so we // send it here when the device first boots. @@ -1514,7 +1581,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, if (cameraGestureTriggered) { // Just to make sure, make sure the device is awake. - mContext.getSystemService(PowerManager.class).wakeUp(SystemClock.uptimeMillis(), + mContext.getSystemService(PowerManager.class).wakeUp(mSystemClock.uptimeMillis(), PowerManager.WAKE_REASON_CAMERA_LAUNCH, "com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK"); setPendingLock(false); @@ -1611,12 +1678,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // to enable it a bit later (i.e, give the user a chance // to turn the screen back on within a certain window without // having to unlock the screen) - final ContentResolver cr = mContext.getContentResolver(); // From SecuritySettings - final long lockAfterTimeout = Settings.Secure.getIntForUser(cr, - Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, - KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, userId); + final long lockAfterTimeout = mSecureSettings.getIntForUser(LOCK_SCREEN_LOCK_AFTER_TIMEOUT, + KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, + userId); // From DevicePolicyAdmin final long policyTimeout = mLockPatternUtils.getDevicePolicyManager() @@ -1628,8 +1694,9 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, timeout = lockAfterTimeout; } else { // From DisplaySettings - long displayTimeout = Settings.System.getIntForUser(cr, SCREEN_OFF_TIMEOUT, - KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT, userId); + long displayTimeout = mSystemSettings.getIntForUser(SCREEN_OFF_TIMEOUT, + KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT, + userId); // policy in effect. Make sure we don't go beyond policy limit. displayTimeout = Math.max(displayTimeout, 0); // ignore negative values @@ -1650,7 +1717,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private void doKeyguardLaterLocked(long timeout) { // Lock in the future - long when = SystemClock.elapsedRealtime() + timeout; + long when = mSystemClock.elapsedRealtime() + timeout; Intent intent = new Intent(DELAYED_KEYGUARD_ACTION); intent.setPackage(mContext.getPackageName()); intent.putExtra("seq", mDelayedShowingSequence); @@ -1672,7 +1739,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, if (userTimeout == 0) { doKeyguardForChildProfilesLocked(); } else { - long userWhen = SystemClock.elapsedRealtime() + userTimeout; + long userWhen = mSystemClock.elapsedRealtime() + userTimeout; Intent lockIntent = new Intent(DELAYED_LOCK_PROFILE_ACTION); lockIntent.setPackage(mContext.getPackageName()); lockIntent.putExtra("seq", mDelayedProfileShowingSequence); @@ -2481,9 +2548,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private void playSound(int soundId) { if (soundId == 0) return; - final ContentResolver cr = mContext.getContentResolver(); - int lockscreenSoundsEnabled = Settings.System.getIntForUser(cr, - Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1, + int lockscreenSoundsEnabled = mSystemSettings.getIntForUser(LOCKSCREEN_SOUNDS_ENABLED, 1, KeyguardUpdateMonitor.getCurrentUser()); if (lockscreenSoundsEnabled == 1) { @@ -2660,7 +2725,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // It's possible that the device was unlocked (via BOUNCER) while dozing. It's time to // wake up. if (mAodShowing) { - mPM.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, + mPM.wakeUp(mSystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:BOUNCER_DOZING"); } @@ -2675,7 +2740,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // TODO(bc-unlock): Fill parameters mNotificationShadeWindowControllerLazy.get().batchApplyWindowLayoutParams(() -> { handleStartKeyguardExitAnimation( - SystemClock.uptimeMillis() + mHideAnimation.getStartOffset(), + mSystemClock.uptimeMillis() + mHideAnimation.getStartOffset(), mHideAnimation.getDuration(), null /* apps */, null /* wallpapers */, null /* nonApps */, null /* finishedCallback */); }); @@ -2684,7 +2749,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // It's possible that the device was unlocked (via BOUNCER or Fingerprint) while // dreaming. It's time to wake up. if (mDreamOverlayShowing) { - mPM.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, + mPM.wakeUp(mSystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:UNLOCK_DREAMING"); } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java index d7c039d9b519..6d6205cde53f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -37,6 +37,7 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.classifier.FalsingModule; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; @@ -51,6 +52,7 @@ import com.android.systemui.keyguard.domain.interactor.StartKeyguardTransitionMo import com.android.systemui.keyguard.domain.quickaffordance.KeyguardQuickAffordanceModule; import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancesMetricsLogger; import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancesMetricsLoggerImpl; +import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel; import com.android.systemui.log.SessionTracker; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.settings.UserTracker; @@ -64,6 +66,9 @@ import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.util.DeviceConfigProxy; +import com.android.systemui.util.settings.SecureSettings; +import com.android.systemui.util.settings.SystemSettings; +import com.android.systemui.util.time.SystemClock; import com.android.wm.shell.keyguard.KeyguardTransitions; import dagger.Lazy; @@ -72,6 +77,8 @@ import dagger.Provides; import java.util.concurrent.Executor; +import kotlinx.coroutines.CoroutineDispatcher; + /** * Dagger Module providing keyguard. */ @@ -128,7 +135,12 @@ public class KeyguardModule { Lazy<NotificationShadeWindowController> notificationShadeWindowController, Lazy<ActivityLaunchAnimator> activityLaunchAnimator, Lazy<ScrimController> scrimControllerLazy, - FeatureFlags featureFlags) { + FeatureFlags featureFlags, + SecureSettings secureSettings, + SystemSettings systemSettings, + SystemClock systemClock, + @Main CoroutineDispatcher mainDispatcher, + Lazy<DreamingToLockscreenTransitionViewModel> dreamingToLockscreenTransitionViewModel) { return new KeyguardViewMediator( context, uiEventLogger, @@ -162,7 +174,12 @@ public class KeyguardModule { notificationShadeWindowController, activityLaunchAnimator, scrimControllerLazy, - featureFlags); + featureFlags, + secureSettings, + systemSettings, + systemClock, + mainDispatcher, + dreamingToLockscreenTransitionViewModel); } /** */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt index 9621f03f63a0..f9e9a9305df3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt @@ -26,6 +26,7 @@ import com.android.internal.logging.UiEventLogger import com.android.keyguard.FaceAuthUiEvent import com.android.systemui.Dumpable import com.android.systemui.R +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton @@ -34,7 +35,6 @@ import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.AcquiredAuthenticationStatus diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt index 742e53515e82..81f62b687e6c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt @@ -25,6 +25,7 @@ import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLoggin import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.common.shared.model.Position import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.doze.DozeMachine import com.android.systemui.doze.DozeTransitionCallback @@ -44,13 +45,16 @@ import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.policy.KeyguardStateController import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.stateIn /** Defines interface for classes that encapsulate application state for the keyguard. */ interface KeyguardRepository { @@ -138,7 +142,7 @@ interface KeyguardRepository { val statusBarState: Flow<StatusBarState> /** Observable for device wake/sleep state */ - val wakefulness: Flow<WakefulnessModel> + val wakefulness: StateFlow<WakefulnessModel> /** Observable for biometric unlock modes */ val biometricUnlockState: Flow<BiometricUnlockModel> @@ -202,7 +206,8 @@ constructor( private val dozeParameters: DozeParameters, private val authController: AuthController, private val dreamOverlayCallbackController: DreamOverlayCallbackController, - @Main private val mainDispatcher: CoroutineDispatcher + @Main private val mainDispatcher: CoroutineDispatcher, + @Application private val scope: CoroutineScope, ) : KeyguardRepository { private val _animateBottomAreaDozingTransitions = MutableStateFlow(false) override val animateBottomAreaDozingTransitions = @@ -486,47 +491,48 @@ constructor( awaitClose { biometricUnlockController.removeListener(callback) } } - override val wakefulness: Flow<WakefulnessModel> = conflatedCallbackFlow { - val observer = - object : WakefulnessLifecycle.Observer { - override fun onStartedWakingUp() { - dispatchNewState() - } - - override fun onFinishedWakingUp() { - dispatchNewState() - } + override val wakefulness: StateFlow<WakefulnessModel> = + conflatedCallbackFlow { + val observer = + object : WakefulnessLifecycle.Observer { + override fun onStartedWakingUp() { + dispatchNewState() + } - override fun onPostFinishedWakingUp() { - dispatchNewState() - } + override fun onFinishedWakingUp() { + dispatchNewState() + } - override fun onStartedGoingToSleep() { - dispatchNewState() - } + override fun onPostFinishedWakingUp() { + dispatchNewState() + } - override fun onFinishedGoingToSleep() { - dispatchNewState() - } + override fun onStartedGoingToSleep() { + dispatchNewState() + } - private fun dispatchNewState() { - trySendWithFailureLogging( - WakefulnessModel.fromWakefulnessLifecycle(wakefulnessLifecycle), - TAG, - "updated wakefulness state" - ) - } - } + override fun onFinishedGoingToSleep() { + dispatchNewState() + } - wakefulnessLifecycle.addObserver(observer) - trySendWithFailureLogging( - WakefulnessModel.fromWakefulnessLifecycle(wakefulnessLifecycle), - TAG, - "initial wakefulness state" - ) + private fun dispatchNewState() { + trySendWithFailureLogging( + WakefulnessModel.fromWakefulnessLifecycle(wakefulnessLifecycle), + TAG, + "updated wakefulness state", + ) + } + } - awaitClose { wakefulnessLifecycle.removeObserver(observer) } - } + wakefulnessLifecycle.addObserver(observer) + awaitClose { wakefulnessLifecycle.removeObserver(observer) } + } + .stateIn( + scope, + // Use Eagerly so that we're always listening and never miss an event. + SharingStarted.Eagerly, + initialValue = WakefulnessModel.fromWakefulnessLifecycle(wakefulnessLifecycle), + ) override val fingerprintSensorLocation: Flow<Point?> = conflatedCallbackFlow { fun sendFpLocation() { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt index 4055fd0bbc49..246ee33fa2e8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt @@ -17,9 +17,11 @@ package com.android.systemui.keyguard.data.repository import com.android.systemui.CoreStartable -import com.android.systemui.keyguard.bouncer.data.repository.BouncerMessageRepository -import com.android.systemui.keyguard.bouncer.data.repository.BouncerMessageRepositoryImpl -import com.android.systemui.keyguard.bouncer.domain.interactor.BouncerMessageAuditLogger +import com.android.systemui.bouncer.data.repository.BouncerMessageRepository +import com.android.systemui.bouncer.data.repository.BouncerMessageRepositoryImpl +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepositoryImpl +import com.android.systemui.bouncer.domain.interactor.BouncerMessageAuditLogger import dagger.Binds import dagger.Module import dagger.multibindings.ClassKey diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt index 100bc596103d..84cd3ef622ba 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt @@ -47,6 +47,11 @@ import kotlinx.coroutines.flow.filter * To create or modify logic that controls when and how transitions get created, look at * [TransitionInteractor]. These interactors will call [startTransition] and [updateTransition] on * this repository. + * + * To print all transitions to logcat to help with debugging, run this command: + * adb shell settings put global systemui/buffer/KeyguardLog VERBOSE + * + * This will print all keyguard transitions to logcat with the KeyguardTransitionAuditLogger tag. */ interface KeyguardTransitionRepository { /** @@ -160,35 +165,28 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio // An animator was provided, so use it to run the transition animator.setFloatValues(startingValue, 1f) animator.duration = ((1f - startingValue) * animator.duration).toLong() - val updateListener = - object : AnimatorUpdateListener { - override fun onAnimationUpdate(animation: ValueAnimator) { - emitTransition( - TransitionStep( - info, - (animation.getAnimatedValue() as Float), - TransitionState.RUNNING - ) - ) - } - } + val updateListener = AnimatorUpdateListener { animation -> + emitTransition( + TransitionStep( + info, + (animation.animatedValue as Float), + TransitionState.RUNNING + ) + ) + } val adapter = object : AnimatorListenerAdapter() { override fun onAnimationStart(animation: Animator) { emitTransition(TransitionStep(info, startingValue, TransitionState.STARTED)) } override fun onAnimationCancel(animation: Animator) { - endAnimation(animation, lastStep.value, TransitionState.CANCELED) + endAnimation(lastStep.value, TransitionState.CANCELED) } override fun onAnimationEnd(animation: Animator) { - endAnimation(animation, 1f, TransitionState.FINISHED) + endAnimation(1f, TransitionState.FINISHED) } - private fun endAnimation( - animation: Animator, - value: Float, - state: TransitionState - ) { + private fun endAnimation(value: Float, state: TransitionState) { emitTransition(TransitionStep(info, value, state)) animator.removeListener(this) animator.removeUpdateListener(updateListener) @@ -201,7 +199,7 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio return@startTransition null } ?: run { - emitTransition(TransitionStep(info, 0f, TransitionState.STARTED)) + emitTransition(TransitionStep(info, startingValue, TransitionState.STARTED)) // No animator, so it's manual. Provide a mechanism to callback updateTransitionId = UUID.randomUUID() 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 323fc317ebe1..ee2c2df41624 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 @@ -52,7 +52,7 @@ constructor( .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair) .collect { (wakefulnessModel, lastStartedTransition) -> if ( - wakefulnessModel.isStartingToWake() && + wakefulnessModel.isStartingToWakeOrAwake() && lastStartedTransition.to == KeyguardState.DOZING ) { keyguardTransitionRepository.startTransition( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt index 36c8eb186924..ccf4bc1588f6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt @@ -23,7 +23,6 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.BiometricUnlockModel import com.android.systemui.keyguard.shared.model.DozeStateModel -import com.android.systemui.keyguard.shared.model.DozeStateModel.Companion.isDozeOff import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo import com.android.systemui.util.kotlin.Utils.Companion.toTriple @@ -48,39 +47,23 @@ constructor( ) : TransitionInteractor(FromDreamingTransitionInteractor::class.simpleName!!) { override fun start() { - listenForDreamingToLockscreen() listenForDreamingToOccluded() listenForDreamingToGone() listenForDreamingToDozing() } - private fun listenForDreamingToLockscreen() { + fun startToLockscreenTransition() { scope.launch { - keyguardInteractor.isAbleToDream - .sample( - combine( - keyguardInteractor.dozeTransitionModel, - keyguardTransitionInteractor.startedKeyguardTransitionStep, - ::Pair - ), - ::toTriple + if (keyguardTransitionInteractor.startedKeyguardState.value == KeyguardState.DREAMING) { + keyguardTransitionRepository.startTransition( + TransitionInfo( + name, + KeyguardState.DREAMING, + KeyguardState.LOCKSCREEN, + getAnimator(TO_LOCKSCREEN_DURATION), + ) ) - .collect { (isDreaming, dozeTransitionModel, lastStartedTransition) -> - if ( - !isDreaming && - isDozeOff(dozeTransitionModel.to) && - lastStartedTransition.to == KeyguardState.DREAMING - ) { - keyguardTransitionRepository.startTransition( - TransitionInfo( - name, - KeyguardState.DREAMING, - KeyguardState.LOCKSCREEN, - getAnimator(TO_LOCKSCREEN_DURATION), - ) - ) - } - } + } } } @@ -173,6 +156,6 @@ constructor( companion object { private val DEFAULT_DURATION = 500.milliseconds - val TO_LOCKSCREEN_DURATION = 1183.milliseconds + val TO_LOCKSCREEN_DURATION = 1167.milliseconds } } 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 3cf9a9ec5a9c..228290a3203f 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,12 +19,13 @@ package com.android.systemui.keyguard.domain.interactor import android.app.StatusBarManager import android.graphics.Point +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.KeyguardRepository import com.android.systemui.keyguard.shared.model.BiometricUnlockModel import com.android.systemui.keyguard.shared.model.CameraLaunchSourceModel @@ -39,6 +40,7 @@ import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter @@ -59,6 +61,7 @@ constructor( private val commandQueue: CommandQueue, featureFlags: FeatureFlags, bouncerRepository: KeyguardBouncerRepository, + configurationRepository: ConfigurationRepository, ) { /** * The amount of doze the system is in, where `1.0` is fully dozing and `0.0` is not dozing at @@ -97,7 +100,7 @@ constructor( } /** The device wake/sleep state */ - val wakefulnessModel: Flow<WakefulnessModel> = repository.wakefulness + val wakefulnessModel: StateFlow<WakefulnessModel> = repository.wakefulness /** * Dozing and dreaming have overlapping events. If the doze state remains in FINISH, it means @@ -111,7 +114,7 @@ constructor( isDreaming && isDozeOff(dozeTransitionModel.to) } .sample(wakefulnessModel) { isAbleToDream, wakefulnessModel -> - isAbleToDream && wakefulnessModel.isStartingToWake() + isAbleToDream && wakefulnessModel.isStartingToWakeOrAwake() } .flatMapLatest { isAbleToDream -> flow { @@ -172,6 +175,9 @@ constructor( /** The approximate location on the screen of the face unlock sensor, if one is available. */ val faceSensorLocation: Flow<Point?> = repository.faceSensorLocation + /** Notifies when a new configuration is set */ + val configurationChange: Flow<Unit> = configurationRepository.onAnyConfigurationChange + fun dozeTransitionTo(vararg states: DozeStateModel): Flow<DozeTransitionModel> { return dozeTransitionModel.filter { states.contains(it.to) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt index da0ada160518..42f12f82d9a7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt @@ -18,6 +18,7 @@ package com.android.systemui.keyguard.domain.interactor import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.KeyguardState.AOD @@ -29,10 +30,14 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge +import kotlinx.coroutines.flow.stateIn /** Encapsulates business-logic related to the keyguard transitions. */ @SysUISingleton @@ -40,6 +45,7 @@ class KeyguardTransitionInteractor @Inject constructor( private val repository: KeyguardTransitionRepository, + @Application val scope: CoroutineScope, ) { /** (any)->GONE transition information */ val anyStateToGoneTransition: Flow<TransitionStep> = @@ -108,10 +114,17 @@ constructor( val finishedKeyguardTransitionStep: Flow<TransitionStep> = repository.transitions.filter { step -> step.transitionState == TransitionState.FINISHED } - /** The last completed [KeyguardState] transition */ - val finishedKeyguardState: Flow<KeyguardState> = - finishedKeyguardTransitionStep.map { step -> step.to } + /** The destination state of the last started transition */ + val startedKeyguardState: StateFlow<KeyguardState> = + startedKeyguardTransitionStep + .map { step -> step.to } + .stateIn(scope, SharingStarted.Eagerly, KeyguardState.OFF) + /** The last completed [KeyguardState] transition */ + val finishedKeyguardState: StateFlow<KeyguardState> = + finishedKeyguardTransitionStep + .map { step -> step.to } + .stateIn(scope, SharingStarted.Eagerly, LOCKSCREEN) /** * The amount of transition into or out of the given [KeyguardState]. * diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/SystemUIKeyguardFaceAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/SystemUIKeyguardFaceAuthInteractor.kt index 6b515dab79f6..8b749f0f4bc4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/SystemUIKeyguardFaceAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/SystemUIKeyguardFaceAuthInteractor.kt @@ -19,6 +19,8 @@ package com.android.systemui.keyguard.domain.interactor import com.android.keyguard.FaceAuthUiEvent import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.CoreStartable +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakeSleepReason.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakeSleepReason.kt index 51ce7ff45182..fb685dab1797 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakeSleepReason.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakeSleepReason.kt @@ -23,9 +23,12 @@ enum class WakeSleepReason { /** The physical power button was pressed to wake up or sleep the device. */ POWER_BUTTON, - /** The user has taped or double tapped to wake the screen */ + /** The user has tapped or double tapped to wake the screen. */ TAP, + /** The user performed some sort of gesture to wake the screen. */ + GESTURE, + /** Something else happened to wake up or sleep the device. */ OTHER; @@ -34,6 +37,7 @@ enum class WakeSleepReason { return when (reason) { PowerManager.WAKE_REASON_POWER_BUTTON -> POWER_BUTTON PowerManager.WAKE_REASON_TAP -> TAP + PowerManager.WAKE_REASON_GESTURE -> GESTURE else -> OTHER } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakefulnessModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakefulnessModel.kt index 7ca90ba63fda..cfd9e0866c06 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakefulnessModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/WakefulnessModel.kt @@ -27,7 +27,13 @@ data class WakefulnessModel( fun isStartingToSleep() = state == WakefulnessState.STARTING_TO_SLEEP - fun isStartingToSleepOrAsleep() = isStartingToSleep() || state == WakefulnessState.ASLEEP + private fun isAsleep() = state == WakefulnessState.ASLEEP + + fun isStartingToSleepOrAsleep() = isStartingToSleep() || isAsleep() + + fun isDeviceInteractive() = !isAsleep() + + fun isStartingToWakeOrAwake() = isStartingToWake() || state == WakefulnessState.AWAKE fun isStartingToSleepFromPowerButton() = isStartingToSleep() && lastWakeReason == WakeSleepReason.POWER_BUTTON @@ -41,6 +47,11 @@ data class WakefulnessModel( fun isAwakeFromTap() = state == WakefulnessState.STARTING_TO_WAKE && lastWakeReason == WakeSleepReason.TAP + fun isDeviceInteractiveFromTapOrGesture(): Boolean { + return isDeviceInteractive() && + (lastWakeReason == WakeSleepReason.TAP || lastWakeReason == WakeSleepReason.GESTURE) + } + companion object { fun fromWakefulnessLifecycle(wakefulnessLifecycle: WakefulnessLifecycle): WakefulnessModel { return WakefulnessModel( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt index a8d662c96284..7d14198bdb17 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt @@ -21,12 +21,10 @@ import android.content.Intent import android.graphics.Rect import android.graphics.drawable.Animatable2 import android.util.Size -import android.util.TypedValue import android.view.View import android.view.ViewGroup import android.view.ViewPropertyAnimator import android.widget.ImageView -import android.widget.TextView import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams @@ -108,14 +106,10 @@ object KeyguardBottomAreaViewBinder { activityStarter: ActivityStarter?, messageDisplayer: (Int) -> Unit, ): Binding { - val indicationArea: View = view.requireViewById(R.id.keyguard_indication_area) val ambientIndicationArea: View? = view.findViewById(R.id.ambient_indication_container) val startButton: ImageView = view.requireViewById(R.id.start_button) val endButton: ImageView = view.requireViewById(R.id.end_button) val overlayContainer: View = view.requireViewById(R.id.overlay_container) - val indicationText: TextView = view.requireViewById(R.id.keyguard_indication_text) - val indicationTextBottom: TextView = - view.requireViewById(R.id.keyguard_indication_text_bottom) val settingsMenu: LaunchableLinearLayout = view.requireViewById(R.id.keyguard_settings_button) @@ -183,7 +177,6 @@ object KeyguardBottomAreaViewBinder { } ambientIndicationArea?.alpha = alpha - indicationArea.alpha = alpha } } @@ -205,50 +198,23 @@ object KeyguardBottomAreaViewBinder { launch { viewModel.indicationAreaTranslationX.collect { translationX -> - indicationArea.translationX = translationX ambientIndicationArea?.translationX = translationX } } launch { - combine( - viewModel.isIndicationAreaPadded, - configurationBasedDimensions.map { it.indicationAreaPaddingPx }, - ) { isPadded, paddingIfPaddedPx -> - if (isPadded) { - paddingIfPaddedPx - } else { - 0 - } - } - .collect { paddingPx -> - indicationArea.setPadding(paddingPx, 0, paddingPx, 0) - } - } - - launch { configurationBasedDimensions .map { it.defaultBurnInPreventionYOffsetPx } .flatMapLatest { defaultBurnInOffsetY -> viewModel.indicationAreaTranslationY(defaultBurnInOffsetY) } .collect { translationY -> - indicationArea.translationY = translationY ambientIndicationArea?.translationY = translationY } } launch { configurationBasedDimensions.collect { dimensions -> - indicationText.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - dimensions.indicationTextSizePx.toFloat(), - ) - indicationTextBottom.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - dimensions.indicationTextSizePx.toFloat(), - ) - startButton.updateLayoutParams<ViewGroup.LayoutParams> { width = dimensions.buttonSizePx.width height = dimensions.buttonSizePx.height @@ -305,7 +271,7 @@ object KeyguardBottomAreaViewBinder { return object : Binding { override fun getIndicationAreaAnimators(): List<ViewPropertyAnimator> { - return listOf(indicationArea, ambientIndicationArea).mapNotNull { it?.animate() } + return listOf(ambientIndicationArea).mapNotNull { it?.animate() } } override fun onConfigurationChanged() { @@ -517,12 +483,6 @@ object KeyguardBottomAreaViewBinder { return ConfigurationBasedDimensions( defaultBurnInPreventionYOffsetPx = view.resources.getDimensionPixelOffset(R.dimen.default_burn_in_prevention_offset), - indicationAreaPaddingPx = - view.resources.getDimensionPixelOffset(R.dimen.keyguard_indication_area_padding), - indicationTextSizePx = - view.resources.getDimensionPixelSize( - com.android.internal.R.dimen.text_size_small_material, - ), buttonSizePx = Size( view.resources.getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_width), @@ -552,8 +512,6 @@ object KeyguardBottomAreaViewBinder { private data class ConfigurationBasedDimensions( val defaultBurnInPreventionYOffsetPx: Int, - val indicationAreaPaddingPx: Int, - val indicationTextSizePx: Int, val buttonSizePx: Size, ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt new file mode 100644 index 000000000000..02e6765fa1d3 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.binder + +import android.util.TypedValue +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.repeatOnLifecycle +import com.android.systemui.R +import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel +import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.statusbar.KeyguardIndicationController +import kotlinx.coroutines.DisposableHandle +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch + +/** + * Binds a keyguard indication area view to its view-model. + * + * To use this properly, users should maintain a one-to-one relationship between the [View] and the + * view-binding, binding each view only once. It is okay and expected for the same instance of the + * view-model to be reused for multiple view/view-binder bindings. + */ +@OptIn(ExperimentalCoroutinesApi::class) +object KeyguardIndicationAreaBinder { + + /** Binds the view to the view-model, continuing to update the former based on the latter. */ + @JvmStatic + fun bind( + view: ViewGroup, + viewModel: KeyguardIndicationAreaViewModel, + indicationController: KeyguardIndicationController, + ): DisposableHandle { + val indicationArea: ViewGroup = view.requireViewById(R.id.keyguard_indication_area) + indicationController.setIndicationArea(indicationArea) + + val indicationText: TextView = indicationArea.requireViewById(R.id.keyguard_indication_text) + val indicationTextBottom: TextView = + indicationArea.requireViewById(R.id.keyguard_indication_text_bottom) + + view.clipChildren = false + view.clipToPadding = false + + val configurationBasedDimensions = MutableStateFlow(loadFromResources(view)) + val disposableHandle = + view.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.STARTED) { + launch { + viewModel.alpha.collect { alpha -> + view.importantForAccessibility = + if (alpha == 0f) { + View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS + } else { + View.IMPORTANT_FOR_ACCESSIBILITY_AUTO + } + + indicationArea.alpha = alpha + } + } + + launch { + viewModel.indicationAreaTranslationX.collect { translationX -> + indicationArea.translationX = translationX + } + } + + launch { + combine( + viewModel.isIndicationAreaPadded, + configurationBasedDimensions.map { it.indicationAreaPaddingPx }, + ) { isPadded, paddingIfPaddedPx -> + if (isPadded) { + paddingIfPaddedPx + } else { + 0 + } + } + .collect { paddingPx -> + indicationArea.setPadding(paddingPx, 0, paddingPx, 0) + } + } + + launch { + configurationBasedDimensions + .map { it.defaultBurnInPreventionYOffsetPx } + .flatMapLatest { defaultBurnInOffsetY -> + viewModel.indicationAreaTranslationY(defaultBurnInOffsetY) + } + .collect { translationY -> indicationArea.translationY = translationY } + } + + launch { + configurationBasedDimensions.collect { dimensions -> + indicationText.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + dimensions.indicationTextSizePx.toFloat(), + ) + indicationTextBottom.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + dimensions.indicationTextSizePx.toFloat(), + ) + } + } + + launch { + viewModel.configurationChange.collect { + configurationBasedDimensions.value = loadFromResources(view) + } + } + } + } + return disposableHandle + } + + private fun loadFromResources(view: View): ConfigurationBasedDimensions { + return ConfigurationBasedDimensions( + defaultBurnInPreventionYOffsetPx = + view.resources.getDimensionPixelOffset(R.dimen.default_burn_in_prevention_offset), + indicationAreaPaddingPx = + view.resources.getDimensionPixelOffset(R.dimen.keyguard_indication_area_padding), + indicationTextSizePx = + view.resources.getDimensionPixelSize( + com.android.internal.R.dimen.text_size_small_material, + ), + ) + } + + private data class ConfigurationBasedDimensions( + val defaultBurnInPreventionYOffsetPx: Int, + val indicationAreaPaddingPx: Int, + val indicationTextSizePx: Int, + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationArea.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationArea.kt new file mode 100644 index 000000000000..890d565b03a5 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationArea.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.ui.view + +import android.content.Context +import android.text.TextUtils +import android.util.AttributeSet +import android.view.Gravity +import android.view.View +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import android.view.ViewGroup.LayoutParams.WRAP_CONTENT +import android.widget.LinearLayout +import com.android.systemui.R +import com.android.systemui.statusbar.phone.KeyguardIndicationTextView + +class KeyguardIndicationArea( + context: Context, + private val attrs: AttributeSet?, +) : + LinearLayout( + context, + attrs, + ) { + + init { + setId(R.id.keyguard_indication_area) + orientation = LinearLayout.VERTICAL + + addView(indicationTopRow(), LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)) + addView( + indicationBottomRow(), + LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply { + gravity = Gravity.CENTER_HORIZONTAL + } + ) + } + + private fun indicationTopRow(): KeyguardIndicationTextView { + return KeyguardIndicationTextView(context, attrs).apply { + id = R.id.keyguard_indication_text + gravity = Gravity.CENTER + accessibilityLiveRegion = View.ACCESSIBILITY_LIVE_REGION_POLITE + setTextAppearance(R.style.TextAppearance_Keyguard_BottomArea) + + val padding = R.dimen.keyguard_indication_text_padding.dp() + setPaddingRelative(padding, 0, padding, 0) + } + } + + private fun indicationBottomRow(): KeyguardIndicationTextView { + return KeyguardIndicationTextView(context, attrs).apply { + id = R.id.keyguard_indication_text_bottom + gravity = Gravity.CENTER + accessibilityLiveRegion = View.ACCESSIBILITY_LIVE_REGION_POLITE + + setTextAppearance(R.style.TextAppearance_Keyguard_BottomArea) + setEllipsize(TextUtils.TruncateAt.END) + setAlpha(0.8f) + setMinHeight(R.dimen.keyguard_indication_text_min_height.dp()) + setMaxLines(2) + setVisibility(View.GONE) + + val padding = R.dimen.keyguard_indication_text_padding.dp() + setPaddingRelative(padding, 0, padding, 0) + } + } + + private fun Int.dp(): Int { + return context.resources.getDimensionPixelSize(this) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardRootView.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardRootView.kt new file mode 100644 index 000000000000..abf0e80bd87a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardRootView.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.ui.view + +import android.content.Context +import android.util.AttributeSet +import android.view.Gravity +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import android.view.ViewGroup.LayoutParams.WRAP_CONTENT +import android.widget.FrameLayout +import com.android.systemui.R + +/** Provides a container for all keyguard ui content. */ +class KeyguardRootView( + context: Context, + private val attrs: AttributeSet?, +) : + FrameLayout( + context, + attrs, + ) { + + init { + addIndicationTextArea() + } + + private fun addIndicationTextArea() { + val view = KeyguardIndicationArea(context, attrs) + addView( + view, + FrameLayout.LayoutParams( + MATCH_PARENT, + WRAP_CONTENT, + ) + .apply { + gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL + bottomMargin = R.dimen.keyguard_indication_margin_bottom.dp() + } + ) + } + + private fun Int.dp(): Int { + return context.resources.getDimensionPixelSize(this) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt index 2c9a9b3271e6..9ca4bd62b6fe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt @@ -16,15 +16,17 @@ package com.android.systemui.keyguard.ui.viewmodel -import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE -import com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE +import com.android.app.animation.Interpolators.EMPHASIZED import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor.Companion.TO_LOCKSCREEN_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor +import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filter /** * Breaks down DREAMING->LOCKSCREEN transition into discrete steps for corresponding views to @@ -34,22 +36,32 @@ import kotlinx.coroutines.flow.Flow class DreamingToLockscreenTransitionViewModel @Inject constructor( - private val interactor: KeyguardTransitionInteractor, + keyguardTransitionInteractor: KeyguardTransitionInteractor, + private val fromDreamingTransitionInteractor: FromDreamingTransitionInteractor ) { + fun startTransition() = fromDreamingTransitionInteractor.startToLockscreenTransition() + private val transitionAnimation = KeyguardTransitionAnimationFlow( transitionDuration = TO_LOCKSCREEN_DURATION, - transitionFlow = interactor.dreamingToLockscreenTransition, + transitionFlow = keyguardTransitionInteractor.dreamingToLockscreenTransition, ) + val transitionEnded = + keyguardTransitionInteractor.dreamingToLockscreenTransition.filter { step -> + step.transitionState == TransitionState.FINISHED || + step.transitionState == TransitionState.CANCELED + } + /** Dream overlay y-translation on exit */ fun dreamOverlayTranslationY(translatePx: Int): Flow<Float> { return transitionAnimation.createFlow( - duration = 600.milliseconds, + duration = TO_LOCKSCREEN_DURATION, onStep = { it * translatePx }, - interpolator = EMPHASIZED_ACCELERATE, + interpolator = EMPHASIZED, ) } + /** Dream overlay views alpha - fade out */ val dreamOverlayAlpha: Flow<Float> = transitionAnimation.createFlow( @@ -65,7 +77,7 @@ constructor( // Reset on cancel or finish onFinish = { 0f }, onCancel = { 0f }, - interpolator = EMPHASIZED_DECELERATE, + interpolator = EMPHASIZED, ) } @@ -76,12 +88,4 @@ constructor( duration = 250.milliseconds, onStep = { it }, ) - - companion object { - /* Length of time before ending the dream activity, in order to start unoccluding */ - val DREAM_ANIMATION_DURATION = 250.milliseconds - @JvmField - val LOCKSCREEN_ANIMATION_DURATION_MS = - (TO_LOCKSCREEN_DURATION - DREAM_ANIMATION_DURATION).inWholeMilliseconds - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt index 62a1a9e16fc6..3e6f8e68891a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModel.kt @@ -57,7 +57,7 @@ constructor( * in the wallpaper picker application. This should _always_ be `false` for the real lock screen * experience. */ - private val previewMode = MutableStateFlow(PreviewMode()) + val previewMode = MutableStateFlow(PreviewMode()) /** * ID of the slot that's currently selected in the preview that renders exclusively in the @@ -101,12 +101,6 @@ constructor( bottomAreaInteractor.alpha.distinctUntilChanged() } } - /** An observable for whether the indication area should be padded. */ - val isIndicationAreaPadded: Flow<Boolean> = - combine(startButton, endButton) { startButtonModel, endButtonModel -> - startButtonModel.isVisible || endButtonModel.isVisible - } - .distinctUntilChanged() /** An observable for the x-offset by which the indication area should be translated. */ val indicationAreaTranslationX: Flow<Float> = bottomAreaInteractor.clockPosition.map { it.x.toFloat() }.distinctUntilChanged() diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt new file mode 100644 index 000000000000..389cf76c47ac --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.viewmodel + +import com.android.systemui.doze.util.BurnInHelperWrapper +import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map + +/** View-model for the keyguard indication area view */ +@OptIn(ExperimentalCoroutinesApi::class) +class KeyguardIndicationAreaViewModel +@Inject +constructor( + private val keyguardInteractor: KeyguardInteractor, + private val bottomAreaInteractor: KeyguardBottomAreaInteractor, + private val keyguardBottomAreaViewModel: KeyguardBottomAreaViewModel, + private val burnInHelperWrapper: BurnInHelperWrapper, +) { + + /** Notifies when a new configuration is set */ + val configurationChange: Flow<Unit> = keyguardInteractor.configurationChange + + /** An observable for the alpha level for the entire bottom area. */ + val alpha: Flow<Float> = keyguardBottomAreaViewModel.alpha + + /** An observable for whether the indication area should be padded. */ + val isIndicationAreaPadded: Flow<Boolean> = + combine(keyguardBottomAreaViewModel.startButton, keyguardBottomAreaViewModel.endButton) { + startButtonModel, + endButtonModel -> + startButtonModel.isVisible || endButtonModel.isVisible + } + .distinctUntilChanged() + /** An observable for the x-offset by which the indication area should be translated. */ + val indicationAreaTranslationX: Flow<Float> = + bottomAreaInteractor.clockPosition.map { it.x.toFloat() }.distinctUntilChanged() + + /** Returns an observable for the y-offset by which the indication area should be translated. */ + fun indicationAreaTranslationY(defaultBurnInOffset: Int): Flow<Float> { + return keyguardInteractor.dozeAmount + .map { dozeAmount -> + dozeAmount * + (burnInHelperWrapper.burnInOffset( + /* amplitude = */ defaultBurnInOffset * 2, + /* xAxis= */ false, + ) - defaultBurnInOffset) + } + .distinctUntilChanged() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt index c6187dde035b..a3ae67d906bd 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt @@ -33,7 +33,7 @@ import kotlinx.coroutines.flow.Flow class LockscreenToDreamingTransitionViewModel @Inject constructor( - private val interactor: KeyguardTransitionInteractor, + interactor: KeyguardTransitionInteractor, ) { private val transitionAnimation = KeyguardTransitionAnimationFlow( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModel.kt index 68810f909016..44e1fd157cf9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModel.kt @@ -17,10 +17,10 @@ package com.android.systemui.keyguard.ui.viewmodel import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromPrimaryBouncerTransitionInteractor.Companion.TO_GONE_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.keyguard.shared.model.ScrimAlpha import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.statusbar.SysuiStatusBarStateController diff --git a/packages/SystemUI/src/com/android/systemui/log/BouncerLogger.kt b/packages/SystemUI/src/com/android/systemui/log/BouncerLogger.kt index 3be4499517b9..3226865d1d82 100644 --- a/packages/SystemUI/src/com/android/systemui/log/BouncerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/log/BouncerLogger.kt @@ -16,8 +16,8 @@ package com.android.systemui.log +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel import com.android.systemui.log.dagger.BouncerLog import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt index 19e112487c46..1e2f71f01c35 100644 --- a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBufferFactory.kt @@ -61,7 +61,7 @@ constructor( bgDispatcher, coroutineScope, ) - dumpManager.registerNormalDumpable(name, tableBuffer) + dumpManager.registerTableLogBuffer(name, tableBuffer) tableBuffer.init() return tableBuffer } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java index 1da8718b111f..8225c47d904b 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java @@ -51,7 +51,6 @@ import android.view.IWallpaperVisibilityListener; import android.view.IWindowManager; import android.view.View; import android.view.WindowInsets; -import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityManager; import androidx.annotation.NonNull; @@ -69,10 +68,13 @@ import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.KeyguardStateController; +import dagger.Lazy; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; @@ -80,8 +82,6 @@ import java.util.Optional; import javax.inject.Inject; -import dagger.Lazy; - /** * Extracts shared elements between navbar and taskbar delegate to de-dupe logic and help them * experience the joys of friendship. @@ -111,6 +111,7 @@ public final class NavBarHelper implements private final AccessibilityButtonTargetsObserver mAccessibilityButtonTargetsObserver; private final List<NavbarTaskbarStateUpdater> mStateListeners = new ArrayList<>(); private final Context mContext; + private final NotificationShadeWindowController mNotificationShadeWindowController; private final CommandQueue mCommandQueue; private final ContentResolver mContentResolver; private final EdgeBackGestureHandler mEdgeBackGestureHandler; @@ -182,9 +183,11 @@ public final class NavBarHelper implements IWindowManager wm, UserTracker userTracker, DisplayTracker displayTracker, + NotificationShadeWindowController notificationShadeWindowController, DumpManager dumpManager, CommandQueue commandQueue) { mContext = context; + mNotificationShadeWindowController = notificationShadeWindowController; mCommandQueue = commandQueue; mContentResolver = mContext.getContentResolver(); mAccessibilityManager = accessibilityManager; @@ -460,11 +463,7 @@ public final class NavBarHelper implements * {@link InputMethodService} and the keyguard states. */ public boolean isImeShown(int vis) { - View shadeWindowView = null; - if (mCentralSurfacesOptionalLazy.get().isPresent()) { - shadeWindowView = - mCentralSurfacesOptionalLazy.get().get().getNotificationShadeWindowView(); - } + View shadeWindowView = mNotificationShadeWindowController.getWindowRootView(); boolean isKeyguardShowing = mKeyguardStateController.isShowing(); boolean imeVisibleOnShade = shadeWindowView != null && shadeWindowView.isAttachedToWindow() && shadeWindowView.getRootWindowInsets().isVisible(WindowInsets.Type.ime()); diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java index 8b3d7a653232..5e9406c9d507 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java @@ -15,11 +15,13 @@ */ package com.android.systemui.navigationbar.gestural; +import static android.view.InputDevice.SOURCE_MOUSE; +import static android.view.InputDevice.SOURCE_TOUCHPAD; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION; import static com.android.systemui.classifier.Classifier.BACK_GESTURE; -import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadFourFingerSwipe; -import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadMultiFingerSwipe; +import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadScroll; +import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe; import android.annotation.NonNull; import android.app.ActivityManager; @@ -37,6 +39,7 @@ import android.graphics.Rect; import android.graphics.Region; import android.hardware.input.InputManager; import android.icu.text.SimpleDateFormat; +import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.os.SystemClock; @@ -195,6 +198,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private final ViewConfiguration mViewConfiguration; private final WindowManager mWindowManager; private final IWindowManager mWindowManagerService; + private final InputManager mInputManager; private final Optional<Pip> mPipOptional; private final Optional<DesktopMode> mDesktopModeOptional; private final FalsingManager mFalsingManager; @@ -206,6 +210,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private final int mDisplayId; private final Executor mMainExecutor; + private final Handler mMainHandler; private final Executor mBackgroundExecutor; private final Rect mPipExcludedBounds = new Rect(); @@ -250,6 +255,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private boolean mIsAttached; private boolean mIsGesturalModeEnabled; + private boolean mIsTrackpadConnected; + private boolean mUsingThreeButtonNav; private boolean mIsEnabled; private boolean mIsNavBarShownTransiently; private boolean mIsBackGestureAllowed; @@ -349,12 +356,48 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack } }; + private final InputManager.InputDeviceListener mInputDeviceListener = + new InputManager.InputDeviceListener() { + + // Only one trackpad can be connected to a device at a time, since it takes over the + // only USB port. + private int mTrackpadDeviceId; + + @Override + public void onInputDeviceAdded(int deviceId) { + if (isTrackpadDevice(deviceId)) { + mTrackpadDeviceId = deviceId; + update(true /* isTrackpadConnected */); + } + } + + @Override + public void onInputDeviceChanged(int deviceId) { } + + @Override + public void onInputDeviceRemoved(int deviceId) { + if (mTrackpadDeviceId == deviceId) { + update(false /* isTrackpadConnected */); + } + } + + private void update(boolean isTrackpadConnected) { + boolean isPreviouslyTrackpadConnected = mIsTrackpadConnected; + mIsTrackpadConnected = isTrackpadConnected; + if (isPreviouslyTrackpadConnected != mIsTrackpadConnected) { + updateIsEnabled(); + updateCurrentUserResources(); + } + } + }; + EdgeBackGestureHandler( Context context, OverviewProxyService overviewProxyService, SysUiState sysUiState, PluginManager pluginManager, @Main Executor executor, + @Main Handler handler, @Background Executor backgroundExecutor, UserTracker userTracker, ProtoTracer protoTracer, @@ -363,6 +406,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack ViewConfiguration viewConfiguration, WindowManager windowManager, IWindowManager windowManagerService, + InputManager inputManager, Optional<Pip> pipOptional, Optional<DesktopMode> desktopModeOptional, FalsingManager falsingManager, @@ -373,6 +417,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mContext = context; mDisplayId = context.getDisplayId(); mMainExecutor = executor; + mMainHandler = handler; mBackgroundExecutor = backgroundExecutor; mUserTracker = userTracker; mOverviewProxyService = overviewProxyService; @@ -384,6 +429,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mViewConfiguration = viewConfiguration; mWindowManager = windowManager; mWindowManagerService = windowManagerService; + mInputManager = inputManager; mPipOptional = pipOptional; mDesktopModeOptional = desktopModeOptional; mFalsingManager = falsingManager; @@ -392,6 +438,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mFeatureFlags = featureFlags; mLightBarControllerProvider = lightBarControllerProvider; mLastReportedConfig.setTo(mContext.getResources().getConfiguration()); + mIsTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled( + Flags.TRACKPAD_GESTURE_FEATURES); ComponentName recentsComponentName = ComponentName.unflattenFromString( context.getString(com.android.internal.R.string.config_recentsComponentName)); if (recentsComponentName != null) { @@ -423,7 +471,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack ViewConfiguration.getLongPressTimeout()); mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver( - mContext.getMainThreadHandler(), mContext, this::onNavigationSettingsChanged); + mMainHandler, mContext, this::onNavigationSettingsChanged); updateCurrentUserResources(); } @@ -510,6 +558,15 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mProtoTracer.add(this); mOverviewProxyService.addCallback(mQuickSwitchListener); mSysUiState.addCallback(mSysUiStateCallback); + if (mIsTrackpadGestureFeaturesEnabled) { + mInputManager.registerInputDeviceListener(mInputDeviceListener, mMainHandler); + int [] inputDevices = mInputManager.getInputDeviceIds(); + for (int inputDeviceId : inputDevices) { + if (isTrackpadDevice(inputDeviceId)) { + mIsTrackpadConnected = true; + } + } + } updateIsEnabled(); mUserTracker.addCallback(mUserChangedCallback, mMainExecutor); } @@ -522,6 +579,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mProtoTracer.remove(this); mOverviewProxyService.removeCallback(mQuickSwitchListener); mSysUiState.removeCallback(mSysUiStateCallback); + mInputManager.unregisterInputDeviceListener(mInputDeviceListener); updateIsEnabled(); mUserTracker.removeCallback(mUserChangedCallback); } @@ -530,7 +588,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack * @see NavigationModeController.ModeChangedListener#onNavigationModeChanged */ public void onNavigationModeChanged(int mode) { - mIsGesturalModeEnabled = QuickStepContract.isGesturalMode(mode); + mUsingThreeButtonNav = QuickStepContract.isLegacyMode(mode); + mIsGesturalModeEnabled = QuickStepContract.isGesturalMode(mode) || ( + mIsTrackpadGestureFeaturesEnabled && mUsingThreeButtonNav && mIsTrackpadConnected); updateIsEnabled(); updateCurrentUserResources(); } @@ -620,8 +680,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack // Add a nav bar panel window mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE); - mIsTrackpadGestureFeaturesEnabled = mFeatureFlags.isEnabled( - Flags.TRACKPAD_GESTURE_FEATURES); resetEdgeBackPlugin(); mPluginManager.addPluginListener( this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false); @@ -825,6 +883,15 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mDisplaySize.y - insets.bottom); } + private boolean isTrackpadDevice(int deviceId) { + InputDevice inputDevice = mInputManager.getInputDevice(deviceId); + if (inputDevice == null) { + return false; + } + return inputDevice.getSources() == (InputDevice.SOURCE_MOUSE + | InputDevice.SOURCE_TOUCHPAD); + } + private boolean desktopExcludeRegionContains(int x, int y) { return mDesktopModeExcludeRegion.contains(x, y); } @@ -924,7 +991,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private void onMotionEvent(MotionEvent ev) { int action = ev.getActionMasked(); - boolean isTrackpadMultiFingerSwipe = isTrackpadMultiFingerSwipe( + boolean isTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe( mIsTrackpadGestureFeaturesEnabled, ev); if (action == MotionEvent.ACTION_DOWN) { if (DEBUG_MISSING_GESTURE) { @@ -938,7 +1005,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack // Verify if this is in within the touch region and we aren't in immersive mode, and // either the bouncer is showing or the notification panel is hidden mInputEventReceiver.setBatchingEnabled(false); - if (isTrackpadMultiFingerSwipe) { + if (isTrackpadThreeFingerSwipe) { // Since trackpad gestures don't have zones, this will be determined later by the // direction of the gesture. {@code mIsOnLeftEdge} is set to false to begin with. mDeferSetIsOnLeftEdge = true; @@ -950,20 +1017,26 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mLogGesture = false; mInRejectedExclusion = false; boolean isWithinInsets = isWithinInsets((int) ev.getX(), (int) ev.getY()); - // Trackpad back gestures don't have zones, so we don't need to check if the down event - // is within insets. - mAllowGesture = !mDisabledForQuickstep && mIsBackGestureAllowed - && (isTrackpadMultiFingerSwipe || isWithinInsets) + boolean isBackAllowedCommon = !mDisabledForQuickstep && mIsBackGestureAllowed && !mGestureBlockingActivityRunning && !QuickStepContract.isBackGestureDisabled(mSysUiFlags) - && (isValidTrackpadBackGesture(isTrackpadMultiFingerSwipe) - || isWithinTouchRegion((int) ev.getX(), (int) ev.getY())); + && !isTrackpadScroll(mIsTrackpadGestureFeaturesEnabled, ev); + if (isTrackpadThreeFingerSwipe) { + // Trackpad back gestures don't have zones, so we don't need to check if the down + // event is within insets. + mAllowGesture = isBackAllowedCommon && isValidTrackpadBackGesture( + isTrackpadThreeFingerSwipe); + } else { + mAllowGesture = isBackAllowedCommon && !mUsingThreeButtonNav && isWithinInsets + && isWithinTouchRegion((int) ev.getX(), (int) ev.getY()) + && !isButtonPressFromTrackpad(ev); + } if (mAllowGesture) { mEdgeBackPlugin.setIsLeftPanel(mIsOnLeftEdge); mEdgeBackPlugin.onMotionEvent(ev); dispatchToBackAnimation(ev); } - if (mLogGesture || isTrackpadMultiFingerSwipe) { + if (mLogGesture || isTrackpadThreeFingerSwipe) { mDownPoint.set(ev.getX(), ev.getY()); mEndPoint.set(-1, -1); mThresholdCrossed = false; @@ -974,10 +1047,10 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mTmpLogDate.setTime(curTime); String curTimeStr = mLogDateFormat.format(mTmpLogDate); (isWithinInsets ? mGestureLogInsideInsets : mGestureLogOutsideInsets).log(String.format( - "Gesture [%d [%s],alw=%B, mltf=%B, left=%B, defLeft=%B, backAlw=%B, disbld=%B," + "Gesture [%d [%s],alw=%B, t3fs=%B, left=%B, defLeft=%B, backAlw=%B, disbld=%B," + " qsDisbld=%b, blkdAct=%B, pip=%B," + " disp=%s, wl=%d, il=%d, wr=%d, ir=%d, excl=%s]", - curTime, curTimeStr, mAllowGesture, isTrackpadMultiFingerSwipe, + curTime, curTimeStr, mAllowGesture, isTrackpadThreeFingerSwipe, mIsOnLeftEdge, mDeferSetIsOnLeftEdge, mIsBackGestureAllowed, QuickStepContract.isBackGestureDisabled(mSysUiFlags), mDisabledForQuickstep, mGestureBlockingActivityRunning, mIsInPip, mDisplaySize, @@ -986,8 +1059,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack if (!mThresholdCrossed) { mEndPoint.x = (int) ev.getX(); mEndPoint.y = (int) ev.getY(); - if (action == MotionEvent.ACTION_POINTER_DOWN && (!isTrackpadMultiFingerSwipe - || isTrackpadFourFingerSwipe(mIsTrackpadGestureFeaturesEnabled, ev))) { + if (action == MotionEvent.ACTION_POINTER_DOWN && !isTrackpadThreeFingerSwipe) { if (mAllowGesture) { logGesture(SysUiStatsLog.BACK_GESTURE__TYPE__INCOMPLETE_MULTI_TOUCH); if (DEBUG_MISSING_GESTURE) { @@ -999,11 +1071,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mLogGesture = false; return; } else if (action == MotionEvent.ACTION_MOVE) { - if (isTrackpadFourFingerSwipe(isTrackpadMultiFingerSwipe, ev)) { - cancelGesture(ev); - return; - } - if (isTrackpadMultiFingerSwipe && mDeferSetIsOnLeftEdge) { + if (isTrackpadThreeFingerSwipe && mDeferSetIsOnLeftEdge) { // mIsOnLeftEdge is determined by the relative position between the down // and the current motion event for trackpad gestures instead of zoning. mIsOnLeftEdge = mEndPoint.x > mDownPoint.x; @@ -1065,6 +1133,13 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mProtoTracer.scheduleFrameUpdate(); } + private boolean isButtonPressFromTrackpad(MotionEvent ev) { + // We don't allow back for button press from the trackpad, and yet we do with a mouse. + int sources = InputManager.getInstance().getInputDevice(ev.getDeviceId()).getSources(); + int sourceTrackpad = (SOURCE_MOUSE | SOURCE_TOUCHPAD); + return (sources & sourceTrackpad) == sourceTrackpad && ev.getButtonState() != 0; + } + private void dispatchToBackAnimation(MotionEvent event) { if (mBackAnimation != null) { mVelocityTracker.addMovement(event); @@ -1184,6 +1259,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack pw.println(" mPredictionLog=" + String.join("\n", mPredictionLog)); pw.println(" mGestureLogInsideInsets=" + String.join("\n", mGestureLogInsideInsets)); pw.println(" mGestureLogOutsideInsets=" + String.join("\n", mGestureLogOutsideInsets)); + pw.println(" mIsTrackpadConnected=" + mIsTrackpadConnected); + pw.println(" mUsingThreeButtonNav=" + mUsingThreeButtonNav); pw.println(" mEdgeBackPlugin=" + mEdgeBackPlugin); if (mEdgeBackPlugin != null) { mEdgeBackPlugin.dump(pw); @@ -1233,6 +1310,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private final SysUiState mSysUiState; private final PluginManager mPluginManager; private final Executor mExecutor; + private final Handler mHandler; private final Executor mBackgroundExecutor; private final UserTracker mUserTracker; private final ProtoTracer mProtoTracer; @@ -1241,6 +1319,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack private final ViewConfiguration mViewConfiguration; private final WindowManager mWindowManager; private final IWindowManager mWindowManagerService; + private final InputManager mInputManager; private final Optional<Pip> mPipOptional; private final Optional<DesktopMode> mDesktopModeOptional; private final FalsingManager mFalsingManager; @@ -1255,6 +1334,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack SysUiState sysUiState, PluginManager pluginManager, @Main Executor executor, + @Main Handler handler, @Background Executor backgroundExecutor, UserTracker userTracker, ProtoTracer protoTracer, @@ -1263,6 +1343,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack ViewConfiguration viewConfiguration, WindowManager windowManager, IWindowManager windowManagerService, + InputManager inputManager, Optional<Pip> pipOptional, Optional<DesktopMode> desktopModeOptional, FalsingManager falsingManager, @@ -1275,6 +1356,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mSysUiState = sysUiState; mPluginManager = pluginManager; mExecutor = executor; + mHandler = handler; mBackgroundExecutor = backgroundExecutor; mUserTracker = userTracker; mProtoTracer = protoTracer; @@ -1283,6 +1365,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mViewConfiguration = viewConfiguration; mWindowManager = windowManager; mWindowManagerService = windowManagerService; + mInputManager = inputManager; mPipOptional = pipOptional; mDesktopModeOptional = desktopModeOptional; mFalsingManager = falsingManager; @@ -1300,6 +1383,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mSysUiState, mPluginManager, mExecutor, + mHandler, mBackgroundExecutor, mUserTracker, mProtoTracer, @@ -1308,6 +1392,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack mViewConfiguration, mWindowManager, mWindowManagerService, + mInputManager, mPipOptional, mDesktopModeOptional, mFalsingManager, diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java index 50e8aa7b2046..10a88c8b4839 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java @@ -16,27 +16,24 @@ package com.android.systemui.navigationbar.gestural; +import static android.view.MotionEvent.AXIS_GESTURE_SWIPE_FINGER_COUNT; import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE; +import static android.view.MotionEvent.CLASSIFICATION_TWO_FINGER_SWIPE; import android.view.MotionEvent; public final class Utilities { - public static boolean isTrackpadMultiFingerSwipe(boolean isTrackpadGestureFeaturesEnabled, + public static boolean isTrackpadScroll(boolean isTrackpadGestureFeaturesEnabled, MotionEvent event) { return isTrackpadGestureFeaturesEnabled - && event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE; + && event.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE; } public static boolean isTrackpadThreeFingerSwipe(boolean isTrackpadGestureFeaturesEnabled, MotionEvent event) { - return isTrackpadMultiFingerSwipe(isTrackpadGestureFeaturesEnabled, event) - && event.getPointerCount() == 3; - } - - public static boolean isTrackpadFourFingerSwipe(boolean isTrackpadGestureFeaturesEnabled, - MotionEvent event) { - return isTrackpadMultiFingerSwipe(isTrackpadGestureFeaturesEnabled, event) - && event.getPointerCount() == 4; + return isTrackpadGestureFeaturesEnabled + && event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE + && event.getAxisValue(AXIS_GESTURE_SWIPE_FINGER_COUNT) == 3; } } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/INoteTaskBubblesService.aidl b/packages/SystemUI/src/com/android/systemui/notetask/INoteTaskBubblesService.aidl new file mode 100644 index 000000000000..3e947d9d2b16 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/notetask/INoteTaskBubblesService.aidl @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.notetask; + +import android.content.Intent; +import android.graphics.drawable.Icon; +import android.os.UserHandle; + +/** A service to help with controlling the state of notes app bubble through the system user. */ +interface INoteTaskBubblesService { + + boolean areBubblesAvailable(); + + void showOrHideAppBubble(in Intent intent, in UserHandle userHandle, in Icon icon); +} diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskBubblesController.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskBubblesController.kt new file mode 100644 index 000000000000..ec205f87d9fa --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskBubblesController.kt @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.notetask + +import android.app.Service +import android.content.Context +import android.content.Intent +import android.graphics.drawable.Icon +import android.os.IBinder +import android.os.UserHandle +import com.android.internal.infra.ServiceConnector +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.log.DebugLogger.debugLog +import com.android.wm.shell.bubbles.Bubbles +import java.util.Optional +import javax.inject.Inject +import kotlin.coroutines.resume +import kotlin.coroutines.suspendCoroutine +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.withContext + +/** + * A utility class to help interact with [Bubbles] as system user. The SysUI instance running as + * system user is the only instance that has the instance of [Bubbles] that manages the notes app + * bubble for all users. + * + * <p>Note: This class is made overridable so that a fake can be created for as mocking suspending + * functions is not supported by the Android tree's version of mockito. + */ +@SysUISingleton +open class NoteTaskBubblesController +@Inject +constructor( + @Application private val context: Context, + @Background private val bgDispatcher: CoroutineDispatcher +) { + + private val serviceConnector: ServiceConnector<INoteTaskBubblesService> = + ServiceConnector.Impl( + context, + Intent(context, NoteTaskBubblesService::class.java), + Context.BIND_AUTO_CREATE or Context.BIND_WAIVE_PRIORITY or Context.BIND_NOT_VISIBLE, + UserHandle.USER_SYSTEM, + INoteTaskBubblesService.Stub::asInterface + ) + + /** Returns whether notes app bubble is supported. */ + open suspend fun areBubblesAvailable(): Boolean = + withContext(bgDispatcher) { + suspendCoroutine { continuation -> + serviceConnector + .postForResult { it.areBubblesAvailable() } + .whenComplete { available, error -> + if (error != null) { + debugLog(error = error) { "Failed to query Bubbles as system user." } + } + continuation.resume(available ?: false) + } + } + } + + /** Calls the [Bubbles.showOrHideAppBubble] API as [UserHandle.USER_SYSTEM]. */ + open suspend fun showOrHideAppBubble( + intent: Intent, + userHandle: UserHandle, + icon: Icon + ) { + withContext(bgDispatcher) { + serviceConnector + .post { it.showOrHideAppBubble(intent, userHandle, icon) } + .whenComplete { _, error -> + if (error != null) { + debugLog(error = error) { + "Failed to show notes app bubble for intent $intent, " + + "user $userHandle, and icon $icon." + } + } else { + debugLog { + "Call to show notes app bubble for intent $intent, " + + "user $userHandle, and icon $icon successful." + } + } + } + } + } + + /** + * A helper service to call [Bubbles] APIs that should always be called from the system user + * instance of SysUI. + * + * <p>Note: This service always runs in the SysUI process running on the system user + * irrespective of which user started the service. This is required so that the correct instance + * of {@link Bubbles} is injected. This is set via attribute {@code android:singleUser=”true”} + * in AndroidManifest. + */ + class NoteTaskBubblesService + @Inject + constructor(private val mOptionalBubbles: Optional<Bubbles>) : Service() { + + override fun onBind(intent: Intent): IBinder { + return object : INoteTaskBubblesService.Stub() { + override fun areBubblesAvailable() = mOptionalBubbles.isPresent + + override fun showOrHideAppBubble( + intent: Intent, + userHandle: UserHandle, + icon: Icon + ) { + mOptionalBubbles.ifPresentOrElse( + { bubbles -> bubbles.showOrHideAppBubble(intent, userHandle, icon) }, + { + debugLog { + "Failed to show or hide bubble for intent $intent," + + "user $user, and icon $icon as bubble is empty." + } + } + ) + } + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt index ccfbaf1da7b6..48790c23e688 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskController.kt @@ -33,25 +33,26 @@ import android.content.pm.ShortcutManager import android.graphics.drawable.Icon import android.os.UserHandle import android.os.UserManager +import android.provider.Settings import android.widget.Toast import androidx.annotation.VisibleForTesting import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.devicepolicy.areKeyguardShortcutsDisabled import com.android.systemui.log.DebugLogger.debugLog import com.android.systemui.notetask.NoteTaskRoleManagerExt.createNoteShortcutInfoAsUser import com.android.systemui.notetask.NoteTaskRoleManagerExt.getDefaultRoleHolderAsUser import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity -import com.android.systemui.notetask.shortcut.LaunchNoteTaskManagedProfileProxyActivity import com.android.systemui.settings.UserTracker import com.android.systemui.shared.system.ActivityManagerKt.isInForeground -import com.android.systemui.util.kotlin.getOrNull +import com.android.systemui.util.settings.SecureSettings import com.android.wm.shell.bubbles.Bubble -import com.android.wm.shell.bubbles.Bubbles import com.android.wm.shell.bubbles.Bubbles.BubbleExpandListener -import java.util.Optional import java.util.concurrent.atomic.AtomicReference import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch /** * Entry point for creating and managing note. @@ -69,13 +70,15 @@ constructor( private val shortcutManager: ShortcutManager, private val resolver: NoteTaskInfoResolver, private val eventLogger: NoteTaskEventLogger, - private val optionalBubbles: Optional<Bubbles>, + private val noteTaskBubblesController: NoteTaskBubblesController, private val userManager: UserManager, private val keyguardManager: KeyguardManager, private val activityManager: ActivityManager, @NoteTaskEnabledKey private val isEnabled: Boolean, private val devicePolicyManager: DevicePolicyManager, private val userTracker: UserTracker, + private val secureSettings: SecureSettings, + @Application private val applicationScope: CoroutineScope ) { @VisibleForTesting val infoReference = AtomicReference<NoteTaskInfo?>() @@ -100,18 +103,6 @@ constructor( } } - /** Starts [LaunchNoteTaskProxyActivity] on the given [user]. */ - fun startNoteTaskProxyActivityForUser(user: UserHandle) { - context.startActivityAsUser( - Intent().apply { - component = - ComponentName(context, LaunchNoteTaskManagedProfileProxyActivity::class.java) - addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - }, - user - ) - } - /** Starts the notes role setting. */ fun startNotesRoleSetting(activityContext: Context, entryPoint: NoteTaskEntryPoint?) { val user = @@ -146,7 +137,7 @@ constructor( userTracker.userProfiles.firstOrNull { userManager.isManagedProfile(it.id) }?.userHandle ?: userTracker.userHandle } else { - userTracker.userHandle + secureSettings.preferredUser } /** @@ -175,7 +166,19 @@ constructor( ) { if (!isEnabled) return - val bubbles = optionalBubbles.getOrNull() ?: return + applicationScope.launch { awaitShowNoteTaskAsUser(entryPoint, user) } + } + + private suspend fun awaitShowNoteTaskAsUser( + entryPoint: NoteTaskEntryPoint, + user: UserHandle, + ) { + if (!isEnabled) return + + if (!noteTaskBubblesController.areBubblesAvailable()) { + debugLog { "Bubbles not available in the system user SysUI instance" } + return + } // TODO(b/249954038): We should handle direct boot (isUserUnlocked). For now, we do nothing. if (!userManager.isUserUnlocked) return @@ -210,7 +213,7 @@ constructor( val intent = createNoteTaskIntent(info) val icon = Icon.createWithResource(context, R.drawable.ic_note_task_shortcut_widget) - bubbles.showOrHideAppBubble(intent, user, icon) + noteTaskBubblesController.showOrHideAppBubble(intent, user, icon) // App bubble logging happens on `onBubbleExpandChanged`. debugLog { "onShowNoteTask - opened as app bubble: $info" } } @@ -284,15 +287,55 @@ constructor( } /** + * Like [updateNoteTaskAsUser] but automatically apply to the current user and all its work + * profiles. + * + * @see updateNoteTaskAsUser + * @see UserTracker.userHandle + * @see UserTracker.userProfiles + */ + fun updateNoteTaskForCurrentUserAndManagedProfiles() { + updateNoteTaskAsUser(userTracker.userHandle) + for (profile in userTracker.userProfiles) { + if (userManager.isManagedProfile(profile.id)) { + updateNoteTaskAsUser(profile.userHandle) + } + } + } + + /** * Updates all [NoteTaskController] related information, including but not exclusively the * widget shortcut created by the [user] - by default it will use the current user. * + * If the user is not current user, the update will be dispatched to run in that user's process. + * * Keep in mind the shortcut API has a * [rate limiting](https://developer.android.com/develop/ui/views/launch/shortcuts/managing-shortcuts#rate-limiting) * and may not be updated in real-time. To reduce the chance of stale shortcuts, we run the * function during System UI initialization. */ fun updateNoteTaskAsUser(user: UserHandle) { + if (!userManager.isUserUnlocked(user)) { + debugLog { "updateNoteTaskAsUser call but user locked: user=$user" } + return + } + + if (user == userTracker.userHandle) { + updateNoteTaskAsUserInternal(user) + } else { + // TODO(b/278729185): Replace fire and forget service with a bounded service. + val intent = NoteTaskControllerUpdateService.createIntent(context) + context.startServiceAsUser(intent, user) + } + } + + @InternalNoteTaskApi + fun updateNoteTaskAsUserInternal(user: UserHandle) { + if (!userManager.isUserUnlocked(user)) { + debugLog { "updateNoteTaskAsUserInternal call but user locked: user=$user" } + return + } + val packageName = roleManager.getDefaultRoleHolderAsUser(ROLE_NOTES, user) val hasNotesRoleHolder = isEnabled && !packageName.isNullOrEmpty() @@ -310,20 +353,20 @@ constructor( /** @see OnRoleHoldersChangedListener */ fun onRoleHoldersChanged(roleName: String, user: UserHandle) { if (roleName != ROLE_NOTES) return - if (!userManager.isUserUnlocked(user)) { - debugLog { "onRoleHoldersChanged call but user locked: role=$roleName, user=$user" } - return - } - if (user == userTracker.userHandle) { - updateNoteTaskAsUser(user) - } else { - // TODO(b/278729185): Replace fire and forget service with a bounded service. - val intent = NoteTaskControllerUpdateService.createIntent(context) - context.startServiceAsUser(intent, user) - } + updateNoteTaskAsUser(user) } + private val SecureSettings.preferredUser: UserHandle + get() { + val userId = + secureSettings.getInt( + Settings.Secure.DEFAULT_NOTE_TASK_PROFILE, + userTracker.userHandle.identifier, + ) + return UserHandle.of(userId) + } + companion object { val TAG = NoteTaskController::class.simpleName.orEmpty() diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskControllerUpdateService.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskControllerUpdateService.kt index 26b35cc8ffd1..3e352afe3832 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskControllerUpdateService.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskControllerUpdateService.kt @@ -44,7 +44,7 @@ constructor( override fun onCreate() { super.onCreate() // TODO(b/278729185): Replace fire and forget service with a bounded service. - controller.updateNoteTaskAsUser(user) + controller.updateNoteTaskAsUserInternal(user) stopSelf() } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt index 221ff65e4dfe..fe1034a6aa32 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt @@ -15,7 +15,10 @@ */ package com.android.systemui.notetask +import android.app.role.OnRoleHoldersChangedListener import android.app.role.RoleManager +import android.content.Context +import android.content.pm.UserInfo import android.os.UserHandle import android.view.KeyEvent import android.view.KeyEvent.KEYCODE_N @@ -54,6 +57,7 @@ constructor( initializeHandleSystemKey() initializeOnRoleHoldersChanged() initializeOnUserUnlocked() + initializeUserTracker() } /** @@ -79,7 +83,7 @@ constructor( private fun initializeOnRoleHoldersChanged() { roleManager.addOnRoleHoldersChangedListenerAsUser( backgroundExecutor, - controller::onRoleHoldersChanged, + callbacks, UserHandle.ALL, ) } @@ -93,18 +97,41 @@ constructor( */ private fun initializeOnUserUnlocked() { if (keyguardUpdateMonitor.isUserUnlocked(userTracker.userId)) { - controller.setNoteTaskShortcutEnabled(true, userTracker.userHandle) - } else { - keyguardUpdateMonitor.registerCallback(onUserUnlockedCallback) + controller.updateNoteTaskForCurrentUserAndManagedProfiles() } + keyguardUpdateMonitor.registerCallback(callbacks) } - // KeyguardUpdateMonitor.registerCallback uses a weak reference, so we need a hard reference. - private val onUserUnlockedCallback = - object : KeyguardUpdateMonitorCallback() { + private fun initializeUserTracker() { + userTracker.addCallback(callbacks, backgroundExecutor) + } + + // Some callbacks use a weak reference, so we play safe and keep a hard reference to them all. + private val callbacks = + object : + KeyguardUpdateMonitorCallback(), + CommandQueue.Callbacks, + UserTracker.Callback, + OnRoleHoldersChangedListener { + + override fun handleSystemKey(key: KeyEvent) { + key.toNoteTaskEntryPointOrNull()?.let(controller::showNoteTask) + } + + override fun onRoleHoldersChanged(roleName: String, user: UserHandle) { + controller.onRoleHoldersChanged(roleName, user) + } + override fun onUserUnlocked() { - controller.setNoteTaskShortcutEnabled(true, userTracker.userHandle) - keyguardUpdateMonitor.removeCallback(this) + controller.updateNoteTaskForCurrentUserAndManagedProfiles() + } + + override fun onUserChanged(newUser: Int, userContext: Context) { + controller.updateNoteTaskForCurrentUserAndManagedProfiles() + } + + override fun onProfilesChanged(profiles: List<UserInfo>) { + controller.updateNoteTaskForCurrentUserAndManagedProfiles() } } } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt index 109cfeec0723..c0e688f0f82f 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt @@ -26,7 +26,6 @@ import com.android.systemui.flags.Flags import com.android.systemui.notetask.quickaffordance.NoteTaskQuickAffordanceModule import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity -import com.android.systemui.notetask.shortcut.LaunchNoteTaskManagedProfileProxyActivity import dagger.Binds import dagger.Module import dagger.Provides @@ -40,12 +39,12 @@ interface NoteTaskModule { @[Binds IntoMap ClassKey(NoteTaskControllerUpdateService::class)] fun NoteTaskControllerUpdateService.bindNoteTaskControllerUpdateService(): Service + @[Binds IntoMap ClassKey(NoteTaskBubblesController.NoteTaskBubblesService::class)] + fun NoteTaskBubblesController.NoteTaskBubblesService.bindNoteTaskBubblesService(): Service + @[Binds IntoMap ClassKey(LaunchNoteTaskActivity::class)] fun LaunchNoteTaskActivity.bindNoteTaskLauncherActivity(): Activity - @[Binds IntoMap ClassKey(LaunchNoteTaskManagedProfileProxyActivity::class)] - fun LaunchNoteTaskManagedProfileProxyActivity.bindNoteTaskLauncherProxyActivity(): Activity - @[Binds IntoMap ClassKey(LaunchNotesRoleSettingsTrampolineActivity::class)] fun LaunchNotesRoleSettingsTrampolineActivity.bindLaunchNotesRoleSettingsTrampolineActivity(): Activity diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskRoleManagerExt.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskRoleManagerExt.kt index 754c3650a5ed..4d30634cda38 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskRoleManagerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskRoleManagerExt.kt @@ -19,6 +19,7 @@ package com.android.systemui.notetask import android.app.role.RoleManager import android.app.role.RoleManager.ROLE_NOTES import android.content.Context +import android.content.pm.PackageManager import android.content.pm.ShortcutInfo import android.graphics.drawable.Icon import android.os.PersistableBundle @@ -42,21 +43,42 @@ internal object NoteTaskRoleManagerExt { context: Context, user: UserHandle, ): ShortcutInfo { + val packageName = getDefaultRoleHolderAsUser(ROLE_NOTES, user) + val extras = PersistableBundle() - getDefaultRoleHolderAsUser(ROLE_NOTES, user)?.let { packageName -> + if (packageName != null) { // Set custom app badge using the icon from ROLES_NOTES default app. extras.putString(NoteTaskController.EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE, packageName) } + val shortLabel = context.getString(R.string.note_task_button_label) + + val applicationLabel = context.packageManager.getApplicationLabel(packageName) + val longLabel = + if (applicationLabel == null) { + shortLabel + } else { + context.getString( + R.string.note_task_shortcut_long_label, + applicationLabel, + ) + } + val icon = Icon.createWithResource(context, R.drawable.ic_note_task_shortcut_widget) return ShortcutInfo.Builder(context, NoteTaskController.SHORTCUT_ID) .setIntent(LaunchNoteTaskActivity.createIntent(context)) .setActivity(LaunchNoteTaskActivity.createComponent(context)) - .setShortLabel(context.getString(R.string.note_task_button_label)) + .setShortLabel(shortLabel) + .setLongLabel(longLabel) .setLongLived(true) .setIcon(icon) .setExtras(extras) .build() } + + private fun PackageManager.getApplicationLabel(packageName: String?): String? = + runCatching { getApplicationInfo(packageName, /* flags= */ 0)!! } + .getOrNull() + ?.let { info -> getApplicationLabel(info).toString() } } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt b/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt index 7ef149de2794..d00a79e6d2bc 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivity.kt @@ -20,67 +20,24 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.os.Bundle -import android.os.UserHandle -import android.os.UserManager import androidx.activity.ComponentActivity -import com.android.systemui.log.DebugLogger.debugLog import com.android.systemui.notetask.NoteTaskController import com.android.systemui.notetask.NoteTaskEntryPoint -import com.android.systemui.settings.UserTracker import javax.inject.Inject /** Activity responsible for launching the note experience, and finish. */ -class LaunchNoteTaskActivity -@Inject -constructor( - private val controller: NoteTaskController, - private val userManager: UserManager, - private val userTracker: UserTracker, -) : ComponentActivity() { +class LaunchNoteTaskActivity @Inject constructor(private val controller: NoteTaskController) : + ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - - // Under the hood, notes app shortcuts are shown in a floating window, called Bubble. - // Bubble API is only available in the main user but not work profile. - // - // On devices with work profile (WP), SystemUI provides both personal notes app shortcuts & - // work profile notes app shortcuts. In order to make work profile notes app shortcuts to - // show in Bubble, a few redirections across users are required: - // 1. When `LaunchNoteTaskActivity` is started in the work profile user, we launch - // `LaunchNoteTaskManagedProfileProxyActivity` on the main user, which has access to the - // Bubble API. - // 2. `LaunchNoteTaskManagedProfileProxyActivity` calls `Bubble#showOrHideAppBubble` with - // the work profile user ID. - // 3. Bubble renders the work profile notes app activity in a floating window, which is - // hosted in the main user. - // - // WP main user - // ------------------------ ------------------------------------------- - // | LaunchNoteTaskActivity | -> | LaunchNoteTaskManagedProfileProxyActivity | - // ------------------------ ------------------------------------------- - // | - // main user | - // ---------------------------- | - // | Bubble#showOrHideAppBubble | <-------------- - // | (with WP user ID) | - // ---------------------------- - val mainUser: UserHandle? = userManager.mainUser - if (userManager.isManagedProfile) { - if (mainUser == null) { - debugLog { "Can't find the main user. Skipping the notes app launch." } + val entryPoint = + if (isInMultiWindowMode) { + NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE } else { - controller.startNoteTaskProxyActivityForUser(mainUser) + NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT } - } else { - val entryPoint = - if (isInMultiWindowMode) { - NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT_IN_MULTI_WINDOW_MODE - } else { - NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT - } - controller.showNoteTask(entryPoint) - } + controller.showNoteTaskAsUser(entryPoint, user) finish() } diff --git a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivity.kt b/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivity.kt deleted file mode 100644 index 3259b0dcc53d..000000000000 --- a/packages/SystemUI/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivity.kt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.notetask.shortcut - -import android.os.Build -import android.os.Bundle -import android.os.UserManager -import android.util.Log -import androidx.activity.ComponentActivity -import com.android.systemui.notetask.NoteTaskController -import com.android.systemui.notetask.NoteTaskEntryPoint -import com.android.systemui.settings.UserTracker -import javax.inject.Inject - -/** - * An internal proxy activity that starts notes app in the work profile. - * - * If there is no work profile, this activity finishes gracefully. - * - * This activity MUST NOT be exported because that would expose the INTERACT_ACROSS_USER privilege - * to any apps. - */ -class LaunchNoteTaskManagedProfileProxyActivity -@Inject -constructor( - private val controller: NoteTaskController, - private val userTracker: UserTracker, - private val userManager: UserManager, -) : ComponentActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val managedProfileUser = - userTracker.userProfiles.firstOrNull { userManager.isManagedProfile(it.id) } - - if (managedProfileUser == null) { - logDebug { "Fail to find the work profile user." } - } else { - controller.showNoteTaskAsUser( - entryPoint = NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT, - user = managedProfileUser.userHandle - ) - } - finish() - } -} - -private inline fun logDebug(message: () -> String) { - if (Build.IS_DEBUGGABLE) { - Log.d(NoteTaskController.TAG, message()) - } -} diff --git a/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt b/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt index b2e04bb4f26f..69cb6119580b 100644 --- a/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt @@ -26,6 +26,8 @@ import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.util.time.SystemClock import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow @@ -34,13 +36,18 @@ import kotlinx.coroutines.flow.Flow interface PowerRepository { /** Whether the device is interactive. Starts with the current state. */ val isInteractive: Flow<Boolean> + + /** Wakes up the device. */ + fun wakeUp(why: String, @PowerManager.WakeReason wakeReason: Int) } @SysUISingleton class PowerRepositoryImpl @Inject constructor( - manager: PowerManager, + private val manager: PowerManager, + @Application private val applicationContext: Context, + private val systemClock: SystemClock, dispatcher: BroadcastDispatcher, ) : PowerRepository { @@ -68,6 +75,14 @@ constructor( awaitClose { dispatcher.unregisterReceiver(receiver) } } + override fun wakeUp(why: String, wakeReason: Int) { + manager.wakeUp( + systemClock.uptimeMillis(), + wakeReason, + "${applicationContext.packageName}:$why", + ) + } + companion object { private const val TAG = "PowerRepository" } diff --git a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt index 3f799f724fe7..c13476fbbe08 100644 --- a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt @@ -17,8 +17,12 @@ package com.android.systemui.power.domain.interactor +import android.os.PowerManager +import com.android.systemui.classifier.FalsingCollector import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.power.data.repository.PowerRepository +import com.android.systemui.statusbar.phone.ScreenOffAnimationController import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -27,8 +31,27 @@ import kotlinx.coroutines.flow.Flow class PowerInteractor @Inject constructor( - repository: PowerRepository, + private val repository: PowerRepository, + private val falsingCollector: FalsingCollector, + private val screenOffAnimationController: ScreenOffAnimationController, + private val statusBarStateController: StatusBarStateController, ) { /** Whether the screen is on or off. */ val isInteractive: Flow<Boolean> = repository.isInteractive + + /** + * Wakes up the device if the device was dozing. + * + * @param why a string explaining why we're waking the device for debugging purposes. Should be + * in SCREAMING_SNAKE_CASE. + * @param wakeReason the PowerManager-based reason why we're waking the device. + */ + fun wakeUpIfDozing(why: String, @PowerManager.WakeReason wakeReason: Int) { + if ( + statusBarStateController.isDozing && screenOffAnimationController.allowWakeUpIfDozing() + ) { + repository.wakeUp(why, wakeReason) + falsingCollector.onScreenOnFromTouch() + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt index 79167f276576..c3b5db42e08d 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt @@ -25,7 +25,7 @@ import android.widget.ImageView import android.widget.LinearLayout import com.android.settingslib.Utils import com.android.systemui.R -import com.android.systemui.animation.LaunchableFrameLayout +import com.android.systemui.animation.view.LaunchableFrameLayout import com.android.systemui.statusbar.events.BackgroundAnimatableView class OngoingPrivacyChip @JvmOverloads constructor( diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index b8c2fad8c10d..8d9475d9a53e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -52,7 +52,6 @@ import com.android.systemui.animation.ShadeInterpolation; import com.android.systemui.compose.ComposeFacade; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.media.controls.ui.MediaHost; import com.android.systemui.plugins.qs.QS; import com.android.systemui.plugins.qs.QSContainerController; @@ -755,8 +754,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca // Alpha progress should be linear on lockscreen shade expansion. return progress; } - if (mIsSmallScreen || !mFeatureFlags.isEnabled( - Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) { + if (mIsSmallScreen) { return ShadeInterpolation.getContentAlpha(progress); } else { return mLargeScreenShadeInterpolator.getQsAlpha(progress); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index 59b94b7c4bd4..d2568ac79105 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -52,8 +52,8 @@ import com.android.systemui.qs.pipeline.data.repository.CustomTileAddedRepositor import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor; import com.android.systemui.settings.UserFileManager; import com.android.systemui.settings.UserTracker; +import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.phone.AutoTileManager; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; import com.android.systemui.util.settings.SecureSettings; @@ -66,7 +66,6 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.concurrent.Executor; import java.util.function.Predicate; @@ -108,7 +107,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P private AutoTileManager mAutoTiles; private final ArrayList<QSFactory> mQsFactories = new ArrayList<>(); private int mCurrentUser; - private final Optional<CentralSurfaces> mCentralSurfacesOptional; + private final ShadeController mShadeController; private Context mUserContext; private UserTracker mUserTracker; private SecureSettings mSecureSettings; @@ -129,7 +128,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P PluginManager pluginManager, TunerService tunerService, Provider<AutoTileManager> autoTiles, - Optional<CentralSurfaces> centralSurfacesOptional, + ShadeController shadeController, QSLogger qsLogger, UserTracker userTracker, SecureSettings secureSettings, @@ -148,7 +147,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P mUserFileManager = userFileManager; mFeatureFlags = featureFlags; - mCentralSurfacesOptional = centralSurfacesOptional; + mShadeController = shadeController; mQsFactories.add(defaultFactory); pluginManager.addPluginListener(this, QSFactory.class, true); @@ -209,17 +208,17 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P @Override public void collapsePanels() { - mCentralSurfacesOptional.ifPresent(CentralSurfaces::postAnimateCollapsePanels); + mShadeController.postAnimateCollapseShade(); } @Override public void forceCollapsePanels() { - mCentralSurfacesOptional.ifPresent(CentralSurfaces::postAnimateForceCollapsePanels); + mShadeController.postAnimateForceCollapseShade(); } @Override public void openPanels() { - mCentralSurfacesOptional.ifPresent(CentralSurfaces::postAnimateOpenPanels); + mShadeController.postAnimateExpandQs(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractor.kt index 260caa767a5e..fa6de8dcdafe 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractor.kt @@ -16,8 +16,7 @@ package com.android.systemui.qs.pipeline.domain.interactor import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.statusbar.phone.CentralSurfaces -import java.util.Optional +import com.android.systemui.shade.ShadeController import javax.inject.Inject /** Encapsulates business logic for interacting with the QS panel. */ @@ -37,17 +36,17 @@ interface PanelInteractor { class PanelInteractorImpl @Inject constructor( - private val centralSurfaces: Optional<CentralSurfaces>, + private val shadeController: ShadeController, ) : PanelInteractor { override fun collapsePanels() { - centralSurfaces.ifPresent { it.postAnimateCollapsePanels() } + shadeController.postAnimateCollapseShade() } override fun forceCollapsePanels() { - centralSurfaces.ifPresent { it.postAnimateForceCollapsePanels() } + shadeController.postAnimateForceCollapseShade() } override fun openPanels() { - centralSurfaces.ifPresent { it.postAnimateOpenPanels() } + shadeController.postAnimateExpandQs() } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java index eef4c1dd4436..b5e6a0f5c60b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java @@ -166,17 +166,6 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> { } @Override - protected void handleLongClick(@Nullable View view) { - try { - // Need to wake on long click so bouncer->settings works. - mDreamManager.awaken(); - } catch (RemoteException e) { - Log.e(LOG_TAG, "Can't awaken", e); - } - super.handleLongClick(view); - } - - @Override protected void handleUpdateState(BooleanState state, Object arg) { state.label = getTileLabel(); state.secondaryLabel = getActiveDreamName(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index ad658458d330..6e1ef9108256 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -284,7 +284,6 @@ public class InternetDialog extends SystemUIDialog implements mHandler.removeCallbacks(mHideProgressBarRunnable); mHandler.removeCallbacks(mHideSearchingRunnable); mMobileNetworkLayout.setOnClickListener(null); - mMobileDataToggle.setOnCheckedChangeListener(null); mConnectedWifListLayout.setOnClickListener(null); if (mSecondaryMobileNetworkLayout != null) { mSecondaryMobileNetworkLayout.setOnClickListener(null); @@ -349,18 +348,16 @@ public class InternetDialog extends SystemUIDialog implements } mInternetDialogController.connectCarrierNetwork(); }); - mMobileDataToggle.setOnCheckedChangeListener( - (buttonView, isChecked) -> { - if (!isChecked && shouldShowMobileDialog()) { - showTurnOffMobileDialog(); - } else if (!shouldShowMobileDialog()) { - if (mInternetDialogController.isMobileDataEnabled() == isChecked) { - return; - } - mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId, - isChecked, false); - } - }); + mMobileDataToggle.setOnClickListener(v -> { + boolean isChecked = mMobileDataToggle.isChecked(); + if (!isChecked && shouldShowMobileDialog()) { + mMobileDataToggle.setChecked(true); + showTurnOffMobileDialog(); + } else if (mInternetDialogController.isMobileDataEnabled() != isChecked) { + mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId, + isChecked, false); + } + }); mConnectedWifListLayout.setOnClickListener(this::onClickConnectedWifi); mSeeAllLayout.setOnClickListener(this::onClickSeeMoreButton); mWiFiToggle.setOnCheckedChangeListener( @@ -686,9 +683,7 @@ public class InternetDialog extends SystemUIDialog implements mAlertDialog = new Builder(mContext) .setTitle(R.string.mobile_data_disable_title) .setMessage(mContext.getString(R.string.mobile_data_disable_message, carrierName)) - .setNegativeButton(android.R.string.cancel, (d, w) -> { - mMobileDataToggle.setChecked(true); - }) + .setNegativeButton(android.R.string.cancel, (d, w) -> {}) .setPositiveButton( com.android.internal.R.string.alert_windows_notification_turn_off_action, (d, w) -> { @@ -698,7 +693,6 @@ public class InternetDialog extends SystemUIDialog implements Prefs.putBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, true); }) .create(); - mAlertDialog.setOnCancelListener(dialog -> mMobileDataToggle.setChecked(true)); mAlertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); SystemUIDialog.setShowForAllUsers(mAlertDialog, true); SystemUIDialog.registerDismissListener(mAlertDialog); diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 07259c2ff283..e7dde6617964 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -200,8 +200,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis // TODO: change the method signature to use (boolean inputFocusTransferStarted) @Override - public void onStatusBarMotionEvent(MotionEvent event) { - verifyCallerAndClearCallingIdentity("onStatusBarMotionEvent", () -> { + public void onStatusBarTouchEvent(MotionEvent event) { + verifyCallerAndClearCallingIdentity("onStatusBarTouchEvent", () -> { // TODO move this logic to message queue mCentralSurfacesOptionalLazy.get().ifPresent(centralSurfaces -> { if (event.getActionMasked() == ACTION_DOWN) { @@ -236,6 +236,13 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } @Override + public void onStatusBarTrackpadEvent(MotionEvent event) { + verifyCallerAndClearCallingIdentityPostMain("onStatusBarTrackpadEvent", () -> + mCentralSurfacesOptionalLazy.get().ifPresent(centralSurfaces -> + centralSurfaces.onStatusBarTrackpadEvent(event))); + } + + @Override public void onBackPressed() { verifyCallerAndClearCallingIdentityPostMain("onBackPressed", () -> { sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK); @@ -345,7 +352,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void expandNotificationPanel() { - verifyCallerAndClearCallingIdentity("expandNotificationPanel", + verifyCallerAndClearCallingIdentityPostMain("expandNotificationPanel", () -> mCommandQueue.handleSystemKey(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN))); } @@ -353,7 +360,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void toggleNotificationPanel() { verifyCallerAndClearCallingIdentityPostMain("toggleNotificationPanel", () -> - mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::togglePanel)); + mCommandQueue.togglePanel()); } private boolean verifyCaller(String reason) { diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt new file mode 100644 index 000000000000..8f001ec6b5e2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt @@ -0,0 +1,7 @@ +package com.android.systemui.scene.ui.view + +import android.content.Context +import android.util.AttributeSet + +/** A root view of the main SysUI window that supports scenes. */ +class SceneWindowRootView(context: Context?, attrs: AttributeSet?) : WindowRootView(context, attrs)
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/WindowRootView.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/WindowRootView.kt new file mode 100644 index 000000000000..a0f966705381 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/WindowRootView.kt @@ -0,0 +1,8 @@ +package com.android.systemui.scene.ui.view + +import android.content.Context +import android.util.AttributeSet +import android.widget.FrameLayout + +/** A view that can serve as the root of the main SysUI window. */ +open class WindowRootView(context: Context?, attrs: AttributeSet?) : FrameLayout(context, attrs)
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsCrossProcessHelper.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsCrossProcessHelper.java index afc8bff91766..7de22b1a9c77 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsCrossProcessHelper.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsCrossProcessHelper.java @@ -19,7 +19,7 @@ package com.android.systemui.screenshot.appclips; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; -import android.os.UserManager; +import android.os.UserHandle; import androidx.annotation.Nullable; @@ -39,15 +39,14 @@ class AppClipsCrossProcessHelper { private final DisplayTracker mDisplayTracker; @Inject - AppClipsCrossProcessHelper(@Application Context context, UserManager userManager, - DisplayTracker displayTracker) { + AppClipsCrossProcessHelper(@Application Context context, DisplayTracker displayTracker) { // Start a service as main user so that even if the app clips activity is running as work // profile user the service is able to use correct instance of Bubbles to grab a screenshot // excluding the bubble layer. mProxyConnector = new ServiceConnector.Impl<>(context, new Intent(context, AppClipsScreenshotHelperService.class), Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY - | Context.BIND_NOT_VISIBLE, userManager.getMainUser().getIdentifier(), + | Context.BIND_NOT_VISIBLE, UserHandle.USER_SYSTEM, IAppClipsScreenshotHelperService.Stub::asInterface); mDisplayTracker = displayTracker; } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsScreenshotHelperService.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsScreenshotHelperService.java index 83ff020362f1..e0b9f9b7ad93 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsScreenshotHelperService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsScreenshotHelperService.java @@ -33,6 +33,11 @@ import javax.inject.Inject; /** * A helper service that runs in SysUI process and helps {@link AppClipsActivity} which runs in its * own separate process take a screenshot. + * + * <p>Note: This service always runs in the SysUI process running on the system user irrespective of + * which user started the service. This is required so that the correct instance of {@link Bubbles} + * instance is injected. This is set via attribute {@code android:singleUser=”true”} in + * AndroidManifest. */ public class AppClipsScreenshotHelperService extends Service { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java index 394949297d6d..dce8c81c3462 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsService.java @@ -16,6 +16,11 @@ package com.android.systemui.screenshot.appclips; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_FAILED; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_SUCCESS; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED; + import static com.android.systemui.flags.Flags.SCREENSHOT_APP_CLIPS; import android.app.Activity; @@ -25,17 +30,12 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.Intent.CaptureContentForNoteStatusCodes; import android.content.res.Resources; import android.os.IBinder; -import android.os.UserHandle; -import android.os.UserManager; -import android.util.Log; import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import com.android.internal.infra.AndroidFuture; -import com.android.internal.infra.ServiceConnector; import com.android.internal.statusbar.IAppClipsService; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Application; @@ -43,73 +43,36 @@ import com.android.systemui.flags.FeatureFlags; import com.android.wm.shell.bubbles.Bubbles; import java.util.Optional; -import java.util.concurrent.ExecutionException; import javax.inject.Inject; /** * A service that communicates with {@link StatusBarManager} to support the - * {@link StatusBarManager#canLaunchCaptureContentActivityForNote(Activity)} API. + * {@link StatusBarManager#canLaunchCaptureContentActivityForNote(Activity)} API. Also used by + * {@link AppClipsTrampolineActivity} to query if an app should be allowed to user App Clips. + * + * <p>Note: This service always runs in the SysUI process running on the system user irrespective of + * which user started the service. This is required so that the correct instance of {@link Bubbles} + * instance is injected. This is set via attribute {@code android:singleUser=”true”} in + * AndroidManifest. */ public class AppClipsService extends Service { - private static final String TAG = AppClipsService.class.getSimpleName(); - @Application private final Context mContext; private final FeatureFlags mFeatureFlags; private final Optional<Bubbles> mOptionalBubbles; private final DevicePolicyManager mDevicePolicyManager; - private final UserManager mUserManager; - private final boolean mAreTaskAndTimeIndependentPrerequisitesMet; - @VisibleForTesting() - @Nullable ServiceConnector<IAppClipsService> mProxyConnectorToMainProfile; - @Inject public AppClipsService(@Application Context context, FeatureFlags featureFlags, - Optional<Bubbles> optionalBubbles, DevicePolicyManager devicePolicyManager, - UserManager userManager) { + Optional<Bubbles> optionalBubbles, DevicePolicyManager devicePolicyManager) { mContext = context; mFeatureFlags = featureFlags; mOptionalBubbles = optionalBubbles; mDevicePolicyManager = devicePolicyManager; - mUserManager = userManager; - - // The consumer of this service are apps that call through StatusBarManager API to query if - // it can use app clips API. Since these apps can be launched as work profile users, this - // service will start as work profile user. SysUI doesn't share injected instances for - // different users. This is why the bubbles instance injected will be incorrect. As the apps - // don't generally have permission to connect to a service running as different user, we - // start a proxy connection to communicate with the main user's version of this service. - if (mUserManager.isManagedProfile()) { - // No need to check for prerequisites in this case as those are incorrect for work - // profile user instance of the service and the main user version of the service will - // take care of this check. - mAreTaskAndTimeIndependentPrerequisitesMet = false; - - // Get the main user so that we can connect to the main user's version of the service. - UserHandle mainUser = mUserManager.getMainUser(); - if (mainUser == null) { - // If main user is not available there isn't much we can do, no apps can use app - // clips. - return; - } - - // Set up the connection to be used later during onBind callback. - mProxyConnectorToMainProfile = - new ServiceConnector.Impl<>( - context, - new Intent(context, AppClipsService.class), - Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY - | Context.BIND_NOT_VISIBLE, - mainUser.getIdentifier(), - IAppClipsService.Stub::asInterface); - return; - } mAreTaskAndTimeIndependentPrerequisitesMet = checkIndependentVariables(); - mProxyConnectorToMainProfile = null; } private boolean checkIndependentVariables() { @@ -144,40 +107,25 @@ public class AppClipsService extends Service { return new IAppClipsService.Stub() { @Override public boolean canLaunchCaptureContentActivityForNote(int taskId) { - // In case of managed profile, use the main user's instance of the service. Callers - // cannot directly connect to the main user's instance as they may not have the - // permission to interact across users. - if (mUserManager.isManagedProfile()) { - return canLaunchCaptureContentActivityForNoteFromMainUser(taskId); - } + return canLaunchCaptureContentActivityForNoteInternal(taskId) + == CAPTURE_CONTENT_FOR_NOTE_SUCCESS; + } + @Override + @CaptureContentForNoteStatusCodes + public int canLaunchCaptureContentActivityForNoteInternal(int taskId) { if (!mAreTaskAndTimeIndependentPrerequisitesMet) { - return false; + return CAPTURE_CONTENT_FOR_NOTE_FAILED; } if (!mOptionalBubbles.get().isAppBubbleTaskId(taskId)) { - return false; + return CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED; } - return !mDevicePolicyManager.getScreenCaptureDisabled(null); + return mDevicePolicyManager.getScreenCaptureDisabled(null) + ? CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN + : CAPTURE_CONTENT_FOR_NOTE_SUCCESS; } }; } - - /** Returns whether the app clips API can be used by querying the service as the main user. */ - private boolean canLaunchCaptureContentActivityForNoteFromMainUser(int taskId) { - if (mProxyConnectorToMainProfile == null) { - return false; - } - - try { - AndroidFuture<Boolean> future = mProxyConnectorToMainProfile.postForResult( - service -> service.canLaunchCaptureContentActivityForNote(taskId)); - return future.get(); - } catch (ExecutionException | InterruptedException e) { - Log.d(TAG, "Exception from service\n" + e); - } - - return false; - } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java index f00803c6d64b..6e5cef47400f 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivity.java @@ -22,41 +22,41 @@ import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_SUCCESS; import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED; import static android.content.Intent.EXTRA_CAPTURE_CONTENT_FOR_NOTE_STATUS_CODE; -import static com.android.systemui.flags.Flags.SCREENSHOT_APP_CLIPS; import static com.android.systemui.screenshot.appclips.AppClipsEvent.SCREENSHOT_FOR_NOTE_TRIGGERED; import android.app.Activity; -import android.app.admin.DevicePolicyManager; import android.content.ActivityNotFoundException; import android.content.ComponentName; +import android.content.Context; import android.content.Intent; +import android.content.Intent.CaptureContentForNoteStatusCodes; import android.content.pm.PackageManager; import android.content.pm.PackageManager.ApplicationInfoFlags; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.UserInfo; -import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Parcel; import android.os.ResultReceiver; import android.os.UserHandle; -import android.os.UserManager; import android.util.Log; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.internal.infra.AndroidFuture; +import com.android.internal.infra.ServiceConnector; import com.android.internal.logging.UiEventLogger; +import com.android.internal.statusbar.IAppClipsService; import com.android.systemui.R; +import com.android.systemui.broadcast.BroadcastSender; +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.flags.FeatureFlags; import com.android.systemui.notetask.NoteTaskController; import com.android.systemui.notetask.NoteTaskEntryPoint; -import com.android.systemui.settings.UserTracker; -import com.android.wm.shell.bubbles.Bubbles; -import java.util.Optional; +import java.util.concurrent.Executor; import javax.inject.Inject; @@ -82,39 +82,57 @@ public class AppClipsTrampolineActivity extends Activity { private static final String TAG = AppClipsTrampolineActivity.class.getSimpleName(); static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; static final String EXTRA_SCREENSHOT_URI = TAG + "SCREENSHOT_URI"; - @VisibleForTesting - static final String EXTRA_USE_WP_USER = TAG + "USE_WP_USER"; static final String ACTION_FINISH_FROM_TRAMPOLINE = TAG + "FINISH_FROM_TRAMPOLINE"; static final String EXTRA_RESULT_RECEIVER = TAG + "RESULT_RECEIVER"; static final String EXTRA_CALLING_PACKAGE_NAME = TAG + "CALLING_PACKAGE_NAME"; private static final ApplicationInfoFlags APPLICATION_INFO_FLAGS = ApplicationInfoFlags.of(0); - private final DevicePolicyManager mDevicePolicyManager; - private final FeatureFlags mFeatureFlags; - private final Optional<Bubbles> mOptionalBubbles; private final NoteTaskController mNoteTaskController; private final PackageManager mPackageManager; - private final UserTracker mUserTracker; private final UiEventLogger mUiEventLogger; - private final UserManager mUserManager; + private final BroadcastSender mBroadcastSender; + @Background + private final Executor mBgExecutor; + @Main + private final Executor mMainExecutor; private final ResultReceiver mResultReceiver; + private final ServiceConnector<IAppClipsService> mAppClipsServiceConnector; + + private UserHandle mUserHandle; private Intent mKillAppClipsBroadcastIntent; - private UserHandle mNotesAppUser; @Inject - public AppClipsTrampolineActivity(DevicePolicyManager devicePolicyManager, FeatureFlags flags, - Optional<Bubbles> optionalBubbles, NoteTaskController noteTaskController, - PackageManager packageManager, UserTracker userTracker, UiEventLogger uiEventLogger, - UserManager userManager, @Main Handler mainHandler) { - mDevicePolicyManager = devicePolicyManager; - mFeatureFlags = flags; - mOptionalBubbles = optionalBubbles; + public AppClipsTrampolineActivity(@Application Context context, + NoteTaskController noteTaskController, PackageManager packageManager, + UiEventLogger uiEventLogger, BroadcastSender broadcastSender, + @Background Executor bgExecutor, @Main Executor mainExecutor, + @Main Handler mainHandler) { + mNoteTaskController = noteTaskController; + mPackageManager = packageManager; + mUiEventLogger = uiEventLogger; + mBroadcastSender = broadcastSender; + mBgExecutor = bgExecutor; + mMainExecutor = mainExecutor; + + mResultReceiver = createResultReceiver(mainHandler); + mAppClipsServiceConnector = createServiceConnector(context); + } + + /** A constructor used only for testing to verify interactions with {@link ServiceConnector}. */ + @VisibleForTesting + AppClipsTrampolineActivity(ServiceConnector<IAppClipsService> appClipsServiceConnector, + NoteTaskController noteTaskController, PackageManager packageManager, + UiEventLogger uiEventLogger, BroadcastSender broadcastSender, + @Background Executor bgExecutor, @Main Executor mainExecutor, + @Main Handler mainHandler) { + mAppClipsServiceConnector = appClipsServiceConnector; mNoteTaskController = noteTaskController; mPackageManager = packageManager; - mUserTracker = userTracker; mUiEventLogger = uiEventLogger; - mUserManager = userManager; + mBroadcastSender = broadcastSender; + mBgExecutor = bgExecutor; + mMainExecutor = mainExecutor; mResultReceiver = createResultReceiver(mainHandler); } @@ -127,62 +145,62 @@ public class AppClipsTrampolineActivity extends Activity { return; } - if (mUserManager.isManagedProfile()) { - maybeStartActivityForWPUser(); - finish(); - return; - } + mUserHandle = getUser(); - if (!mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)) { - finish(); - return; - } + mBgExecutor.execute(() -> { + AndroidFuture<Integer> statusCodeFuture = mAppClipsServiceConnector.postForResult( + service -> service.canLaunchCaptureContentActivityForNoteInternal(getTaskId())); + statusCodeFuture.whenCompleteAsync(this::handleAppClipsStatusCode, mMainExecutor); + }); + } - if (mOptionalBubbles.isEmpty()) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_FAILED); - return; + @Override + protected void onDestroy() { + if (isFinishing() && mKillAppClipsBroadcastIntent != null) { + mBroadcastSender.sendBroadcast(mKillAppClipsBroadcastIntent, PERMISSION_SELF); } - if (!mOptionalBubbles.get().isAppBubbleTaskId(getTaskId())) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED); - return; - } + super.onDestroy(); + } - if (mDevicePolicyManager.getScreenCaptureDisabled(null)) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN); + private void handleAppClipsStatusCode(@CaptureContentForNoteStatusCodes int statusCode, + Throwable error) { + if (isFinishing()) { + // It's too late, trampoline activity is finishing or already finished. Return early. return; } - ComponentName componentName; - try { - componentName = ComponentName.unflattenFromString( - getString(R.string.config_screenshotAppClipsActivityComponent)); - } catch (Resources.NotFoundException e) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_FAILED); + if (error != null) { + Log.d(TAG, "Error querying app clips service", error); + setErrorResultAndFinish(statusCode); return; } - if (componentName == null || componentName.getPackageName().isEmpty() - || componentName.getClassName().isEmpty()) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_FAILED); - return; - } + switch (statusCode) { + case CAPTURE_CONTENT_FOR_NOTE_SUCCESS: + launchAppClipsActivity(); + break; - mNotesAppUser = getUser(); - if (getIntent().getBooleanExtra(EXTRA_USE_WP_USER, /* defaultValue= */ false)) { - // Get the work profile user internally instead of passing around via intent extras as - // this activity is exported apps could potentially mess around with intent extras. - mNotesAppUser = getWorkProfileUser().orElse(mNotesAppUser); + case CAPTURE_CONTENT_FOR_NOTE_FAILED: + case CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED: + case CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN: + default: + setErrorResultAndFinish(statusCode); } + } + private void launchAppClipsActivity() { + ComponentName componentName = ComponentName.unflattenFromString( + getString(R.string.config_screenshotAppClipsActivityComponent)); String callingPackageName = getCallingPackage(); - Intent intent = new Intent().setComponent(componentName) + + Intent intent = new Intent() + .setComponent(componentName) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra(EXTRA_RESULT_RECEIVER, mResultReceiver) .putExtra(EXTRA_CALLING_PACKAGE_NAME, callingPackageName); try { - // Start the App Clips activity for the user corresponding to the notes app user. - startActivityAsUser(intent, mNotesAppUser); + startActivity(intent); // Set up the broadcast intent that will inform the above App Clips activity to finish // when this trampoline activity is finished. @@ -198,39 +216,6 @@ public class AppClipsTrampolineActivity extends Activity { } } - @Override - protected void onDestroy() { - super.onDestroy(); - - if (isFinishing() && mKillAppClipsBroadcastIntent != null) { - sendBroadcast(mKillAppClipsBroadcastIntent, PERMISSION_SELF); - } - } - - private Optional<UserHandle> getWorkProfileUser() { - return mUserTracker.getUserProfiles().stream() - .filter(profile -> mUserManager.isManagedProfile(profile.id)) - .findFirst() - .map(UserInfo::getUserHandle); - } - - private void maybeStartActivityForWPUser() { - UserHandle mainUser = mUserManager.getMainUser(); - if (mainUser == null) { - setErrorResultAndFinish(CAPTURE_CONTENT_FOR_NOTE_FAILED); - return; - } - - // Start the activity as the main user with activity result forwarding. Set the intent extra - // so that the newly started trampoline activity starts the actual app clips activity as the - // work profile user. Starting the app clips activity as the work profile user is required - // to save the screenshot in work profile user storage and grant read permission to the URI. - startActivityAsUser( - new Intent(this, AppClipsTrampolineActivity.class) - .putExtra(EXTRA_USE_WP_USER, /* value= */ true) - .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT), mainUser); - } - private void setErrorResultAndFinish(int errorCode) { setResult(RESULT_OK, new Intent().putExtra(EXTRA_CAPTURE_CONTENT_FOR_NOTE_STATUS_CODE, errorCode)); @@ -241,7 +226,7 @@ public class AppClipsTrampolineActivity extends Activity { int callingPackageUid = 0; try { callingPackageUid = mPackageManager.getApplicationInfoAsUser(callingPackageName, - APPLICATION_INFO_FLAGS, mNotesAppUser.getIdentifier()).uid; + APPLICATION_INFO_FLAGS, mUserHandle.getIdentifier()).uid; } catch (NameNotFoundException e) { Log.d(TAG, "Couldn't find notes app UID " + e); } @@ -281,7 +266,7 @@ public class AppClipsTrampolineActivity extends Activity { mKillAppClipsBroadcastIntent = null; // Expand the note bubble before returning the result. - mNoteTaskController.showNoteTaskAsUser(NoteTaskEntryPoint.APP_CLIPS, mNotesAppUser); + mNoteTaskController.showNoteTaskAsUser(NoteTaskEntryPoint.APP_CLIPS, mUserHandle); setResult(RESULT_OK, convertedData); finish(); } @@ -298,11 +283,18 @@ public class AppClipsTrampolineActivity extends Activity { appClipsResultReceiver.writeToParcel(parcel, 0); parcel.setDataPosition(0); - ResultReceiver resultReceiver = ResultReceiver.CREATOR.createFromParcel(parcel); + ResultReceiver resultReceiver = ResultReceiver.CREATOR.createFromParcel(parcel); parcel.recycle(); return resultReceiver; } + private ServiceConnector<IAppClipsService> createServiceConnector( + @Application Context context) { + return new ServiceConnector.Impl<>(context, new Intent(context, AppClipsService.class), + Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY | Context.BIND_NOT_VISIBLE, + UserHandle.USER_SYSTEM, IAppClipsService.Stub::asInterface); + } + /** This is a test only API for mocking response from {@link AppClipsActivity}. */ @VisibleForTesting public ResultReceiver getResultReceiverForTest() { diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 17a887019541..72941372fc1c 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -17,8 +17,6 @@ package com.android.systemui.shade; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; -import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE; -import static android.view.MotionEvent.CLASSIFICATION_TWO_FINGER_SWIPE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; @@ -30,6 +28,8 @@ import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK; import static com.android.systemui.classifier.Classifier.GENERIC; import static com.android.systemui.classifier.Classifier.QUICK_SETTINGS; import static com.android.systemui.classifier.Classifier.UNLOCK; +import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadScroll; +import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe; import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_CLOSED; import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPEN; import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPENING; @@ -125,14 +125,16 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.fragments.FragmentService; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.keyguard.KeyguardViewConfigurator; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; +import com.android.systemui.keyguard.shared.model.WakefulnessModel; import com.android.systemui.keyguard.ui.binder.KeyguardLongPressViewBinder; import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel; import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingTransitionViewModel; @@ -599,6 +601,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private final KeyguardTransitionInteractor mKeyguardTransitionInteractor; private final KeyguardInteractor mKeyguardInteractor; + private final KeyguardViewConfigurator mKeyguardViewConfigurator; private final @Nullable MultiShadeInteractor mMultiShadeInteractor; private final CoroutineDispatcher mMainDispatcher; private boolean mIsAnyMultiShadeExpanded; @@ -741,6 +744,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump KeyguardLongPressViewModel keyguardLongPressViewModel, KeyguardInteractor keyguardInteractor, ActivityStarter activityStarter, + KeyguardViewConfigurator keyguardViewConfigurator, KeyguardFaceAuthInteractor keyguardFaceAuthInteractor) { mInteractionJankMonitor = interactionJankMonitor; keyguardStateController.addCallback(new KeyguardStateController.Callback() { @@ -763,6 +767,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mLockscreenToOccludedTransitionViewModel = lockscreenToOccludedTransitionViewModel; mKeyguardTransitionInteractor = keyguardTransitionInteractor; mKeyguardInteractor = keyguardInteractor; + mKeyguardViewConfigurator = keyguardViewConfigurator; mView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { @Override public void onViewAttachedToWindow(View v) { @@ -1321,7 +1326,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mKeyguardBottomArea.initFrom(oldBottomArea); mView.addView(mKeyguardBottomArea, index); initBottomArea(); - mKeyguardIndicationController.setIndicationArea(mKeyguardBottomArea); mStatusBarStateListener.onDozeAmountChanged(mStatusBarStateController.getDozeAmount(), mStatusBarStateController.getInterpolatedDozeAmount()); @@ -1363,6 +1367,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mKeyguardIndicationController.showTransientIndication(stringResourceId), mVibratorHelper, mActivityStarter); + + // Rebind (for now), as a new bottom area and indication area may have been created + mKeyguardViewConfigurator.bindIndicationArea(mKeyguardBottomArea); } @VisibleForTesting @@ -1400,7 +1407,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private void setKeyguardBottomArea(KeyguardBottomAreaView keyguardBottomArea) { mKeyguardBottomArea = keyguardBottomArea; - mKeyguardIndicationController.setIndicationArea(mKeyguardBottomArea); } void setOpenCloseListener(OpenCloseListener openCloseListener) { @@ -2149,10 +2155,14 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } int getFalsingThreshold() { - float factor = mCentralSurfaces.isWakeUpComingFromTouch() ? 1.5f : 1.0f; + float factor = ShadeViewController.getFalsingThresholdFactor(getWakefulness()); return (int) (mQsController.getFalsingThreshold() * factor); } + private WakefulnessModel getWakefulness() { + return mKeyguardInteractor.getWakefulnessModel().getValue(); + } + private void maybeAnimateBottomAreaAlpha() { mBottomAreaShadeAlphaAnimator.cancel(); if (mBarState == StatusBarState.SHADE_LOCKED) { @@ -2430,6 +2440,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown; if (mPanelExpanded != isExpanded) { mPanelExpanded = isExpanded; + updateSystemUiStateFlags(); mShadeExpansionStateManager.onShadeExpansionFullyChanged(isExpanded); if (!isExpanded) { mQsController.closeQsCustomizer(); @@ -2437,6 +2448,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } } + @Override public boolean isPanelExpanded() { return mPanelExpanded; } @@ -2572,7 +2584,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump this); return; } - if (mCentralSurfaces.getNotificationShadeWindowView() + if (mNotificationShadeWindowController.getWindowRootView() .isVisibleToUser()) { mView.getViewTreeObserver().removeOnGlobalLayoutListener( this); @@ -2894,9 +2906,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump float scrimMinFraction; if (mSplitShadeEnabled) { boolean highHun = mHeadsUpStartHeight * 2.5 - > - (mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION) - ? mSplitShadeFullTransitionDistance : mSplitShadeScrimTransitionDistance); + > mSplitShadeFullTransitionDistance; // if HUN height is higher than 40% of predefined transition distance, it means HUN // is too high for regular transition. In that case we need to calculate transition // distance - here we take scrim transition distance as equal to shade transition @@ -3027,12 +3037,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mKeyguardStatusViewController.setStatusAccessibilityImportance(mode); } - //TODO(b/254875405): this should be removed. - @Override - public KeyguardBottomAreaView getKeyguardBottomAreaView() { - return mKeyguardBottomArea; - } - @Override public void applyLaunchAnimationProgress(float linearProgress) { boolean hideIcons = LaunchAnimator.getProgress(ActivityLaunchAnimator.TIMINGS, @@ -3436,9 +3440,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump Log.d(TAG, "Updating panel sysui state flags: fullyExpanded=" + isFullyExpanded() + " inQs=" + mQsController.getExpanded()); } - boolean isPanelVisible = mCentralSurfaces != null && mCentralSurfaces.isPanelExpanded(); mSysUiState - .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelVisible) + .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, mPanelExpanded) .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, isFullyExpanded() && !mQsController.getExpanded()) .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED, @@ -3593,8 +3596,10 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump expand = flingExpands(vel, vectorVel, x, y); } - mDozeLog.traceFling(expand, mTouchAboveFalsingThreshold, - mCentralSurfaces.isWakeUpComingFromTouch()); + mDozeLog.traceFling( + expand, + mTouchAboveFalsingThreshold, + /* screenOnFromTouch=*/ getWakefulness().isDeviceInteractiveFromTapOrGesture()); // Log collapse gesture if on lock screen. if (!expand && onKeyguard) { float displayDensity = mCentralSurfaces.getDisplayDensity(); @@ -4661,6 +4666,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump final float x = event.getX(pointerIndex); final float y = event.getY(pointerIndex); boolean canCollapsePanel = canCollapsePanelOnTouch(); + final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll( + mTrackpadGestureFeaturesEnabled, event) || isTrackpadThreeFingerSwipe( + mTrackpadGestureFeaturesEnabled, event); switch (event.getActionMasked()) { case MotionEvent.ACTION_DOWN: @@ -4693,7 +4701,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump addMovement(event); break; case MotionEvent.ACTION_POINTER_UP: - if (isTrackpadMotionEvent(event)) { + if (isTrackpadTwoOrThreeFingerSwipe) { break; } final int upPointer = event.getPointerId(event.getActionIndex()); @@ -4709,7 +4717,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mShadeLog.logMotionEventStatusBarState(event, mStatusBarStateController.getState(), "onInterceptTouchEvent: pointer down action"); - if (!isTrackpadMotionEvent(event) + if (!isTrackpadTwoOrThreeFingerSwipe && mStatusBarStateController.getState() == StatusBarState.KEYGUARD) { mMotionAborted = true; mVelocityTracker.clear(); @@ -4858,9 +4866,13 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump return false; } + final boolean isTrackpadTwoOrThreeFingerSwipe = isTrackpadScroll( + mTrackpadGestureFeaturesEnabled, event) || isTrackpadThreeFingerSwipe( + mTrackpadGestureFeaturesEnabled, event); + // On expanding, single mouse click expands the panel instead of dragging. if (isFullyCollapsed() && (event.isFromSource(InputDevice.SOURCE_MOUSE) - && !isTrackpadMotionEvent(event))) { + && !isTrackpadTwoOrThreeFingerSwipe)) { if (event.getAction() == MotionEvent.ACTION_UP) { expand(true /* animate */); } @@ -4920,7 +4932,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump break; case MotionEvent.ACTION_POINTER_UP: - if (isTrackpadMotionEvent(event)) { + if (isTrackpadTwoOrThreeFingerSwipe) { break; } final int upPointer = event.getPointerId(event.getActionIndex()); @@ -4939,7 +4951,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mShadeLog.logMotionEventStatusBarState(event, mStatusBarStateController.getState(), "handleTouch: pointer down action"); - if (!isTrackpadMotionEvent(event) + if (!isTrackpadTwoOrThreeFingerSwipe && mStatusBarStateController.getState() == StatusBarState.KEYGUARD) { mMotionAborted = true; endMotionEvent(event, x, y, true /* forceCancel */); @@ -5014,12 +5026,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mShadeLog.logHandleTouchLastReturn(event, !mGestureWaitForTouchSlop, mTracking); return !mGestureWaitForTouchSlop || mTracking; } - - private boolean isTrackpadMotionEvent(MotionEvent ev) { - return mTrackpadGestureFeaturesEnabled && ( - ev.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE - || ev.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE); - } } private final class HeadsUpNotificationViewControllerImpl implements diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index 0c800d456f3c..8105a145d15a 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -103,7 +103,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW private final KeyguardViewMediator mKeyguardViewMediator; private final KeyguardBypassController mKeyguardBypassController; private final AuthController mAuthController; - private ViewGroup mNotificationShadeView; + private ViewGroup mWindowRootView; private LayoutParams mLp; private boolean mHasTopUi; private boolean mHasTopUiChanged; @@ -262,7 +262,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW mLp.privateFlags |= PRIVATE_FLAG_BEHAVIOR_CONTROLLED; mLp.insetsFlags.behavior = BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE; - mWindowManager.addView(mNotificationShadeView, mLp); + mWindowManager.addView(mWindowRootView, mLp); mLpChanged.copyFrom(mLp); onThemeChanged(); @@ -274,13 +274,13 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } @Override - public void setNotificationShadeView(ViewGroup view) { - mNotificationShadeView = view; + public void setWindowRootView(ViewGroup view) { + mWindowRootView = view; } @Override - public ViewGroup getNotificationShadeView() { - return mNotificationShadeView; + public ViewGroup getWindowRootView() { + return mWindowRootView; } @Override @@ -289,7 +289,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } private void setKeyguardDark(boolean dark) { - int vis = mNotificationShadeView.getSystemUiVisibility(); + int vis = mWindowRootView.getSystemUiVisibility(); if (dark) { vis = vis | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; vis = vis | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; @@ -297,7 +297,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW vis = vis & ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; vis = vis & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; } - mNotificationShadeView.setSystemUiVisibility(vis); + mWindowRootView.setSystemUiVisibility(vis); } private void applyKeyguardFlags(NotificationShadeWindowState state) { @@ -413,11 +413,11 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW visible = true; mLogger.d("Visibility forced to be true"); } - if (mNotificationShadeView != null) { + if (mWindowRootView != null) { if (visible) { - mNotificationShadeView.setVisibility(View.VISIBLE); + mWindowRootView.setVisibility(View.VISIBLE); } else { - mNotificationShadeView.setVisibility(View.INVISIBLE); + mWindowRootView.setVisibility(View.INVISIBLE); } } } @@ -439,10 +439,10 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW private void applyFitsSystemWindows(NotificationShadeWindowState state) { boolean fitsSystemWindows = !state.isKeyguardShowingAndNotOccluded(); - if (mNotificationShadeView != null - && mNotificationShadeView.getFitsSystemWindows() != fitsSystemWindows) { - mNotificationShadeView.setFitsSystemWindows(fitsSystemWindows); - mNotificationShadeView.requestApplyInsets(); + if (mWindowRootView != null + && mWindowRootView.getFitsSystemWindows() != fitsSystemWindows) { + mWindowRootView.setFitsSystemWindows(fitsSystemWindows); + mWindowRootView.requestApplyInsets(); } } @@ -482,7 +482,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW if (mDeferWindowLayoutParams == 0 && mLp != null && mLp.copyFrom(mLpChanged) != 0) { mLogger.logApplyingWindowLayoutParams(mLp); Trace.beginSection("updateViewLayout"); - mWindowManager.updateViewLayout(mNotificationShadeView, mLp); + mWindowManager.updateViewLayout(mWindowRootView, mLp); Trace.endSection(); } } @@ -608,7 +608,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW try { final IWindowSession session = WindowManagerGlobal.getWindowSession(); session.updateTapExcludeRegion( - IWindow.Stub.asInterface(getNotificationShadeView().getWindowToken()), + IWindow.Stub.asInterface(getWindowRootView().getWindowToken()), region); } catch (RemoteException e) { Log.e(TAG, "could not update the tap exclusion region:" + e); @@ -847,8 +847,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW pw.println(" mKeyguardPreferredRefreshRate=" + mKeyguardPreferredRefreshRate); pw.println(" mDeferWindowLayoutParams=" + mDeferWindowLayoutParams); pw.println(mCurrentState); - if (mNotificationShadeView != null && mNotificationShadeView.getViewRootImpl() != null) { - mNotificationShadeView.getViewRootImpl().dump(" ", pw); + if (mWindowRootView != null && mWindowRootView.getViewRootImpl() != null) { + mWindowRootView.getViewRootImpl().dump(" ", pw); } new DumpsysTableLogger( TAG, @@ -864,7 +864,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW @Override public void onThemeChanged() { - if (mNotificationShadeView == null) { + if (mWindowRootView == null) { return; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java index d75190e7289a..c9122c77c1d4 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java @@ -59,11 +59,14 @@ import com.android.internal.view.FloatingActionMode; import com.android.internal.widget.floatingtoolbar.FloatingToolbar; import com.android.systemui.R; import com.android.systemui.compose.ComposeFacade; +import com.android.systemui.scene.ui.view.WindowRootView; /** - * Combined keyguard and notification panel view. Also holding backdrop and scrims. + * Combined keyguard and notification panel view. Also holding backdrop and scrims. This view can + * serve as the root view of the main SysUI window, but because other views can also serve that + * purpose, users of this class cannot assume it is the root. */ -public class NotificationShadeWindowView extends FrameLayout { +public class NotificationShadeWindowView extends WindowRootView { public static final String TAG = "NotificationShadeWindowView"; private int mRightInset = 0; diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java index 2f7644eb5c82..c4b74fc4ddf8 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java @@ -36,6 +36,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.keyguard.AuthKeyguardMessageArea; +import com.android.keyguard.KeyguardMessageAreaController; import com.android.keyguard.LockIconViewController; import com.android.keyguard.dagger.KeyguardBouncerComponent; import com.android.systemui.R; @@ -45,12 +46,14 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; -import com.android.systemui.keyguard.ui.binder.KeyguardBouncerViewBinder; -import com.android.systemui.keyguard.ui.viewmodel.KeyguardBouncerViewModel; +import com.android.systemui.bouncer.ui.binder.KeyguardBouncerViewBinder; +import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel; import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel; +import com.android.systemui.log.BouncerLogger; import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor; import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor; import com.android.systemui.multishade.ui.view.MultiShadeView; @@ -149,12 +152,15 @@ public class NotificationShadeWindowViewController { PulsingGestureListener pulsingGestureListener, KeyguardBouncerViewModel keyguardBouncerViewModel, KeyguardBouncerComponent.Factory keyguardBouncerComponentFactory, + KeyguardMessageAreaController.Factory messageAreaControllerFactory, KeyguardTransitionInteractor keyguardTransitionInteractor, PrimaryBouncerToGoneTransitionViewModel primaryBouncerToGoneTransitionViewModel, FeatureFlags featureFlags, Provider<MultiShadeInteractor> multiShadeInteractorProvider, SystemClock clock, - Provider<MultiShadeMotionEventInteractor> multiShadeMotionEventInteractorProvider) { + Provider<MultiShadeMotionEventInteractor> multiShadeMotionEventInteractorProvider, + BouncerMessageInteractor bouncerMessageInteractor, + BouncerLogger bouncerLogger) { mLockscreenShadeTransitionController = transitionController; mFalsingCollector = falsingCollector; mStatusBarStateController = statusBarStateController; @@ -183,7 +189,11 @@ public class NotificationShadeWindowViewController { mView.findViewById(R.id.keyguard_bouncer_container), keyguardBouncerViewModel, primaryBouncerToGoneTransitionViewModel, - keyguardBouncerComponentFactory); + keyguardBouncerComponentFactory, + messageAreaControllerFactory, + bouncerMessageInteractor, + bouncerLogger, + featureFlags); collectFlow(mView, keyguardTransitionInteractor.getLockscreenToDreamingTransition(), mLockscreenToDreamingTransition); diff --git a/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt b/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt index fd82e2fc01fc..9b797a7e2571 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt @@ -18,7 +18,6 @@ package com.android.systemui.shade import android.hardware.display.AmbientDisplayConfiguration import android.os.PowerManager -import android.os.SystemClock import android.provider.Settings import android.view.GestureDetector import android.view.MotionEvent @@ -28,8 +27,8 @@ import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.FalsingManager.LOW_PENALTY import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent import com.android.systemui.tuner.TunerService import com.android.systemui.tuner.TunerService.Tunable @@ -50,7 +49,7 @@ class PulsingGestureListener @Inject constructor( private val notificationShadeWindowView: NotificationShadeWindowView, private val falsingManager: FalsingManager, private val dockManager: DockManager, - private val centralSurfaces: CentralSurfaces, + private val powerInteractor: PowerInteractor, private val ambientDisplayConfiguration: AmbientDisplayConfiguration, private val statusBarStateController: StatusBarStateController, private val shadeLogger: ShadeLogger, @@ -88,11 +87,7 @@ class PulsingGestureListener @Inject constructor( shadeLogger.logSingleTapUpFalsingState(proximityIsNotNear, isNotAFalseTap) if (proximityIsNotNear && isNotAFalseTap) { shadeLogger.d("Single tap handled, requesting centralSurfaces.wakeUpIfDozing") - centralSurfaces.wakeUpIfDozing( - SystemClock.uptimeMillis(), - "PULSING_SINGLE_TAP", - PowerManager.WAKE_REASON_TAP - ) + powerInteractor.wakeUpIfDozing("PULSING_SINGLE_TAP", PowerManager.WAKE_REASON_TAP) } return true } @@ -113,11 +108,7 @@ class PulsingGestureListener @Inject constructor( !falsingManager.isProximityNear && !falsingManager.isFalseDoubleTap ) { - centralSurfaces.wakeUpIfDozing( - SystemClock.uptimeMillis(), - "PULSING_DOUBLE_TAP", - PowerManager.WAKE_REASON_TAP - ) + powerInteractor.wakeUpIfDozing("PULSING_DOUBLE_TAP", PowerManager.WAKE_REASON_TAP) return true } return false diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java index d0a3cbbf0b02..9ed0e9a8b359 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java @@ -38,23 +38,41 @@ public interface ShadeController { /** Collapse the shade instantly with no animation. */ void instantCollapseShade(); - /** See {@link #animateCollapsePanels(int, boolean, boolean, float)}. */ + /** See {@link #animateCollapseShade(int, boolean, boolean, float)}. */ void animateCollapseShade(); - /** See {@link #animateCollapsePanels(int, boolean, boolean, float)}. */ + /** See {@link #animateCollapseShade(int, boolean, boolean, float)}. */ void animateCollapseShade(int flags); - /** See {@link #animateCollapsePanels(int, boolean, boolean, float)}. */ + /** See {@link #animateCollapseShade(int, boolean, boolean, float)}. */ void animateCollapseShadeForced(); - /** See {@link #animateCollapsePanels(int, boolean, boolean, float)}. */ - void animateCollapseShadeDelayed(); + /** See {@link #animateCollapseShade(int, boolean, boolean, float)}. */ + void animateCollapseShadeForcedDelayed(); /** * Collapse the shade animated, showing the bouncer when on {@link StatusBarState#KEYGUARD} or * dismissing status bar when on {@link StatusBarState#SHADE}. */ - void animateCollapsePanels(int flags, boolean force, boolean delayed, float speedUpFactor); + void animateCollapseShade(int flags, boolean force, boolean delayed, float speedUpFactor); + + /** Expand the shade with an animation. */ + void animateExpandShade(); + + /** Expand the shade with quick settings expanded with an animation. */ + void animateExpandQs(); + + /** Posts a request to collapse the shade. */ + void postAnimateCollapseShade(); + + /** Posts a request to force collapse the shade. */ + void postAnimateForceCollapseShade(); + + /** Posts a request to expand the shade to quick settings. */ + void postAnimateExpandQs(); + + /** Cancels any ongoing expansion touch handling and collapses the shade. */ + void cancelExpansionAndCollapseShade(); /** * If the shade is not fully expanded, collapse it animated. @@ -115,6 +133,9 @@ public interface ShadeController { */ void collapseShade(boolean animate); + /** Calls #collapseShade if already on the main thread. If not, posts a call to it. */ + void collapseOnMainThread(); + /** Makes shade expanded but not visible. */ void makeExpandedInvisible(); @@ -127,8 +148,11 @@ public interface ShadeController { /** Handle status bar touch event. */ void onStatusBarTouch(MotionEvent event); - /** Called when the shade finishes collapsing. */ - void onClosingFinished(); + /** Called when a launch animation was cancelled. */ + void onLaunchAnimationCancelled(boolean isLaunchForActivity); + + /** Called when a launch animation ends. */ + void onLaunchAnimationEnd(boolean launchIsFullScreen); /** Sets the listener for when the visibility of the shade changes. */ void setVisibilityListener(ShadeVisibilityListener listener); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java index d00dab633014..c9338b3614ea 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java @@ -17,6 +17,7 @@ package com.android.systemui.shade; import android.content.ComponentCallbacks2; +import android.os.Looper; import android.util.Log; import android.view.MotionEvent; import android.view.ViewTreeObserver; @@ -25,6 +26,7 @@ import android.view.WindowManagerGlobal; import com.android.systemui.assist.AssistManager; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationPresenter; @@ -32,12 +34,14 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.window.StatusBarWindowController; import dagger.Lazy; import java.util.ArrayList; +import java.util.concurrent.Executor; import javax.inject.Inject; @@ -51,11 +55,13 @@ public final class ShadeControllerImpl implements ShadeController { private final int mDisplayId; private final CommandQueue mCommandQueue; + private final Executor mMainExecutor; private final KeyguardStateController mKeyguardStateController; private final NotificationShadeWindowController mNotificationShadeWindowController; private final StatusBarStateController mStatusBarStateController; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final StatusBarWindowController mStatusBarWindowController; + private final DeviceProvisionedController mDeviceProvisionedController; private final Lazy<AssistManager> mAssistManagerLazy; private final Lazy<NotificationGutsManager> mGutsManager; @@ -72,18 +78,22 @@ public final class ShadeControllerImpl implements ShadeController { @Inject public ShadeControllerImpl( CommandQueue commandQueue, + @Main Executor mainExecutor, KeyguardStateController keyguardStateController, StatusBarStateController statusBarStateController, StatusBarKeyguardViewManager statusBarKeyguardViewManager, StatusBarWindowController statusBarWindowController, + DeviceProvisionedController deviceProvisionedController, NotificationShadeWindowController notificationShadeWindowController, WindowManager windowManager, Lazy<AssistManager> assistManagerLazy, Lazy<NotificationGutsManager> gutsManager ) { mCommandQueue = commandQueue; + mMainExecutor = mainExecutor; mStatusBarStateController = statusBarStateController; mStatusBarWindowController = statusBarWindowController; + mDeviceProvisionedController = deviceProvisionedController; mGutsManager = gutsManager; mNotificationShadeWindowController = notificationShadeWindowController; mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; @@ -107,21 +117,21 @@ public final class ShadeControllerImpl implements ShadeController { @Override public void animateCollapseShade(int flags) { - animateCollapsePanels(flags, false, false, 1.0f); + animateCollapseShade(flags, false, false, 1.0f); } @Override public void animateCollapseShadeForced() { - animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true, false, 1.0f); + animateCollapseShade(CommandQueue.FLAG_EXCLUDE_NONE, true, false, 1.0f); } @Override - public void animateCollapseShadeDelayed() { - animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true, true, 1.0f); + public void animateCollapseShadeForcedDelayed() { + animateCollapseShade(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true, true, 1.0f); } @Override - public void animateCollapsePanels(int flags, boolean force, boolean delayed, + public void animateCollapseShade(int flags, boolean force, boolean delayed, float speedUpFactor) { if (!force && mStatusBarStateController.getState() != StatusBarState.SHADE) { runPostCollapseRunnables(); @@ -143,6 +153,25 @@ public final class ShadeControllerImpl implements ShadeController { } @Override + public void animateExpandShade() { + if (!mCommandQueue.panelsEnabled()) { + return; + } + mNotificationPanelViewController.expandToNotifications(); + } + + @Override + public void animateExpandQs() { + if (!mCommandQueue.panelsEnabled()) { + return; + } + // Settings are not available in setup + if (!mDeviceProvisionedController.isCurrentUserSetup()) return; + + mNotificationPanelViewController.expandToQs(); + } + + @Override public boolean closeShadeIfOpen() { if (!mNotificationPanelViewController.isFullyCollapsed()) { mCommandQueue.animateCollapsePanels( @@ -167,6 +196,20 @@ public final class ShadeControllerImpl implements ShadeController { public boolean isExpandingOrCollapsing() { return mNotificationPanelViewController.isExpandingOrCollapsing(); } + @Override + public void postAnimateCollapseShade() { + mMainExecutor.execute(this::animateCollapseShade); + } + + @Override + public void postAnimateForceCollapseShade() { + mMainExecutor.execute(this::animateCollapseShadeForced); + } + + @Override + public void postAnimateExpandQs() { + mMainExecutor.execute(this::animateExpandQs); + } @Override public void postOnShadeExpanded(Runnable executable) { @@ -202,7 +245,7 @@ public final class ShadeControllerImpl implements ShadeController { public boolean collapseShade() { if (!mNotificationPanelViewController.isFullyCollapsed()) { // close the shade if it was open - animateCollapseShadeDelayed(); + animateCollapseShadeForcedDelayed(); notifyVisibilityChanged(false); return true; @@ -227,6 +270,26 @@ public final class ShadeControllerImpl implements ShadeController { } @Override + public void cancelExpansionAndCollapseShade() { + if (mNotificationPanelViewController.isTracking()) { + mNotificationShadeWindowViewController.cancelCurrentTouch(); + } + if (mNotificationPanelViewController.isPanelExpanded() + && mStatusBarStateController.getState() == StatusBarState.SHADE) { + animateCollapseShade(); + } + } + + @Override + public void collapseOnMainThread() { + if (Looper.getMainLooper().isCurrentThread()) { + collapseShade(); + } else { + mMainExecutor.execute(this::collapseShade); + } + } + + @Override public void onStatusBarTouch(MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_UP) { if (mExpandedVisible) { @@ -235,8 +298,7 @@ public final class ShadeControllerImpl implements ShadeController { } } - @Override - public void onClosingFinished() { + private void onClosingFinished() { runPostCollapseRunnables(); if (!mPresenter.isPresenterFullyCollapsed()) { // if we set it not to be focusable when collapsing, we have to undo it when we aborted @@ -246,6 +308,27 @@ public final class ShadeControllerImpl implements ShadeController { } @Override + public void onLaunchAnimationCancelled(boolean isLaunchForActivity) { + if (mPresenter.isPresenterFullyCollapsed() + && !mPresenter.isCollapsing() + && isLaunchForActivity) { + onClosingFinished(); + } else { + collapseShade(true /* animate */); + } + } + + @Override + public void onLaunchAnimationEnd(boolean launchIsFullScreen) { + if (!mPresenter.isCollapsing()) { + onClosingFinished(); + } + if (launchIsFullScreen) { + instantCollapseShade(); + } + } + + @Override public void instantCollapseShade() { mNotificationPanelViewController.instantCollapse(); runPostCollapseRunnables(); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt index b7551cf3408e..1752ff6d531f 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt @@ -31,7 +31,10 @@ import com.android.systemui.biometrics.AuthRippleView import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.ui.view.KeyguardRootView import com.android.systemui.privacy.OngoingPrivacyChip +import com.android.systemui.scene.ui.view.WindowRootView import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout @@ -61,17 +64,33 @@ abstract class ShadeModule { @Provides @SysUISingleton + fun providesWindowRootView( + layoutInflater: LayoutInflater, + featureFlags: FeatureFlags, + ): WindowRootView { + return if (featureFlags.isEnabled(Flags.SCENE_CONTAINER)) { + layoutInflater.inflate(R.layout.scene_window_root, null) + } else { + layoutInflater.inflate(R.layout.super_notification_shade, null) + } + as WindowRootView? + ?: throw IllegalStateException("Window root view could not be properly inflated") + } + + @Provides + @SysUISingleton // TODO(b/277762009): Do something similar to // {@link StatusBarWindowModule.InternalWindowView} so that only // {@link NotificationShadeWindowViewController} can inject this view. fun providesNotificationShadeWindowView( - layoutInflater: LayoutInflater, + root: WindowRootView, + featureFlags: FeatureFlags, ): NotificationShadeWindowView { - return layoutInflater.inflate(R.layout.super_notification_shade, /* root= */ null) - as NotificationShadeWindowView? - ?: throw IllegalStateException( - "R.layout.super_notification_shade could not be properly inflated" - ) + if (featureFlags.isEnabled(Flags.SCENE_CONTAINER)) { + return root.findViewById(R.id.legacy_window_root) + } + return root as NotificationShadeWindowView? + ?: throw IllegalStateException("root view not a NotificationShadeWindowView") } // TODO(b/277762009): Only allow this view's controller to inject the view. See above. @@ -100,6 +119,14 @@ abstract class ShadeModule { return notificationShadeWindowView.findViewById(R.id.light_reveal_scrim) } + @Provides + @SysUISingleton + fun providesKeyguardRootView( + notificationShadeWindowView: NotificationShadeWindowView, + ): KeyguardRootView { + return notificationShadeWindowView.findViewById(R.id.keyguard_root_view) + } + // TODO(b/277762009): Only allow this view's controller to inject the view. See above. @Provides @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index f75047c2072a..9c80e0250ee9 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -17,11 +17,11 @@ package com.android.systemui.shade import android.view.MotionEvent import android.view.ViewGroup +import com.android.systemui.keyguard.shared.model.WakefulnessModel import com.android.systemui.statusbar.RemoteInputController import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController import com.android.systemui.statusbar.phone.HeadsUpAppearanceController -import com.android.systemui.statusbar.phone.KeyguardBottomAreaView import com.android.systemui.statusbar.phone.KeyguardStatusBarView import com.android.systemui.statusbar.phone.KeyguardStatusBarViewController import java.util.function.Consumer @@ -60,7 +60,7 @@ interface ShadeViewController { * Returns whether the shade height is greater than zero or the shade is expecting a synthesized * down event. */ - @get:Deprecated("use {@link #isExpanded()} instead") val isPanelExpanded: Boolean + val isPanelExpanded: Boolean /** Returns whether the shade is fully expanded in either QS or QQS. */ val isShadeFullyExpanded: Boolean @@ -120,13 +120,6 @@ interface ShadeViewController { /** Returns the StatusBarState. */ val barState: Int - /** - * Returns the bottom part of the keyguard, which contains quick affordances. - * - * TODO(b/275550429): this should be removed. - */ - val keyguardBottomAreaView: KeyguardBottomAreaView? - /** Returns the NSSL controller. */ val notificationStackScrollLayoutController: NotificationStackScrollLayoutController @@ -226,6 +219,16 @@ interface ShadeViewController { val shadeNotificationPresenter: ShadeNotificationPresenter companion object { + /** + * Returns a multiplicative factor to use when determining the falsing threshold for touches + * on the shade. The factor will be larger when the device is waking up due to a touch or + * gesture. + */ + @JvmStatic + fun getFalsingThresholdFactor(wakefulness: WakefulnessModel): Float { + return if (wakefulness.isDeviceInteractiveFromTapOrGesture()) 1.5f else 1.0f + } + const val WAKEUP_ANIMATION_DELAY_MS = 250 const val FLING_MAX_LENGTH_SECONDS = 0.6f const val FLING_SPEED_UP_FACTOR = 0.6f diff --git a/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt index 4e1c272ead99..abb69f691c47 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt @@ -16,24 +16,11 @@ package com.android.systemui.shade.transition -import android.content.res.Configuration -import android.content.res.Resources -import android.util.MathUtils.constrain -import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager -import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.shade.PanelState -import com.android.systemui.shade.STATE_OPENING import com.android.systemui.shade.ShadeExpansionChangeEvent -import com.android.systemui.statusbar.StatusBarState -import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.phone.ScrimController -import com.android.systemui.statusbar.policy.ConfigurationController -import com.android.systemui.statusbar.policy.HeadsUpManager -import com.android.systemui.util.LargeScreenUtils import java.io.PrintWriter import javax.inject.Inject @@ -42,37 +29,19 @@ import javax.inject.Inject class ScrimShadeTransitionController @Inject constructor( - configurationController: ConfigurationController, dumpManager: DumpManager, private val scrimController: ScrimController, - @Main private val resources: Resources, - private val statusBarStateController: SysuiStatusBarStateController, - private val headsUpManager: HeadsUpManager, - private val featureFlags: FeatureFlags, ) { - private var inSplitShade = false - private var splitShadeScrimTransitionDistance = 0 private var lastExpansionFraction: Float? = null private var lastExpansionEvent: ShadeExpansionChangeEvent? = null private var currentPanelState: Int? = null init { - updateResources() - configurationController.addCallback( - object : ConfigurationController.ConfigurationListener { - override fun onConfigChanged(newConfig: Configuration?) { - updateResources() - } - }) dumpManager.registerDumpable( - ScrimShadeTransitionController::class.java.simpleName, this::dump) - } - - private fun updateResources() { - inSplitShade = LargeScreenUtils.shouldUseSplitNotificationShade(resources) - splitShadeScrimTransitionDistance = - resources.getDimensionPixelSize(R.dimen.split_shade_scrim_transition_distance) + ScrimShadeTransitionController::class.java.simpleName, + this::dump + ) } fun onPanelStateChanged(@PanelState state: Int) { @@ -87,46 +56,25 @@ constructor( private fun onStateChanged() { val expansionEvent = lastExpansionEvent ?: return - val panelState = currentPanelState - val expansionFraction = calculateScrimExpansionFraction(expansionEvent, panelState) + val expansionFraction = calculateScrimExpansionFraction(expansionEvent) scrimController.setRawPanelExpansionFraction(expansionFraction) lastExpansionFraction = expansionFraction } - private fun calculateScrimExpansionFraction( - expansionEvent: ShadeExpansionChangeEvent, - @PanelState panelState: Int? - ): Float { - return if (canUseCustomFraction(panelState)) { - constrain(expansionEvent.dragDownPxAmount / splitShadeScrimTransitionDistance, 0f, 1f) - } else { - expansionEvent.fraction - } + private fun calculateScrimExpansionFraction(expansionEvent: ShadeExpansionChangeEvent): Float { + return expansionEvent.fraction } - private fun canUseCustomFraction(panelState: Int?) = - inSplitShade && isScreenUnlocked() && panelState == STATE_OPENING && - // in case of HUN we can't always use predefined distances to manage scrim - // transition because dragDownPxAmount can start from value bigger than - // splitShadeScrimTransitionDistance - !headsUpManager.isTrackingHeadsUp && - !featureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION) - - private fun isScreenUnlocked() = - statusBarStateController.currentOrUpcomingState == StatusBarState.SHADE - private fun dump(printWriter: PrintWriter, args: Array<String>) { printWriter.println( """ ScrimShadeTransitionController: - Resources: - inSplitShade: $inSplitShade - isScreenUnlocked: ${isScreenUnlocked()} - splitShadeScrimTransitionDistance: $splitShadeScrimTransitionDistance State: currentPanelState: $currentPanelState lastExpansionFraction: $lastExpansionFraction lastExpansionEvent: $lastExpansionEvent - """.trimIndent()) + """ + .trimIndent() + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java index 06f43f1eeaa5..39181449aaa0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java @@ -56,7 +56,6 @@ import android.view.View.AccessibilityDelegate; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import android.view.WindowManager.KeyboardShortcutsReceiver; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Button; import android.widget.EditText; @@ -337,6 +336,12 @@ public final class KeyboardShortcutListSearch { mSpecialCharacterNames.put(KeyEvent.KEYCODE_MUHENKAN, "無変換"); mSpecialCharacterNames.put(KeyEvent.KEYCODE_HENKAN, "変換"); mSpecialCharacterNames.put(KeyEvent.KEYCODE_KATAKANA_HIRAGANA, "かな"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_ALT_LEFT, "Alt"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_ALT_RIGHT, "Alt"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_CTRL_LEFT, "Ctrl"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_CTRL_RIGHT, "Ctrl"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_SHIFT_LEFT, "Shift"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_SHIFT_RIGHT, "Shift"); mModifierNames.put(KeyEvent.META_META_ON, "Meta"); mModifierNames.put(KeyEvent.META_CTRL_ON, "Ctrl"); @@ -411,27 +416,45 @@ public final class KeyboardShortcutListSearch { mKeyCharacterMap = mBackupKeyCharacterMap; } + private boolean mAppShortcutsReceived; + private boolean mImeShortcutsReceived; + @VisibleForTesting void showKeyboardShortcuts(int deviceId) { retrieveKeyCharacterMap(deviceId); - mWindowManager.requestAppKeyboardShortcuts(new KeyboardShortcutsReceiver() { - @Override - public void onKeyboardShortcutsReceived( - final List<KeyboardShortcutGroup> result) { - // Add specific app shortcuts - if (result.isEmpty()) { - mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, false); - } else { - mSpecificAppGroup = reMapToKeyboardShortcutMultiMappingGroup(result); - mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, true); - } - mFullShortsGroup.add(SHORTCUT_SYSTEM_INDEX, mSystemGroup); - mFullShortsGroup.add(SHORTCUT_INPUT_INDEX, mInputGroup); - mFullShortsGroup.add(SHORTCUT_OPENAPPS_INDEX, mOpenAppsGroup); - mFullShortsGroup.add(SHORTCUT_SPECIFICAPP_INDEX, mSpecificAppGroup); - showKeyboardShortcutSearchList(mFullShortsGroup); + mAppShortcutsReceived = false; + mImeShortcutsReceived = false; + mWindowManager.requestAppKeyboardShortcuts(result -> { + // Add specific app shortcuts + if (result.isEmpty()) { + mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, false); + } else { + mSpecificAppGroup.addAll(reMapToKeyboardShortcutMultiMappingGroup(result)); + mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, true); + } + mAppShortcutsReceived = true; + if (mImeShortcutsReceived) { + mergeAndShowKeyboardShortcutsGroups(); } }, deviceId); + mWindowManager.requestImeKeyboardShortcuts(result -> { + // Add specific Ime shortcuts + if (!result.isEmpty()) { + mInputGroup.addAll(reMapToKeyboardShortcutMultiMappingGroup(result)); + } + mImeShortcutsReceived = true; + if (mAppShortcutsReceived) { + mergeAndShowKeyboardShortcutsGroups(); + } + }, deviceId); + } + + private void mergeAndShowKeyboardShortcutsGroups() { + mFullShortsGroup.add(SHORTCUT_SYSTEM_INDEX, mSystemGroup); + mFullShortsGroup.add(SHORTCUT_INPUT_INDEX, mInputGroup); + mFullShortsGroup.add(SHORTCUT_OPENAPPS_INDEX, mOpenAppsGroup); + mFullShortsGroup.add(SHORTCUT_SPECIFICAPP_INDEX, mSpecificAppGroup); + showKeyboardShortcutSearchList(mFullShortsGroup); } // The original data structure is only for 1-to-1 shortcut mapping, so remap the old diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java index 43fbc7cbae03..a3fd82e9b140 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java @@ -56,7 +56,6 @@ import android.view.View.AccessibilityDelegate; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import android.view.WindowManager.KeyboardShortcutsReceiver; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; import android.widget.LinearLayout; @@ -129,6 +128,9 @@ public final class KeyboardShortcuts { private KeyCharacterMap mKeyCharacterMap; private KeyCharacterMap mBackupKeyCharacterMap; + @Nullable private List<KeyboardShortcutGroup> mReceivedAppShortcutGroups = null; + @Nullable private List<KeyboardShortcutGroup> mReceivedImeShortcutGroups = null; + @VisibleForTesting KeyboardShortcuts(Context context, WindowManager windowManager) { this.mContext = new ContextThemeWrapper( @@ -324,6 +326,12 @@ public final class KeyboardShortcuts { mSpecialCharacterNames.put(KeyEvent.KEYCODE_MUHENKAN, "無変換"); mSpecialCharacterNames.put(KeyEvent.KEYCODE_HENKAN, "変換"); mSpecialCharacterNames.put(KeyEvent.KEYCODE_KATAKANA_HIRAGANA, "かな"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_ALT_LEFT, "Alt"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_ALT_RIGHT, "Alt"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_CTRL_LEFT, "Ctrl"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_CTRL_RIGHT, "Ctrl"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_SHIFT_LEFT, "Shift"); + mSpecialCharacterNames.put(KeyEvent.KEYCODE_SHIFT_RIGHT, "Shift"); mModifierNames.put(KeyEvent.META_META_ON, "Meta"); mModifierNames.put(KeyEvent.META_CTRL_ON, "Ctrl"); @@ -382,18 +390,36 @@ public final class KeyboardShortcuts { @VisibleForTesting void showKeyboardShortcuts(int deviceId) { retrieveKeyCharacterMap(deviceId); - mWindowManager.requestAppKeyboardShortcuts(new KeyboardShortcutsReceiver() { - @Override - public void onKeyboardShortcutsReceived( - final List<KeyboardShortcutGroup> result) { - result.add(getSystemShortcuts()); - final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts(); - if (appShortcuts != null) { - result.add(appShortcuts); - } - showKeyboardShortcutsDialog(result); - } - }, deviceId); + mReceivedAppShortcutGroups = null; + mReceivedImeShortcutGroups = null; + mWindowManager.requestAppKeyboardShortcuts( + result -> { + mReceivedAppShortcutGroups = result; + maybeMergeAndShowKeyboardShortcuts(); + }, deviceId); + mWindowManager.requestImeKeyboardShortcuts( + result -> { + mReceivedImeShortcutGroups = result; + maybeMergeAndShowKeyboardShortcuts(); + }, deviceId); + } + + private void maybeMergeAndShowKeyboardShortcuts() { + if (mReceivedAppShortcutGroups == null || mReceivedImeShortcutGroups == null) { + return; + } + List<KeyboardShortcutGroup> shortcutGroups = mReceivedAppShortcutGroups; + shortcutGroups.addAll(mReceivedImeShortcutGroups); + mReceivedAppShortcutGroups = null; + mReceivedImeShortcutGroups = null; + + final KeyboardShortcutGroup defaultAppShortcuts = + getDefaultApplicationShortcuts(); + if (defaultAppShortcuts != null) { + shortcutGroups.add(defaultAppShortcuts); + } + shortcutGroups.add(getSystemShortcuts()); + showKeyboardShortcutsDialog(shortcutGroups); } private void dismissKeyboardShortcuts() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 12420ff5f481..926d9b8072c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -94,7 +94,8 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.keyguard.KeyguardIndication; import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController; import com.android.systemui.keyguard.ScreenLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.log.LogLevel; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -147,6 +148,7 @@ public class KeyguardIndicationController { private final AuthController mAuthController; private final KeyguardLogger mKeyguardLogger; private final UserTracker mUserTracker; + private final BouncerMessageInteractor mBouncerMessageInteractor; private ViewGroup mIndicationArea; private KeyguardIndicationTextView mTopIndicationView; private KeyguardIndicationTextView mLockScreenIndicationView; @@ -253,7 +255,8 @@ public class KeyguardIndicationController { KeyguardLogger keyguardLogger, AlternateBouncerInteractor alternateBouncerInteractor, AlarmManager alarmManager, - UserTracker userTracker + UserTracker userTracker, + BouncerMessageInteractor bouncerMessageInteractor ) { mContext = context; mBroadcastDispatcher = broadcastDispatcher; @@ -278,7 +281,7 @@ public class KeyguardIndicationController { mScreenLifecycle.addObserver(mScreenObserver); mAlternateBouncerInteractor = alternateBouncerInteractor; mUserTracker = userTracker; - + mBouncerMessageInteractor = bouncerMessageInteractor; mFaceAcquiredMessageDeferral = faceHelpMessageDeferral; mCoExFaceAcquisitionMsgIdsToShow = new HashSet<>(); int[] msgIds = context.getResources().getIntArray( @@ -1151,6 +1154,11 @@ public class KeyguardIndicationController { msgId, helpString); } else if (mStatusBarKeyguardViewManager.isBouncerShowing()) { + if (biometricSourceType == FINGERPRINT && !fpAuthFailed) { + mBouncerMessageInteractor.setFingerprintAcquisitionMessage(helpString); + } else if (faceAuthSoftError) { + mBouncerMessageInteractor.setFaceAcquisitionMessage(helpString); + } mStatusBarKeyguardViewManager.setKeyguardMessage(helpString, mInitialTextColorState); } else if (mScreenLifecycle.getScreenState() == SCREEN_ON) { @@ -1206,6 +1214,8 @@ public class KeyguardIndicationController { if (biometricSourceType == FACE) { mFaceAcquiredMessageDeferral.reset(); } + mBouncerMessageInteractor.setFaceAcquisitionMessage(null); + mBouncerMessageInteractor.setFingerprintAcquisitionMessage(null); } @Override @@ -1226,6 +1236,8 @@ public class KeyguardIndicationController { } else if (biometricSourceType == FINGERPRINT) { onFingerprintAuthError(msgId, errString); } + mBouncerMessageInteractor.setFaceAcquisitionMessage(null); + mBouncerMessageInteractor.setFingerprintAcquisitionMessage(null); } private void onFaceAuthError(int msgId, String errString) { @@ -1310,6 +1322,8 @@ public class KeyguardIndicationController { showActionToUnlock(); } } + mBouncerMessageInteractor.setFaceAcquisitionMessage(null); + mBouncerMessageInteractor.setFingerprintAcquisitionMessage(null); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java index 2ca0b0054bf7..47a4641bcdd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java @@ -60,11 +60,11 @@ public interface NotificationShadeWindowController extends RemoteInputController default void attach() {} /** Sets the notification shade view. */ - default void setNotificationShadeView(ViewGroup view) {} + default void setWindowRootView(ViewGroup view) {} /** Gets the notification shade view. */ @Nullable - default ViewGroup getNotificationShadeView() { + default ViewGroup getWindowRootView() { return null; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index 9d7f3be4dfe7..edf37ef71450 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -40,8 +40,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.SystemBarUtils; import com.android.systemui.R; import com.android.systemui.animation.ShadeInterpolation; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener; import com.android.systemui.shade.transition.LargeScreenShadeInterpolator; import com.android.systemui.statusbar.notification.NotificationUtils; @@ -226,9 +224,7 @@ public class NotificationShelf extends ActivatableNotificationView implements St if (ambientState.isBouncerInTransit()) { viewState.setAlpha(aboutToShowBouncerProgress(expansion)); } else { - FeatureFlags flags = ambientState.getFeatureFlags(); - if (ambientState.isSmallScreen() || !flags.isEnabled( - Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) { + if (ambientState.isSmallScreen()) { viewState.setAlpha(ShadeInterpolation.getContentAlpha(expansion)); } else { LargeScreenShadeInterpolator interpolator = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java index f6c9a5cae34a..73eba0ee9675 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -35,7 +35,7 @@ import com.android.systemui.dump.DumpHandler; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 518825cea5e0..cf3903860e94 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt @@ -137,6 +137,19 @@ constructor( updateTextColorFromWallpaper() statusBarStateListener.onDozeAmountChanged(0f, statusBarStateController.dozeAmount) + + if (regionSamplingEnabled && (!regionSamplers.containsKey(v))) { + var regionSampler = RegionSampler( + v as View, + uiExecutor, + bgExecutor, + regionSamplingEnabled, + isLockscreen = true, + ) { updateTextColorFromRegionSampler() } + initializeTextColors(regionSampler) + regionSamplers[v] = regionSampler + regionSampler.startRegionSampler() + } } override fun onViewDetachedFromWindow(v: View) { @@ -171,23 +184,6 @@ constructor( val filteredTargets = targets.filter(::filterSmartspaceTarget) plugin?.onTargetsAvailable(filteredTargets) - if (!isRegionSamplersCreated) { - for (v in smartspaceViews) { - if (regionSamplingEnabled) { - var regionSampler = RegionSampler( - v as View, - uiExecutor, - bgExecutor, - regionSamplingEnabled, - isLockscreen = true, - ) { updateTextColorFromRegionSampler() } - initializeTextColors(regionSampler) - regionSamplers[v] = regionSampler - regionSampler.startRegionSampler() - } - } - isRegionSamplersCreated = true - } } private val userTrackerCallback = object : UserTracker.Callback { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index 8aeefeeac211..b116246586b5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -274,10 +274,6 @@ public class NotifCollection implements Dumpable, PipelineDumpable { Assert.isMainThread(); checkForReentrantCall(); - // TODO (b/206842750): This method is called from (silent) clear all and non-clear all - // contexts and should be checking the NO_CLEAR flag, rather than depending on NSSL - // to pass in a properly filtered list of notifications - final List<NotificationEntry> entriesToLocallyDismiss = new ArrayList<>(); for (int i = 0; i < entriesToDismiss.size(); i++) { NotificationEntry entry = entriesToDismiss.get(i).first; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt index 2fa070ca20b5..706594cee81d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt @@ -28,12 +28,9 @@ import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.data.repository.KeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState -import com.android.systemui.keyguard.shared.model.TransitionState -import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.expansionChanges -import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope @@ -50,30 +47,29 @@ import com.android.systemui.util.settings.SecureSettings import com.android.systemui.util.settings.SettingsProxyExt.observerFlow import java.io.PrintWriter import javax.inject.Inject -import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.Job import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.emitAll -import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart -import kotlinx.coroutines.flow.transformLatest import kotlinx.coroutines.launch import kotlinx.coroutines.yield /** * Filters low priority and privacy-sensitive notifications from the lockscreen, and hides section - * headers on the lockscreen. + * headers on the lockscreen. If enabled, it will also track and hide seen notifications on the + * lockscreen. */ @CoordinatorScope class KeyguardCoordinator @@ -86,7 +82,6 @@ constructor( private val keyguardRepository: KeyguardRepository, private val keyguardTransitionRepository: KeyguardTransitionRepository, private val logger: KeyguardCoordinatorLogger, - private val notifPipelineFlags: NotifPipelineFlags, @Application private val scope: CoroutineScope, private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider, private val secureSettings: SecureSettings, @@ -95,6 +90,8 @@ constructor( ) : Coordinator, Dumpable { private val unseenNotifications = mutableSetOf<NotificationEntry>() + private val unseenEntryAdded = MutableSharedFlow<NotificationEntry>(extraBufferCapacity = 1) + private val unseenEntryRemoved = MutableSharedFlow<NotificationEntry>(extraBufferCapacity = 1) private var unseenFilterEnabled = false override fun attach(pipeline: NotifPipeline) { @@ -109,79 +106,131 @@ constructor( private fun attachUnseenFilter(pipeline: NotifPipeline) { pipeline.addFinalizeFilter(unseenNotifFilter) pipeline.addCollectionListener(collectionListener) - scope.launch { trackUnseenNotificationsWhileUnlocked() } + scope.launch { trackSeenNotifications() } scope.launch { invalidateWhenUnseenSettingChanges() } dumpManager.registerDumpable(this) } - private suspend fun trackUnseenNotificationsWhileUnlocked() { - // Whether or not we're actively tracking unseen notifications to mark them as seen when - // appropriate. - val isTrackingUnseen: Flow<Boolean> = - keyguardRepository.isKeyguardShowing - // transformLatest so that we can cancel listening to keyguard transitions once - // isKeyguardShowing changes (after a successful transition to the keyguard). - .transformLatest { isShowing -> - if (isShowing) { - // If the keyguard is showing, we're not tracking unseen. - emit(false) - } else { - // If the keyguard stops showing, then start tracking unseen notifications. - emit(true) - // If the screen is turning off, stop tracking, but if that transition is - // cancelled, then start again. - emitAll( - keyguardTransitionRepository.transitions.map { step -> - !step.isScreenTurningOff - } - ) - } - } - // Prevent double emit of `false` caused by transition to AOD, followed by keyguard - // showing + private suspend fun trackSeenNotifications() { + // Whether or not keyguard is visible (or occluded). + val isKeyguardPresent: Flow<Boolean> = + keyguardTransitionRepository.transitions + .map { step -> step.to != KeyguardState.GONE } .distinctUntilChanged() .onEach { trackingUnseen -> logger.logTrackingUnseen(trackingUnseen) } - // Use collectLatest so that trackUnseenNotifications() is cancelled when the keyguard is - // showing again - var clearUnseenOnBeginTracking = false - isTrackingUnseen.collectLatest { trackingUnseen -> - if (!trackingUnseen) { - // Wait for the user to spend enough time on the lock screen before clearing unseen - // set when unlocked - awaitTimeSpentNotDozing(SEEN_TIMEOUT) - clearUnseenOnBeginTracking = true - logger.logSeenOnLockscreen() + // Separately track seen notifications while the device is locked, applying once the device + // is unlocked. + val notificationsSeenWhileLocked = mutableSetOf<NotificationEntry>() + + // Use [collectLatest] to cancel any running jobs when [trackingUnseen] changes. + isKeyguardPresent.collectLatest { isKeyguardPresent: Boolean -> + if (isKeyguardPresent) { + // Keyguard is not gone, notifications need to be visible for a certain threshold + // before being marked as seen + trackSeenNotificationsWhileLocked(notificationsSeenWhileLocked) } else { - if (clearUnseenOnBeginTracking) { - clearUnseenOnBeginTracking = false - logger.logAllMarkedSeenOnUnlock() - unseenNotifications.clear() + // Mark all seen-while-locked notifications as seen for real. + if (notificationsSeenWhileLocked.isNotEmpty()) { + unseenNotifications.removeAll(notificationsSeenWhileLocked) + logger.logAllMarkedSeenOnUnlock( + seenCount = notificationsSeenWhileLocked.size, + remainingUnseenCount = unseenNotifications.size + ) + notificationsSeenWhileLocked.clear() } unseenNotifFilter.invalidateList("keyguard no longer showing") - trackUnseenNotifications() + // Keyguard is gone, notifications can be immediately marked as seen when they + // become visible. + trackSeenNotificationsWhileUnlocked() } } } - private suspend fun awaitTimeSpentNotDozing(duration: Duration) { - keyguardRepository.isDozing - // Use transformLatest so that the timeout delay is cancelled if the device enters doze, - // and is restarted when doze ends. - .transformLatest { isDozing -> - if (!isDozing) { - delay(duration) - // Signal timeout has completed - emit(Unit) + /** + * Keep [notificationsSeenWhileLocked] updated to represent which notifications have actually + * been "seen" while the device is on the keyguard. + */ + private suspend fun trackSeenNotificationsWhileLocked( + notificationsSeenWhileLocked: MutableSet<NotificationEntry>, + ) = coroutineScope { + // Remove removed notifications from the set + launch { + unseenEntryRemoved.collect { entry -> + if (notificationsSeenWhileLocked.remove(entry)) { + logger.logRemoveSeenOnLockscreen(entry) } } - // Suspend until the first emission - .first() + } + // Use collectLatest so that the timeout delay is cancelled if the device enters doze, and + // is restarted when doze ends. + keyguardRepository.isDozing.collectLatest { isDozing -> + if (!isDozing) { + trackSeenNotificationsWhileLockedAndNotDozing(notificationsSeenWhileLocked) + } + } } - // Track "unseen" notifications, marking them as seen when either shade is expanded or the + /** + * Keep [notificationsSeenWhileLocked] updated to represent which notifications have actually + * been "seen" while the device is on the keyguard and not dozing. Any new and existing unseen + * notifications are not marked as seen until they are visible for the [SEEN_TIMEOUT] duration. + */ + private suspend fun trackSeenNotificationsWhileLockedAndNotDozing( + notificationsSeenWhileLocked: MutableSet<NotificationEntry> + ) = coroutineScope { + // All child tracking jobs will be cancelled automatically when this is cancelled. + val trackingJobsByEntry = mutableMapOf<NotificationEntry, Job>() + + /** + * Wait for the user to spend enough time on the lock screen before removing notification + * from unseen set upon unlock. + */ + suspend fun trackSeenDurationThreshold(entry: NotificationEntry) { + if (notificationsSeenWhileLocked.remove(entry)) { + logger.logResetSeenOnLockscreen(entry) + } + delay(SEEN_TIMEOUT) + notificationsSeenWhileLocked.add(entry) + trackingJobsByEntry.remove(entry) + logger.logSeenOnLockscreen(entry) + } + + /** Stop any unseen tracking when a notification is removed. */ + suspend fun stopTrackingRemovedNotifs(): Nothing = + unseenEntryRemoved.collect { entry -> + trackingJobsByEntry.remove(entry)?.let { + it.cancel() + logger.logStopTrackingLockscreenSeenDuration(entry) + } + } + + /** Start tracking new notifications when they are posted. */ + suspend fun trackNewUnseenNotifs(): Nothing = coroutineScope { + unseenEntryAdded.collect { entry -> + logger.logTrackingLockscreenSeenDuration(entry) + // If this is an update, reset the tracking. + trackingJobsByEntry[entry]?.let { + it.cancel() + logger.logResetSeenOnLockscreen(entry) + } + trackingJobsByEntry[entry] = launch { trackSeenDurationThreshold(entry) } + } + } + + // Start tracking for all notifications that are currently unseen. + logger.logTrackingLockscreenSeenDuration(unseenNotifications) + unseenNotifications.forEach { entry -> + trackingJobsByEntry[entry] = launch { trackSeenDurationThreshold(entry) } + } + + launch { trackNewUnseenNotifs() } + launch { stopTrackingRemovedNotifs() } + } + + // Track "seen" notifications, marking them as such when either shade is expanded or the // notification becomes heads up. - private suspend fun trackUnseenNotifications() { + private suspend fun trackSeenNotificationsWhileUnlocked() { coroutineScope { launch { clearUnseenNotificationsWhenShadeIsExpanded() } launch { markHeadsUpNotificationsAsSeen() } @@ -250,6 +299,7 @@ constructor( ) { logger.logUnseenAdded(entry.key) unseenNotifications.add(entry) + unseenEntryAdded.tryEmit(entry) } } @@ -259,12 +309,14 @@ constructor( ) { logger.logUnseenUpdated(entry.key) unseenNotifications.add(entry) + unseenEntryAdded.tryEmit(entry) } } override fun onEntryRemoved(entry: NotificationEntry, reason: Int) { if (unseenNotifications.remove(entry)) { logger.logUnseenRemoved(entry.key) + unseenEntryRemoved.tryEmit(entry) } } } @@ -347,6 +399,3 @@ constructor( private val SEEN_TIMEOUT = 5.seconds } } - -private val TransitionStep.isScreenTurningOff: Boolean - get() = transitionState == TransitionState.STARTED && to != KeyguardState.GONE diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt index 1f8ec3411bcd..c61281661717 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorLogger.kt @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogLevel import com.android.systemui.log.dagger.UnseenNotificationLog +import com.android.systemui.statusbar.notification.collection.NotificationEntry import javax.inject.Inject private const val TAG = "KeyguardCoordinator" @@ -28,11 +29,14 @@ class KeyguardCoordinatorLogger constructor( @UnseenNotificationLog private val buffer: LogBuffer, ) { - fun logSeenOnLockscreen() = + fun logSeenOnLockscreen(entry: NotificationEntry) = buffer.log( TAG, LogLevel.DEBUG, - "Notifications on lockscreen will be marked as seen when unlocked." + messageInitializer = { str1 = entry.key }, + messagePrinter = { + "Notification [$str1] on lockscreen will be marked as seen when unlocked." + }, ) fun logTrackingUnseen(trackingUnseen: Boolean) = @@ -43,11 +47,21 @@ constructor( messagePrinter = { "${if (bool1) "Start" else "Stop"} tracking unseen notifications." }, ) - fun logAllMarkedSeenOnUnlock() = + fun logAllMarkedSeenOnUnlock( + seenCount: Int, + remainingUnseenCount: Int, + ) = buffer.log( TAG, LogLevel.DEBUG, - "Notifications have been marked as seen now that device is unlocked." + messageInitializer = { + int1 = seenCount + int2 = remainingUnseenCount + }, + messagePrinter = { + "$int1 Notifications have been marked as seen now that device is unlocked. " + + "$int2 notifications remain unseen." + }, ) fun logShadeExpanded() = @@ -96,4 +110,60 @@ constructor( messageInitializer = { str1 = key }, messagePrinter = { "Unseen notif has become heads up: $str1" }, ) + + fun logTrackingLockscreenSeenDuration(unseenNotifications: Set<NotificationEntry>) { + buffer.log( + TAG, + LogLevel.DEBUG, + messageInitializer = { + str1 = unseenNotifications.joinToString { it.key } + int1 = unseenNotifications.size + }, + messagePrinter = { + "Tracking $int1 unseen notifications for lockscreen seen duration threshold: $str1" + }, + ) + } + + fun logTrackingLockscreenSeenDuration(entry: NotificationEntry) { + buffer.log( + TAG, + LogLevel.DEBUG, + messageInitializer = { str1 = entry.key }, + messagePrinter = { + "Tracking new notification for lockscreen seen duration threshold: $str1" + }, + ) + } + + fun logStopTrackingLockscreenSeenDuration(entry: NotificationEntry) { + buffer.log( + TAG, + LogLevel.DEBUG, + messageInitializer = { str1 = entry.key }, + messagePrinter = { + "Stop tracking removed notification for lockscreen seen duration threshold: $str1" + }, + ) + } + + fun logResetSeenOnLockscreen(entry: NotificationEntry) { + buffer.log( + TAG, + LogLevel.DEBUG, + messageInitializer = { str1 = entry.key }, + messagePrinter = { + "Reset tracking updated notification for lockscreen seen duration threshold: $str1" + }, + ) + } + + fun logRemoveSeenOnLockscreen(entry: NotificationEntry) { + buffer.log( + TAG, + LogLevel.DEBUG, + messageInitializer = { str1 = entry.key }, + messagePrinter = { "Notification marked as seen on lockscreen removed: $str1" }, + ) + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragController.java index 7a2bee91e972..b95018777fea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragController.java @@ -148,7 +148,7 @@ public class ExpandableNotificationRowDragController { private void dismissShade() { // Speed up dismissing the shade since the drag needs to be handled by // the shell layer underneath - mShadeController.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */, + mShadeController.animateCollapseShade(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */, false /* delayed */, 1.1f /* speedUpFactor */); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index f7c6594e3a70..36025e8b8d2a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -104,13 +104,13 @@ import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; +import com.android.systemui.statusbar.notification.init.NotificationsController; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.notification.row.FooterView; import com.android.systemui.statusbar.notification.row.StackScrollerDecorView; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.HeadsUpTouchHelper; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; @@ -197,7 +197,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable */ private Set<Integer> mDebugTextUsedYPositions; private final boolean mDebugRemoveAnimation; - private final boolean mSimplifiedAppearFraction; private final boolean mSensitiveRevealAnimEndabled; private boolean mAnimatedInsets; @@ -316,7 +315,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } }; private NotificationStackScrollLogger mLogger; - private CentralSurfaces mCentralSurfaces; + private NotificationsController mNotificationsController; private ActivityStarter mActivityStarter; private final int[] mTempInt2 = new int[2]; private boolean mGenerateChildOrderChangedEvent; @@ -621,7 +620,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable FeatureFlags featureFlags = Dependency.get(FeatureFlags.class); mDebugLines = featureFlags.isEnabled(Flags.NSSL_DEBUG_LINES); mDebugRemoveAnimation = featureFlags.isEnabled(Flags.NSSL_DEBUG_REMOVE_ANIMATION); - mSimplifiedAppearFraction = featureFlags.isEnabled(Flags.SIMPLIFIED_APPEAR_FRACTION); mSensitiveRevealAnimEndabled = featureFlags.isEnabled(Flags.SENSITIVE_REVEAL_ANIM); setAnimatedInsetsEnabled(featureFlags.isEnabled(Flags.ANIMATED_NOTIFICATION_SHADE_INSETS)); mSectionsManager = Dependency.get(NotificationSectionsManager.class); @@ -1638,14 +1636,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable return mAmbientState.getTrackedHeadsUpRow() != null; } - // TODO(b/246353296): remove it when Flags.SIMPLIFIED_APPEAR_FRACTION is removed - public float calculateAppearFractionOld(float height) { - float appearEndPosition = getAppearEndPosition(); - float appearStartPosition = getAppearStartPosition(); - return (height - appearStartPosition) - / (appearEndPosition - appearStartPosition); - } - /** * @param height the height of the panel * @return Fraction of the appear animation that has been performed. Normally follows expansion @@ -1653,33 +1643,24 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable * when HUN is swiped up. */ @FloatRange(from = -1.0, to = 1.0) - public float simplifiedAppearFraction(float height) { + public float calculateAppearFraction(float height) { if (isHeadsUpTransition()) { // HUN is a special case because fraction can go negative if swiping up. And for now // it must go negative as other pieces responsible for proper translation up assume // negative value for HUN going up. // This can't use expansion fraction as that goes only from 0 to 1. Also when // appear fraction for HUN is 0, expansion fraction will be already around 0.2-0.3 - // and that makes translation jump immediately. Let's use old implementation for now and - // see if we can figure out something better - return MathUtils.constrain(calculateAppearFractionOld(height), -1, 1); + // and that makes translation jump immediately. + float appearEndPosition = getAppearEndPosition(); + float appearStartPosition = getAppearStartPosition(); + float hunAppearFraction = (height - appearStartPosition) + / (appearEndPosition - appearStartPosition); + return MathUtils.constrain(hunAppearFraction, -1, 1); } else { return mAmbientState.getExpansionFraction(); } } - public float calculateAppearFraction(float height) { - if (mSimplifiedAppearFraction) { - return simplifiedAppearFraction(height); - } else if (mShouldUseSplitNotificationShade) { - // for split shade we want to always use the new way of calculating appear fraction - // because without it heads-up experience is very broken and it's less risky change - return simplifiedAppearFraction(height); - } else { - return calculateAppearFractionOld(height); - } - } - public float getStackTranslation() { return mStackTranslation; } @@ -4008,7 +3989,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mAmbientState.setExpansionChanging(false); if (!mIsExpanded) { resetScrollPosition(); - mCentralSurfaces.resetUserExpandedStates(); + mNotificationsController.resetUserExpandedStates(); clearTemporaryViews(); clearUserLockedViews(); cancelActiveSwipe(); @@ -4602,8 +4583,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable return max + getStackTranslation(); } - public void setCentralSurfaces(CentralSurfaces centralSurfaces) { - this.mCentralSurfaces = centralSurfaces; + public void setNotificationsController(NotificationsController notificationsController) { + this.mNotificationsController = notificationsController; } public void setActivityStarter(ActivityStarter activityStarter) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 9272c376d4fe..a70862aead0f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -61,6 +61,7 @@ import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.media.controls.ui.KeyguardMediaController; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; @@ -69,6 +70,7 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.OnMenuEv import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeController; +import com.android.systemui.shade.ShadeViewController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener; @@ -98,6 +100,7 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStats; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController; import com.android.systemui.statusbar.notification.dagger.SilentHeader; +import com.android.systemui.statusbar.notification.init.NotificationsController; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; @@ -144,6 +147,7 @@ public class NotificationStackScrollLayoutController { private final boolean mAllowLongPress; private final NotificationGutsManager mNotificationGutsManager; + private final NotificationsController mNotificationsController; private final NotificationVisibilityProvider mVisibilityProvider; private final HeadsUpManagerPhone mHeadsUpManager; private final NotificationRoundnessManager mNotificationRoundnessManager; @@ -170,6 +174,7 @@ public class NotificationStackScrollLayoutController { private final KeyguardMediaController mKeyguardMediaController; private final SysuiStatusBarStateController mStatusBarStateController; private final KeyguardBypassController mKeyguardBypassController; + private final KeyguardInteractor mKeyguardInteractor; private final NotificationLockscreenUserManager mLockscreenUserManager; // TODO: CentralSurfaces should be encapsulated behind a Controller private final CentralSurfaces mCentralSurfaces; @@ -429,7 +434,7 @@ public class NotificationStackScrollLayoutController { @Override public void onSnooze(StatusBarNotification sbn, NotificationSwipeActionHelper.SnoozeOption snoozeOption) { - mCentralSurfaces.setNotificationSnoozed(sbn, snoozeOption); + mNotificationsController.setNotificationSnoozed(sbn, snoozeOption); } @Override @@ -559,7 +564,8 @@ public class NotificationStackScrollLayoutController { @Override public float getFalsingThresholdFactor() { - return mCentralSurfaces.isWakeUpComingFromTouch() ? 1.5f : 1.0f; + return ShadeViewController.getFalsingThresholdFactor( + mKeyguardInteractor.getWakefulnessModel().getValue()); } @Override @@ -613,6 +619,7 @@ public class NotificationStackScrollLayoutController { NotificationStackScrollLayout view, @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress, NotificationGutsManager notificationGutsManager, + NotificationsController notificationsController, NotificationVisibilityProvider visibilityProvider, HeadsUpManagerPhone headsUpManager, NotificationRoundnessManager notificationRoundnessManager, @@ -623,6 +630,7 @@ public class NotificationStackScrollLayoutController { SysuiStatusBarStateController statusBarStateController, KeyguardMediaController keyguardMediaController, KeyguardBypassController keyguardBypassController, + KeyguardInteractor keyguardInteractor, ZenModeController zenModeController, NotificationLockscreenUserManager lockscreenUserManager, Optional<NotificationListViewModel> nsslViewModel, @@ -660,6 +668,7 @@ public class NotificationStackScrollLayoutController { mLogger = logger; mAllowLongPress = allowLongPress; mNotificationGutsManager = notificationGutsManager; + mNotificationsController = notificationsController; mVisibilityProvider = visibilityProvider; mHeadsUpManager = headsUpManager; mNotificationRoundnessManager = notificationRoundnessManager; @@ -670,6 +679,7 @@ public class NotificationStackScrollLayoutController { mStatusBarStateController = statusBarStateController; mKeyguardMediaController = keyguardMediaController; mKeyguardBypassController = keyguardBypassController; + mKeyguardInteractor = keyguardInteractor; mZenModeController = zenModeController; mLockscreenUserManager = lockscreenUserManager; mViewModel = nsslViewModel; @@ -709,7 +719,7 @@ public class NotificationStackScrollLayoutController { mView.setController(this); mView.setLogger(mLogger); mView.setTouchHandler(new TouchHandler()); - mView.setCentralSurfaces(mCentralSurfaces); + mView.setNotificationsController(mNotificationsController); mView.setActivityStarter(mActivityStarter); mView.setClearAllAnimationListener(this::onAnimationEnd); mView.setClearAllListener((selection) -> mUiEventLogger.log( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index 6f1c378f429d..ce2658dc2fcc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -29,8 +29,6 @@ import com.android.internal.policy.SystemBarUtils; import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.systemui.R; import com.android.systemui.animation.ShadeInterpolation; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.shade.transition.LargeScreenShadeInterpolator; import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.NotificationShelf; @@ -189,9 +187,7 @@ public class StackScrollAlgorithm { private float interpolateFooterAlpha(AmbientState ambientState) { float expansion = ambientState.getExpansionFraction(); - FeatureFlags flags = ambientState.getFeatureFlags(); - if (ambientState.isSmallScreen() - || !flags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) { + if (ambientState.isSmallScreen()) { return ShadeInterpolation.getContentAlpha(expansion); } LargeScreenShadeInterpolator interpolator = ambientState.getLargeScreenShadeInterpolator(); @@ -200,9 +196,7 @@ public class StackScrollAlgorithm { private float interpolateNotificationContentAlpha(AmbientState ambientState) { float expansion = ambientState.getExpansionFraction(); - FeatureFlags flags = ambientState.getFeatureFlags(); - if (ambientState.isSmallScreen() - || !flags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) { + if (ambientState.isSmallScreen()) { return ShadeInterpolation.getContentAlpha(expansion); } LargeScreenShadeInterpolator interpolator = ambientState.getLargeScreenShadeInterpolator(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt index 1827a46958f8..730ef57f1972 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt @@ -45,6 +45,7 @@ import com.android.systemui.plugins.ActivityStarter.OnDismissAction import com.android.systemui.settings.UserTracker import com.android.systemui.shade.ShadeController import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.policy.DeviceProvisionedController @@ -68,6 +69,7 @@ constructor( private val keyguardViewMediatorLazy: Lazy<KeyguardViewMediator>, private val shadeControllerLazy: Lazy<ShadeController>, private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>, + private val notifShadeWindowControllerLazy: Lazy<NotificationShadeWindowController>, private val activityLaunchAnimator: ActivityLaunchAnimator, private val context: Context, private val lockScreenUserManager: NotificationLockscreenUserManager, @@ -387,6 +389,35 @@ constructor( } /** + * Whether we should animate an activity launch. + * + * Note: This method must be called *before* dismissing the keyguard. + */ + private fun shouldAnimateLaunch( + isActivityIntent: Boolean, + showOverLockscreen: Boolean, + ): Boolean { + // TODO(b/184121838): Support launch animations when occluded. + if (keyguardStateController.isOccluded) { + return false + } + + // Always animate if we are not showing the keyguard or if we animate over the lockscreen + // (without unlocking it). + if (showOverLockscreen || !keyguardStateController.isShowing) { + return true + } + + // We don't animate non-activity launches as they can break the animation. + // TODO(b/184121838): Support non activity launches on the lockscreen. + return isActivityIntent + } + + override fun shouldAnimateLaunch(isActivityIntent: Boolean): Boolean { + return shouldAnimateLaunch(isActivityIntent, false) + } + + /** * Encapsulates the activity logic for activity starter. * * Logic is duplicated in {@link CentralSurfacesImpl} @@ -417,7 +448,7 @@ constructor( val animate = animationController != null && !willLaunchResolverActivity && - centralSurfaces?.shouldAnimateLaunch(true /* isActivityIntent */) == true + shouldAnimateLaunch(isActivityIntent = true) val animController = wrapAnimationController( animationController = animationController, @@ -536,7 +567,7 @@ constructor( val animate = !willLaunchResolverActivity && animationController != null && - centralSurfaces?.shouldAnimateLaunch(intent.isActivity) == true + shouldAnimateLaunch(intent.isActivity) // If we animate, don't collapse the shade and defer the keyguard dismiss (in case we // run the animation on the keyguard). The animation will take care of (instantly) @@ -593,7 +624,7 @@ constructor( Log.w(TAG, "Sending intent failed: $e") if (!collapse) { // executeRunnableDismissingKeyguard did not collapse for us already. - centralSurfaces?.collapsePanelOnMainThread() + shadeControllerLazy.get().collapseOnMainThread() } // TODO: Dismiss Keyguard. } @@ -635,7 +666,7 @@ constructor( val animate = animationController != null && - centralSurfaces?.shouldAnimateLaunch( + shouldAnimateLaunch( /* isActivityIntent= */ true, showOverLockscreenWhenLocked ) == true @@ -713,7 +744,7 @@ constructor( } else if (dismissShade) { // The animation will take care of dismissing the shade at the end of the animation. // If we don't animate, collapse it directly. - centralSurfaces?.collapseShade() + shadeControllerLazy.get().cancelExpansionAndCollapseShade() } // We should exit the dream to prevent the activity from starting below the @@ -802,7 +833,7 @@ constructor( shadeControllerLazy.get().isExpandedVisible && !statusBarKeyguardViewManagerLazy.get().isBouncerShowing ) { - shadeControllerLazy.get().animateCollapseShadeDelayed() + shadeControllerLazy.get().animateCollapseShadeForcedDelayed() } else { // Do it after DismissAction has been processed to conserve the // needed ordering. @@ -865,7 +896,9 @@ constructor( if (dismissShade) { return StatusBarLaunchAnimatorController( animationController, - it, + it.shadeViewController, + shadeControllerLazy.get(), + notifShadeWindowControllerLazy.get(), isLaunchForActivity ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 86bf7cb6fa2f..18d8050f9a36 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -26,11 +26,10 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.PowerManager; import android.os.UserHandle; -import android.service.notification.StatusBarNotification; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.RemoteAnimationAdapter; import android.view.View; -import android.view.ViewGroup; import android.window.RemoteTransition; import android.window.SplashScreen; @@ -39,19 +38,15 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleOwner; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.keyguard.AuthKeyguardMessageArea; import com.android.systemui.Dumpable; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.plugins.ActivityStarter.OnDismissAction; -import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; +import com.android.systemui.power.domain.interactor.PowerInteractor; import com.android.systemui.qs.QSPanelController; -import com.android.systemui.shade.NotificationShadeWindowView; -import com.android.systemui.shade.NotificationShadeWindowViewController; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; -import com.android.systemui.statusbar.LightRevealScrim; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.util.Compile; @@ -69,14 +64,11 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { String TAG = "CentralSurfaces"; boolean DEBUG = false; boolean SPEW = false; - boolean DUMPTRUCK = true; // extra dumpsys info boolean DEBUG_GESTURES = false; boolean DEBUG_MEDIA_FAKE_ARTWORK = false; boolean DEBUG_CAMERA_LIFT = false; boolean DEBUG_WINDOW_STATE = false; boolean DEBUG_WAKEUP_DELAY = Compile.IS_DEBUG; - // additional instrumentation for testing purposes; intended to be left on during development - boolean CHATTY = DEBUG; boolean SHOW_LOCKSCREEN_MEDIA_ARTWORK = true; String ACTION_FAKE_ARTWORK = "fake_artwork"; int FADE_KEYGUARD_START_DELAY = 100; @@ -194,14 +186,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { return contextForUser.getPackageManager(); } - void animateExpandNotificationsPanel(); - - void animateExpandSettingsPanel(@Nullable String subpanel); - - void collapsePanelOnMainThread(); - - void togglePanel(); - void start(); boolean updateIsKeyguard(); @@ -214,13 +198,12 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { /** * Wakes up the device if the device was dozing. + * + * @deprecated Use {@link PowerInteractor#wakeUpIfDozing(String, int)} instead. */ + @Deprecated void wakeUpIfDozing(long time, String why, @PowerManager.WakeReason int wakeReason); - NotificationShadeWindowView getNotificationShadeWindowView(); - - NotificationShadeWindowViewController getNotificationShadeWindowViewController(); - /** */ ShadeViewController getShadeViewController(); @@ -235,40 +218,30 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { boolean isLaunchingActivityOverLockscreen(); - boolean isWakeUpComingFromTouch(); - void onKeyguardViewManagerStatesUpdated(); - ViewGroup getNotificationScrollLayout(); - boolean isPulsing(); boolean isOccluded(); - //TODO: These can / should probably be moved to NotificationPresenter or ShadeController - void onLaunchAnimationCancelled(boolean isLaunchForActivity); - - void onLaunchAnimationEnd(boolean launchIsFullScreen); - - boolean shouldAnimateLaunch(boolean isActivityIntent, boolean showOverLockscreen); - - boolean shouldAnimateLaunch(boolean isActivityIntent); - boolean isDeviceInVrMode(); NotificationPresenter getPresenter(); - void postAnimateCollapsePanels(); - - void postAnimateForceCollapsePanels(); - - void postAnimateOpenPanels(); - - boolean isPanelExpanded(); - + /** + * Used to dispatch initial touch events before crossing the threshold to pull down the + * notification shade. After that, since the launcher window is set to slippery, input + * frameworks take care of routing the events to the notification shade. + */ void onInputFocusTransfer(boolean start, boolean cancel, float velocity); - void animateCollapseQuickSettings(); + /** + * Dispatches status bar motion event to the notification shade. This is different from + * {@link #onInputFocusTransfer(boolean, boolean, float)} as it doesn't rely on setting the + * launcher window slippery to allow the frameworks to route those events after passing the + * initial threshold. + */ + default void onStatusBarTrackpadEvent(MotionEvent event) {} /** */ boolean getCommandQueuePanelsEnabled(); @@ -289,16 +262,12 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { @Override void dump(PrintWriter pwOriginal, String[] args); - void createAndAddWindows(@Nullable RegisterStatusBarResult result); - float getDisplayWidth(); float getDisplayHeight(); void readyForKeyguardDone(); - void resetUserExpandedStates(); - void setLockscreenUser(int newUserId); void showKeyguard(); @@ -340,8 +309,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { void showBouncerWithDimissAndCancelIfKeyguard(OnDismissAction performAction, Runnable cancelAction); - LightRevealScrim getLightRevealScrim(); - // TODO: Figure out way to remove these. NavigationBarView getNavigationBarView(); @@ -355,8 +322,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { void setBouncerShowingOverDream(boolean bouncerShowingOverDream); - void collapseShade(); - int getWakefulnessState(); boolean isScreenFullyOff(); @@ -389,9 +354,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { boolean isDeviceInteractive(); - void setNotificationSnoozed(StatusBarNotification sbn, - NotificationSwipeActionHelper.SnoozeOption snoozeOption); - void awakenDreams(); void clearNotificationEffects(); @@ -455,8 +417,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { void extendDozePulse(); - boolean shouldDelayWakeUpAnimation(); - public static class KeyboardShortcutsMessage { final int mDeviceId; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java index 0ccc81981e58..5e0cfd6e4c33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java @@ -208,7 +208,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba @Override public void animateCollapsePanels(int flags, boolean force) { - mShadeController.animateCollapsePanels(flags, force, false /* delayed */, + mShadeController.animateCollapseShade(flags, force, false /* delayed */, 1.0f /* speedUpFactor */); } @@ -218,11 +218,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba Log.d(CentralSurfaces.TAG, "animateExpand: mExpandedVisible=" + mShadeController.isExpandedVisible()); } - if (!mCommandQueue.panelsEnabled()) { - return; - } - - mShadeViewController.expandToNotifications(); + mShadeController.animateExpandShade(); } @Override @@ -231,14 +227,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba Log.d(CentralSurfaces.TAG, "animateExpand: mExpandedVisible=" + mShadeController.isExpandedVisible()); } - if (!mCommandQueue.panelsEnabled()) { - return; - } - - // Settings are not available in setup - if (!mDeviceProvisionedController.isCurrentUserSetup()) return; - - mShadeViewController.expandToQs(); + mShadeController.animateExpandQs(); } @Override @@ -556,10 +545,10 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba @Override public void togglePanel() { - if (mCentralSurfaces.isPanelExpanded()) { + if (mShadeViewController.isPanelExpanded()) { mShadeController.animateCollapseShade(); } else { - animateExpandNotificationsPanel(); + mShadeController.animateExpandShade(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 1cd0f081a744..81048d60c6d9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -69,7 +69,6 @@ import android.net.Uri; import android.os.Binder; import android.os.Bundle; import android.os.Handler; -import android.os.Looper; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; @@ -91,6 +90,7 @@ import android.view.Display; import android.view.IRemoteAnimationRunner; import android.view.IWindowManager; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.ThreadedRenderer; import android.view.View; import android.view.ViewGroup; @@ -136,6 +136,7 @@ import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenu import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.assist.AssistManager; import com.android.systemui.biometrics.AuthRippleController; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.camera.CameraIntents; import com.android.systemui.charging.WiredChargingRippleController; @@ -157,7 +158,6 @@ import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.ui.binder.LightRevealScrimViewBinder; import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel; import com.android.systemui.navigationbar.NavigationBarController; @@ -172,7 +172,6 @@ import com.android.systemui.plugins.PluginDependencyProvider; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.PluginManager; import com.android.systemui.plugins.qs.QS; -import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSFragment; import com.android.systemui.qs.QSPanelController; @@ -411,23 +410,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { return mQSPanelController; } - /** */ - @Override - public void animateExpandNotificationsPanel() { - mCommandQueueCallbacks.animateExpandNotificationsPanel(); - } - - /** */ - @Override - public void animateExpandSettingsPanel(@Nullable String subpanel) { - mCommandQueueCallbacks.animateExpandSettingsPanel(subpanel); - } - - /** */ - @Override - public void togglePanel() { - mCommandQueueCallbacks.togglePanel(); - } /** * The {@link StatusBarState} of the status bar. */ @@ -455,7 +437,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private PhoneStatusBarTransitions mStatusBarTransitions; private final AuthRippleController mAuthRippleController; @WindowVisibleState private int mStatusBarWindowState = WINDOW_STATE_SHOWING; - protected final NotificationShadeWindowController mNotificationShadeWindowController; + private final NotificationShadeWindowController mNotificationShadeWindowController; private final StatusBarInitializer mStatusBarInitializer; private final StatusBarWindowController mStatusBarWindowController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @@ -464,8 +446,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final LightRevealScrim mLightRevealScrim; private PowerButtonReveal mPowerButtonReveal; - private boolean mWakeUpComingFromTouch; - /** * Whether we should delay the wakeup animation (which shows the notifications and moves the * clock view). This is typically done when waking up from a 'press to unlock' gesture on a @@ -498,7 +478,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final AlternateBouncerInteractor mAlternateBouncerInteractor; private final PluginDependencyProvider mPluginDependencyProvider; - private final KeyguardDismissUtil mKeyguardDismissUtil; private final ExtensionController mExtensionController; private final UserInfoControllerImpl mUserInfoControllerImpl; private final DemoModeController mDemoModeController; @@ -648,7 +627,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final UserSwitcherController mUserSwitcherController; private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this); protected final BatteryController mBatteryController; - protected boolean mPanelExpanded; private UiModeManager mUiModeManager; private LogMaker mStatusBarStateLog; protected final NotificationIconAreaController mNotificationIconAreaController; @@ -785,7 +763,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { InitController initController, @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, PluginDependencyProvider pluginDependencyProvider, - KeyguardDismissUtil keyguardDismissUtil, ExtensionController extensionController, UserInfoControllerImpl userInfoControllerImpl, PhoneStatusBarPolicy phoneStatusBarPolicy, @@ -882,7 +859,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mKeyguardViewMediatorCallback = viewMediatorCallback; mInitController = initController; mPluginDependencyProvider = pluginDependencyProvider; - mKeyguardDismissUtil = keyguardDismissUtil; mExtensionController = extensionController; mUserInfoControllerImpl = userInfoControllerImpl; mIconPolicy = phoneStatusBarPolicy; @@ -1144,7 +1120,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { @Override public void onPluginConnected(OverlayPlugin plugin, Context pluginContext) { mMainExecutor.execute( - () -> plugin.setup(getNotificationShadeWindowView(), + () -> plugin.setup( + mNotificationShadeWindowController.getWindowRootView(), getNavigationBarView(), new Callback(plugin), mDozeParameters)); } @@ -1544,22 +1521,15 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { @VisibleForTesting void onShadeExpansionFullyChanged(Boolean isExpanded) { - if (mPanelExpanded != isExpanded) { - mPanelExpanded = isExpanded; - if (getShadeViewController() != null) { - // Needed to update SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE - getShadeViewController().updateSystemUiStateFlags(); - } - if (isExpanded && mStatusBarStateController.getState() != StatusBarState.KEYGUARD) { - if (DEBUG) { - Log.v(TAG, "clearing notification effects from Height"); - } - clearNotificationEffects(); + if (isExpanded && mStatusBarStateController.getState() != StatusBarState.KEYGUARD) { + if (DEBUG) { + Log.v(TAG, "clearing notification effects from Height"); } + clearNotificationEffects(); + } - if (!isExpanded) { - mRemoteInputManager.onPanelCollapsed(); - } + if (!isExpanded) { + mRemoteInputManager.onPanelCollapsed(); } } @@ -1617,15 +1587,17 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { /** * Ask the display to wake up if currently dozing, else do nothing * + * @deprecated Use {@link PowerInteractor#wakeUpIfDozing(String, int)} instead. + * * @param time when to wake up * @param why the reason for the wake up */ @Override + @Deprecated public void wakeUpIfDozing(long time, String why, @PowerManager.WakeReason int wakeReason) { if (mDozing && mScreenOffAnimationController.allowWakeUpIfDozing()) { mPowerManager.wakeUp( time, wakeReason, "com.android.systemui:" + why); - mWakeUpComingFromTouch = true; mFalsingCollector.onScreenOnFromTouch(); } } @@ -1658,12 +1630,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { CollapsedStatusBarFragment.class, mCentralSurfacesComponent::createCollapsedStatusBarFragment); + ViewGroup windowRootView = mCentralSurfacesComponent.getWindowRootView(); mNotificationShadeWindowView = mCentralSurfacesComponent.getNotificationShadeWindowView(); mNotificationShadeWindowViewController = mCentralSurfacesComponent .getNotificationShadeWindowViewController(); // TODO(b/277762009): Inject [NotificationShadeWindowView] directly into the controller. // (Right now, there's a circular dependency.) - mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView); + mNotificationShadeWindowController.setWindowRootView(windowRootView); mNotificationShadeWindowViewController.setupExpandedStatusBar(); NotificationPanelViewController npvc = mCentralSurfacesComponent.getNotificationPanelViewController(); @@ -1739,21 +1712,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mLightBarController.setBiometricUnlockController(mBiometricUnlockController); mMediaManager.setBiometricUnlockController(mBiometricUnlockController); - mKeyguardDismissUtil.setDismissHandler(this::executeWhenUnlocked); Trace.endSection(); } @Override - public NotificationShadeWindowView getNotificationShadeWindowView() { - return mNotificationShadeWindowView; - } - - @Override - public NotificationShadeWindowViewController getNotificationShadeWindowViewController() { - return mNotificationShadeWindowViewController; - } - - @Override public ShadeViewController getShadeViewController() { return mShadeSurface; } @@ -1812,11 +1774,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { return mIsLaunchingActivityOverLockscreen; } - @Override - public boolean isWakeUpComingFromTouch() { - return mWakeUpComingFromTouch; - } - /** * To be called when there's a state change in StatusBarKeyguardViewManager. */ @@ -1826,11 +1783,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } @Override - public ViewGroup getNotificationScrollLayout() { - return mStackScroller; - } - - @Override public boolean isPulsing() { return mDozeServiceHost.isPulsing(); } @@ -1846,58 +1798,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { return mKeyguardStateController.isOccluded(); } - /** A launch animation was cancelled. */ - //TODO: These can / should probably be moved to NotificationPresenter or ShadeController - @Override - public void onLaunchAnimationCancelled(boolean isLaunchForActivity) { - if (mPresenter.isPresenterFullyCollapsed() && !mPresenter.isCollapsing() - && isLaunchForActivity) { - mShadeController.onClosingFinished(); - } else { - mShadeController.collapseShade(true /* animate */); - } - } - - /** A launch animation ended. */ - @Override - public void onLaunchAnimationEnd(boolean launchIsFullScreen) { - if (!mPresenter.isCollapsing()) { - mShadeController.onClosingFinished(); - } - if (launchIsFullScreen) { - mShadeController.instantCollapseShade(); - } - } - - /** - * Whether we should animate an activity launch. - * - * Note: This method must be called *before* dismissing the keyguard. - */ - @Override - public boolean shouldAnimateLaunch(boolean isActivityIntent, boolean showOverLockscreen) { - // TODO(b/184121838): Support launch animations when occluded. - if (isOccluded()) { - return false; - } - - // Always animate if we are not showing the keyguard or if we animate over the lockscreen - // (without unlocking it). - if (showOverLockscreen || !mKeyguardStateController.isShowing()) { - return true; - } - - // We don't animate non-activity launches as they can break the animation. - // TODO(b/184121838): Support non activity launches on the lockscreen. - return isActivityIntent; - } - - /** Whether we should animate an activity launch. */ - @Override - public boolean shouldAnimateLaunch(boolean isActivityIntent) { - return shouldAnimateLaunch(isActivityIntent, false /* showOverLockscreen */); - } - @Override public boolean isDeviceInVrMode() { return mPresenter.isDeviceInVrMode(); @@ -1950,30 +1850,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_APPLICATION, "com.android.systemui:full_screen_intent"); - mWakeUpComingFromTouch = false; } } - @Override - public void postAnimateCollapsePanels() { - mMainExecutor.execute(mShadeController::animateCollapseShade); - } - - @Override - public void postAnimateForceCollapsePanels() { - mMainExecutor.execute(mShadeController::animateCollapseShadeForced); - } - - @Override - public void postAnimateOpenPanels() { - mMessageRouter.sendMessage(MSG_OPEN_SETTINGS_PANEL); - } - - @Override - public boolean isPanelExpanded() { - return mPanelExpanded; - } - /** * Called when another window is about to transfer it's input focus. */ @@ -1991,11 +1870,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } @Override - public void animateCollapseQuickSettings() { - if (mState == StatusBarState.SHADE) { - mShadeSurface.collapse( - true, false /* delayed */, 1.0f /* speedUpFactor */); - } + public void onStatusBarTrackpadEvent(MotionEvent event) { + mCentralSurfacesComponent.getNotificationPanelViewController().handleExternalTouch(event); } private void onExpandedInvisible() { @@ -2249,8 +2125,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { + CameraIntents.getOverrideCameraPackage(mContext)); } - @Override - public void createAndAddWindows(@Nullable RegisterStatusBarResult result) { + private void createAndAddWindows(@Nullable RegisterStatusBarResult result) { makeStatusBarView(result); mNotificationShadeWindowController.attach(); mStatusBarWindowController.attach(); @@ -2334,7 +2209,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mNotificationShadeWindowController.setNotTouchable(false); } finishBarAnimations(); - resetUserExpandedStates(); + mNotificationsController.resetUserExpandedStates(); } Trace.endSection(); } @@ -2353,20 +2228,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } }; - @Override - public void resetUserExpandedStates() { - mNotificationsController.resetUserExpandedStates(); - } - - private void executeWhenUnlocked(OnDismissAction action, boolean requiresShadeOpen, - boolean afterKeyguardGone) { - if (mKeyguardStateController.isShowing() && requiresShadeOpen) { - mStatusBarStateController.setLeaveOpenOnKeyguardHide(true); - } - mActivityStarter.dismissKeyguardThenExecute(action, null /* cancelAction */, - afterKeyguardGone /* afterKeyguardGone */); - } - /** * Notify the shade controller that the current user changed * @@ -2992,19 +2853,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } /** - * Collapse the panel directly if we are on the main thread, post the collapsing on the main - * thread if we are not. - */ - @Override - public void collapsePanelOnMainThread() { - if (Looper.getMainLooper().isCurrentThread()) { - mShadeController.collapseShade(); - } else { - mContext.getMainExecutor().execute(mShadeController::collapseShade); - } - } - - /** * Updates the light reveal effect to reflect the reason we're waking or sleeping (for example, * from the power button). * @param wakingUp Whether we're updating because we're waking up (true) or going to sleep @@ -3040,11 +2888,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } } - @Override - public LightRevealScrim getLightRevealScrim() { - return mLightRevealScrim; - } - // TODO: Figure out way to remove these. @Override public NavigationBarView getNavigationBarView() { @@ -3067,9 +2910,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } protected ViewRootImpl getViewRootImpl() { - NotificationShadeWindowView nswv = getNotificationShadeWindowView(); - if (nswv != null) return nswv.getViewRootImpl(); - + View root = mNotificationShadeWindowController.getWindowRootView(); + if (root != null) return root.getViewRootImpl(); return null; } /** @@ -3121,19 +2963,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mShadeSurface.setBouncerShowing(bouncerShowing); } - /** - * Collapses the notification shade if it is tracking or expanded. - */ - @Override - public void collapseShade() { - if (mShadeSurface.isTracking()) { - mNotificationShadeWindowViewController.cancelCurrentTouch(); - } - if (mPanelExpanded && mState == StatusBarState.SHADE) { - mShadeController.animateCollapseShade(); - } - } - @VisibleForTesting final WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() { @Override @@ -3142,7 +2971,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { releaseGestureWakeLock(); mLaunchCameraWhenFinishedWaking = false; mDeviceInteractive = false; - mWakeUpComingFromTouch = false; updateVisibleToUser(); updateNotificationPanelTouchState(); @@ -3242,41 +3070,28 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { updateVisibleToUser(); updateIsKeyguard(); - if (!mFeatureFlags.isEnabled(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD)) { - startLockscreenTransitionFromAod(); - } }); DejankUtils.stopDetectingBlockingIpcs(tag); } - /** - * Private helper for starting the LOCKSCREEN_TRANSITION_FROM_AOD animation - only necessary - * so we can start it from either onFinishedWakingUp() or onFinishedWakingUp() depending - * on a flag value. - */ - private void startLockscreenTransitionFromAod() { - // stopDozing() starts the LOCKSCREEN_TRANSITION_FROM_AOD animation. - mDozeServiceHost.stopDozing(); - // This is intentionally below the stopDozing call above, since it avoids that we're - // unnecessarily animating the wakeUp transition. Animations should only be enabled - // once we fully woke up. - updateRevealEffect(true /* wakingUp */); - updateNotificationPanelTouchState(); - mStatusBarTouchableRegionManager.updateTouchableRegion(); - - // If we are waking up during the screen off animation, we should undo making the - // expanded visible (we did that so the LightRevealScrim would be visible). - if (mScreenOffAnimationController.shouldHideLightRevealScrimOnWakeUp()) { - mShadeController.makeExpandedInvisible(); - } - } - @Override public void onFinishedWakingUp() { - if (mFeatureFlags.isEnabled(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD)) { - mNotificationShadeWindowController.batchApplyWindowLayoutParams( - this::startLockscreenTransitionFromAod); - } + mNotificationShadeWindowController.batchApplyWindowLayoutParams(()-> { + // stopDozing() starts the LOCKSCREEN_TRANSITION_FROM_AOD animation. + mDozeServiceHost.stopDozing(); + // This is intentionally below the stopDozing call above, since it avoids that we're + // unnecessarily animating the wakeUp transition. Animations should only be enabled + // once we fully woke up. + updateRevealEffect(true /* wakingUp */); + updateNotificationPanelTouchState(); + mStatusBarTouchableRegionManager.updateTouchableRegion(); + + // If we are waking up during the screen off animation, we should undo making the + // expanded visible (we did that so the LightRevealScrim would be visible). + if (mScreenOffAnimationController.shouldHideLightRevealScrimOnWakeUp()) { + mShadeController.makeExpandedInvisible(); + } + }); mWakeUpCoordinator.setFullyAwake(true); mWakeUpCoordinator.setWakingUp(false, false); if (mKeyguardStateController.isOccluded() @@ -3496,7 +3311,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mScrimController.setExpansionAffectsAlpha(!unlocking); if (mAlternateBouncerInteractor.isVisibleState()) { - if ((!isOccluded() || isPanelExpanded()) + if ((!isOccluded() || mShadeSurface.isPanelExpanded()) && (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED || mTransitionToFullShadeProgress > 0f)) { mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED_SHADE); @@ -3626,12 +3441,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { }; @Override - public void setNotificationSnoozed(StatusBarNotification sbn, SnoozeOption snoozeOption) { - mNotificationsController.setNotificationSnoozed(sbn, snoozeOption); - } - - - @Override public void awakenDreams() { mUiBgExecutor.execute(() -> { try { @@ -3832,8 +3641,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { if (userSetup != mUserSetup) { mUserSetup = userSetup; - if (!mUserSetup) { - animateCollapseQuickSettings(); + if (!mUserSetup && mState == StatusBarState.SHADE) { + mShadeSurface.collapse(true /* animate */, false /* delayed */, + 1.0f /* speedUpFactor */); } updateQsExpansionEnabled(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java index 27b68f2ffb7d..1c90c0def95f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java @@ -16,48 +16,41 @@ package com.android.systemui.statusbar.phone; -import android.util.Log; - import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter.OnDismissAction; +import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.policy.KeyguardStateController; import javax.inject.Inject; /** - * Executes actions that require the screen to be unlocked. Delegates the actual handling to an - * implementation passed via {@link #setDismissHandler}. + * Executes actions that require the screen to be unlocked. */ @SysUISingleton public class KeyguardDismissUtil implements KeyguardDismissHandler { - private static final String TAG = "KeyguardDismissUtil"; + private final KeyguardStateController mKeyguardStateController; - private volatile KeyguardDismissHandler mDismissHandler; + private final SysuiStatusBarStateController mStatusBarStateController; - @Inject - public KeyguardDismissUtil() { - } + private final ActivityStarter mActivityStarter; - /** Sets the actual {@link KeyguardDismissHandler} implementation. */ - public void setDismissHandler(KeyguardDismissHandler dismissHandler) { - mDismissHandler = dismissHandler; + @Inject + public KeyguardDismissUtil(KeyguardStateController keyguardStateController, + SysuiStatusBarStateController statusBarStateController, + ActivityStarter activityStarter) { + mKeyguardStateController = keyguardStateController; + mStatusBarStateController = statusBarStateController; + mActivityStarter = activityStarter; } - /** - * Executes an action that requires the screen to be unlocked. - * - * <p>Must be called after {@link #setDismissHandler}. - * - * @param requiresShadeOpen does the shade need to be forced open when hiding the keyguard? - */ @Override public void executeWhenUnlocked(OnDismissAction action, boolean requiresShadeOpen, boolean afterKeyguardGone) { - KeyguardDismissHandler dismissHandler = mDismissHandler; - if (dismissHandler == null) { - Log.wtf(TAG, "KeyguardDismissHandler not set."); - action.onDismiss(); - return; + if (mKeyguardStateController.isShowing() && requiresShadeOpen) { + mStatusBarStateController.setLeaveOpenOnKeyguardHide(true); } - dismissHandler.executeWhenUnlocked(action, requiresShadeOpen, afterKeyguardGone); + mActivityStarter.dismissKeyguardThenExecute(action, null /* cancelAction */, + afterKeyguardGone /* afterKeyguardGone */); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 25ecf1a424e0..47c4023ca8aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -59,7 +59,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; import com.android.systemui.keyguard.shared.model.ScrimAlpha; import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; @@ -881,24 +881,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump mBehindAlpha = 1; mNotificationsAlpha = behindFraction * mDefaultScrimAlpha; } else { - if (mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) { - mBehindAlpha = mLargeScreenShadeInterpolator.getBehindScrimAlpha( - mPanelExpansionFraction * mDefaultScrimAlpha); - mNotificationsAlpha = - mLargeScreenShadeInterpolator.getNotificationScrimAlpha( - mPanelExpansionFraction); - } else { - // Behind scrim will finish fading in at 30% expansion. - float behindFraction = MathUtils - .constrainedMap(0f, 1f, 0f, 0.3f, mPanelExpansionFraction); - mBehindAlpha = behindFraction * mDefaultScrimAlpha; - // Delay fade-in of notification scrim a bit further, to coincide with the - // behind scrim finishing fading in. - // Also to coincide with the view starting to fade in, otherwise the empty - // panel can be quite jarring. - mNotificationsAlpha = MathUtils - .constrainedMap(0f, 1f, 0.3f, 0.75f, mPanelExpansionFraction); - } + mBehindAlpha = mLargeScreenShadeInterpolator.getBehindScrimAlpha( + mPanelExpansionFraction * mDefaultScrimAlpha); + mNotificationsAlpha = + mLargeScreenShadeInterpolator.getNotificationScrimAlpha( + mPanelExpansionFraction); } mBehindTint = mState.getBehindTint(); mInFrontAlpha = 0; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 1bf63be3c8b0..bb4aacbe4cab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -18,7 +18,7 @@ package com.android.systemui.statusbar.phone; import static android.view.WindowInsets.Type.navigationBars; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; import static com.android.systemui.plugins.ActivityStarter.OnDismissAction; import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK; import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING; @@ -58,11 +58,11 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; -import com.android.systemui.keyguard.data.BouncerView; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.ui.BouncerView; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.TaskbarDelegate; @@ -750,7 +750,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void onStartedWakingUp() { - mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController() + mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController() .setAnimationsDisabled(false); NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView(); if (navBarView != null) { @@ -764,7 +764,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void onStartedGoingToSleep() { - mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController() + mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController() .setAnimationsDisabled(true); NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView(); if (navBarView != null) { @@ -1114,7 +1114,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (view != null) { view.setVisibility(View.VISIBLE); } - mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController() + mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController() .show(navigationBars()); } }; @@ -1192,7 +1192,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } } else { mNotificationContainer.removeCallbacks(mMakeNavigationBarVisibleRunnable); - mCentralSurfaces.getNotificationShadeWindowView().getWindowInsetsController() + mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController() .hide(navigationBars()); } } @@ -1312,7 +1312,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public ViewRootImpl getViewRootImpl() { - ViewGroup viewGroup = mNotificationShadeWindowController.getNotificationShadeView(); + ViewGroup viewGroup = mNotificationShadeWindowController.getWindowRootView(); if (viewGroup != null) { return viewGroup.getViewRootImpl(); } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt index 9f69db93e64a..b67ec581f8a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt @@ -3,6 +3,9 @@ package com.android.systemui.statusbar.phone import android.view.View import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.animation.LaunchAnimator +import com.android.systemui.shade.ShadeController +import com.android.systemui.shade.ShadeViewController +import com.android.systemui.statusbar.NotificationShadeWindowController /** * A [ActivityLaunchAnimator.Controller] that takes care of collapsing the status bar at the right @@ -10,36 +13,38 @@ import com.android.systemui.animation.LaunchAnimator */ class StatusBarLaunchAnimatorController( private val delegate: ActivityLaunchAnimator.Controller, - private val centralSurfaces: CentralSurfaces, + private val shadeViewController: ShadeViewController, + private val shadeController: ShadeController, + private val notificationShadeWindowController: NotificationShadeWindowController, private val isLaunchForActivity: Boolean = true ) : ActivityLaunchAnimator.Controller by delegate { // Always sync the opening window with the shade, given that we draw a hole punch in the shade // of the same size and position as the opening app to make it visible. override val openingWindowSyncView: View? - get() = centralSurfaces.notificationShadeWindowView + get() = notificationShadeWindowController.windowRootView override fun onIntentStarted(willAnimate: Boolean) { delegate.onIntentStarted(willAnimate) if (willAnimate) { - centralSurfaces.shadeViewController.setIsLaunchAnimationRunning(true) + shadeViewController.setIsLaunchAnimationRunning(true) } else { - centralSurfaces.collapsePanelOnMainThread() + shadeController.collapseOnMainThread() } } override fun onLaunchAnimationStart(isExpandingFullyAbove: Boolean) { delegate.onLaunchAnimationStart(isExpandingFullyAbove) - centralSurfaces.shadeViewController.setIsLaunchAnimationRunning(true) + shadeViewController.setIsLaunchAnimationRunning(true) if (!isExpandingFullyAbove) { - centralSurfaces.shadeViewController.collapseWithDuration( + shadeViewController.collapseWithDuration( ActivityLaunchAnimator.TIMINGS.totalDuration.toInt()) } } override fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) { delegate.onLaunchAnimationEnd(isExpandingFullyAbove) - centralSurfaces.shadeViewController.setIsLaunchAnimationRunning(false) - centralSurfaces.onLaunchAnimationEnd(isExpandingFullyAbove) + shadeViewController.setIsLaunchAnimationRunning(false) + shadeController.onLaunchAnimationEnd(isExpandingFullyAbove) } override fun onLaunchAnimationProgress( @@ -48,12 +53,12 @@ class StatusBarLaunchAnimatorController( linearProgress: Float ) { delegate.onLaunchAnimationProgress(state, progress, linearProgress) - centralSurfaces.shadeViewController.applyLaunchAnimationProgress(linearProgress) + shadeViewController.applyLaunchAnimationProgress(linearProgress) } override fun onLaunchAnimationCancelled(newKeyguardOccludedState: Boolean?) { delegate.onLaunchAnimationCancelled() - centralSurfaces.shadeViewController.setIsLaunchAnimationRunning(false) - centralSurfaces.onLaunchAnimationCancelled(isLaunchForActivity) + shadeViewController.setIsLaunchAnimationRunning(false) + shadeController.onLaunchAnimationCancelled(isLaunchForActivity) } }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index 7bbb03b4bc94..f79a08173bf2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -63,6 +63,7 @@ import com.android.systemui.statusbar.NotificationClickNotifier; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationRemoteInputManager; +import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.notification.NotificationActivityStarter; import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -121,7 +122,8 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte private final CentralSurfaces mCentralSurfaces; private final NotificationPresenter mPresenter; - private final ShadeViewController mNotificationPanel; + private final ShadeViewController mShadeViewController; + private final NotificationShadeWindowController mNotificationShadeWindowController; private final ActivityLaunchAnimator mActivityLaunchAnimator; private final NotificationLaunchAnimatorControllerProvider mNotificationAnimationProvider; private final UserTracker mUserTracker; @@ -156,7 +158,8 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte OnUserInteractionCallback onUserInteractionCallback, CentralSurfaces centralSurfaces, NotificationPresenter presenter, - ShadeViewController panel, + ShadeViewController shadeViewController, + NotificationShadeWindowController notificationShadeWindowController, ActivityLaunchAnimator activityLaunchAnimator, NotificationLaunchAnimatorControllerProvider notificationAnimationProvider, LaunchFullScreenIntentProvider launchFullScreenIntentProvider, @@ -182,6 +185,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte mLockPatternUtils = lockPatternUtils; mStatusBarRemoteInputCallback = remoteInputCallback; mActivityIntentHelper = activityIntentHelper; + mNotificationShadeWindowController = notificationShadeWindowController; mFeatureFlags = featureFlags; mMetricsLogger = metricsLogger; mLogger = logger; @@ -189,7 +193,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte // TODO: use KeyguardStateController#isOccluded to remove this dependency mCentralSurfaces = centralSurfaces; mPresenter = presenter; - mNotificationPanel = panel; + mShadeViewController = shadeViewController; mActivityLaunchAnimator = activityLaunchAnimator; mNotificationAnimationProvider = notificationAnimationProvider; mUserTracker = userTracker; @@ -233,7 +237,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte && mActivityIntentHelper.wouldPendingLaunchResolverActivity(intent, mLockscreenUserManager.getCurrentUserId()); final boolean animate = !willLaunchResolverActivity - && mCentralSurfaces.shouldAnimateLaunch(isActivityIntent); + && mActivityStarter.shouldAnimateLaunch(isActivityIntent); boolean showOverLockscreen = mKeyguardStateController.isShowing() && intent != null && mActivityIntentHelper.wouldPendingShowOverLockscreen(intent, mLockscreenUserManager.getCurrentUserId()); @@ -284,7 +288,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte } // Always defer the keyguard dismiss when animating. - return animate || !mNotificationPanel.isFullyCollapsed(); + return animate || !mShadeViewController.isFullyCollapsed(); } private void handleNotificationClickAfterPanelCollapsed( @@ -319,7 +323,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte removeHunAfterClick(row); // Show work challenge, do not run PendingIntent and // remove notification - collapseOnMainThread(); + mShadeController.collapseOnMainThread(); return; } } @@ -436,7 +440,9 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte ActivityLaunchAnimator.Controller animationController = new StatusBarLaunchAnimatorController( mNotificationAnimationProvider.getAnimatorController(row, null), - mCentralSurfaces, + mShadeViewController, + mShadeController, + mNotificationShadeWindowController, isActivityIntent); mActivityLaunchAnimator.startPendingIntentWithAnimation( animationController, @@ -467,7 +473,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte @Override public void startNotificationGutsIntent(final Intent intent, final int appUid, ExpandableNotificationRow row) { - boolean animate = mCentralSurfaces.shouldAnimateLaunch(true /* isActivityIntent */); + boolean animate = mActivityStarter.shouldAnimateLaunch(true /* isActivityIntent */); ActivityStarter.OnDismissAction onDismissAction = new ActivityStarter.OnDismissAction() { @Override public boolean onDismiss() { @@ -475,7 +481,10 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte ActivityLaunchAnimator.Controller animationController = new StatusBarLaunchAnimatorController( mNotificationAnimationProvider.getAnimatorController(row), - mCentralSurfaces, true /* isActivityIntent */); + mShadeViewController, + mShadeController, + mNotificationShadeWindowController, + true /* isActivityIntent */); mActivityLaunchAnimator.startIntentWithAnimation( animationController, animate, intent.getPackage(), @@ -500,7 +509,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte @Override public void startHistoryIntent(View view, boolean showHistory) { - boolean animate = mCentralSurfaces.shouldAnimateLaunch(true /* isActivityIntent */); + boolean animate = mActivityStarter.shouldAnimateLaunch(true /* isActivityIntent */); ActivityStarter.OnDismissAction onDismissAction = new ActivityStarter.OnDismissAction() { @Override public boolean onDismiss() { @@ -520,9 +529,12 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte ); ActivityLaunchAnimator.Controller animationController = viewController == null ? null - : new StatusBarLaunchAnimatorController(viewController, - mCentralSurfaces, - true /* isActivityIntent */); + : new StatusBarLaunchAnimatorController( + viewController, + mShadeViewController, + mShadeController, + mNotificationShadeWindowController, + true /* isActivityIntent */); mActivityLaunchAnimator.startIntentWithAnimation(animationController, animate, intent.getPackage(), @@ -621,11 +633,4 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte return true; } - private void collapseOnMainThread() { - if (Looper.getMainLooper().isCurrentThread()) { - mShadeController.collapseShade(); - } else { - mMainThreadHandler.post(mShadeController::collapseShade); - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index dfaee4c674ad..5624e28204cc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -40,7 +40,6 @@ import com.android.systemui.shade.NotificationShadeWindowView; import com.android.systemui.shade.QuickSettingsController; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; @@ -86,7 +85,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, private final HeadsUpManagerPhone mHeadsUpManager; private final AboveShelfObserver mAboveShelfObserver; private final DozeScrimController mDozeScrimController; - private final KeyguardIndicationController mKeyguardIndicationController; private final CentralSurfaces mCentralSurfaces; private final LockscreenShadeTransitionController mShadeTransitionController; private final CommandQueue mCommandQueue; @@ -115,7 +113,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, NotificationShadeWindowController notificationShadeWindowController, DynamicPrivacyController dynamicPrivacyController, KeyguardStateController keyguardStateController, - KeyguardIndicationController keyguardIndicationController, CentralSurfaces centralSurfaces, LockscreenShadeTransitionController shadeTransitionController, CommandQueue commandQueue, @@ -137,7 +134,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, mQsController = quickSettingsController; mHeadsUpManager = headsUp; mDynamicPrivacyController = dynamicPrivacyController; - mKeyguardIndicationController = keyguardIndicationController; // TODO: use KeyguardStateController#isOccluded to remove this dependency mCentralSurfaces = centralSurfaces; mShadeTransitionController = shadeTransitionController; @@ -173,7 +169,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, mNotificationPanel.getShadeNotificationPresenter().createRemoteInputDelegate()); initController.addPostInitTask(() -> { - mKeyguardIndicationController.init(); mNotifShadeEventSource.setShadeEmptiedCallback(this::maybeClosePanelForShadeEmptied); mNotifShadeEventSource.setNotifRemovedByUserCallback(this::maybeEndAmbientPulse); notificationInterruptStateProvider.addSuppressor(mInterruptSuppressor); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt index 592d1aa8f43f..96a4d900c160 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt @@ -22,6 +22,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.statusbar.CircleReveal import com.android.systemui.statusbar.LightRevealScrim +import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.StatusBarStateControllerImpl import com.android.systemui.statusbar.notification.AnimatableProperty @@ -60,6 +61,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( private val keyguardStateController: KeyguardStateController, private val dozeParameters: dagger.Lazy<DozeParameters>, private val globalSettings: GlobalSettings, + private val notifShadeWindowControllerLazy: dagger.Lazy<NotificationShadeWindowController>, private val interactionJankMonitor: InteractionJankMonitor, private val powerManager: PowerManager, private val handler: Handler = Handler() @@ -114,7 +116,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( override fun onAnimationStart(animation: Animator?) { interactionJankMonitor.begin( - mCentralSurfaces.notificationShadeWindowView, CUJ_SCREEN_OFF) + notifShadeWindowControllerLazy.get().windowRootView, CUJ_SCREEN_OFF) } }) } @@ -218,7 +220,7 @@ class UnlockedScreenOffAnimationController @Inject constructor( .setCustomInterpolator(View.ALPHA, Interpolators.FAST_OUT_SLOW_IN), true /* animate */) interactionJankMonitor.begin( - mCentralSurfaces.notificationShadeWindowView, + notifShadeWindowControllerLazy.get().windowRootView, CUJ_SCREEN_OFF_SHOW_AOD ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java index 273e78350f27..158f96123d92 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java @@ -20,6 +20,7 @@ import static com.android.systemui.statusbar.phone.dagger.StatusBarViewModule.ST import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.android.systemui.scene.ui.view.WindowRootView; import com.android.systemui.shade.NotificationPanelViewController; import com.android.systemui.shade.NotificationShadeWindowView; import com.android.systemui.shade.NotificationShadeWindowViewController; @@ -80,8 +81,11 @@ public interface CentralSurfacesComponent { @Scope @interface CentralSurfacesScope {} + /** Creates the root view of the main SysUI window}. */ + WindowRootView getWindowRootView(); + /** - * Creates a {@link NotificationShadeWindowView}. + * Creates or returns a {@link NotificationShadeWindowView}. */ NotificationShadeWindowView getNotificationShadeWindowView(); diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index 080be6d8cf25..12da17f6a301 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -192,12 +192,6 @@ android:excludeFromRecents="true" /> <activity - android:name="com.android.systemui.notetask.shortcut.LaunchNoteTaskManagedProfileProxyActivity" - android:exported="false" - android:permission="com.android.systemui.permission.SELF" - android:excludeFromRecents="true" /> - - <activity android:name="com.android.systemui.notetask.LaunchNotesRoleSettingsTrampolineActivity" android:exported="false" android:permission="com.android.systemui.permission.SELF" diff --git a/packages/SystemUI/tests/src/com/android/keyguard/AdminSecondaryLockScreenControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/AdminSecondaryLockScreenControllerTest.java index f5cd0ca7ab3b..319a02d911ed 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/AdminSecondaryLockScreenControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/AdminSecondaryLockScreenControllerTest.java @@ -50,6 +50,7 @@ import com.android.systemui.SysuiTestCase; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations; @RunWithLooper @RunWith(AndroidTestingRunner.class) @SmallTest +@Ignore("b/286245842") public class AdminSecondaryLockScreenControllerTest extends SysuiTestCase { private static final int TARGET_USER_ID = KeyguardUpdateMonitor.getCurrentUser(); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt index 3f1560bc5fce..0dcd404d2fc5 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt @@ -23,7 +23,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.flags.FeatureFlags -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor @@ -47,12 +47,14 @@ import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.yield import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock @@ -62,6 +64,7 @@ import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import java.util.TimeZone import java.util.concurrent.Executor +import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository import org.mockito.Mockito.`when` as whenever @RunWith(AndroidTestingRunner::class) @@ -117,8 +120,9 @@ class ClockEventControllerTest : SysuiTestCase() { commandQueue = commandQueue, featureFlags = featureFlags, bouncerRepository = bouncerRepository, + configurationRepository = FakeConfigurationRepository(), ), - KeyguardTransitionInteractor(repository = transitionRepository), + KeyguardTransitionInteractor(transitionRepository, TestScope().backgroundScope), broadcastDispatcher, batteryController, keyguardUpdateMonitor, @@ -155,9 +159,8 @@ class ClockEventControllerTest : SysuiTestCase() { @Test fun themeChanged_verifyClockPaletteUpdated() = runBlocking(IMMEDIATE) { - // TODO(b/266103601): delete this test and add more coverage for updateColors() - // verify(smallClockEvents).onRegionDarknessChanged(anyBoolean()) - // verify(largeClockEvents).onRegionDarknessChanged(anyBoolean()) + verify(smallClockEvents).onRegionDarknessChanged(anyBoolean()) + verify(largeClockEvents).onRegionDarknessChanged(anyBoolean()) val captor = argumentCaptor<ConfigurationController.ConfigurationListener>() verify(configurationController).addCallback(capture(captor)) diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java index 061340e385a5..65c677ea7e5a 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java @@ -16,6 +16,7 @@ package com.android.keyguard; +import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static com.android.keyguard.KeyguardClockSwitch.LARGE; @@ -192,6 +193,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { assertThat(mLargeClockFrame.getAlpha()).isEqualTo(1); assertThat(mLargeClockFrame.getVisibility()).isEqualTo(VISIBLE); assertThat(mSmallClockFrame.getAlpha()).isEqualTo(0); + assertThat(mSmallClockFrame.getVisibility()).isEqualTo(INVISIBLE); } @Test @@ -201,6 +203,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { assertThat(mLargeClockFrame.getAlpha()).isEqualTo(1); assertThat(mLargeClockFrame.getVisibility()).isEqualTo(VISIBLE); assertThat(mSmallClockFrame.getAlpha()).isEqualTo(0); + assertThat(mSmallClockFrame.getVisibility()).isEqualTo(INVISIBLE); } @Test @@ -216,6 +219,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { // only big clock is removed at switch assertThat(mLargeClockFrame.getParent()).isNull(); assertThat(mLargeClockFrame.getAlpha()).isEqualTo(0); + assertThat(mLargeClockFrame.getVisibility()).isEqualTo(INVISIBLE); } @Test @@ -227,6 +231,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { // only big clock is removed at switch assertThat(mLargeClockFrame.getParent()).isNull(); assertThat(mLargeClockFrame.getAlpha()).isEqualTo(0); + assertThat(mLargeClockFrame.getVisibility()).isEqualTo(INVISIBLE); } @Test diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java index d2e5a45c3a93..f59fd99b9a01 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java @@ -18,7 +18,7 @@ package com.android.keyguard; import static com.android.keyguard.KeyguardSecurityContainer.MODE_DEFAULT; import static com.android.keyguard.KeyguardSecurityContainer.MODE_ONE_HANDED; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; import static com.google.common.truth.Truth.assertThat; @@ -67,6 +67,7 @@ import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.ActivityStarter; @@ -216,7 +217,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { mUserSwitcherController, mFeatureFlags, mGlobalSettings, mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate, mTelephonyManager, mViewMediatorCallback, mAudioManager, - mock(KeyguardFaceAuthInteractor.class)); + mock(KeyguardFaceAuthInteractor.class), + mock(BouncerMessageInteractor.class)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index de306d669476..0edfd77f2703 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -38,6 +38,7 @@ import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_CANCELL import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT; import static com.android.keyguard.KeyguardUpdateMonitor.HAL_POWER_PRESS_TIMEOUT; import static com.android.keyguard.KeyguardUpdateMonitor.getCurrentUser; +import static com.android.systemui.flags.Flags.FP_LISTEN_OCCLUDING_APPS; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_CLOSED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN; @@ -134,6 +135,7 @@ import com.android.systemui.biometrics.AuthController; import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dump.DumpManager; +import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.settings.UserTracker; @@ -277,6 +279,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { private final Executor mBackgroundExecutor = Runnable::run; private final Executor mMainExecutor = Runnable::run; private TestableLooper mTestableLooper; + private FakeFeatureFlags mFeatureFlags; private Handler mHandler; private TestableKeyguardUpdateMonitor mKeyguardUpdateMonitor; private MockitoSession mMockitoSession; @@ -325,6 +328,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mTestableLooper = TestableLooper.get(this); allowTestableLooperAsMainThread(); + mFeatureFlags = new FakeFeatureFlags(); + mFeatureFlags.set(FP_LISTEN_OCCLUDING_APPS, false); when(mSecureSettings.getUriFor(anyString())).thenReturn(mURI); @@ -1430,6 +1435,23 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + public void testOccludingAppFingerprintListeningState_featureFlagEnabled() { + mFeatureFlags.set(FP_LISTEN_OCCLUDING_APPS, true); + + // GIVEN keyguard isn't visible (app occluding) + mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON); + mKeyguardUpdateMonitor.setKeyguardShowing(true, true); + when(mStrongAuthTracker.hasUserAuthenticatedSinceBoot()).thenReturn(true); + + // THEN we SHOULD listen for non-UDFPS fingerprint + assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(false)).isEqualTo(true); + + // THEN we should listen for udfps (hiding of mechanism to actually auth is + // controlled by UdfpsKeyguardViewController) + assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(true)).isEqualTo(true); + } + + @Test public void testOccludingAppFingerprintListeningState() { // GIVEN keyguard isn't visible (app occluding) mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON); @@ -3136,7 +3158,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mDreamManager, mDevicePolicyManager, mSensorPrivacyManager, mTelephonyManager, mPackageManager, mFaceManager, mFingerprintManager, mBiometricManager, mFaceWakeUpTriggersConfig, mDevicePostureController, - Optional.of(mInteractiveToAuthProvider)); + Optional.of(mInteractiveToAuthProvider), mFeatureFlags); setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java index 456702b65091..c88c4d65f412 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java @@ -18,6 +18,7 @@ package com.android.keyguard; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1; +import static com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; @@ -42,15 +43,12 @@ import com.android.systemui.biometrics.AuthController; import com.android.systemui.biometrics.AuthRippleController; import com.android.systemui.doze.util.BurnInHelperKt; import com.android.systemui.dump.DumpManager; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository; -import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository; +import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository; -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -91,10 +89,9 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { protected @Mock ConfigurationController mConfigurationController; protected @Mock VibratorHelper mVibrator; protected @Mock AuthRippleController mAuthRippleController; - protected @Mock FeatureFlags mFeatureFlags; protected @Mock KeyguardTransitionRepository mTransitionRepository; - protected @Mock CommandQueue mCommandQueue; protected FakeExecutor mDelayableExecutor = new FakeExecutor(new FakeSystemClock()); + protected FakeFeatureFlags mFeatureFlags; protected LockIconViewController mUnderTest; @@ -144,6 +141,8 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { when(mStatusBarStateController.isDozing()).thenReturn(false); when(mStatusBarStateController.getState()).thenReturn(StatusBarState.KEYGUARD); + mFeatureFlags = new FakeFeatureFlags(); + mFeatureFlags.set(FACE_AUTH_REFACTOR, false); mUnderTest = new LockIconViewController( mLockIconView, mStatusBarStateController, @@ -159,13 +158,9 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { mVibrator, mAuthRippleController, mResources, - new KeyguardTransitionInteractor(mTransitionRepository), - new KeyguardInteractor( - new FakeKeyguardRepository(), - mCommandQueue, - mFeatureFlags, - new FakeKeyguardBouncerRepository() - ), + new KeyguardTransitionInteractor(mTransitionRepository, + TestScopeProvider.getTestScope().getBackgroundScope()), + KeyguardInteractorFactory.create(mFeatureFlags).getKeyguardInteractor(), mFeatureFlags ); } @@ -226,7 +221,7 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { } protected void init(boolean useMigrationFlag) { - when(mFeatureFlags.isEnabled(DOZING_MIGRATION_1)).thenReturn(useMigrationFlag); + mFeatureFlags.set(DOZING_MIGRATION_1, useMigrationFlag); mUnderTest.init(); verify(mLockIconView, atLeast(1)).addOnAttachStateChangeListener(mAttachCaptor.capture()); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/TestScopeProvider.kt b/packages/SystemUI/tests/src/com/android/keyguard/TestScopeProvider.kt new file mode 100644 index 000000000000..073c7feb25e3 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/keyguard/TestScopeProvider.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2022 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.keyguard + +import kotlinx.coroutines.test.TestScope + +class TestScopeProvider { + companion object { + @JvmStatic fun getTestScope() = TestScope() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java index a0fdc8f1555e..24a5e8072796 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java @@ -48,8 +48,7 @@ public class DependencyTest extends SysuiTestCase { @Test public void testInitDependency() throws ExecutionException, InterruptedException { Dependency.clearDependencies(); - SystemUIInitializer initializer = - SystemUIInitializerFactory.createFromConfigNoAssert(mContext); + SystemUIInitializer initializer = new SystemUIInitializerImpl(mContext); initializer.init(true); Dependency dependency = initializer.getSysUIComponent().createDependency(); dependency.start(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationSettingsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationSettingsControllerTest.java index 665246bd7f7d..62a176c94d67 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationSettingsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationSettingsControllerTest.java @@ -73,9 +73,9 @@ public class MagnificationSettingsControllerTest extends SysuiTestCase { @Test public void testShowSettingsPanel() { - mMagnificationSettingsController.showMagnificationSettings(); + mMagnificationSettingsController.toggleSettingsPanelVisibility(); - verify(mWindowMagnificationSettings).showSettingPanel(); + verify(mWindowMagnificationSettings).toggleSettingsPanelVisibility(); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index 9c36af3a35e4..31c09b8e7ec4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -16,6 +16,7 @@ package com.android.systemui.accessibility; +import static android.content.pm.PackageManager.FEATURE_WINDOW_MAGNIFICATION; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.content.res.Configuration.ORIENTATION_UNDEFINED; @@ -96,6 +97,7 @@ import com.android.systemui.utils.os.FakeHandler; import com.google.common.util.concurrent.AtomicDouble; import org.junit.After; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -147,8 +149,15 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { private View.OnTouchListener mTouchListener; private MotionEventHelper mMotionEventHelper = new MotionEventHelper(); + /** + * return whether window magnification is supported for current test context. + */ + private boolean isWindowModeSupported() { + return getContext().getPackageManager().hasSystemFeature(FEATURE_WINDOW_MAGNIFICATION); + } + @Before - public void setUp() throws RemoteException { + public void setUp() throws Exception { MockitoAnnotations.initMocks(this); mContext = Mockito.spy(getContext()); mHandler = new FakeHandler(TestableLooper.get(this).getLooper()); @@ -202,6 +211,9 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { return null; }).when(mSpyView).setOnTouchListener( any(View.OnTouchListener.class)); + + // skip test if window magnification is not supported to prevent fail results. (b/279820875) + Assume.assumeTrue(isWindowModeSupported()); } @After diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSettingsTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSettingsTest.java index ce96708039ae..b3f9958764dc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSettingsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSettingsTest.java @@ -16,6 +16,7 @@ package com.android.systemui.accessibility; +import static android.provider.Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN; @@ -30,6 +31,7 @@ import static junit.framework.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,6 +39,7 @@ import android.annotation.IdRes; import android.content.Context; import android.content.pm.ActivityInfo; import android.database.ContentObserver; +import android.graphics.Rect; import android.os.UserHandle; import android.provider.Settings; import android.testing.AndroidTestingRunner; @@ -49,8 +52,10 @@ import android.widget.Button; import android.widget.CompoundButton; import android.widget.LinearLayout; +import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; +import com.android.internal.accessibility.common.MagnificationConstants; import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; @@ -60,12 +65,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper(setAsMainLooper = true) +@TestableLooper.RunWithLooper public class WindowMagnificationSettingsTest extends SysuiTestCase { private static final int MAGNIFICATION_SIZE_SMALL = 1; @@ -85,6 +91,11 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { private WindowMagnificationSettings mWindowMagnificationSettings; private MotionEventHelper mMotionEventHelper = new MotionEventHelper(); + private ArgumentCaptor<Float> mSecureSettingsScaleCaptor; + private ArgumentCaptor<String> mSecureSettingsNameCaptor; + private ArgumentCaptor<Integer> mSecureSettingsUserHandleCaptor; + private ArgumentCaptor<Float> mCallbackMagnifierScaleCaptor; + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -100,6 +111,10 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { mSecureSettings); mSettingView = mWindowMagnificationSettings.getSettingView(); + mSecureSettingsScaleCaptor = ArgumentCaptor.forClass(Float.class); + mSecureSettingsNameCaptor = ArgumentCaptor.forClass(String.class); + mSecureSettingsUserHandleCaptor = ArgumentCaptor.forClass(Integer.class); + mCallbackMagnifierScaleCaptor = ArgumentCaptor.forClass(Float.class); } @After @@ -275,6 +290,39 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { } @Test + public void onScreenSizeChanged_resetPositionToRightBottomCorner() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_ALL, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + mWindowMagnificationSettings.showSettingPanel(); + + // move the panel to the center of draggable window bounds + mWindowMagnificationSettings.mParams.x = + mWindowMagnificationSettings.mDraggableWindowBounds.centerX(); + mWindowMagnificationSettings.mParams.y = + mWindowMagnificationSettings.mDraggableWindowBounds.centerY(); + mWindowMagnificationSettings.updateButtonViewLayoutIfNeeded(); + + final Rect testWindowBounds = new Rect( + mWindowManager.getCurrentWindowMetrics().getBounds()); + testWindowBounds.set(testWindowBounds.left, testWindowBounds.top, + testWindowBounds.right + 200, testWindowBounds.bottom + 50); + mWindowManager.setWindowBounds(testWindowBounds); + + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + mWindowMagnificationSettings.onConfigurationChanged(ActivityInfo.CONFIG_SCREEN_SIZE); + }); + + // the panel position should be reset to the bottom-right corner + assertEquals( + mWindowMagnificationSettings.mParams.x, + mWindowMagnificationSettings.mDraggableWindowBounds.right); + assertEquals( + mWindowMagnificationSettings.mParams.y, + mWindowMagnificationSettings.mDraggableWindowBounds.bottom); + } + + @Test public void showSettingsPanel_observerRegistered() { setupMagnificationCapabilityAndMode( /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_ALL, @@ -289,6 +337,20 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { } @Test + public void showSettingsPanel_observerForMagnificationScaleRegistered() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_ALL, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + verify(mSecureSettings).registerContentObserverForUser( + eq(ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE), + any(ContentObserver.class), + eq(UserHandle.USER_CURRENT)); + } + + @Test public void hideSettingsPanel_observerUnregistered() { setupMagnificationCapabilityAndMode( /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_ALL, @@ -297,7 +359,162 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { mWindowMagnificationSettings.showSettingPanel(); mWindowMagnificationSettings.hideSettingPanel(); - verify(mSecureSettings).unregisterContentObserver(any(ContentObserver.class)); + verify(mSecureSettings, times(2)).unregisterContentObserver(any(ContentObserver.class)); + } + + @Test + public void seekbarProgress_justInflated_maxValueAndProgressSetCorrectly() { + setupScaleInSecureSettings(0f); + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(0); + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getMax()).isEqualTo(70); + } + + @Test + public void seekbarProgress_minMagnification_seekbarProgressIsCorrect() { + setupScaleInSecureSettings(0f); + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + // Seekbar index from 0 to 70. 1.0f scale (A11Y_SCALE_MIN_VALUE) would correspond to 0. + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(0); + } + + @Test + public void seekbarProgress_belowMinMagnification_seekbarProgressIsZero() { + setupScaleInSecureSettings(0f); + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(0); + } + + @Test + public void seekbarProgress_magnificationBefore_seekbarProgressIsHalf() { + setupScaleInSecureSettings(4f); + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + // float scale : from 1.0f to 8.0f, seekbar index from 0 to 70. + // 4.0f would correspond to 30. + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(30); + } + + @Test + public void seekbarProgress_maxMagnificationBefore_seekbarProgressIsMax() { + setupScaleInSecureSettings(8f); + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + // 8.0f is max magnification {@link MagnificationScaleProvider#MAX_SCALE}. + // Max zoom seek bar is 70. + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(70); + } + + @Test + public void seekbarProgress_aboveMaxMagnificationBefore_seekbarProgressIsMax() { + setupScaleInSecureSettings(9f); + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + + mWindowMagnificationSettings.showSettingPanel(); + + // Max zoom seek bar is 70. + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(70); + } + + @Test + public void seekbarProgress_progressChangedRoughlyHalf_scaleAndCallbackUpdated() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + mWindowMagnificationSettings.showSettingPanel(); + + mWindowMagnificationSettings.mZoomSeekbar.setProgress(30); + + verifyScaleUpdatedInSecureSettings(4f); + verifyCallbackOnMagnifierScale(4f); + } + + @Test + public void seekbarProgress_minProgress_callbackUpdated() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + mWindowMagnificationSettings.showSettingPanel(); + // Set progress to non-zero first so onProgressChanged can be triggered upon setting to 0. + mWindowMagnificationSettings.mZoomSeekbar.setProgress(30); + + mWindowMagnificationSettings.mZoomSeekbar.setProgress(0); + + // For now, secure settings will not be updated for values < 1.3f. Follow up on this later. + verify(mWindowMagnificationSettingsCallback, times(2)) + .onMagnifierScale(mCallbackMagnifierScaleCaptor.capture()); + var capturedArgs = mCallbackMagnifierScaleCaptor.getAllValues(); + assertThat(capturedArgs).hasSize(2); + assertThat(capturedArgs.get(1)).isWithin(0.01f).of(1f); + } + + @Test + public void seekbarProgress_maxProgress_scaleAndCallbackUpdated() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + mWindowMagnificationSettings.showSettingPanel(); + + mWindowMagnificationSettings.mZoomSeekbar.setProgress(70); + + verifyScaleUpdatedInSecureSettings(8f); + verifyCallbackOnMagnifierScale(8f); + } + + @Test + public void seekbarProgress_scaleUpdatedAfterSettingPanelOpened_progressAlsoUpdated() { + setupMagnificationCapabilityAndMode( + /* capability= */ ACCESSIBILITY_MAGNIFICATION_MODE_ALL, + /* mode= */ ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); + var contentObserverCaptor = ArgumentCaptor.forClass(ContentObserver.class); + mWindowMagnificationSettings.showSettingPanel(); + verify(mSecureSettings).registerContentObserverForUser( + eq(ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE), + contentObserverCaptor.capture(), + eq(UserHandle.USER_CURRENT)); + + // Simulate outside changes. + setupScaleInSecureSettings(4f); + // Simulate callback due to outside change. + contentObserverCaptor.getValue().onChange(/* selfChange= */ false); + + assertThat(mWindowMagnificationSettings.mZoomSeekbar.getProgress()).isEqualTo(30); + } + + private void verifyScaleUpdatedInSecureSettings(float scale) { + verify(mSecureSettings).putFloatForUser( + mSecureSettingsNameCaptor.capture(), + mSecureSettingsScaleCaptor.capture(), + mSecureSettingsUserHandleCaptor.capture()); + assertThat(mSecureSettingsScaleCaptor.getValue()).isWithin(0.01f).of(scale); + assertThat(mSecureSettingsNameCaptor.getValue()) + .isEqualTo(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE); + assertThat(mSecureSettingsUserHandleCaptor.getValue()).isEqualTo(UserHandle.USER_CURRENT); + } + + private void verifyCallbackOnMagnifierScale(float scale) { + verify(mWindowMagnificationSettingsCallback) + .onMagnifierScale(mCallbackMagnifierScaleCaptor.capture()); + assertThat(mCallbackMagnifierScaleCaptor.getValue()).isWithin(0.01f).of(scale); } private <T extends View> T getInternalView(@IdRes int idRes) { @@ -316,4 +533,11 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { ACCESSIBILITY_MAGNIFICATION_MODE_NONE, UserHandle.USER_CURRENT)).thenReturn(mode); } + + private void setupScaleInSecureSettings(float scale) { + when(mSecureSettings.getFloatForUser( + ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, + MagnificationConstants.SCALE_MIN_VALUE, + UserHandle.USER_CURRENT)).thenReturn(scale); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java index 38ecec0b4602..db580742a68f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java @@ -110,7 +110,7 @@ public class WindowMagnificationTest extends SysuiTestCase { mWindowMagnification.mMagnificationSettingsControllerCallback .onSettingsPanelVisibilityChanged(TEST_DISPLAY, /* shown= */ true); return null; - }).when(mMagnificationSettingsController).showMagnificationSettings(); + }).when(mMagnificationSettingsController).toggleSettingsPanelVisibility(); doAnswer(invocation -> { mWindowMagnification.mMagnificationSettingsControllerCallback .onSettingsPanelVisibilityChanged(TEST_DISPLAY, /* shown= */ false); @@ -198,7 +198,7 @@ public class WindowMagnificationTest extends SysuiTestCase { mWindowMagnification.mWindowMagnifierCallback.onClickSettingsButton(TEST_DISPLAY); waitForIdleSync(); - verify(mMagnificationSettingsController).showMagnificationSettings(); + verify(mMagnificationSettingsController).toggleSettingsPanelVisibility(); verify(mA11yLogger).log( eq(MagnificationSettingsEvent.MAGNIFICATION_SETTINGS_PANEL_OPENED)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt index 0798d73cc2f2..d1ac0e861d26 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt @@ -21,6 +21,7 @@ import android.testing.TestableLooper import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.view.LaunchableFrameLayout import org.junit.Assert.assertThrows import org.junit.Test import org.junit.runner.RunWith diff --git a/packages/SystemUI/tests/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractorTest.kt index 1990c8f644b4..3a93e7744d00 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractorTest.kt @@ -16,6 +16,7 @@ package com.android.systemui.authentication.domain.interactor +import android.app.admin.DevicePolicyManager import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.authentication.data.repository.AuthenticationRepository @@ -48,7 +49,7 @@ class AuthenticationInteractorTest : SysuiTestCase() { fun authMethod() = testScope.runTest { val authMethod by collectLastValue(underTest.authenticationMethod) - assertThat(authMethod).isEqualTo(AuthenticationMethodModel.PIN(1234)) + assertThat(authMethod).isEqualTo(AuthenticationMethodModel.Pin(1234)) underTest.setAuthenticationMethod(AuthenticationMethodModel.Password("password")) assertThat(authMethod).isEqualTo(AuthenticationMethodModel.Password("password")) @@ -147,7 +148,7 @@ class AuthenticationInteractorTest : SysuiTestCase() { testScope.runTest { val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) val isUnlocked by collectLastValue(underTest.isUnlocked) - underTest.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + underTest.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(isUnlocked).isFalse() assertThat(underTest.authenticate(listOf(1, 2, 3, 4))).isTrue() @@ -160,7 +161,7 @@ class AuthenticationInteractorTest : SysuiTestCase() { testScope.runTest { val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) val isUnlocked by collectLastValue(underTest.isUnlocked) - underTest.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + underTest.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(isUnlocked).isFalse() assertThat(underTest.authenticate(listOf(9, 8, 7))).isFalse() @@ -169,6 +170,51 @@ class AuthenticationInteractorTest : SysuiTestCase() { } @Test + fun authenticate_withEmptyPin_returnsFalseAndDoesNotUnlockDevice() = + testScope.runTest { + val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) + val isUnlocked by collectLastValue(underTest.isUnlocked) + underTest.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) + assertThat(isUnlocked).isFalse() + + assertThat(underTest.authenticate(listOf())).isFalse() + assertThat(isUnlocked).isFalse() + assertThat(failedAttemptCount).isEqualTo(1) + } + + @Test + fun authenticate_withCorrectMaxLengthPin_returnsTrueAndUnlocksDevice() = + testScope.runTest { + val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) + val isUnlocked by collectLastValue(underTest.isUnlocked) + underTest.setAuthenticationMethod(AuthenticationMethodModel.Pin(9999999999999999)) + assertThat(isUnlocked).isFalse() + + assertThat(underTest.authenticate(List(16) { 9 })).isTrue() + assertThat(isUnlocked).isTrue() + assertThat(failedAttemptCount).isEqualTo(0) + } + + @Test + fun authenticate_withCorrectTooLongPin_returnsFalseAndDoesNotUnlockDevice() = + testScope.runTest { + // Max pin length is 16 digits. To avoid issues with overflows, this test ensures + // that all pins > 16 decimal digits are rejected. + + // If the policy changes, there is work to do in SysUI. + assertThat(DevicePolicyManager.MAX_PASSWORD_LENGTH).isLessThan(17) + + val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) + val isUnlocked by collectLastValue(underTest.isUnlocked) + underTest.setAuthenticationMethod(AuthenticationMethodModel.Pin(99999999999999999)) + assertThat(isUnlocked).isFalse() + + assertThat(underTest.authenticate(List(17) { 9 })).isFalse() + assertThat(isUnlocked).isFalse() + assertThat(failedAttemptCount).isEqualTo(1) + } + + @Test fun authenticate_withCorrectPassword_returnsTrueAndUnlocksDevice() = testScope.runTest { val failedAttemptCount by collectLastValue(underTest.failedAuthenticationAttempts) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java index b9f92a064bc8..b4a4a11a81a1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -954,6 +954,25 @@ public class AuthControllerTest extends SysuiTestCase { eq(null) /* credentialAttestation */); } + @Test + public void testShowDialog_whenOwnerNotInForeground() { + PromptInfo promptInfo = createTestPromptInfo(); + promptInfo.setAllowBackgroundAuthentication(false); + switchTask("other_package"); + mAuthController.showAuthenticationDialog(promptInfo, + mReceiver /* receiver */, + new int[]{1} /* sensorIds */, + false /* credentialAllowed */, + true /* requireConfirmation */, + 0 /* userId */, + 0 /* operationId */, + "testPackage", + REQUEST_ID); + + assertNull(mAuthController.mCurrentDialog); + verify(mDialog1, never()).show(any(), any()); + } + private void showDialog(int[] sensorIds, boolean credentialAllowed) { mAuthController.showAuthenticationDialog(createTestPromptInfo(), mReceiver /* receiver */, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt index 2908e753c2fe..d022653a33c8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt @@ -58,11 +58,11 @@ import com.android.systemui.SysuiTestableContext import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.concurrency.FakeExecutor diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt index 9dcdc46a394a..224875590d75 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt @@ -46,8 +46,8 @@ import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.statusbar.LockscreenShadeTransitionController @@ -114,6 +114,8 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { @Mock private lateinit var primaryBouncerInteractor: PrimaryBouncerInteractor @Mock private lateinit var alternateBouncerInteractor: AlternateBouncerInteractor @Mock private lateinit var udfpsUtils: UdfpsUtils + @Mock private lateinit var udfpsKeyguardAccessibilityDelegate: + UdfpsKeyguardAccessibilityDelegate @Captor private lateinit var layoutParamsCaptor: ArgumentCaptor<WindowManager.LayoutParams> private val onTouch = { _: View, _: MotionEvent, _: Boolean -> true } @@ -144,7 +146,8 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { configurationController, keyguardStateController, unlockedScreenOffAnimationController, udfpsDisplayMode, secureSettings, REQUEST_ID, reason, controllerCallback, onTouch, activityLaunchAnimator, featureFlags, - primaryBouncerInteractor, alternateBouncerInteractor, isDebuggable, udfpsUtils + primaryBouncerInteractor, alternateBouncerInteractor, isDebuggable, udfpsUtils, + udfpsKeyguardAccessibilityDelegate, ) block() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java index b2ccd60216d7..72cd82236f39 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -87,9 +87,9 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.ScreenLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -217,6 +217,8 @@ public class UdfpsControllerTest extends SysuiTestCase { private AlternateBouncerInteractor mAlternateBouncerInteractor; @Mock private SecureSettings mSecureSettings; + @Mock + private UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate; // Capture listeners so that they can be used to send events @Captor @@ -315,7 +317,8 @@ public class UdfpsControllerTest extends SysuiTestCase { mActivityLaunchAnimator, alternateTouchProvider, mBiometricExecutor, mPrimaryBouncerInteractor, mSinglePointerTouchProcessor, mSessionTracker, mAlternateBouncerInteractor, mSecureSettings, mInputManager, mUdfpsUtils, - mock(KeyguardFaceAuthInteractor.class)); + mock(KeyguardFaceAuthInteractor.class), + mUdfpsKeyguardAccessibilityDelegate); verify(mFingerprintManager).setUdfpsOverlayController(mOverlayCaptor.capture()); mOverlayController = mOverlayCaptor.getValue(); verify(mScreenLifecycle).addObserver(mScreenObserverCaptor.capture()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegateTest.kt new file mode 100644 index 000000000000..921ff098753e --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegateTest.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.biometrics + +import android.testing.TestableLooper +import android.view.View +import android.view.accessibility.AccessibilityNodeInfo +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager +import com.android.systemui.util.mockito.argumentCaptor +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.Mock +import org.mockito.Mockito.mock +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@RunWith(AndroidJUnit4::class) +@SmallTest +@TestableLooper.RunWithLooper +class UdfpsKeyguardAccessibilityDelegateTest : SysuiTestCase() { + + @Mock private lateinit var keyguardViewManager: StatusBarKeyguardViewManager + @Mock private lateinit var hostView: View + private lateinit var underTest: UdfpsKeyguardAccessibilityDelegate + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + underTest = + UdfpsKeyguardAccessibilityDelegate( + context.resources, + keyguardViewManager, + ) + } + + @Test + fun onInitializeAccessibilityNodeInfo_clickActionAdded() { + // WHEN node is initialized + val mockedNodeInfo = mock(AccessibilityNodeInfo::class.java) + underTest.onInitializeAccessibilityNodeInfo(hostView, mockedNodeInfo) + + // THEN a11y action is added + val argumentCaptor = argumentCaptor<AccessibilityNodeInfo.AccessibilityAction>() + verify(mockedNodeInfo).addAction(argumentCaptor.capture()) + + // AND the a11y action is a click action + assertEquals( + AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK.id, + argumentCaptor.value.id + ) + } + + @Test + fun performAccessibilityAction_actionClick_showsPrimaryBouncer() { + // WHEN click action is performed + val mockedNodeInfo = mock(AccessibilityNodeInfo::class.java) + underTest.performAccessibilityAction( + hostView, + AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK.id, + null + ) + + // THEN primary bouncer shows + verify(keyguardViewManager).showPrimaryBouncer(anyBoolean()) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java index 0d3b394eabdb..032753a19044 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java @@ -31,8 +31,8 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.KeyguardViewMediator; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.shade.ShadeExpansionListener; @@ -73,6 +73,7 @@ public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase { protected @Mock ActivityLaunchAnimator mActivityLaunchAnimator; protected @Mock PrimaryBouncerInteractor mPrimaryBouncerInteractor; protected @Mock AlternateBouncerInteractor mAlternateBouncerInteractor; + protected @Mock UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate; protected FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); @@ -167,7 +168,8 @@ public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase { mActivityLaunchAnimator, mFeatureFlags, mPrimaryBouncerInteractor, - mAlternateBouncerInteractor); + mAlternateBouncerInteractor, + mUdfpsKeyguardAccessibilityDelegate); return controller; } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt index ffad32626db3..9df06dc9e18f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt @@ -22,20 +22,20 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardSecurityModel import com.android.systemui.RoboPilotTest +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepositoryImpl +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants +import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.classifier.FalsingCollector import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.FakeTrustRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepositoryImpl -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.StatusBarState diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt index 1f2b64d7adbd..263ce1a2e9f5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt @@ -56,6 +56,7 @@ class LogContextInteractorImplTest : SysuiTestCase() { foldProvider, KeyguardTransitionInteractor( keyguardTransitionRepository, + testScope.backgroundScope ), ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/data/factory/BouncerMessageFactoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/factory/BouncerMessageFactoryTest.kt index 9e798490eaff..992ee1a83254 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/data/factory/BouncerMessageFactoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/factory/BouncerMessageFactoryTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.data.factory +package com.android.systemui.bouncer.data.factory import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest @@ -26,7 +26,7 @@ import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_DEFAULT import com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_INCORRECT_PRIMARY_AUTH_INPUT import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.SysuiTestCase -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import com.android.systemui.util.mockito.whenever import com.google.common.truth.StringSubject import com.google.common.truth.Truth.assertThat diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/data/repository/BouncerMessageRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/repo/BouncerMessageRepositoryTest.kt index 1277fc0e1bdd..de712da9d99b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/data/repository/BouncerMessageRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/repo/BouncerMessageRepositoryTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.data.repository +package com.android.systemui.bouncer.data.repo import android.content.pm.UserInfo import android.hardware.biometrics.BiometricSourceType @@ -45,10 +45,12 @@ import com.android.systemui.R.string.kg_prompt_reason_restart_pin import com.android.systemui.R.string.kg_prompt_unattended_update import com.android.systemui.R.string.kg_trust_agent_disabled import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.data.repository.BouncerMessageRepository +import com.android.systemui.bouncer.data.repository.BouncerMessageRepositoryImpl +import com.android.systemui.bouncer.shared.model.BouncerMessageModel +import com.android.systemui.bouncer.shared.model.Message import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.keyguard.bouncer.data.factory.BouncerMessageFactory -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel -import com.android.systemui.keyguard.bouncer.shared.model.Message import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.FakeTrustRepository diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepositoryTest.kt index b3104b7de4b9..a04919185350 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepositoryTest.kt @@ -1,20 +1,4 @@ -/* - * Copyright (C) 2022 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.keyguard.data.repository +package com.android.systemui.bouncer.data.repository import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest @@ -24,14 +8,14 @@ import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.SystemClock -import kotlinx.coroutines.runBlocking import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.TestCoroutineScope import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito.verify +import org.mockito.Mockito import org.mockito.MockitoAnnotations @OptIn(ExperimentalCoroutinesApi::class) @@ -59,6 +43,7 @@ class KeyguardBouncerRepositoryTest : SysuiTestCase() { @Test fun changingFlowValueTriggersLogging() = runBlocking { underTest.setPrimaryShow(true) - verify(bouncerLogger).logChange(eq(""), eq("PrimaryBouncerShow"), value = eq(false), any()) + Mockito.verify(bouncerLogger) + .logChange(eq(""), eq("PrimaryBouncerShow"), value = eq(false), any()) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt index ca6b8d51e9e6..37b9ca49ef57 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepositoryImpl import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepositoryImpl import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.policy.KeyguardStateController diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt index 374c28d6dce8..6a63c32f2c40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt @@ -69,7 +69,7 @@ class BouncerInteractorTest : SysuiTestCase() { val currentScene by collectLastValue(sceneInteractor.currentScene("container1")) val message by collectLastValue(underTest.message) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() underTest.showOrUnlockDevice("container1") assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) @@ -167,7 +167,7 @@ class BouncerInteractorTest : SysuiTestCase() { fun showOrUnlockDevice_notLocked_switchesToGoneScene() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene("container1")) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() runCurrent() @@ -211,7 +211,7 @@ class BouncerInteractorTest : SysuiTestCase() { val throttling by collectLastValue(underTest.throttling) val message by collectLastValue(underTest.message) val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(throttling).isNull() assertThat(message).isEqualTo("") assertThat(isUnlocked).isFalse() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt index b0af3104a3ae..8e5256e970a3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/bouncer/domain/interactor/BouncerMessageInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.bouncer.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.content.pm.UserInfo import android.testing.TestableLooper @@ -26,14 +26,14 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.R.string.keyguard_enter_pin import com.android.systemui.R.string.kg_too_many_failed_attempts_countdown import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.data.repository.FakeBouncerMessageRepository +import com.android.systemui.bouncer.shared.model.BouncerMessageModel +import com.android.systemui.bouncer.shared.model.Message import com.android.systemui.coroutines.FlowValue import com.android.systemui.coroutines.collectLastValue import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.bouncer.data.factory.BouncerMessageFactory -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel -import com.android.systemui.keyguard.bouncer.shared.model.Message -import com.android.systemui.keyguard.data.repository.FakeBouncerMessageRepository import com.android.systemui.user.data.repository.FakeUserRepository import com.android.systemui.util.mockito.KotlinArgumentCaptor import com.android.systemui.util.mockito.whenever diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt index 2b135cc406bf..a81ca86f338d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.view.View import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorTest.kt index b5cb44aafd29..f892453b3a57 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorTest.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.hardware.biometrics.BiometricSourceType import android.testing.AndroidTestingRunner @@ -27,17 +27,17 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.DejankUtils import com.android.systemui.R import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.KeyguardBouncerRepository +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel +import com.android.systemui.bouncer.ui.BouncerView +import com.android.systemui.bouncer.ui.BouncerViewDelegate import com.android.systemui.classifier.FalsingCollector import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.BouncerViewDelegate import com.android.systemui.keyguard.data.repository.FakeTrustRepository -import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.mockito.any @@ -407,6 +407,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { whenever(keyguardStateController.isFaceAuthEnabled).thenReturn(true) whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE)) .thenReturn(true) + whenever(keyguardUpdateMonitor.doesCurrentPostureAllowFaceAuth()).thenReturn(true) // WHEN bouncer show is requested underTest.show(true) @@ -424,6 +425,25 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { } @Test + fun noDelayBouncer_biometricsAllowed_postureDoesNotAllowFaceAuth() { + mainHandler.setMode(FakeHandler.Mode.QUEUEING) + + // GIVEN bouncer should not be delayed because device isn't in the right posture for + // face auth + whenever(keyguardStateController.isFaceAuthEnabled).thenReturn(true) + whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE)) + .thenReturn(true) + whenever(keyguardUpdateMonitor.doesCurrentPostureAllowFaceAuth()).thenReturn(false) + + // WHEN bouncer show is requested + underTest.show(true) + + // THEN primary show & primary showing soon are updated immediately + verify(repository).setPrimaryShow(true) + verify(repository).setPrimaryShowingSoon(false) + } + + @Test fun delayBouncerWhenActiveUnlockPossible() { testScope.run { mainHandler.setMode(FakeHandler.Mode.QUEUEING) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt index b288fbcc0678..665456d5cd80 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.bouncer.domain.interactor import android.os.Looper import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -23,13 +23,13 @@ import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.classifier.FalsingCollector import com.android.systemui.coroutines.collectLastValue import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.TrustRepository import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.policy.KeyguardStateController diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt index 1642410e5a3f..b53e03419df3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt @@ -55,7 +55,7 @@ class AuthMethodBouncerViewModelTest : SysuiTestCase() { @Test fun animateFailure() = testScope.runTest { - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) val animateFailure by collectLastValue(underTest.animateFailure) assertThat(animateFailure).isFalse() diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt index e8c946cdd59d..c6074962ee8e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt @@ -97,7 +97,7 @@ class BouncerViewModelTest : SysuiTestCase() { testScope.runTest { val message by collectLastValue(underTest.message) val throttling by collectLastValue(bouncerInteractor.throttling) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(message?.isUpdateAnimated).isTrue() repeat(BouncerInteractor.THROTTLE_EVERY) { @@ -120,7 +120,7 @@ class BouncerViewModelTest : SysuiTestCase() { } ) val throttling by collectLastValue(bouncerInteractor.throttling) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(isInputEnabled).isTrue() repeat(BouncerInteractor.THROTTLE_EVERY) { @@ -137,7 +137,7 @@ class BouncerViewModelTest : SysuiTestCase() { fun throttlingDialogMessage() = testScope.runTest { val throttlingDialogMessage by collectLastValue(underTest.throttlingDialogMessage) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) repeat(BouncerInteractor.THROTTLE_EVERY) { // Wrong PIN. @@ -154,7 +154,7 @@ class BouncerViewModelTest : SysuiTestCase() { return listOf( AuthenticationMethodModel.None, AuthenticationMethodModel.Swipe, - AuthenticationMethodModel.PIN(1234), + AuthenticationMethodModel.Pin(1234), AuthenticationMethodModel.Password("password"), AuthenticationMethodModel.Pattern( listOf(AuthenticationMethodModel.Pattern.PatternCoordinate(1, 1)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModelTest.kt index 15707c93146c..8236165b62d8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModelTest.kt @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.systemui.keyguard.ui.viewmodel +package com.android.systemui.bouncer.ui.viewmodel import android.os.Looper import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -23,16 +23,16 @@ import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel +import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.classifier.FalsingCollector import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.TrustRepository -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.utils.os.FakeHandler diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt index 3bdaf0590888..7b6bb37459a7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt @@ -25,12 +25,12 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.scene.SceneTestUtils import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.shared.model.SceneModel +import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test @@ -85,8 +85,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -95,7 +95,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onShown() assertThat(message?.text).isEqualTo(ENTER_YOUR_PIN) - assertThat(pinLengths).isEqualTo(0 to 0) + assertThat(entries).hasSize(0) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) } @@ -106,8 +106,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -117,7 +117,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onPinButtonClicked(1) assertThat(message?.text).isEmpty() - assertThat(pinLengths).isEqualTo(0 to 1) + assertThat(entries).hasSize(1) + assertThat(entries?.map { it.input }).containsExactly(1) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) } @@ -128,32 +129,59 @@ class PinBouncerViewModelTest : SysuiTestCase() { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) underTest.onShown() underTest.onPinButtonClicked(1) - assertThat(pinLengths).isEqualTo(0 to 1) + assertThat(entries).hasSize(1) underTest.onBackspaceButtonClicked() assertThat(message?.text).isEmpty() - assertThat(pinLengths).isEqualTo(1 to 0) + assertThat(entries).hasSize(0) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) } @Test + fun onPinEdit() = + testScope.runTest { + val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) + val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) + val message by collectLastValue(bouncerViewModel.message) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) + authenticationInteractor.lockDevice() + sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) + assertThat(isUnlocked).isFalse() + assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + underTest.onShown() + + underTest.onPinButtonClicked(1) + underTest.onPinButtonClicked(2) + underTest.onPinButtonClicked(3) + underTest.onBackspaceButtonClicked() + underTest.onBackspaceButtonClicked() + underTest.onPinButtonClicked(4) + underTest.onPinButtonClicked(5) + + assertThat(entries).hasSize(3) + assertThat(entries?.map { it.input }).containsExactly(1, 4, 5).inOrder() + assertThat(entries?.map { it.sequenceNumber }).isInStrictOrder() + } + + @Test fun onBackspaceButtonLongPressed() = testScope.runTest { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -165,13 +193,9 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onPinButtonClicked(4) underTest.onBackspaceButtonLongPressed() - repeat(4) { index -> - assertThat(pinLengths).isEqualTo(4 - index to 3 - index) - advanceTimeBy(PinBouncerViewModel.BACKSPACE_LONG_PRESS_DELAY_MS) - } assertThat(message?.text).isEmpty() - assertThat(pinLengths).isEqualTo(1 to 0) + assertThat(entries).hasSize(0) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) } @@ -181,7 +205,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { testScope.runTest { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -204,8 +228,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -219,7 +243,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onAuthenticateButtonClicked() - assertThat(pinLengths).isEqualTo(0 to 0) + assertThat(entries).hasSize(0) assertThat(message?.text).isEqualTo(WRONG_PIN) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) @@ -231,8 +255,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_NAME)) val message by collectLastValue(bouncerViewModel.message) - val pinLengths by collectLastValue(underTest.pinLengths) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + val entries by collectLastValue(underTest.pinEntries) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() sceneInteractor.setCurrentScene(CONTAINER_NAME, SceneModel(SceneKey.Bouncer)) assertThat(isUnlocked).isFalse() @@ -245,7 +269,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onPinButtonClicked(5) // PIN is now wrong! underTest.onAuthenticateButtonClicked() assertThat(message?.text).isEqualTo(WRONG_PIN) - assertThat(pinLengths).isEqualTo(0 to 0) + assertThat(entries).hasSize(0) assertThat(isUnlocked).isFalse() assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) @@ -266,5 +290,11 @@ class PinBouncerViewModelTest : SysuiTestCase() { private const val CONTAINER_NAME = "container1" private const val ENTER_YOUR_PIN = "Enter your pin" private const val WRONG_PIN = "Wrong pin" + + val KEY_CODE = + Correspondence.transforming<EnteredKey, Int>( + { it?.input }, + "has a eventId of", + ) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java index ca6282c66a17..461ec653d819 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java @@ -28,6 +28,7 @@ import androidx.lifecycle.Observer; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.DreamLogger; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; @@ -56,6 +57,8 @@ public class ComplicationCollectionLiveDataTest extends SysuiTestCase { private FakeFeatureFlags mFeatureFlags; @Mock private Observer mObserver; + @Mock + private DreamLogger mLogger; @Before public void setUp() { @@ -66,7 +69,8 @@ public class ComplicationCollectionLiveDataTest extends SysuiTestCase { mStateController = new DreamOverlayStateController( mExecutor, /* overlayEnabled= */ true, - mFeatureFlags); + mFeatureFlags, + mLogger); mLiveData = new ComplicationCollectionLiveData(mStateController); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsBindingControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsBindingControllerImplTest.kt index 26cbd7703075..724c9d1dfc42 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsBindingControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsBindingControllerImplTest.kt @@ -116,11 +116,7 @@ class ControlsBindingControllerImplTest : SysuiTestCase() { @Test fun testBindAndLoad_cancel() { - val callback = object : ControlsBindingController.LoadCallback { - override fun error(message: String) {} - - override fun accept(t: List<Control>) {} - } + val callback = mock(ControlsBindingController.LoadCallback::class.java) val subscription = mock(IControlsSubscription::class.java) val canceller = controller.bindAndLoad(TEST_COMPONENT_NAME_1, callback) @@ -130,6 +126,7 @@ class ControlsBindingControllerImplTest : SysuiTestCase() { canceller.run() verify(providers[0]).cancelSubscription(subscription) + verify(callback).error(any()) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt index 039682c88498..a00e5456b711 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt @@ -11,7 +11,6 @@ import com.android.systemui.complication.ComplicationHostViewController import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel import com.android.systemui.statusbar.BlurUtils import com.android.systemui.statusbar.policy.ConfigurationController -import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever @@ -23,9 +22,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mock -import org.mockito.Mockito.anyLong import org.mockito.Mockito.atLeastOnce -import org.mockito.Mockito.eq import org.mockito.Mockito.never import org.mockito.Mockito.times import org.mockito.Mockito.verify @@ -92,16 +89,10 @@ class DreamOverlayAnimationsControllerTest : SysuiTestCase() { } @Test - fun testWakeUpCallsExecutor() { - val mockExecutor: DelayableExecutor = mock() - val mockCallback: Runnable = mock() + fun testWakeUpSetsExitAnimationsRunning() { + controller.wakeUp() - controller.wakeUp( - doneCallback = mockCallback, - executor = mockExecutor, - ) - - verify(mockExecutor).executeDelayed(eq(mockCallback), anyLong()) + verify(stateController).setExitAnimationsRunning(true) } @Test @@ -112,10 +103,7 @@ class DreamOverlayAnimationsControllerTest : SysuiTestCase() { verify(mockStartAnimator, never()).cancel() - controller.wakeUp( - doneCallback = mock(), - executor = mock(), - ) + controller.wakeUp() // Verify that we cancelled the start animator in favor of the exit // animator. diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index 47b7d49ac7af..8786520ccf0e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -41,8 +41,8 @@ import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.systemui.SysuiTestCase; import com.android.systemui.complication.ComplicationHostViewController; import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; import com.android.systemui.statusbar.BlurUtils; import org.junit.Before; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index cfd51e3901bd..d99f0da494fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -16,6 +16,8 @@ package com.android.systemui.dreams; +import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -23,7 +25,6 @@ import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -498,18 +499,33 @@ public class DreamOverlayServiceTest extends SysuiTestCase { true /*shouldShowComplication*/); mMainExecutor.runAllReady(); - final Runnable callback = mock(Runnable.class); - mService.onWakeUp(callback); - mMainExecutor.runAllReady(); - verify(mDreamOverlayContainerViewController).wakeUp(callback, mMainExecutor); + mService.onWakeUp(); + verify(mDreamOverlayContainerViewController).wakeUp(); verify(mDreamOverlayCallbackController).onWakeUp(); } @Test public void testWakeUpBeforeStartDoesNothing() { - final Runnable callback = mock(Runnable.class); - mService.onWakeUp(callback); + mService.onWakeUp(); + verify(mDreamOverlayContainerViewController, never()).wakeUp(); + } + + @Test + public void testSystemFlagShowForAllUsersSetOnWindow() throws RemoteException { + final IDreamOverlayClient client = getClient(); + + // Inform the overlay service of dream starting. Do not show dream complications. + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + false /*shouldShowComplication*/); mMainExecutor.runAllReady(); - verify(mDreamOverlayContainerViewController, never()).wakeUp(callback, mMainExecutor); + + final ArgumentCaptor<WindowManager.LayoutParams> paramsCaptor = + ArgumentCaptor.forClass(WindowManager.LayoutParams.class); + + // Verify that a new window is added. + verify(mWindowManager).addView(any(), paramsCaptor.capture()); + + assertThat((paramsCaptor.getValue().privateFlags & SYSTEM_FLAG_SHOW_FOR_ALL_USERS) + == SYSTEM_FLAG_SHOW_FOR_ALL_USERS).isTrue(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index 7b4160551c82..2c1ebe4121af 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -58,6 +58,9 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { @Mock private FeatureFlags mFeatureFlags; + @Mock + private DreamLogger mLogger; + final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); @Before @@ -405,6 +408,6 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { } private DreamOverlayStateController getDreamOverlayStateController(boolean overlayEnabled) { - return new DreamOverlayStateController(mExecutor, overlayEnabled, mFeatureFlags); + return new DreamOverlayStateController(mExecutor, overlayEnabled, mFeatureFlags, mLogger); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java index d16b7570e2c3..5dc0e55632fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java @@ -113,6 +113,8 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { DreamOverlayStateController mDreamOverlayStateController; @Mock UserTracker mUserTracker; + @Mock + DreamLogger mLogger; @Captor private ArgumentCaptor<DreamOverlayStateController.Callback> mCallbackCaptor; @@ -146,7 +148,8 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { mStatusBarWindowStateController, mDreamOverlayStatusBarItemsProvider, mDreamOverlayStateController, - mUserTracker); + mUserTracker, + mLogger); } @Test @@ -289,7 +292,8 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { mStatusBarWindowStateController, mDreamOverlayStatusBarItemsProvider, mDreamOverlayStateController, - mUserTracker); + mUserTracker, + mLogger); controller.onViewAttached(); verify(mView, never()).showIcon( eq(DreamOverlayStatusBarView.STATUS_ICON_NOTIFICATIONS), eq(true), any()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java index 1a89076741ef..3f9b198ee17d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.content.pm.UserInfo; import android.graphics.Rect; import android.graphics.Region; import android.testing.AndroidTestingRunner; @@ -39,10 +40,12 @@ import android.view.VelocityTracker; import androidx.test.filters.SmallTest; import com.android.internal.logging.UiEventLogger; +import com.android.internal.widget.LockPatternUtils; import com.android.systemui.SysuiTestCase; +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; import com.android.systemui.dreams.touch.scrim.ScrimController; import com.android.systemui.dreams.touch.scrim.ScrimManager; -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; +import com.android.systemui.settings.FakeUserTracker; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.shared.system.InputChannelCompat; import com.android.systemui.statusbar.NotificationShadeWindowController; @@ -57,6 +60,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import java.util.Collections; import java.util.Optional; @SmallTest @@ -100,21 +104,34 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { @Mock UiEventLogger mUiEventLogger; + @Mock + LockPatternUtils mLockPatternUtils; + + FakeUserTracker mUserTracker; + private static final float TOUCH_REGION = .3f; private static final int SCREEN_WIDTH_PX = 1024; private static final int SCREEN_HEIGHT_PX = 100; private static final Rect SCREEN_BOUNDS = new Rect(0, 0, 1024, 100); + private static final UserInfo CURRENT_USER_INFO = new UserInfo( + 10, + /* name= */ "user10", + /* flags= */ 0 + ); @Before public void setup() { MockitoAnnotations.initMocks(this); + mUserTracker = new FakeUserTracker(); mTouchHandler = new BouncerSwipeTouchHandler( mScrimManager, Optional.of(mCentralSurfaces), mNotificationShadeWindowController, mValueAnimatorCreator, mVelocityTrackerFactory, + mLockPatternUtils, + mUserTracker, mFlingAnimationUtils, mFlingAnimationUtilsClosing, TOUCH_REGION, @@ -126,6 +143,9 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { when(mVelocityTrackerFactory.obtain()).thenReturn(mVelocityTracker); when(mFlingAnimationUtils.getMinVelocityPxPerSecond()).thenReturn(Float.MAX_VALUE); when(mTouchSession.getBounds()).thenReturn(SCREEN_BOUNDS); + when(mLockPatternUtils.isSecure(CURRENT_USER_INFO.id)).thenReturn(true); + + mUserTracker.set(Collections.singletonList(CURRENT_USER_INFO), 0); } /** @@ -265,6 +285,32 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { verifyScroll(.7f, Direction.DOWN, true, gestureListener); } + /** + * Makes sure the expansion amount is proportional to (1 - scroll). + */ + @Test + public void testSwipeUp_keyguardNotSecure_doesNotExpand() { + when(mLockPatternUtils.isSecure(CURRENT_USER_INFO.id)).thenReturn(false); + mTouchHandler.onSessionStart(mTouchSession); + ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor = + ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class); + verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture()); + + final OnGestureListener gestureListener = gestureListenerCaptor.getValue(); + + final float distanceY = SCREEN_HEIGHT_PX * 0.3f; + final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, + 0, SCREEN_HEIGHT_PX, 0); + final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, + 0, SCREEN_HEIGHT_PX - distanceY, 0); + + reset(mScrimController); + assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) + .isTrue(); + // We should not expand since the keyguard is not secure + verify(mScrimController, never()).expand(any()); + } + private void verifyScroll(float percent, Direction direction, boolean isBouncerInitiallyShowing, GestureDetector.OnGestureListener gestureListener) { final float distanceY = SCREEN_HEIGHT_PX * percent; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt index e8cbdf3db327..2830476874ed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpHandlerTest.kt @@ -22,7 +22,7 @@ import com.android.systemui.Dumpable import com.android.systemui.ProtoDumpable import com.android.systemui.SysuiTestCase import com.android.systemui.log.LogBuffer -import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager +import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.google.common.truth.Truth.assertThat @@ -45,8 +45,6 @@ class DumpHandlerTest : SysuiTestCase() { @Mock private lateinit var logBufferEulogizer: LogBufferEulogizer - @Mock - private lateinit var exceptionHandlerManager: UncaughtExceptionPreHandlerManager @Mock private lateinit var pw: PrintWriter @@ -70,6 +68,11 @@ class DumpHandlerTest : SysuiTestCase() { @Mock private lateinit var buffer2: LogBuffer + @Mock + private lateinit var table1: TableLogBuffer + @Mock + private lateinit var table2: TableLogBuffer + private val dumpManager = DumpManager() @Before @@ -83,21 +86,22 @@ class DumpHandlerTest : SysuiTestCase() { mutableMapOf( EmptyCoreStartable::class.java to Provider { EmptyCoreStartable() } ), - exceptionHandlerManager ) } @Test fun testDumpablesCanBeDumpedSelectively() { // GIVEN a variety of registered dumpables and buffers - dumpManager.registerDumpable("dumpable1", dumpable1) - dumpManager.registerDumpable("dumpable2", dumpable2) - dumpManager.registerDumpable("dumpable3", dumpable3) + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerCriticalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) // WHEN some of them are dumped explicitly - val args = arrayOf("dumpable1", "dumpable3", "buffer2") + val args = arrayOf("dumpable1", "dumpable3", "buffer2", "table2") dumpHandler.dump(fd, pw, args) // THEN only the requested ones have their dump() method called @@ -108,12 +112,14 @@ class DumpHandlerTest : SysuiTestCase() { verify(dumpable3).dump(pw, args) verify(buffer1, never()).dump(any(PrintWriter::class.java), anyInt()) verify(buffer2).dump(pw, 0) + verify(table1, never()).dump(any(), any()) + verify(table2).dump(pw, args) } @Test fun testDumpableMatchingIsBasedOnEndOfTag() { // GIVEN a dumpable registered to the manager - dumpManager.registerDumpable("com.android.foo.bar.dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("com.android.foo.bar.dumpable1", dumpable1) // WHEN that module is dumped val args = arrayOf("dumpable1") @@ -131,6 +137,8 @@ class DumpHandlerTest : SysuiTestCase() { dumpManager.registerNormalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) // WHEN a critical dump is requested val args = arrayOf("--dump-priority", "CRITICAL") @@ -144,6 +152,8 @@ class DumpHandlerTest : SysuiTestCase() { any(Array<String>::class.java)) verify(buffer1, never()).dump(any(PrintWriter::class.java), anyInt()) verify(buffer2, never()).dump(any(PrintWriter::class.java), anyInt()) + verify(table1, never()).dump(any(), any()) + verify(table2, never()).dump(any(), any()) } @Test @@ -154,6 +164,8 @@ class DumpHandlerTest : SysuiTestCase() { dumpManager.registerNormalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) // WHEN a normal dump is requested val args = arrayOf("--dump-priority", "NORMAL") @@ -169,6 +181,8 @@ class DumpHandlerTest : SysuiTestCase() { verify(dumpable3).dump(pw, args) verify(buffer1).dump(pw, 0) verify(buffer2).dump(pw, 0) + verify(table1).dump(pw, args) + verify(table2).dump(pw, args) } @Test @@ -184,6 +198,81 @@ class DumpHandlerTest : SysuiTestCase() { } @Test + fun testDumpBuffers() { + // GIVEN a variety of registered dumpables and buffers and tables + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerNormalDumpable("dumpable3", dumpable3) + dumpManager.registerBuffer("buffer1", buffer1) + dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) + + // WHEN a buffer dump is requested + val args = arrayOf("buffers", "--tail", "1") + dumpHandler.dump(fd, pw, args) + + // THEN all buffers are dumped (and no dumpables or tables) + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2, never()).dump(any(), any()) + verify(dumpable3, never()).dump(any(), any()) + verify(buffer1).dump(pw, tailLength = 1) + verify(buffer2).dump(pw, tailLength = 1) + verify(table1, never()).dump(any(), any()) + verify(table2, never()).dump(any(), any()) + } + + @Test + fun testDumpDumpables() { + // GIVEN a variety of registered dumpables and buffers and tables + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerNormalDumpable("dumpable3", dumpable3) + dumpManager.registerBuffer("buffer1", buffer1) + dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) + + // WHEN a dumpable dump is requested + val args = arrayOf("dumpables") + dumpHandler.dump(fd, pw, args) + + // THEN all dumpables are dumped (both critical and normal) (and no dumpables) + verify(dumpable1).dump(pw, args) + verify(dumpable2).dump(pw, args) + verify(dumpable3).dump(pw, args) + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2, never()).dump(any(), anyInt()) + verify(table1, never()).dump(any(), any()) + verify(table2, never()).dump(any(), any()) + } + + @Test + fun testDumpTables() { + // GIVEN a variety of registered dumpables and buffers and tables + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerNormalDumpable("dumpable3", dumpable3) + dumpManager.registerBuffer("buffer1", buffer1) + dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) + + // WHEN a dumpable dump is requested + val args = arrayOf("tables") + dumpHandler.dump(fd, pw, args) + + // THEN all dumpables are dumped (both critical and normal) (and no dumpables) + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2, never()).dump(any(), any()) + verify(dumpable3, never()).dump(any(), any()) + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2, never()).dump(any(), anyInt()) + verify(table1).dump(pw, args) + verify(table2).dump(pw, args) + } + + @Test fun testDumpAllProtoDumpables() { dumpManager.registerDumpable("protoDumpable1", protoDumpable1) dumpManager.registerDumpable("protoDumpable2", protoDumpable2) @@ -207,6 +296,123 @@ class DumpHandlerTest : SysuiTestCase() { verify(protoDumpable2, never()).dumpProto(any(), any()) } + @Test + fun testDumpTarget_selectsShortestNamedDumpable() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerCriticalDumpable("first-dumpable", dumpable1) + dumpManager.registerCriticalDumpable("scnd-dumpable", dumpable2) + dumpManager.registerCriticalDumpable("third-dumpable", dumpable3) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("dumpable") + dumpHandler.dump(fd, pw, args) + + // THEN the matching dumpable with the shorter name is dumped + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2).dump(pw, args) + verify(dumpable3, never()).dump(any(), any()) + } + + @Test + fun testDumpTarget_selectsShortestNamedBuffer() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerBuffer("first-buffer", buffer1) + dumpManager.registerBuffer("scnd-buffer", buffer2) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("buffer", "--tail", "14") + dumpHandler.dump(fd, pw, args) + + // THEN the matching buffer with the shorter name is dumped + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2).dump(pw, tailLength = 14) + } + + @Test + fun testDumpTarget_selectsShortestNamedMatch_dumpable() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerCriticalDumpable("dumpable3", dumpable3) + dumpManager.registerBuffer("big-buffer1", buffer1) + dumpManager.registerBuffer("big-buffer2", buffer2) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("2") + dumpHandler.dump(fd, pw, args) + + // THEN the matching dumpable with the shorter name is dumped + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2).dump(pw, args) + verify(dumpable3, never()).dump(any(), any()) + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2, never()).dump(any(), anyInt()) + } + + @Test + fun testDumpTarget_selectsShortestNamedMatch_buffer() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerCriticalDumpable("dumpable1", dumpable1) + dumpManager.registerCriticalDumpable("dumpable2", dumpable2) + dumpManager.registerCriticalDumpable("dumpable3", dumpable3) + dumpManager.registerBuffer("buffer1", buffer1) + dumpManager.registerBuffer("buffer2", buffer2) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("2", "--tail", "14") + dumpHandler.dump(fd, pw, args) + + // THEN the matching buffer with the shorter name is dumped + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2, never()).dump(any(), any()) + verify(dumpable3, never()).dump(any(), any()) + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2).dump(pw, tailLength = 14) + } + + @Test + fun testDumpTarget_selectsTheAlphabeticallyFirstShortestMatch_dumpable() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerCriticalDumpable("d1x", dumpable1) + dumpManager.registerCriticalDumpable("d2x", dumpable2) + dumpManager.registerCriticalDumpable("a3x", dumpable3) + dumpManager.registerBuffer("ab1x", buffer1) + dumpManager.registerBuffer("b2x", buffer2) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("x") + dumpHandler.dump(fd, pw, args) + + // THEN the alphabetically first dumpable/buffer (of the 3 letter names) is dumped + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2, never()).dump(any(), any()) + verify(dumpable3).dump(pw, args) + verify(buffer1, never()).dump(any(), anyInt()) + verify(buffer2, never()).dump(any(), anyInt()) + } + + @Test + fun testDumpTarget_selectsTheAlphabeticallyFirstShortestMatch_buffer() { + // GIVEN a variety of registered dumpables and buffers + dumpManager.registerCriticalDumpable("d1x", dumpable1) + dumpManager.registerCriticalDumpable("d2x", dumpable2) + dumpManager.registerCriticalDumpable("az1x", dumpable3) + dumpManager.registerBuffer("b1x", buffer1) + dumpManager.registerBuffer("b2x", buffer2) + + // WHEN a dumpable is dumped by a suffix that matches multiple options + val args = arrayOf("x", "--tail", "14") + dumpHandler.dump(fd, pw, args) + + // THEN the alphabetically first dumpable/buffer (of the 3 letter names) is dumped + verify(dumpable1, never()).dump(any(), any()) + verify(dumpable2, never()).dump(any(), any()) + verify(dumpable3, never()).dump(any(), any()) + verify(buffer1).dump(pw, tailLength = 14) + verify(buffer2, never()).dump(any(), anyInt()) + } + + private class EmptyCoreStartable : CoreStartable { override fun start() {} } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt index 02555cfa783a..6d5226f35e97 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/DumpManagerTest.kt @@ -20,21 +20,17 @@ import androidx.test.filters.SmallTest import com.android.systemui.Dumpable import com.android.systemui.SysuiTestCase import com.android.systemui.log.LogBuffer -import com.android.systemui.util.mockito.any -import java.io.PrintWriter +import com.android.systemui.log.table.TableLogBuffer +import com.google.common.truth.Truth.assertThat +import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Test import org.mockito.Mock -import org.mockito.Mockito.anyInt -import org.mockito.Mockito.never -import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @SmallTest class DumpManagerTest : SysuiTestCase() { - @Mock private lateinit var pw: PrintWriter - @Mock private lateinit var dumpable1: Dumpable @Mock private lateinit var dumpable2: Dumpable @Mock private lateinit var dumpable3: Dumpable @@ -42,6 +38,9 @@ class DumpManagerTest : SysuiTestCase() { @Mock private lateinit var buffer1: LogBuffer @Mock private lateinit var buffer2: LogBuffer + @Mock private lateinit var table1: TableLogBuffer + @Mock private lateinit var table2: TableLogBuffer + private val dumpManager = DumpManager() @Before @@ -50,276 +49,144 @@ class DumpManagerTest : SysuiTestCase() { } @Test - fun testDumpTarget_dumpable() { - // GIVEN a variety of registered dumpables and buffers + fun testRegisterUnregister_dumpables() { + // GIVEN a variety of registered dumpables dumpManager.registerCriticalDumpable("dumpable1", dumpable1) dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerCriticalDumpable("dumpable3", dumpable3) - dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) + dumpManager.registerNormalDumpable("dumpable3", dumpable3) - // WHEN a dumpable is dumped explicitly - val args = arrayOf<String>() - dumpManager.dumpTarget("dumpable2", pw, args, tailLength = 0) + // WHEN the collection is requested + var dumpables = dumpManager.getDumpables().map { it.dumpable } - // THEN only the requested one has their dump() method called - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2).dump(pw, args) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2, never()).dump(any(), anyInt()) - } + // THEN it contains the registered entries + assertThat(dumpables).containsExactly(dumpable1, dumpable2, dumpable3) - @Test - fun testDumpTarget_buffer() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerCriticalDumpable("dumpable3", dumpable3) - dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) + // WHEN the dumpables are unregistered + dumpManager.unregisterDumpable("dumpable2") + dumpManager.unregisterDumpable("dumpable3") - // WHEN a buffer is dumped explicitly - val args = arrayOf<String>() - dumpManager.dumpTarget("buffer1", pw, args, tailLength = 14) + // WHEN the dumpable collection is requests + dumpables = dumpManager.getDumpables().map { it.dumpable } - // THEN only the requested one has their dump() method called - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1).dump(pw, tailLength = 14) - verify(buffer2, never()).dump(any(), anyInt()) + // THEN it contains only the currently-registered entry + assertThat(dumpables).containsExactly(dumpable1) } @Test - fun testDumpableMatchingIsBasedOnEndOfTag() { - // GIVEN a dumpable registered to the manager - dumpManager.registerCriticalDumpable("com.android.foo.bar.dumpable1", dumpable1) + fun testRegister_buffers() { + // GIVEN a set of registered buffers + dumpManager.registerBuffer("buffer1", buffer1) + dumpManager.registerBuffer("buffer2", buffer2) - // WHEN that module is dumped - val args = arrayOf<String>() - dumpManager.dumpTarget("dumpable1", pw, arrayOf(), tailLength = 14) + // WHEN the collection is requested + val dumpables = dumpManager.getLogBuffers().map { it.buffer } - // THEN its dump() method is called - verify(dumpable1).dump(pw, args) + // THEN it contains the registered entries + assertThat(dumpables).containsExactly(buffer1, buffer2) } @Test - fun testDumpTarget_selectsShortestNamedDumpable() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("first-dumpable", dumpable1) - dumpManager.registerCriticalDumpable("scnd-dumpable", dumpable2) - dumpManager.registerCriticalDumpable("third-dumpable", dumpable3) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("dumpable", pw, args, tailLength = 0) - - // THEN the matching dumpable with the shorter name is dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2).dump(pw, args) - verify(dumpable3, never()).dump(any(), any()) - } + fun testRegister_tableLogBuffers() { + // GIVEN a set of registered buffers + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) - @Test - fun testDumpTarget_selectsShortestNamedBuffer() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerBuffer("first-buffer", buffer1) - dumpManager.registerBuffer("scnd-buffer", buffer2) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("buffer", pw, args, tailLength = 14) - - // THEN the matching buffer with the shorter name is dumped - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2).dump(pw, tailLength = 14) - } + // WHEN the collection is requested + val tables = dumpManager.getTableLogBuffers().map { it.table } - @Test - fun testDumpTarget_selectsShortestNamedMatch_dumpable() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerCriticalDumpable("dumpable3", dumpable3) - dumpManager.registerBuffer("big-buffer1", buffer1) - dumpManager.registerBuffer("big-buffer2", buffer2) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("2", pw, args, tailLength = 14) - - // THEN the matching dumpable with the shorter name is dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2).dump(pw, args) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2, never()).dump(any(), anyInt()) + // THEN it contains the registered entries + assertThat(tables).containsExactly(table1, table2) } @Test - fun testDumpTarget_selectsShortestNamedMatch_buffer() { - // GIVEN a variety of registered dumpables and buffers + fun registerDumpable_throwsWhenNameCannotBeAssigned() { + // GIVEN dumpable1 and buffer1 and table1 are registered dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerCriticalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("2", pw, args, tailLength = 14) - - // THEN the matching buffer with the shorter name is dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2).dump(pw, tailLength = 14) + dumpManager.registerTableLogBuffer("table1", table1) + + // THEN an exception is thrown when trying to re-register a new dumpable under the same key + assertThrows(IllegalArgumentException::class.java) { + dumpManager.registerCriticalDumpable("dumpable1", dumpable2) + } + assertThrows(IllegalArgumentException::class.java) { + dumpManager.registerBuffer("buffer1", buffer2) + } + assertThrows(IllegalArgumentException::class.java) { + dumpManager.registerTableLogBuffer("table1", table2) + } } @Test - fun testDumpTarget_selectsTheAlphabeticallyFirstShortestMatch_dumpable() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("d1x", dumpable1) - dumpManager.registerCriticalDumpable("d2x", dumpable2) - dumpManager.registerCriticalDumpable("a3x", dumpable3) - dumpManager.registerBuffer("ab1x", buffer1) - dumpManager.registerBuffer("b2x", buffer2) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("x", pw, args, tailLength = 14) - - // THEN the alphabetically first dumpable/buffer (of the 3 letter names) is dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3).dump(pw, args) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2, never()).dump(any(), anyInt()) - } - - @Test - fun testDumpTarget_selectsTheAlphabeticallyFirstShortestMatch_buffer() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("d1x", dumpable1) - dumpManager.registerCriticalDumpable("d2x", dumpable2) - dumpManager.registerCriticalDumpable("az1x", dumpable3) - dumpManager.registerBuffer("b1x", buffer1) - dumpManager.registerBuffer("b2x", buffer2) - - // WHEN a dumpable is dumped by a suffix that matches multiple options - val args = arrayOf<String>() - dumpManager.dumpTarget("x", pw, args, tailLength = 14) - - // THEN the alphabetically first dumpable/buffer (of the 3 letter names) is dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1).dump(pw, tailLength = 14) - verify(buffer2, never()).dump(any(), anyInt()) - } - - @Test - fun testDumpDumpables() { - // GIVEN a variety of registered dumpables and buffers + fun registerDumpable_doesNotThrowWhenReRegistering() { + // GIVEN dumpable1 and buffer1 are registered dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerNormalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) - // WHEN a dumpable dump is requested - val args = arrayOf<String>() - dumpManager.dumpDumpables(pw, args) - - // THEN all dumpables are dumped (both critical and normal) (and no dumpables) - verify(dumpable1).dump(pw, args) - verify(dumpable2).dump(pw, args) - verify(dumpable3).dump(pw, args) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2, never()).dump(any(), anyInt()) - } - - @Test - fun testDumpBuffers() { - // GIVEN a variety of registered dumpables and buffers + // THEN no exception is thrown when trying to re-register a new dumpable under the same key dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerNormalDumpable("dumpable3", dumpable3) dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) - - // WHEN a buffer dump is requested - dumpManager.dumpBuffers(pw, tailLength = 1) - // THEN all buffers are dumped (and no dumpables) - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1).dump(pw, tailLength = 1) - verify(buffer2).dump(pw, tailLength = 1) + // No exception thrown } @Test - fun testCriticalDump() { - // GIVEN a variety of registered dumpables and buffers + fun getDumpables_returnsSafeCollection() { + // GIVEN a variety of registered dumpables dumpManager.registerCriticalDumpable("dumpable1", dumpable1) dumpManager.registerCriticalDumpable("dumpable2", dumpable2) dumpManager.registerNormalDumpable("dumpable3", dumpable3) - dumpManager.registerBuffer("buffer1", buffer1) - dumpManager.registerBuffer("buffer2", buffer2) - // WHEN a critical dump is requested - val args = arrayOf<String>() - dumpManager.dumpCritical(pw, args) + // WHEN the collection is retrieved + val dumpables = dumpManager.getDumpables() - // THEN only critical modules are dumped (and no buffers) - verify(dumpable1).dump(pw, args) - verify(dumpable2).dump(pw, args) - verify(dumpable3, never()).dump(any(), any()) - verify(buffer1, never()).dump(any(), anyInt()) - verify(buffer2, never()).dump(any(), anyInt()) + // WHEN the collection changes from underneath + dumpManager.unregisterDumpable("dumpable1") + dumpManager.unregisterDumpable("dumpable2") + dumpManager.unregisterDumpable("dumpable3") + + // THEN new collections are empty + assertThat(dumpManager.getDumpables()).isEmpty() + + // AND the collection is still safe to use + assertThat(dumpables).hasSize(3) } @Test - fun testNormalDump() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerNormalDumpable("dumpable3", dumpable3) + fun getBuffers_returnsSafeCollection() { + // GIVEN a set of registered buffers dumpManager.registerBuffer("buffer1", buffer1) dumpManager.registerBuffer("buffer2", buffer2) - // WHEN a normal dump is requested - val args = arrayOf<String>() - dumpManager.dumpNormal(pw, args, tailLength = 2) + // WHEN the collection is requested + val buffers = dumpManager.getLogBuffers() + + // WHEN the collection changes + dumpManager.registerBuffer("buffer3", buffer1) - // THEN the normal module and all buffers are dumped - verify(dumpable1, never()).dump(any(), any()) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3).dump(pw, args) - verify(buffer1).dump(pw, tailLength = 2) - verify(buffer2).dump(pw, tailLength = 2) + // THEN the new entry is represented + assertThat(dumpManager.getLogBuffers()).hasSize(3) + + // AND the previous collection is unchanged + assertThat(buffers).hasSize(2) } @Test - fun testUnregister() { - // GIVEN a variety of registered dumpables and buffers - dumpManager.registerCriticalDumpable("dumpable1", dumpable1) - dumpManager.registerCriticalDumpable("dumpable2", dumpable2) - dumpManager.registerNormalDumpable("dumpable3", dumpable3) + fun getTableBuffers_returnsSafeCollection() { + // GIVEN a set of registered buffers + dumpManager.registerTableLogBuffer("table1", table1) + dumpManager.registerTableLogBuffer("table2", table2) - dumpManager.unregisterDumpable("dumpable2") - dumpManager.unregisterDumpable("dumpable3") + // WHEN the collection is requested + val tables = dumpManager.getTableLogBuffers() + + // WHEN the collection changes + dumpManager.registerTableLogBuffer("table3", table1) - // WHEN a dumpables dump is requested - val args = arrayOf<String>() - dumpManager.dumpDumpables(pw, args) + // THEN the new entry is represented + assertThat(dumpManager.getTableLogBuffers()).hasSize(3) - // THEN the unregistered dumpables (both normal and critical) are not dumped - verify(dumpable1).dump(pw, args) - verify(dumpable2, never()).dump(any(), any()) - verify(dumpable3, never()).dump(any(), any()) + // AND the previous collection is unchanged + assertThat(tables).hasSize(2) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dump/LogEulogizerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dump/LogEulogizerTest.kt index cb38846a0514..3ff72028d5ca 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dump/LogEulogizerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dump/LogEulogizerTest.kt @@ -18,20 +18,14 @@ package com.android.systemui.dump import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.dump.DumpHandler.Companion.dump +import com.android.systemui.log.LogBuffer import com.android.systemui.util.io.FakeBasicFileAttributes import com.android.systemui.util.io.Files import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock -import org.junit.Assert.assertEquals -import org.junit.Assert.assertTrue -import org.junit.Before -import org.junit.Test -import org.mockito.Mock -import org.mockito.Mockito -import org.mockito.Mockito.never -import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations import java.io.BufferedWriter import java.io.ByteArrayOutputStream import java.io.IOException @@ -42,17 +36,29 @@ import java.nio.file.OpenOption import java.nio.file.Paths import java.nio.file.attribute.BasicFileAttributes import java.util.Arrays +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations @SmallTest class LogEulogizerTest : SysuiTestCase() { lateinit var eulogizer: LogBufferEulogizer - @Mock - lateinit var dumpManager: DumpManager + @Mock lateinit var dumpManager: DumpManager + @Mock lateinit var logBuffer1: LogBuffer + lateinit var logBufferEntry1: DumpsysEntry.LogBufferEntry + @Mock lateinit var logBuffer2: LogBuffer + lateinit var logBufferEntry2: DumpsysEntry.LogBufferEntry - @Mock - lateinit var files: Files + @Mock lateinit var files: Files private val clock = FakeSystemClock() @@ -67,37 +73,47 @@ class LogEulogizerTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) + logBufferEntry1 = DumpsysEntry.LogBufferEntry(logBuffer1, "logbuffer1") + logBufferEntry2 = DumpsysEntry.LogBufferEntry(logBuffer2, "logbuffer2") - eulogizer = - LogBufferEulogizer(dumpManager, clock, files, path, MIN_WRITE_GAP, MAX_READ_AGE) + eulogizer = LogBufferEulogizer(dumpManager, clock, files, path, MIN_WRITE_GAP, MAX_READ_AGE) Mockito.`when`(files.newBufferedWriter(eq(path), any(OpenOption::class.java))) - .thenReturn(fileWriter) + .thenReturn(fileWriter) Mockito.`when`( - files.readAttributes(eq(path), - eq(BasicFileAttributes::class.java), - any(LinkOption::class.java)) - ).thenReturn(fileAttrs) + files.readAttributes( + eq(path), + eq(BasicFileAttributes::class.java), + any(LinkOption::class.java) + ) + ) + .thenReturn(fileAttrs) Mockito.`when`(files.lines(eq(path))).thenReturn(Arrays.stream(FAKE_LINES)) + + whenever(dumpManager.getLogBuffers()).thenReturn(listOf(logBufferEntry1, logBufferEntry2)) } @Test fun testFileIsCreated() { // GIVEN that the log file doesn't already exist Mockito.`when`( - files.readAttributes(eq(path), - eq(BasicFileAttributes::class.java), - any(LinkOption::class.java)) - ).thenThrow(IOException("File not found")) + files.readAttributes( + eq(path), + eq(BasicFileAttributes::class.java), + any(LinkOption::class.java) + ) + ) + .thenThrow(IOException("File not found")) // WHEN .record() is called val exception = RuntimeException("Something bad happened") assertEquals(exception, eulogizer.record(exception)) // THEN the buffers are dumped to the file - verify(dumpManager).dumpBuffers(any(PrintWriter::class.java), Mockito.anyInt()) + verify(logBuffer1).dump(any(PrintWriter::class.java), anyInt()) + verify(logBuffer2).dump(any(PrintWriter::class.java), anyInt()) assertTrue(fileStream.toString().isNotEmpty()) } @@ -111,7 +127,8 @@ class LogEulogizerTest : SysuiTestCase() { assertEquals(exception, eulogizer.record(exception)) // THEN the buffers are dumped to the file - verify(dumpManager).dumpBuffers(any(PrintWriter::class.java), Mockito.anyInt()) + verify(logBuffer1).dump(any(PrintWriter::class.java), anyInt()) + verify(logBuffer2).dump(any(PrintWriter::class.java), anyInt()) assertTrue(fileStream.toString().isNotEmpty()) } @@ -125,7 +142,8 @@ class LogEulogizerTest : SysuiTestCase() { assertEquals(exception, eulogizer.record(exception)) // THEN the file isn't written to - verify(dumpManager, never()).dumpBuffers(any(PrintWriter::class.java), Mockito.anyInt()) + verify(logBuffer1, never()).dump(any(PrintWriter::class.java), anyInt()) + verify(logBuffer2, never()).dump(any(PrintWriter::class.java), anyInt()) assertTrue(fileStream.toString().isEmpty()) } @@ -161,9 +179,4 @@ class LogEulogizerTest : SysuiTestCase() { private const val MIN_WRITE_GAP = 10L private const val MAX_READ_AGE = 100L -private val FAKE_LINES = - arrayOf( - "First line", - "Second line", - "Third line" - ) +private val FAKE_LINES = arrayOf("First line", "Second line", "Third line") diff --git a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java index c9ee1e8ef5b9..6aa5a00c36da 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java @@ -67,6 +67,7 @@ import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.plugins.GlobalActions; import com.android.systemui.settings.UserContextProvider; import com.android.systemui.settings.UserTracker; +import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -128,6 +129,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { @Mock private UserContextProvider mUserContextProvider; @Mock private VibratorHelper mVibratorHelper; @Mock private CentralSurfaces mCentralSurfaces; + @Mock private ShadeController mShadeController; @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Mock private DialogLaunchAnimator mDialogLaunchAnimator; @Mock private OnBackInvokedDispatcher mOnBackInvokedDispatcher; @@ -177,6 +179,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { mHandler, mPackageManager, Optional.of(mCentralSurfaces), + mShadeController, mKeyguardUpdateMonitor, mDialogLaunchAnimator); mGlobalActionsDialogLite.setZeroDialogPressDelayForTesting(); @@ -317,7 +320,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { MotionEvent end = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 500, 0); gestureListener.onFling(start, end, 0, 1000); verifyLogPosted(GlobalActionsDialogLite.GlobalActionsEvent.GA_CLOSE_TAP_OUTSIDE); - verify(mCentralSurfaces).animateExpandSettingsPanel(null); + verify(mShadeController).animateExpandQs(); } @Test @@ -341,7 +344,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { MotionEvent end = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 500, 0); gestureListener.onFling(start, end, 0, 1000); verifyLogPosted(GlobalActionsDialogLite.GlobalActionsEvent.GA_CLOSE_TAP_OUTSIDE); - verify(mCentralSurfaces).animateExpandNotificationsPanel(); + verify(mShadeController).animateExpandShade(); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt index cdc99af3cbfe..3383516fa366 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt @@ -34,6 +34,8 @@ import com.android.systemui.R import com.android.systemui.SystemUIAppComponentFactoryBase import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags @@ -43,7 +45,6 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceLocalUserSelectionManager import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor @@ -188,6 +189,7 @@ class CustomizationProviderTest : SysuiTestCase() { commandQueue = commandQueue, featureFlags = featureFlags, bouncerRepository = FakeKeyguardBouncerRepository(), + configurationRepository = FakeConfigurationRepository(), ), registry = mock(), lockPatternUtils = lockPatternUtils, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt index 22308414547a..9a2936e227f8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt @@ -385,8 +385,6 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { // We expect that we've set the surface behind to alpha = 0f since we're not interactive. assertEquals(0f, params.alpha) assertTrue(params.matrix.isIdentity) - assertEquals("Wallpaper surface was expected to have opacity 0", - 0f, captorWp.getLastValue().alpha) verifyNoMoreInteractions(surfaceTransactionApplier) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index f31ac00051f6..a77f4761a6d1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -16,11 +16,16 @@ package com.android.systemui.keyguard; +import static android.os.PowerManager.WAKE_REASON_WAKE_MOTION; +import static android.provider.Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT; import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY; +import static android.view.WindowManagerPolicyConstants.OFF_BECAUSE_OF_TIMEOUT; import static android.view.WindowManagerPolicyConstants.OFF_BECAUSE_OF_USER; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT; +import static com.android.systemui.keyguard.KeyguardViewMediator.DELAYED_KEYGUARD_ACTION; +import static com.android.systemui.keyguard.KeyguardViewMediator.KEYGUARD_LOCK_AFTER_DELAY_DEFAULT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,9 +40,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.AlarmManager; import android.app.IActivityManager; +import android.app.PendingIntent; import android.app.admin.DevicePolicyManager; import android.app.trust.TrustManager; +import android.content.Context; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.telephony.TelephonyManager; @@ -71,6 +79,7 @@ import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel; import com.android.systemui.log.SessionTracker; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.settings.UserTracker; @@ -94,9 +103,12 @@ import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.util.DeviceConfigProxy; import com.android.systemui.util.DeviceConfigProxyFake; import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.settings.SecureSettings; +import com.android.systemui.util.settings.SystemSettings; import com.android.systemui.util.time.FakeSystemClock; import com.android.wm.shell.keyguard.KeyguardTransitions; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -105,6 +117,9 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import kotlinx.coroutines.CoroutineDispatcher; +import kotlinx.coroutines.flow.Flow; + @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest @@ -156,21 +171,32 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { private @Mock CentralSurfaces mCentralSurfaces; private @Mock UiEventLogger mUiEventLogger; private @Mock SessionTracker mSessionTracker; + private @Mock SystemSettings mSystemSettings; + private @Mock SecureSettings mSecureSettings; + private @Mock AlarmManager mAlarmManager; + private FakeSystemClock mSystemClock; + + private @Mock CoroutineDispatcher mDispatcher; + private @Mock DreamingToLockscreenTransitionViewModel mDreamingToLockscreenTransitionViewModel; private FakeFeatureFlags mFeatureFlags; + private int mInitialUserId; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); mFalsingCollector = new FalsingCollectorFake(); - + mSystemClock = new FakeSystemClock(); when(mLockPatternUtils.getDevicePolicyManager()).thenReturn(mDevicePolicyManager); when(mPowerManager.newWakeLock(anyInt(), any())).thenReturn(mock(WakeLock.class)); when(mInteractionJankMonitor.begin(any(), anyInt())).thenReturn(true); when(mInteractionJankMonitor.end(anyInt())).thenReturn(true); + mContext.addMockSystemService(Context.ALARM_SERVICE, mAlarmManager); final ViewRootImpl testViewRoot = mock(ViewRootImpl.class); when(testViewRoot.getView()).thenReturn(mock(View.class)); when(mStatusBarKeyguardViewManager.getViewRootImpl()).thenReturn(testViewRoot); + when(mDreamingToLockscreenTransitionViewModel.getDreamOverlayAlpha()) + .thenReturn(mock(Flow.class)); mNotificationShadeWindowController = new NotificationShadeWindowControllerImpl(mContext, mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController, mConfigurationController, mViewMediator, mKeyguardBypassController, @@ -183,9 +209,16 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { DejankUtils.setImmediate(true); createAndStartViewMediator(); + mInitialUserId = KeyguardUpdateMonitor.getCurrentUser(); + } + + @After + public void teardown() { + KeyguardUpdateMonitor.setCurrentUser(mInitialUserId); } @Test + @TestableLooper.RunWithLooper(setAsMainLooper = true) public void onLockdown_showKeyguard_evenIfKeyguardIsNotEnabledExternally() { // GIVEN keyguard is not enabled and isn't showing mViewMediator.onSystemReady(); @@ -369,6 +402,49 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { } @Test + public void lockAfterScreenTimeoutUsesValueFromSettings() { + int currentUserId = 99; + int userSpecificTimeout = 5999; + KeyguardUpdateMonitor.setCurrentUser(currentUserId); + + when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(false); + when(mDevicePolicyManager.getMaximumTimeToLock(null, currentUserId)).thenReturn(0L); + when(mSecureSettings.getIntForUser(LOCK_SCREEN_LOCK_AFTER_TIMEOUT, + KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, currentUserId)).thenReturn(userSpecificTimeout); + mSystemClock.setElapsedRealtime(0L); + ArgumentCaptor<PendingIntent> pendingIntent = ArgumentCaptor.forClass(PendingIntent.class); + + mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_TIMEOUT); + + verify(mAlarmManager).setExactAndAllowWhileIdle(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP), + eq(Long.valueOf(userSpecificTimeout)), pendingIntent.capture()); + assertEquals(DELAYED_KEYGUARD_ACTION, pendingIntent.getValue().getIntent().getAction()); + } + + @Test + public void lockAfterSpecifiedAfterDreamStarted() { + int currentUserId = 99; + int userSpecificTimeout = 5999; + KeyguardUpdateMonitor.setCurrentUser(currentUserId); + + // set mDeviceInteractive to true + mViewMediator.onStartedWakingUp(WAKE_REASON_WAKE_MOTION, false); + mFeatureFlags.set(Flags.LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING, false); + when(mLockPatternUtils.isSecure(currentUserId)).thenReturn(true); + when(mDevicePolicyManager.getMaximumTimeToLock(null, currentUserId)).thenReturn(0L); + when(mSecureSettings.getIntForUser(LOCK_SCREEN_LOCK_AFTER_TIMEOUT, + KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, currentUserId)).thenReturn(userSpecificTimeout); + mSystemClock.setElapsedRealtime(0L); + ArgumentCaptor<PendingIntent> pendingIntent = ArgumentCaptor.forClass(PendingIntent.class); + + mViewMediator.onDreamingStarted(); + + verify(mAlarmManager).setExactAndAllowWhileIdle(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP), + eq(Long.valueOf(userSpecificTimeout)), pendingIntent.capture()); + assertEquals(DELAYED_KEYGUARD_ACTION, pendingIntent.getValue().getIntent().getAction()); + } + + @Test public void testHideSurfaceBehindKeyguardMarksKeyguardNotGoingAway() { mViewMediator.hideSurfaceBehindKeyguard(); @@ -629,7 +705,12 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { () -> mNotificationShadeWindowController, () -> mActivityLaunchAnimator, () -> mScrimController, - mFeatureFlags); + mFeatureFlags, + mSecureSettings, + mSystemSettings, + mSystemClock, + mDispatcher, + () -> mDreamingToLockscreenTransitionViewModel); mViewMediator.start(); mViewMediator.registerCentralSurfaces(mCentralSurfaces, null, null, null, null, null); diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt index 78a65a8473db..b4bd473b8b8c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt @@ -7,11 +7,9 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeCommandQueue -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionStep @@ -60,17 +58,19 @@ class ResourceTrimmerTest : SysuiTestCase() { keyguardRepository.setDozeAmount(0f) keyguardRepository.setKeyguardGoingAway(false) - val keyguardInteractor = - KeyguardInteractor( - keyguardRepository, - FakeCommandQueue(), - featureFlags, - FakeKeyguardBouncerRepository() + val withDeps = + KeyguardInteractorFactory.create( + repository = keyguardRepository, + featureFlags = featureFlags, ) + val keyguardInteractor = withDeps.keyguardInteractor resourceTrimmer = ResourceTrimmer( keyguardInteractor, - KeyguardTransitionInteractor(keyguardTransitionRepository), + KeyguardTransitionInteractor( + keyguardTransitionRepository, + testScope.backgroundScope + ), globalWindowManager, testScope.backgroundScope, testDispatcher, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt index e61620beeff3..92ec9a1cfabc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt @@ -39,14 +39,16 @@ import com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_TRIGGERED_SWIPE_UP_ON_BOUN import com.android.systemui.R import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.coroutines.FlowValue import com.android.systemui.coroutines.collectLastValue import com.android.systemui.dump.DumpManager import com.android.systemui.dump.logcatLogBuffer import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.AuthenticationStatus import com.android.systemui.keyguard.shared.model.DetectionStatus @@ -159,17 +161,16 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { biometricSettingsRepository = FakeBiometricSettingsRepository() deviceEntryFingerprintAuthRepository = FakeDeviceEntryFingerprintAuthRepository() trustRepository = FakeTrustRepository() - keyguardRepository = FakeKeyguardRepository() - bouncerRepository = FakeKeyguardBouncerRepository() featureFlags = FakeFeatureFlags().apply { set(FACE_AUTH_REFACTOR, true) } - fakeCommandQueue = FakeCommandQueue() - keyguardInteractor = - KeyguardInteractor( - keyguardRepository, - fakeCommandQueue, - featureFlags, - bouncerRepository + val withDeps = + KeyguardInteractorFactory.create( + featureFlags = featureFlags, ) + keyguardInteractor = withDeps.keyguardInteractor + keyguardRepository = withDeps.repository + bouncerRepository = withDeps.bouncerRepository + fakeCommandQueue = withDeps.commandQueue + alternateBouncerInteractor = AlternateBouncerInteractor( bouncerRepository = bouncerRepository, @@ -215,7 +216,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { ) keyguardTransitionRepository = FakeKeyguardTransitionRepository() val keyguardTransitionInteractor = - KeyguardTransitionInteractor(keyguardTransitionRepository) + KeyguardTransitionInteractor(keyguardTransitionRepository, testScope.backgroundScope) return DeviceEntryFaceAuthRepositoryImpl( mContext, fmOverride, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt index 4b797cb1ba46..953d61844596 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt @@ -97,7 +97,8 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { dozeParameters, authController, dreamOverlayCallbackController, - mainDispatcher + mainDispatcher, + testScope.backgroundScope, ) } @@ -343,8 +344,6 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { ) job.cancel() - runCurrent() - verify(wakefulnessLifecycle).removeObserver(captor.value) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardFaceAuthInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardFaceAuthInteractorTest.kt index 6af122051afc..80700e59a2d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardFaceAuthInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardFaceAuthInteractorTest.kt @@ -24,16 +24,19 @@ import com.android.keyguard.FaceAuthUiEvent import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor +import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.classifier.FalsingCollector import com.android.systemui.dump.logcatLogBuffer import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.BouncerView import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFaceAuthRepository import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.data.repository.FakeTrustRepository import com.android.systemui.keyguard.shared.model.KeyguardState @@ -82,7 +85,8 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { bouncerRepository = FakeKeyguardBouncerRepository() faceAuthRepository = FakeDeviceEntryFaceAuthRepository() keyguardTransitionRepository = FakeKeyguardTransitionRepository() - keyguardTransitionInteractor = KeyguardTransitionInteractor(keyguardTransitionRepository) + keyguardTransitionInteractor = + KeyguardTransitionInteractor(keyguardTransitionRepository, testScope.backgroundScope) underTest = SystemUIKeyguardFaceAuthInteractor( diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt index 0d695aa231cc..4b094687cc61 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt @@ -22,11 +22,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository import com.android.systemui.coroutines.collectLastValue import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR import com.android.systemui.keyguard.data.repository.FakeCommandQueue -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.shared.model.CameraLaunchSourceModel import com.google.common.truth.Truth.assertThat @@ -50,6 +51,7 @@ class KeyguardInteractorTest : SysuiTestCase() { private lateinit var underTest: KeyguardInteractor private lateinit var repository: FakeKeyguardRepository private lateinit var bouncerRepository: FakeKeyguardBouncerRepository + private lateinit var configurationRepository: FakeConfigurationRepository @Before fun setUp() { @@ -59,12 +61,14 @@ class KeyguardInteractorTest : SysuiTestCase() { testScope = TestScope() repository = FakeKeyguardRepository() bouncerRepository = FakeKeyguardBouncerRepository() + configurationRepository = FakeConfigurationRepository() underTest = KeyguardInteractor( repository, commandQueue, featureFlags, bouncerRepository, + configurationRepository, ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt index 5de24e4fc322..f63be610fd11 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt @@ -292,7 +292,8 @@ class KeyguardLongPressInteractorTest : SysuiTestCase() { scope = testScope.backgroundScope, transitionInteractor = KeyguardTransitionInteractor( - repository = keyguardTransitionRepository, + keyguardTransitionRepository, + testScope.backgroundScope ), repository = keyguardRepository, logger = logger, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt index 2c90d530194d..8540bf7f6b17 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt @@ -39,8 +39,6 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceLocalUserSelectionManager import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository import com.android.systemui.keyguard.domain.quickaffordance.FakeKeyguardQuickAffordanceRegistry import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancePosition @@ -49,7 +47,6 @@ import com.android.systemui.plugins.ActivityStarter import com.android.systemui.settings.FakeUserTracker import com.android.systemui.settings.UserFileManager import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSharedPreferences import com.android.systemui.util.mockito.any @@ -226,7 +223,6 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { @Mock private lateinit var animationController: ActivityLaunchAnimator.Controller @Mock private lateinit var expandable: Expandable @Mock private lateinit var launchAnimator: DialogLaunchAnimator - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @@ -312,12 +308,10 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { underTest = KeyguardQuickAffordanceInteractor( keyguardInteractor = - KeyguardInteractor( - repository = FakeKeyguardRepository(), - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ), + KeyguardInteractorFactory.create( + featureFlags = featureFlags, + ) + .keyguardInteractor, registry = FakeKeyguardQuickAffordanceRegistry( mapOf( @@ -372,11 +366,11 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { KeyguardQuickAffordanceConfig.OnTriggeredResult.Handled } - underTest.onQuickAffordanceTriggered( - configKey = BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS, - expandable = expandable, - slotId = "", - ) + underTest.onQuickAffordanceTriggered( + configKey = BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS, + expandable = expandable, + slotId = "", + ) if (startActivity) { if (needsToUnlockFirst) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt index 7cab680ef3e6..a0c5a75ecd9e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt @@ -41,7 +41,6 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceLocalUserSelectionManager import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository import com.android.systemui.keyguard.domain.model.KeyguardQuickAffordanceModel @@ -54,7 +53,6 @@ import com.android.systemui.plugins.ActivityStarter import com.android.systemui.settings.UserFileManager import com.android.systemui.settings.UserTracker import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSharedPreferences import com.android.systemui.util.mockito.mock @@ -85,7 +83,6 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var launchAnimator: DialogLaunchAnimator - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @@ -171,15 +168,14 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { set(Flags.FACE_AUTH_REFACTOR, true) } + val withDeps = + KeyguardInteractorFactory.create( + featureFlags = featureFlags, + repository = repository, + ) underTest = KeyguardQuickAffordanceInteractor( - keyguardInteractor = - KeyguardInteractor( - repository = repository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ), + keyguardInteractor = withDeps.keyguardInteractor, registry = FakeKeyguardQuickAffordanceRegistry( mapOf( diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt index d66e42009348..fa4941cbb895 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt @@ -27,11 +27,14 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.AOD import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING 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.OFF +import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER import com.android.systemui.keyguard.shared.model.TransitionState.FINISHED import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING import com.android.systemui.keyguard.shared.model.TransitionState.STARTED import com.android.systemui.keyguard.shared.model.TransitionStep import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -46,11 +49,12 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() { private lateinit var underTest: KeyguardTransitionInteractor private lateinit var repository: FakeKeyguardTransitionRepository + private val testScope = TestScope() @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - underTest = KeyguardTransitionInteractor(repository) + underTest = KeyguardTransitionInteractor(repository, testScope.backgroundScope) } @Test @@ -108,17 +112,39 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() { } @Test - fun keyguardStateTests() = runTest { + fun finishedKeyguardStateTests() = testScope.runTest { val finishedSteps by collectValues(underTest.finishedKeyguardState) + runCurrent() + val steps = mutableListOf<TransitionStep>() + + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 0f, STARTED)) + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 0.5f, RUNNING)) + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 1f, FINISHED)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 0f, STARTED)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 0.9f, RUNNING)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 1f, FINISHED)) + steps.add(TransitionStep(AOD, GONE, 1f, STARTED)) + steps.forEach { + repository.sendTransitionStep(it) + runCurrent() + } + + assertThat(finishedSteps).isEqualTo(listOf(LOCKSCREEN, PRIMARY_BOUNCER, AOD)) + } + + @Test + fun startedKeyguardStateTests() = testScope.runTest { + val finishedSteps by collectValues(underTest.startedKeyguardState) + runCurrent() val steps = mutableListOf<TransitionStep>() - steps.add(TransitionStep(AOD, LOCKSCREEN, 0f, STARTED)) - steps.add(TransitionStep(AOD, LOCKSCREEN, 0.5f, RUNNING)) - steps.add(TransitionStep(AOD, LOCKSCREEN, 1f, FINISHED)) - steps.add(TransitionStep(LOCKSCREEN, AOD, 0f, STARTED)) - steps.add(TransitionStep(LOCKSCREEN, AOD, 0.9f, RUNNING)) - steps.add(TransitionStep(LOCKSCREEN, AOD, 1f, FINISHED)) + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 0f, STARTED)) + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 0.5f, RUNNING)) + steps.add(TransitionStep(AOD, PRIMARY_BOUNCER, 1f, FINISHED)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 0f, STARTED)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 0.9f, RUNNING)) + steps.add(TransitionStep(PRIMARY_BOUNCER, AOD, 1f, FINISHED)) steps.add(TransitionStep(AOD, GONE, 1f, STARTED)) steps.forEach { @@ -126,7 +152,7 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() { runCurrent() } - assertThat(finishedSteps).isEqualTo(listOf(LOCKSCREEN, AOD)) + assertThat(finishedSteps).isEqualTo(listOf(OFF, PRIMARY_BOUNCER, AOD, GONE)) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index 603f199b468b..50075b5ae5d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -20,10 +20,9 @@ import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardSecurityModel.SecurityMode.PIN import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository @@ -39,7 +38,6 @@ import com.android.systemui.keyguard.shared.model.WakefulnessModel import com.android.systemui.keyguard.shared.model.WakefulnessState import com.android.systemui.shade.data.repository.FakeShadeRepository import com.android.systemui.shade.data.repository.ShadeRepository -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.withArgCaptor @@ -74,10 +72,10 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { private lateinit var bouncerRepository: FakeKeyguardBouncerRepository private lateinit var shadeRepository: ShadeRepository private lateinit var transitionRepository: FakeKeyguardTransitionRepository + private lateinit var featureFlags: FakeFeatureFlags // Used to verify transition requests for test output @Mock private lateinit var mockTransitionRepository: KeyguardTransitionRepository - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var keyguardSecurityModel: KeyguardSecurityModel private lateinit var fromLockscreenTransitionInteractor: FromLockscreenTransitionInteractor @@ -103,118 +101,91 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { whenever(keyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(PIN) - val featureFlags = FakeFeatureFlags().apply { set(Flags.FACE_AUTH_REFACTOR, true) } + featureFlags = FakeFeatureFlags().apply { set(Flags.FACE_AUTH_REFACTOR, true) } fromLockscreenTransitionInteractor = FromLockscreenTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), shadeRepository = shadeRepository, keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromLockscreenTransitionInteractor.start() fromDreamingTransitionInteractor = FromDreamingTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromDreamingTransitionInteractor.start() fromAodTransitionInteractor = FromAodTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromAodTransitionInteractor.start() fromGoneTransitionInteractor = FromGoneTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromGoneTransitionInteractor.start() fromDozingTransitionInteractor = FromDozingTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromDozingTransitionInteractor.start() fromOccludedTransitionInteractor = FromOccludedTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromOccludedTransitionInteractor.start() fromAlternateBouncerTransitionInteractor = FromAlternateBouncerTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), ) fromAlternateBouncerTransitionInteractor.start() fromPrimaryBouncerTransitionInteractor = FromPrimaryBouncerTransitionInteractor( scope = testScope, - keyguardInteractor = createKeyguardInteractor(featureFlags), + keyguardInteractor = createKeyguardInteractor(), keyguardTransitionRepository = mockTransitionRepository, - keyguardTransitionInteractor = KeyguardTransitionInteractor(transitionRepository), + keyguardTransitionInteractor = + KeyguardTransitionInteractor(transitionRepository, testScope.backgroundScope), keyguardSecurityModel = keyguardSecurityModel, ) fromPrimaryBouncerTransitionInteractor.start() } @Test - fun dreamingToLockscreen() = - testScope.runTest { - // GIVEN a device is dreaming - keyguardRepository.setDreamingWithOverlay(true) - keyguardRepository.setWakefulnessModel(startingToWake()) - runCurrent() - - // GIVEN a prior transition has run to DREAMING - runTransition(KeyguardState.LOCKSCREEN, KeyguardState.DREAMING) - - // WHEN doze is complete - keyguardRepository.setDozeTransitionModel( - DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH) - ) - // AND dreaming has stopped - keyguardRepository.setDreamingWithOverlay(false) - advanceUntilIdle() - // AND then occluded has stopped - keyguardRepository.setKeyguardOccluded(false) - advanceUntilIdle() - - val info = - withArgCaptor<TransitionInfo> { - verify(mockTransitionRepository).startTransition(capture(), anyBoolean()) - } - // THEN a transition to BOUNCER should occur - assertThat(info.ownerName).isEqualTo("FromDreamingTransitionInteractor") - assertThat(info.from).isEqualTo(KeyguardState.DREAMING) - assertThat(info.to).isEqualTo(KeyguardState.LOCKSCREEN) - assertThat(info.animator).isNotNull() - - coroutineContext.cancelChildren() - } - - @Test fun lockscreenToPrimaryBouncerViaBouncerShowingCall() = testScope.runTest { // GIVEN a device that has at least woken up @@ -882,13 +853,13 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { WakeSleepReason.OTHER ) - private fun createKeyguardInteractor(featureFlags: FeatureFlags): KeyguardInteractor { - return KeyguardInteractor( - keyguardRepository, - commandQueue, - featureFlags, - bouncerRepository, - ) + private fun createKeyguardInteractor(): KeyguardInteractor { + return KeyguardInteractorFactory.create( + featureFlags = featureFlags, + repository = keyguardRepository, + bouncerRepository = bouncerRepository, + ) + .keyguardInteractor } private suspend fun TestScope.runTransition(from: KeyguardState, to: KeyguardState) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt index 4440946a2383..08e99dc6b7d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt @@ -29,6 +29,7 @@ import com.android.systemui.statusbar.LightRevealEffect import com.android.systemui.statusbar.LightRevealScrim import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals @@ -45,7 +46,7 @@ class LightRevealScrimInteractorTest : SysuiTestCase() { private val fakeLightRevealScrimRepository = FakeLightRevealScrimRepository() private val keyguardTransitionInteractor = - KeyguardTransitionInteractor(fakeKeyguardTransitionRepository) + KeyguardTransitionInteractor(fakeKeyguardTransitionRepository, TestScope().backgroundScope) private lateinit var underTest: LightRevealScrimInteractor diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LockscreenSceneInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LockscreenSceneInteractorTest.kt index d622f1c30816..65781c497944 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LockscreenSceneInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/LockscreenSceneInteractorTest.kt @@ -95,7 +95,7 @@ class LockscreenSceneInteractorTest : SysuiTestCase() { testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) authenticationInteractor.lockDevice() - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) underTest.dismissLockscreen() @@ -108,7 +108,7 @@ class LockscreenSceneInteractorTest : SysuiTestCase() { testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) authenticationInteractor.unlockDevice() - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) underTest.dismissLockscreen() @@ -195,7 +195,7 @@ class LockscreenSceneInteractorTest : SysuiTestCase() { testScope.runTest { val isUnlocked by collectLastValue(authenticationInteractor.isUnlocked) sceneInteractor.setCurrentScene(CONTAINER_1, SceneModel(SceneKey.Lockscreen)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) assertThat(isUnlocked).isFalse() sceneInteractor.setCurrentScene(CONTAINER_1, SceneModel(SceneKey.Gone)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt index cdd06acf4370..a3413466d62e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt @@ -25,11 +25,12 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import com.android.systemui.util.mockito.mock import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -42,13 +43,12 @@ import org.junit.runner.RunWith class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { private lateinit var underTest: DreamingToLockscreenTransitionViewModel private lateinit var repository: FakeKeyguardTransitionRepository - private lateinit var transitionAnimation: KeyguardTransitionAnimationFlow @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) - underTest = DreamingToLockscreenTransitionViewModel(interactor) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) + underTest = DreamingToLockscreenTransitionViewModel(interactor, mock()) } @Test @@ -60,17 +60,15 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.dreamOverlayTranslationY(pixels).onEach { values.add(it) }.launchIn(this) - // Should start running here... repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) repository.sendTransitionStep(step(0.6f)) - // ...up to here repository.sendTransitionStep(step(0.8f)) repository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(7) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } job.cancel() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt index 40511a06d486..694539b0cbfe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt @@ -29,6 +29,7 @@ import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -45,7 +46,7 @@ class GoneToDreamingTransitionViewModelTest : SysuiTestCase() { @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) underTest = GoneToDreamingTransitionViewModel(interactor) } 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 73fe380f01c7..29886d5481b9 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 @@ -40,12 +40,11 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceLocalUserSelectionManager import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.keyguard.domain.interactor.KeyguardLongPressInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardQuickAffordanceInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor @@ -57,7 +56,6 @@ import com.android.systemui.plugins.ActivityStarter import com.android.systemui.settings.UserFileManager import com.android.systemui.settings.UserTracker import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSharedPreferences @@ -96,7 +94,6 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var launchAnimator: DialogLaunchAnimator - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher @@ -143,7 +140,6 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { ), ), ) - repository = FakeKeyguardRepository() val featureFlags = FakeFeatureFlags().apply { set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, false) @@ -152,13 +148,10 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, false) } - val keyguardInteractor = - KeyguardInteractor( - repository = repository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ) + val withDeps = KeyguardInteractorFactory.create(featureFlags = featureFlags) + val keyguardInteractor = withDeps.keyguardInteractor + repository = withDeps.repository + whenever(userTracker.userHandle).thenReturn(mock()) whenever(userTracker.userId).thenReturn(10) whenever(lockPatternUtils.getStrongAuthForUser(anyInt())) @@ -219,6 +212,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { transitionInteractor = KeyguardTransitionInteractor( repository = FakeKeyguardTransitionRepository(), + scope = testScope.backgroundScope ), repository = repository, logger = UiEventLoggerFake(), @@ -554,91 +548,6 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { } @Test - fun isIndicationAreaPadded() = - testScope.runTest { - repository.setKeyguardShowing(true) - val value = collectLastValue(underTest.isIndicationAreaPadded) - - assertThat(value()).isFalse() - setUpQuickAffordanceModel( - position = KeyguardQuickAffordancePosition.BOTTOM_START, - testConfig = - TestConfig( - isVisible = true, - isClickable = true, - icon = mock(), - canShowWhileLocked = true, - slotId = KeyguardQuickAffordancePosition.BOTTOM_START.toSlotId(), - ) - ) - assertThat(value()).isTrue() - setUpQuickAffordanceModel( - position = KeyguardQuickAffordancePosition.BOTTOM_END, - testConfig = - TestConfig( - isVisible = true, - isClickable = true, - icon = mock(), - canShowWhileLocked = false, - slotId = KeyguardQuickAffordancePosition.BOTTOM_END.toSlotId(), - ) - ) - assertThat(value()).isTrue() - setUpQuickAffordanceModel( - position = KeyguardQuickAffordancePosition.BOTTOM_START, - testConfig = - TestConfig( - isVisible = false, - slotId = KeyguardQuickAffordancePosition.BOTTOM_START.toSlotId(), - ) - ) - assertThat(value()).isTrue() - setUpQuickAffordanceModel( - position = KeyguardQuickAffordancePosition.BOTTOM_END, - testConfig = - TestConfig( - isVisible = false, - slotId = KeyguardQuickAffordancePosition.BOTTOM_END.toSlotId(), - ) - ) - assertThat(value()).isFalse() - } - - @Test - fun indicationAreaTranslationX() = - testScope.runTest { - val value = collectLastValue(underTest.indicationAreaTranslationX) - - assertThat(value()).isEqualTo(0f) - repository.setClockPosition(100, 100) - assertThat(value()).isEqualTo(100f) - repository.setClockPosition(200, 100) - assertThat(value()).isEqualTo(200f) - repository.setClockPosition(200, 200) - assertThat(value()).isEqualTo(200f) - repository.setClockPosition(300, 100) - assertThat(value()).isEqualTo(300f) - } - - @Test - fun indicationAreaTranslationY() = - testScope.runTest { - val value = - collectLastValue(underTest.indicationAreaTranslationY(DEFAULT_BURN_IN_OFFSET)) - - // Negative 0 - apparently there's a difference in floating point arithmetic - FML - assertThat(value()).isEqualTo(-0f) - val expected1 = setDozeAmountAndCalculateExpectedTranslationY(0.1f) - assertThat(value()).isEqualTo(expected1) - val expected2 = setDozeAmountAndCalculateExpectedTranslationY(0.2f) - assertThat(value()).isEqualTo(expected2) - val expected3 = setDozeAmountAndCalculateExpectedTranslationY(0.5f) - assertThat(value()).isEqualTo(expected3) - val expected4 = setDozeAmountAndCalculateExpectedTranslationY(1f) - assertThat(value()).isEqualTo(expected4) - } - - @Test fun isClickable_trueWhenAlphaAtThreshold() = testScope.runTest { repository.setKeyguardShowing(true) @@ -761,11 +670,6 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { ) } - private fun setDozeAmountAndCalculateExpectedTranslationY(dozeAmount: Float): Float { - repository.setDozeAmount(dozeAmount) - return dozeAmount * (RETURNED_BURN_IN_OFFSET - DEFAULT_BURN_IN_OFFSET) - } - private suspend fun setUpQuickAffordanceModel( position: KeyguardQuickAffordancePosition, testConfig: TestConfig, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModelTest.kt new file mode 100644 index 000000000000..dff0f2909126 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModelTest.kt @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.viewmodel + +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.doze.util.BurnInHelperWrapper +import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository +import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory +import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancePosition +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.Mock +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(JUnit4::class) +class KeyguardIndicationAreaViewModelTest : SysuiTestCase() { + + @Mock private lateinit var burnInHelperWrapper: BurnInHelperWrapper + + private lateinit var underTest: KeyguardIndicationAreaViewModel + private lateinit var repository: FakeKeyguardRepository + + private val startButtonFlow = + MutableStateFlow<KeyguardQuickAffordanceViewModel>( + KeyguardQuickAffordanceViewModel( + slotId = KeyguardQuickAffordancePosition.BOTTOM_START.toSlotId() + ) + ) + private val endButtonFlow = + MutableStateFlow<KeyguardQuickAffordanceViewModel>( + KeyguardQuickAffordanceViewModel( + slotId = KeyguardQuickAffordancePosition.BOTTOM_END.toSlotId() + ) + ) + private val alphaFlow = MutableStateFlow<Float>(1f) + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + whenever(burnInHelperWrapper.burnInOffset(anyInt(), any())) + .thenReturn(RETURNED_BURN_IN_OFFSET) + + val withDeps = KeyguardInteractorFactory.create() + val keyguardInteractor = withDeps.keyguardInteractor + repository = withDeps.repository + + val bottomAreaViewModel: KeyguardBottomAreaViewModel = mock() + whenever(bottomAreaViewModel.startButton).thenReturn(startButtonFlow) + whenever(bottomAreaViewModel.endButton).thenReturn(endButtonFlow) + whenever(bottomAreaViewModel.alpha).thenReturn(alphaFlow) + underTest = + KeyguardIndicationAreaViewModel( + keyguardInteractor = keyguardInteractor, + bottomAreaInteractor = KeyguardBottomAreaInteractor(repository = repository), + keyguardBottomAreaViewModel = bottomAreaViewModel, + burnInHelperWrapper = burnInHelperWrapper, + ) + } + + @Test + fun alpha() = runTest { + val value = collectLastValue(underTest.alpha) + + assertThat(value()).isEqualTo(1f) + alphaFlow.value = 0.1f + assertThat(value()).isEqualTo(0.1f) + alphaFlow.value = 0.5f + assertThat(value()).isEqualTo(0.5f) + alphaFlow.value = 0.2f + assertThat(value()).isEqualTo(0.2f) + alphaFlow.value = 0f + assertThat(value()).isEqualTo(0f) + } + + @Test + fun isIndicationAreaPadded() = runTest { + repository.setKeyguardShowing(true) + val value = collectLastValue(underTest.isIndicationAreaPadded) + + assertThat(value()).isFalse() + startButtonFlow.value = startButtonFlow.value.copy(isVisible = true) + assertThat(value()).isTrue() + endButtonFlow.value = endButtonFlow.value.copy(isVisible = true) + assertThat(value()).isTrue() + startButtonFlow.value = startButtonFlow.value.copy(isVisible = false) + assertThat(value()).isTrue() + endButtonFlow.value = endButtonFlow.value.copy(isVisible = false) + assertThat(value()).isFalse() + } + + @Test + fun indicationAreaTranslationX() = runTest { + val value = collectLastValue(underTest.indicationAreaTranslationX) + + assertThat(value()).isEqualTo(0f) + repository.setClockPosition(100, 100) + assertThat(value()).isEqualTo(100f) + repository.setClockPosition(200, 100) + assertThat(value()).isEqualTo(200f) + repository.setClockPosition(200, 200) + assertThat(value()).isEqualTo(200f) + repository.setClockPosition(300, 100) + assertThat(value()).isEqualTo(300f) + } + + @Test + fun indicationAreaTranslationY() = runTest { + val value = collectLastValue(underTest.indicationAreaTranslationY(DEFAULT_BURN_IN_OFFSET)) + + // Negative 0 - apparently there's a difference in floating point arithmetic - FML + assertThat(value()).isEqualTo(-0f) + val expected1 = setDozeAmountAndCalculateExpectedTranslationY(0.1f) + assertThat(value()).isEqualTo(expected1) + val expected2 = setDozeAmountAndCalculateExpectedTranslationY(0.2f) + assertThat(value()).isEqualTo(expected2) + val expected3 = setDozeAmountAndCalculateExpectedTranslationY(0.5f) + assertThat(value()).isEqualTo(expected3) + val expected4 = setDozeAmountAndCalculateExpectedTranslationY(1f) + assertThat(value()).isEqualTo(expected4) + } + + private fun setDozeAmountAndCalculateExpectedTranslationY(dozeAmount: Float): Float { + repository.setDozeAmount(dozeAmount) + return dozeAmount * (RETURNED_BURN_IN_OFFSET - DEFAULT_BURN_IN_OFFSET) + } + + companion object { + private const val DEFAULT_BURN_IN_OFFSET = 5 + private const val RETURNED_BURN_IN_OFFSET = 3 + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt index 8ba3f0f57eed..f0ea0077596a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt @@ -109,7 +109,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { fun upTransitionSceneKey_swipeToUnlockedNotEnabled_bouncer() = testScope.runTest { val upTransitionSceneKey by collectLastValue(underTest.upDestinationSceneKey) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Bouncer) @@ -119,7 +119,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { fun onLockButtonClicked_deviceLockedSecurely_switchesToBouncer() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() runCurrent() @@ -132,7 +132,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceUnlocked_switchesToGone() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() runCurrent() @@ -145,7 +145,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceLockedSecurely_switchesToBouncer() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() runCurrent() @@ -158,7 +158,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { fun onLockButtonClicked_deviceUnlocked_switchesToGone() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt index c98058dd22a7..ea17751782c4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt @@ -29,6 +29,7 @@ import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -45,7 +46,7 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) underTest = LockscreenToDreamingTransitionViewModel(interactor) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt index 031b7fb13d26..bf56a981fa31 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt @@ -29,6 +29,7 @@ import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -45,7 +46,7 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) underTest = LockscreenToOccludedTransitionViewModel(interactor) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt index c7ff8826a17c..34da26ecc0bf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt @@ -29,6 +29,7 @@ import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -45,7 +46,7 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() { @Before fun setUp() { repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) underTest = OccludedToLockscreenTransitionViewModel(interactor) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt index db251a0b2258..f88b71d469cf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt @@ -20,9 +20,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.ScrimAlpha import com.android.systemui.keyguard.shared.model.TransitionState @@ -33,6 +33,7 @@ import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -54,7 +55,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) repository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(repository) + val interactor = KeyguardTransitionInteractor(repository, TestScope().backgroundScope) underTest = PrimaryBouncerToGoneTransitionViewModel( interactor, diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt index 07f7c158fc4d..2aff90c47189 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt @@ -63,6 +63,7 @@ import junit.framework.Assert.assertEquals import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before @@ -146,7 +147,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { debugLogger, mediaFlags, keyguardUpdateMonitor, - KeyguardTransitionInteractor(repository = transitionRepository), + KeyguardTransitionInteractor(transitionRepository, TestScope().backgroundScope), ) verify(configurationController).addCallback(capture(configListener)) verify(mediaDataManager).addListener(capture(listener)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt index 19f9960558b2..9e5422470d8b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/multishade/domain/interactor/MultiShadeMotionEventInteractorTest.kt @@ -99,6 +99,7 @@ class MultiShadeMotionEventInteractorTest : SysuiTestCase() { keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = keyguardTransitionRepository, + scope = testScope.backgroundScope ), falsingManager = falsingManager, shadeController = shadeController, diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavBarHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavBarHelperTest.java index 9b8605dccd09..8d306cceeaa7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavBarHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavBarHelperTest.java @@ -52,6 +52,7 @@ import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -112,6 +113,9 @@ public class NavBarHelperTest extends SysuiTestCase { EdgeBackGestureHandler mEdgeBackGestureHandler; @Mock EdgeBackGestureHandler.Factory mEdgeBackGestureHandlerFactory; + @Mock + NotificationShadeWindowController mNotificationShadeWindowController; + private AccessibilityManager.AccessibilityServicesStateChangeListener mAccessibilityServicesStateChangeListener; @@ -136,7 +140,7 @@ public class NavBarHelperTest extends SysuiTestCase { mSystemActions, mOverviewProxyService, mAssistManagerLazy, () -> Optional.of(mock(CentralSurfaces.class)), mock(KeyguardStateController.class), mNavigationModeController, mEdgeBackGestureHandlerFactory, mWm, mUserTracker, - mDisplayTracker, mDumpManager, mCommandQueue); + mDisplayTracker, mNotificationShadeWindowController, mDumpManager, mCommandQueue); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java index f062ec732b21..25d494cee5e8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java @@ -99,6 +99,7 @@ import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationShadeDepthController; +import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.LightBarController; @@ -209,6 +210,8 @@ public class NavigationBarTest extends SysuiTestCase { private EdgeBackGestureHandler.Factory mEdgeBackGestureHandlerFactory; @Mock private EdgeBackGestureHandler mEdgeBackGestureHandler; + @Mock + private NotificationShadeWindowController mNotificationShadeWindowController; private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); private DeviceConfigProxyFake mDeviceConfigProxyFake = new DeviceConfigProxyFake(); private TaskStackChangeListeners mTaskStackChangeListeners = @@ -256,7 +259,8 @@ public class NavigationBarTest extends SysuiTestCase { () -> mock(AssistManager.class), () -> Optional.of(mCentralSurfaces), mKeyguardStateController, mock(NavigationModeController.class), mEdgeBackGestureHandlerFactory, mock(IWindowManager.class), - mock(UserTracker.class), mock(DisplayTracker.class), mock(DumpManager.class), + mock(UserTracker.class), mock(DisplayTracker.class), + mNotificationShadeWindowController, mock(DumpManager.class), mock(CommandQueue.class))); mNavigationBar = createNavBar(mContext); mExternalDisplayNavigationBar = createNavBar(mSysuiTestableContextExternal); @@ -339,7 +343,6 @@ public class NavigationBarTest extends SysuiTestCase { NotificationShadeWindowView mockShadeWindowView = mock(NotificationShadeWindowView.class); WindowInsets windowInsets = new WindowInsets.Builder().setVisible(ime(), false).build(); doReturn(windowInsets).when(mockShadeWindowView).getRootWindowInsets(); - doReturn(mockShadeWindowView).when(mCentralSurfaces).getNotificationShadeWindowView(); doReturn(true).when(mockShadeWindowView).isAttachedToWindow(); doNothing().when(defaultNavBar).checkNavBarModes(); doNothing().when(externalNavBar).checkNavBarModes(); @@ -375,7 +378,7 @@ public class NavigationBarTest extends SysuiTestCase { @Test public void testSetImeWindowStatusWhenKeyguardLockingAndImeInsetsChange() { NotificationShadeWindowView mockShadeWindowView = mock(NotificationShadeWindowView.class); - doReturn(mockShadeWindowView).when(mCentralSurfaces).getNotificationShadeWindowView(); + doReturn(mockShadeWindowView).when(mNotificationShadeWindowController).getWindowRootView(); doReturn(true).when(mockShadeWindowView).isAttachedToWindow(); doNothing().when(mNavigationBar).checkNavBarModes(); mNavigationBar.init(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/FakeNoteTaskBubbleController.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/FakeNoteTaskBubbleController.kt new file mode 100644 index 000000000000..450aadd70171 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/FakeNoteTaskBubbleController.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.notetask + +import android.content.Context +import android.content.Intent +import android.graphics.drawable.Icon +import android.os.UserHandle +import com.android.wm.shell.bubbles.Bubbles +import java.util.Optional +import kotlinx.coroutines.CoroutineDispatcher + +/** + * Fake for [NoteTaskBubblesController] as mocking suspending functions is not supported in the + * Android tree's version of mockito. Ideally the [NoteTaskBubblesController] should be implemented + * using an interface for effectively providing multiple implementations but as this fake primarily + * for dealing with old version of mockito there isn't any benefit in adding complexity. + */ +class FakeNoteTaskBubbleController( + unUsed1: Context, + unsUsed2: CoroutineDispatcher, + private val optionalBubbles: Optional<Bubbles> +) : NoteTaskBubblesController(unUsed1, unsUsed2) { + override suspend fun areBubblesAvailable() = optionalBubbles.isPresent + + override suspend fun showOrHideAppBubble(intent: Intent, userHandle: UserHandle, icon: Icon) { + optionalBubbles.ifPresentOrElse( + { bubbles -> bubbles.showOrHideAppBubble(intent, userHandle, icon) }, + { throw IllegalAccessException() } + ) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskBubblesServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskBubblesServiceTest.kt new file mode 100644 index 000000000000..baac9e020280 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskBubblesServiceTest.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.notetask + +import android.content.Intent +import android.graphics.drawable.Icon +import android.os.UserHandle +import androidx.test.filters.SmallTest +import androidx.test.runner.AndroidJUnit4 +import com.android.systemui.R +import com.android.systemui.SysuiTestCase +import com.android.systemui.notetask.NoteTaskBubblesController.NoteTaskBubblesService +import com.android.wm.shell.bubbles.Bubbles +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +/** atest SystemUITests:NoteTaskBubblesServiceTest */ +@SmallTest +@RunWith(AndroidJUnit4::class) +internal class NoteTaskBubblesServiceTest : SysuiTestCase() { + + @Mock private lateinit var bubbles: Bubbles + + private fun createServiceBinder(bubbles: Bubbles? = this.bubbles) = + NoteTaskBubblesService(Optional.ofNullable(bubbles)).onBind(Intent()) + as INoteTaskBubblesService + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + } + + @Test + fun areBubblesAvailable_bubblesNotNull_shouldReturnTrue() { + assertThat(createServiceBinder().areBubblesAvailable()).isTrue() + } + + @Test + fun areBubblesAvailable_bubblesNull_shouldReturnFalse() { + assertThat(createServiceBinder(bubbles = null).areBubblesAvailable()).isFalse() + } + + @Test + fun showOrHideAppBubble() { + val intent = Intent() + val user = UserHandle.SYSTEM + val icon = Icon.createWithResource(context, R.drawable.ic_note_task_shortcut_widget) + + createServiceBinder().showOrHideAppBubble(intent, user, icon) + + verify(bubbles).showOrHideAppBubble(intent, user, icon) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt index 0954f6f0ffaf..a76af8e83248 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt @@ -36,12 +36,12 @@ import android.content.Intent.FLAG_ACTIVITY_NEW_TASK import android.content.pm.PackageManager import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED -import android.content.pm.ShortcutInfo import android.content.pm.ShortcutManager import android.content.pm.UserInfo import android.graphics.drawable.Icon import android.os.UserHandle import android.os.UserManager +import android.provider.Settings import androidx.test.ext.truth.content.IntentSubject.assertThat import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 @@ -56,17 +56,22 @@ import com.android.systemui.notetask.NoteTaskEntryPoint.TAIL_BUTTON import com.android.systemui.notetask.NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity -import com.android.systemui.notetask.shortcut.LaunchNoteTaskManagedProfileProxyActivity import com.android.systemui.settings.FakeUserTracker import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.mockito.withArgCaptor +import com.android.systemui.util.settings.SecureSettings import com.android.wm.shell.bubbles.Bubble import com.android.wm.shell.bubbles.Bubbles import com.google.common.truth.Truth.assertThat import java.util.Optional +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -81,6 +86,7 @@ import org.mockito.Mockito.verifyZeroInteractions import org.mockito.MockitoAnnotations /** atest SystemUITests:NoteTaskControllerTest */ +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidJUnit4::class) internal class NoteTaskControllerTest : SysuiTestCase() { @@ -98,7 +104,10 @@ internal class NoteTaskControllerTest : SysuiTestCase() { @Mock private lateinit var shortcutManager: ShortcutManager @Mock private lateinit var activityManager: ActivityManager @Mock private lateinit var devicePolicyManager: DevicePolicyManager + @Mock private lateinit var secureSettings: SecureSettings private val userTracker = FakeUserTracker() + private val testDispatcher = UnconfinedTestDispatcher() + private val testScope = TestScope(testDispatcher) @Before fun setUp() { @@ -106,7 +115,11 @@ internal class NoteTaskControllerTest : SysuiTestCase() { whenever(context.getString(R.string.note_task_button_label)) .thenReturn(NOTE_TASK_SHORT_LABEL) + whenever(context.getString(eq(R.string.note_task_shortcut_long_label), any())) + .thenReturn(NOTE_TASK_LONG_LABEL) whenever(context.packageManager).thenReturn(packageManager) + whenever(packageManager.getApplicationInfo(any(), any<Int>())).thenReturn(mock()) + whenever(packageManager.getApplicationLabel(any())).thenReturn(NOTE_TASK_LONG_LABEL) whenever(resolver.resolveInfo(any(), any(), any())).thenReturn(NOTE_TASK_INFO) whenever(userManager.isUserUnlocked).thenReturn(true) whenever(userManager.isUserUnlocked(any<Int>())).thenReturn(true) @@ -123,6 +136,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { whenever(activityManager.getRunningTasks(anyInt())).thenReturn(emptyList()) whenever(userManager.isManagedProfile(workUserInfo.id)).thenReturn(true) whenever(context.resources).thenReturn(getContext().resources) + whenever(secureSettings.userTracker).thenReturn(userTracker) } private fun createNoteTaskController( @@ -133,7 +147,6 @@ internal class NoteTaskControllerTest : SysuiTestCase() { context = context, resolver = resolver, eventLogger = eventLogger, - optionalBubbles = Optional.ofNullable(bubbles), userManager = userManager, keyguardManager = keyguardManager, isEnabled = isEnabled, @@ -142,6 +155,10 @@ internal class NoteTaskControllerTest : SysuiTestCase() { roleManager = roleManager, shortcutManager = shortcutManager, activityManager = activityManager, + secureSettings = secureSettings, + noteTaskBubblesController = + FakeNoteTaskBubbleController(context, testDispatcher, Optional.ofNullable(bubbles)), + applicationScope = testScope, ) // region onBubbleExpandChanged @@ -157,7 +174,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { ) verify(eventLogger).logNoteTaskOpened(expectedInfo) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager) + verifyZeroInteractions(bubbles, keyguardManager, userManager) } @Test @@ -172,7 +189,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { ) verify(eventLogger).logNoteTaskClosed(expectedInfo) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager) + verifyZeroInteractions(bubbles, keyguardManager, userManager) } @Test @@ -186,7 +203,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { key = Bubble.getAppBubbleKeyForApp(expectedInfo.packageName, expectedInfo.user), ) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager, eventLogger) + verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger) } @Test @@ -200,7 +217,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { key = Bubble.getAppBubbleKeyForApp(expectedInfo.packageName, expectedInfo.user), ) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager, eventLogger) + verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger) } @Test @@ -211,7 +228,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { key = "any other key", ) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager, eventLogger) + verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger) } @Test @@ -222,16 +239,19 @@ internal class NoteTaskControllerTest : SysuiTestCase() { key = Bubble.getAppBubbleKeyForApp(NOTE_TASK_INFO.packageName, NOTE_TASK_INFO.user), ) - verifyZeroInteractions(context, bubbles, keyguardManager, userManager, eventLogger) + verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger) } // endregion // region showNoteTask - @Test fun showNoteTaskAsUser_keyguardIsLocked_shouldStartActivityWithExpectedUserAndLogUiEvent() { val user10 = UserHandle.of(/* userId= */ 10) val expectedInfo = - NOTE_TASK_INFO.copy(entryPoint = TAIL_BUTTON, isKeyguardLocked = true, user = user10) + NOTE_TASK_INFO.copy( + entryPoint = TAIL_BUTTON, + isKeyguardLocked = true, + user = user10, + ) whenever(keyguardManager.isKeyguardLocked).thenReturn(expectedInfo.isKeyguardLocked) whenever(resolver.resolveInfo(any(), any(), any())).thenReturn(expectedInfo) @@ -332,10 +352,48 @@ internal class NoteTaskControllerTest : SysuiTestCase() { } @Test + fun showNoteTask_defaultUserSet_shouldStartActivityWithExpectedUserAndLogUiEvent() { + whenever(secureSettings.getInt(eq(Settings.Secure.DEFAULT_NOTE_TASK_PROFILE), any())) + .thenReturn(10) + val user10 = UserHandle.of(/* userId= */ 10) + + val expectedInfo = + NOTE_TASK_INFO.copy( + entryPoint = NoteTaskEntryPoint.TAIL_BUTTON, + isKeyguardLocked = true, + user = user10, + ) + whenever(keyguardManager.isKeyguardLocked).thenReturn(expectedInfo.isKeyguardLocked) + whenever(resolver.resolveInfo(any(), any(), any())).thenReturn(expectedInfo) + + createNoteTaskController() + .showNoteTask( + entryPoint = expectedInfo.entryPoint!!, + ) + + val intentCaptor = argumentCaptor<Intent>() + val userCaptor = argumentCaptor<UserHandle>() + verify(context).startActivityAsUser(capture(intentCaptor), capture(userCaptor)) + intentCaptor.value.let { intent -> + assertThat(intent.action).isEqualTo(Intent.ACTION_CREATE_NOTE) + assertThat(intent.`package`).isEqualTo(NOTE_TASK_PACKAGE_NAME) + assertThat(intent.flags and FLAG_ACTIVITY_NEW_TASK).isEqualTo(FLAG_ACTIVITY_NEW_TASK) + assertThat(intent.flags and FLAG_ACTIVITY_MULTIPLE_TASK) + .isEqualTo(FLAG_ACTIVITY_MULTIPLE_TASK) + assertThat(intent.flags and FLAG_ACTIVITY_NEW_DOCUMENT) + .isEqualTo(FLAG_ACTIVITY_NEW_DOCUMENT) + assertThat(intent.getBooleanExtra(Intent.EXTRA_USE_STYLUS_MODE, false)).isTrue() + } + assertThat(userCaptor.value).isEqualTo(user10) + verify(eventLogger).logNoteTaskOpened(expectedInfo) + verifyZeroInteractions(bubbles) + } + + @Test fun showNoteTask_bubblesIsNull_shouldDoNothing() { createNoteTaskController(bubbles = null).showNoteTask(entryPoint = TAIL_BUTTON) - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test @@ -347,14 +405,14 @@ internal class NoteTaskControllerTest : SysuiTestCase() { noteTaskController.showNoteTask(entryPoint = TAIL_BUTTON) verify(noteTaskController).showNoDefaultNotesAppToast() - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test fun showNoteTask_flagDisabled_shouldDoNothing() { createNoteTaskController(isEnabled = false).showNoteTask(entryPoint = TAIL_BUTTON) - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test @@ -363,7 +421,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { createNoteTaskController().showNoteTask(entryPoint = TAIL_BUTTON) - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test @@ -483,7 +541,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { createNoteTaskController().showNoteTask(entryPoint = QUICK_AFFORDANCE) - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test @@ -499,7 +557,7 @@ internal class NoteTaskControllerTest : SysuiTestCase() { createNoteTaskController().showNoteTask(entryPoint = QUICK_AFFORDANCE) - verifyZeroInteractions(context, bubbles, eventLogger) + verifyZeroInteractions(bubbles, eventLogger) } @Test @@ -611,11 +669,11 @@ internal class NoteTaskControllerTest : SysuiTestCase() { createNoteTaskController(isEnabled = true).onRoleHoldersChanged("NOT_NOTES", user) - verifyZeroInteractions(context) + verify(context, never()).startActivityAsUser(any(), any()) } @Test - fun onRoleHoldersChanged_notesRole_sameUser_shouldUpdateShortcuts() { + fun onRoleHoldersChanged_notesRole_shouldUpdateShortcuts() { val user = userTracker.userHandle val controller = spy(createNoteTaskController()) doNothing().whenever(controller).updateNoteTaskAsUser(any()) @@ -624,22 +682,41 @@ internal class NoteTaskControllerTest : SysuiTestCase() { verify(controller).updateNoteTaskAsUser(user) } + // endregion + // region updateNoteTaskAsUser @Test - fun onRoleHoldersChanged_notesRole_differentUser_shouldUpdateShortcutsInUserProcess() { + fun updateNoteTaskAsUser_sameUser_shouldUpdateShortcuts() { + val user = userTracker.userHandle + val controller = spy(createNoteTaskController()) + doNothing().whenever(controller).updateNoteTaskAsUserInternal(any()) + + controller.updateNoteTaskAsUser(user) + + verify(controller).updateNoteTaskAsUserInternal(user) + verify(context, never()).startServiceAsUser(any(), any()) + } + + @Test + fun updateNoteTaskAsUser_differentUser_shouldUpdateShortcutsInUserProcess() { // FakeUserTracker will default to UserHandle.SYSTEM. val user = UserHandle.CURRENT + val controller = spy(createNoteTaskController(isEnabled = true)) + doNothing().whenever(controller).updateNoteTaskAsUserInternal(any()) - createNoteTaskController(isEnabled = true).onRoleHoldersChanged(ROLE_NOTES, user) + controller.updateNoteTaskAsUser(user) - verify(context).startServiceAsUser(any(), eq(user)) + verify(controller, never()).updateNoteTaskAsUserInternal(any()) + val intent = withArgCaptor { verify(context).startServiceAsUser(capture(), eq(user)) } + assertThat(intent).hasComponentClass(NoteTaskControllerUpdateService::class.java) } // endregion - // region updateNoteTaskAsUser + // region internalUpdateNoteTaskAsUser @Test - fun updateNoteTaskAsUser_withNotesRole_withShortcuts_shouldUpdateShortcuts() { - createNoteTaskController(isEnabled = true).updateNoteTaskAsUser(userTracker.userHandle) + fun updateNoteTaskAsUserInternal_withNotesRole_withShortcuts_shouldUpdateShortcuts() { + createNoteTaskController(isEnabled = true) + .updateNoteTaskAsUserInternal(userTracker.userHandle) val actualComponent = argumentCaptor<ComponentName>() verify(context.packageManager) @@ -652,27 +729,29 @@ internal class NoteTaskControllerTest : SysuiTestCase() { .isEqualTo(CreateNoteTaskShortcutActivity::class.java.name) verify(shortcutManager, never()).disableShortcuts(any()) verify(shortcutManager).enableShortcuts(listOf(SHORTCUT_ID)) - val actualShortcuts = argumentCaptor<List<ShortcutInfo>>() - verify(shortcutManager).updateShortcuts(actualShortcuts.capture()) - val actualShortcut = actualShortcuts.value.first() - assertThat(actualShortcut.id).isEqualTo(SHORTCUT_ID) - assertThat(actualShortcut.intent).run { - hasComponentClass(LaunchNoteTaskActivity::class.java) - hasAction(ACTION_CREATE_NOTE) + val shortcutInfo = withArgCaptor { verify(shortcutManager).updateShortcuts(capture()) } + with(shortcutInfo.first()) { + assertThat(id).isEqualTo(SHORTCUT_ID) + assertThat(intent).run { + hasComponentClass(LaunchNoteTaskActivity::class.java) + hasAction(ACTION_CREATE_NOTE) + } + assertThat(shortLabel).isEqualTo(NOTE_TASK_SHORT_LABEL) + assertThat(longLabel).isEqualTo(NOTE_TASK_LONG_LABEL) + assertThat(isLongLived).isEqualTo(true) + assertThat(icon.resId).isEqualTo(R.drawable.ic_note_task_shortcut_widget) + assertThat(extras?.getString(EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE)) + .isEqualTo(NOTE_TASK_PACKAGE_NAME) } - assertThat(actualShortcut.shortLabel).isEqualTo(NOTE_TASK_SHORT_LABEL) - assertThat(actualShortcut.isLongLived).isEqualTo(true) - assertThat(actualShortcut.icon.resId).isEqualTo(R.drawable.ic_note_task_shortcut_widget) - assertThat(actualShortcut.extras?.getString(EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE)) - .isEqualTo(NOTE_TASK_PACKAGE_NAME) } @Test - fun updateNoteTaskAsUser_noNotesRole_shouldDisableShortcuts() { + fun updateNoteTaskAsUserInternal_noNotesRole_shouldDisableShortcuts() { whenever(roleManager.getRoleHoldersAsUser(ROLE_NOTES, userTracker.userHandle)) .thenReturn(emptyList()) - createNoteTaskController(isEnabled = true).updateNoteTaskAsUser(userTracker.userHandle) + createNoteTaskController(isEnabled = true) + .updateNoteTaskAsUserInternal(userTracker.userHandle) val argument = argumentCaptor<ComponentName>() verify(context.packageManager) @@ -689,8 +768,9 @@ internal class NoteTaskControllerTest : SysuiTestCase() { } @Test - fun updateNoteTaskAsUser_flagDisabled_shouldDisableShortcuts() { - createNoteTaskController(isEnabled = false).updateNoteTaskAsUser(userTracker.userHandle) + fun updateNoteTaskAsUserInternal_flagDisabled_shouldDisableShortcuts() { + createNoteTaskController(isEnabled = false) + .updateNoteTaskAsUserInternal(userTracker.userHandle) val argument = argumentCaptor<ComponentName>() verify(context.packageManager) @@ -707,18 +787,17 @@ internal class NoteTaskControllerTest : SysuiTestCase() { } // endregion - // startregion startNoteTaskProxyActivityForUser + // startregion updateNoteTaskForAllUsers @Test - fun startNoteTaskProxyActivityForUser_shouldStartLaunchNoteTaskProxyActivityWithExpectedUser() { - val user0 = UserHandle.of(0) - createNoteTaskController().startNoteTaskProxyActivityForUser(user0) + fun updateNoteTaskForAllUsers_shouldRunUpdateForCurrentUserAndProfiles() { + userTracker.set(mainAndWorkProfileUsers, mainAndWorkProfileUsers.indexOf(mainUserInfo)) + val controller = spy(createNoteTaskController()) + doNothing().whenever(controller).updateNoteTaskAsUser(any()) - val intentCaptor = argumentCaptor<Intent>() - verify(context).startActivityAsUser(intentCaptor.capture(), eq(user0)) - assertThat(intentCaptor.value).run { - hasComponentClass(LaunchNoteTaskManagedProfileProxyActivity::class.java) - hasFlags(FLAG_ACTIVITY_NEW_TASK) - } + controller.updateNoteTaskForCurrentUserAndManagedProfiles() + + verify(controller).updateNoteTaskAsUser(mainUserInfo.userHandle) + verify(controller).updateNoteTaskAsUser(workUserInfo.userHandle) } // endregion @@ -838,7 +917,8 @@ internal class NoteTaskControllerTest : SysuiTestCase() { // endregion private companion object { - const val NOTE_TASK_SHORT_LABEL = "Notetaking" + const val NOTE_TASK_SHORT_LABEL = "Note-taking" + const val NOTE_TASK_LONG_LABEL = "Note-taking, App" const val NOTE_TASK_ACTIVITY_NAME = "NoteTaskActivity" const val NOTE_TASK_PACKAGE_NAME = "com.android.note.app" const val NOTE_TASK_UID = 123456 diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt index 4e85b6c555ef..95bb3e0a4538 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt @@ -32,9 +32,12 @@ import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.mockito.withArgCaptor import com.android.systemui.util.time.FakeSystemClock import com.android.wm.shell.bubbles.Bubbles +import com.google.common.truth.Truth.assertThat import java.util.Optional import kotlinx.coroutines.ExperimentalCoroutinesApi import org.junit.Before @@ -71,19 +74,19 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { } private fun createUnderTest( - isEnabled: Boolean, - bubbles: Bubbles?, + isEnabled: Boolean, + bubbles: Bubbles?, ): NoteTaskInitializer = - NoteTaskInitializer( - controller = controller, - commandQueue = commandQueue, - optionalBubbles = Optional.ofNullable(bubbles), - isEnabled = isEnabled, - roleManager = roleManager, - userTracker = userTracker, - keyguardUpdateMonitor = keyguardMonitor, - backgroundExecutor = executor, - ) + NoteTaskInitializer( + controller = controller, + commandQueue = commandQueue, + optionalBubbles = Optional.ofNullable(bubbles), + isEnabled = isEnabled, + roleManager = roleManager, + userTracker = userTracker, + keyguardUpdateMonitor = keyguardMonitor, + backgroundExecutor = executor, + ) @Test fun initialize_withUserUnlocked() { @@ -93,8 +96,8 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { verify(commandQueue).addCallback(any()) verify(roleManager).addOnRoleHoldersChangedListenerAsUser(any(), any(), any()) - verify(controller).setNoteTaskShortcutEnabled(any(), any()) - verify(keyguardMonitor, never()).registerCallback(any()) + verify(controller).updateNoteTaskForCurrentUserAndManagedProfiles() + verify(keyguardMonitor).registerCallback(any()) } @Test @@ -107,6 +110,7 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { verify(roleManager).addOnRoleHoldersChangedListenerAsUser(any(), any(), any()) verify(controller, never()).setNoteTaskShortcutEnabled(any(), any()) verify(keyguardMonitor).registerCallback(any()) + assertThat(userTracker.callbacks).isNotEmpty() } @Test @@ -116,12 +120,12 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { underTest.initialize() verifyZeroInteractions( - commandQueue, - bubbles, - controller, - roleManager, - userManager, - keyguardMonitor, + commandQueue, + bubbles, + controller, + roleManager, + userManager, + keyguardMonitor, ) } @@ -132,12 +136,12 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { underTest.initialize() verifyZeroInteractions( - commandQueue, - bubbles, - controller, - roleManager, - userManager, - keyguardMonitor, + commandQueue, + bubbles, + controller, + roleManager, + userManager, + keyguardMonitor, ) } @@ -146,7 +150,7 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { val expectedKeyEvent = KeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL) val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) underTest.initialize() - val callback = captureArgument { verify(commandQueue).addCallback(capture()) } + val callback = withArgCaptor { verify(commandQueue).addCallback(capture()) } callback.handleSystemKey(expectedKeyEvent) @@ -154,31 +158,49 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { } @Test - fun initialize_userUnlocked() { + fun initialize_userUnlocked_shouldUpdateNoteTask() { whenever(keyguardMonitor.isUserUnlocked(userTracker.userId)).thenReturn(false) val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) underTest.initialize() - val callback = captureArgument { verify(keyguardMonitor).registerCallback(capture()) } + val callback = withArgCaptor { verify(keyguardMonitor).registerCallback(capture()) } whenever(keyguardMonitor.isUserUnlocked(userTracker.userId)).thenReturn(true) callback.onUserUnlocked() - verify(controller).setNoteTaskShortcutEnabled(any(), any()) + + verify(controller).updateNoteTaskForCurrentUserAndManagedProfiles() } @Test - fun initialize_onRoleHoldersChanged() { + fun initialize_onRoleHoldersChanged_shouldRunOnRoleHoldersChanged() { val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) underTest.initialize() - val callback = captureArgument { + val callback = withArgCaptor { verify(roleManager) - .addOnRoleHoldersChangedListenerAsUser(any(), capture(), eq(UserHandle.ALL)) + .addOnRoleHoldersChangedListenerAsUser(any(), capture(), eq(UserHandle.ALL)) } callback.onRoleHoldersChanged(ROLE_NOTES, userTracker.userHandle) verify(controller).onRoleHoldersChanged(ROLE_NOTES, userTracker.userHandle) } -} -private inline fun <reified T : Any> captureArgument(block: ArgumentCaptor<T>.() -> Unit) = - argumentCaptor<T>().apply(block).value + @Test + fun initialize_onProfilesChanged_shouldUpdateNoteTask() { + val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) + underTest.initialize() + + userTracker.callbacks.first().onProfilesChanged(emptyList()) + + verify(controller, times(2)).updateNoteTaskForCurrentUserAndManagedProfiles() + } + + @Test + fun initialize_onUserChanged_shouldUpdateNoteTask() { + val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) + underTest.initialize() + + userTracker.callbacks.first().onUserChanged(0, mock()) + + verify(controller, times(2)).updateNoteTaskForCurrentUserAndManagedProfiles() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt index a0c376ff1a1c..627c4a80e1ec 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskActivityTest.kt @@ -17,9 +17,6 @@ package com.android.systemui.notetask.shortcut import android.content.Intent -import android.content.pm.UserInfo -import android.os.UserHandle -import android.os.UserManager import android.testing.AndroidTestingRunner import android.testing.TestableLooper import androidx.test.filters.SmallTest @@ -29,17 +26,14 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.verify import com.android.systemui.SysuiTestCase import com.android.systemui.notetask.NoteTaskController import com.android.systemui.notetask.NoteTaskEntryPoint -import com.android.systemui.settings.FakeUserTracker import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito.never import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @@ -48,8 +42,6 @@ import org.mockito.MockitoAnnotations class LaunchNoteTaskActivityTest : SysuiTestCase() { @Mock lateinit var noteTaskController: NoteTaskController - @Mock lateinit var userManager: UserManager - private val userTracker: FakeUserTracker = FakeUserTracker() @Rule @JvmField @@ -60,8 +52,6 @@ class LaunchNoteTaskActivityTest : SysuiTestCase() { override fun create(intent: Intent?) = LaunchNoteTaskActivity( controller = noteTaskController, - userManager = userManager, - userTracker = userTracker ) }, /* initialTouchMode= */ false, @@ -71,7 +61,6 @@ class LaunchNoteTaskActivityTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(userManager.isManagedProfile(eq(workProfileUser.id))).thenReturn(true) } @After @@ -83,36 +72,7 @@ class LaunchNoteTaskActivityTest : SysuiTestCase() { fun startActivityOnNonWorkProfileUser_shouldLaunchNoteTask() { activityRule.launchActivity(/* startIntent= */ null) - verify(noteTaskController).showNoteTask(eq(NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT)) - } - - @Test - fun startActivityOnWorkProfileUser_shouldLaunchProxyActivity() { - val mainUserHandle: UserHandle = mainUser.userHandle - userTracker.set(listOf(mainUser, workProfileUser), selectedUserIndex = 1) - whenever(userManager.isManagedProfile).thenReturn(true) - whenever(userManager.mainUser).thenReturn(mainUserHandle) - - activityRule.launchActivity(/* startIntent= */ null) - - verify(noteTaskController).startNoteTaskProxyActivityForUser(eq(mainUserHandle)) - } - - @Test - fun startActivityOnWorkProfileUser_noMainUser_shouldNotLaunch() { - userTracker.set(listOf(mainUser, workProfileUser), selectedUserIndex = 1) - whenever(userManager.isManagedProfile).thenReturn(true) - whenever(userManager.mainUser).thenReturn(null) - - activityRule.launchActivity(/* startIntent= */ null) - - verify(noteTaskController, never()).showNoteTask(any()) - verify(noteTaskController, never()).startNoteTaskProxyActivityForUser(any()) - } - - private companion object { - val mainUser = UserInfo(/* id= */ 0, /* name= */ "primary", /* flags= */ UserInfo.FLAG_MAIN) - val workProfileUser = - UserInfo(/* id= */ 10, /* name= */ "work", /* flags= */ UserInfo.FLAG_PROFILE) + verify(noteTaskController) + .showNoteTaskAsUser(eq(NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT), any()) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivityTest.kt deleted file mode 100644 index 6347c3404348..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/shortcut/LaunchNoteTaskManagedProfileProxyActivityTest.kt +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.notetask.shortcut - -import android.content.Intent -import android.content.pm.UserInfo -import android.os.UserHandle -import android.os.UserManager -import android.testing.AndroidTestingRunner -import android.testing.TestableLooper -import androidx.test.filters.SmallTest -import androidx.test.rule.ActivityTestRule -import androidx.test.runner.intercepting.SingleActivityFactory -import com.android.dx.mockito.inline.extended.ExtendedMockito.never -import com.android.dx.mockito.inline.extended.ExtendedMockito.verify -import com.android.systemui.SysuiTestCase -import com.android.systemui.notetask.NoteTaskController -import com.android.systemui.notetask.NoteTaskEntryPoint -import com.android.systemui.settings.FakeUserTracker -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever -import org.junit.After -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.MockitoAnnotations - -@RunWith(AndroidTestingRunner::class) -@SmallTest -@TestableLooper.RunWithLooper -class LaunchNoteTaskManagedProfileProxyActivityTest : SysuiTestCase() { - - @Mock lateinit var noteTaskController: NoteTaskController - @Mock lateinit var userManager: UserManager - private val userTracker = FakeUserTracker() - - @Rule - @JvmField - val activityRule = - ActivityTestRule<LaunchNoteTaskManagedProfileProxyActivity>( - /* activityFactory= */ object : - SingleActivityFactory<LaunchNoteTaskManagedProfileProxyActivity>( - LaunchNoteTaskManagedProfileProxyActivity::class.java - ) { - override fun create(intent: Intent?) = - LaunchNoteTaskManagedProfileProxyActivity( - controller = noteTaskController, - userManager = userManager, - userTracker = userTracker - ) - }, - /* initialTouchMode= */ false, - /* launchActivity= */ false, - ) - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - whenever(userManager.isManagedProfile(eq(workProfileUser.id))).thenReturn(true) - } - - @After - fun tearDown() { - activityRule.finishActivity() - } - - @Test - fun startActivity_noWorkProfileUser_shouldNotLaunchNoteTask() { - userTracker.set(listOf(mainUser), selectedUserIndex = 0) - activityRule.launchActivity(/* startIntent= */ null) - - verify(noteTaskController, never()).showNoteTaskAsUser(any(), any()) - } - - @Test - fun startActivity_hasWorkProfileUser_shouldLaunchNoteTaskOnTheWorkProfileUser() { - userTracker.set(mainAndWorkProfileUsers, mainAndWorkProfileUsers.indexOf(mainUser)) - activityRule.launchActivity(/* startIntent= */ null) - - val workProfileUserHandle: UserHandle = workProfileUser.userHandle - verify(noteTaskController) - .showNoteTaskAsUser( - eq(NoteTaskEntryPoint.WIDGET_PICKER_SHORTCUT), - eq(workProfileUserHandle) - ) - } - - private companion object { - val mainUser = UserInfo(/* id= */ 0, /* name= */ "primary", /* flags= */ UserInfo.FLAG_MAIN) - val workProfileUser = - UserInfo(/* id= */ 10, /* name= */ "work", /* flags= */ UserInfo.FLAG_PROFILE) - val mainAndWorkProfileUsers = listOf(mainUser, workProfileUser) - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/data/repository/PowerRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/power/data/repository/PowerRepositoryImplTest.kt index bb3b3f709a7b..a01394f027cf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/data/repository/PowerRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/power/data/repository/PowerRepositoryImplTest.kt @@ -24,7 +24,11 @@ import android.os.PowerManager import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.launchIn @@ -47,6 +51,8 @@ import org.mockito.MockitoAnnotations @RunWith(JUnit4::class) class PowerRepositoryImplTest : SysuiTestCase() { + private val systemClock = FakeSystemClock() + @Mock private lateinit var manager: PowerManager @Mock private lateinit var dispatcher: BroadcastDispatcher @Captor private lateinit var receiverCaptor: ArgumentCaptor<BroadcastReceiver> @@ -62,7 +68,13 @@ class PowerRepositoryImplTest : SysuiTestCase() { isInteractive = true whenever(manager.isInteractive).then { isInteractive } - underTest = PowerRepositoryImpl(manager = manager, dispatcher = dispatcher) + underTest = + PowerRepositoryImpl( + manager, + context.applicationContext, + systemClock, + dispatcher, + ) } @Test @@ -160,6 +172,27 @@ class PowerRepositoryImplTest : SysuiTestCase() { job.cancel() } + @Test + fun wakeUp_notifiesPowerManager() { + systemClock.setUptimeMillis(345000) + + underTest.wakeUp("fakeWhy", PowerManager.WAKE_REASON_GESTURE) + + val reasonCaptor = argumentCaptor<String>() + verify(manager) + .wakeUp(eq(345000L), eq(PowerManager.WAKE_REASON_GESTURE), capture(reasonCaptor)) + assertThat(reasonCaptor.value).contains("fakeWhy") + } + + @Test + fun wakeUp_usesApplicationPackageName() { + underTest.wakeUp("fakeWhy", PowerManager.WAKE_REASON_GESTURE) + + val reasonCaptor = argumentCaptor<String>() + verify(manager).wakeUp(any(), any(), capture(reasonCaptor)) + assertThat(reasonCaptor.value).contains(context.applicationContext.packageName) + } + private fun verifyRegistered() { // We must verify with all arguments, even those that are optional because they have default // values because Mockito is forcing us to. Once we can use mockito-kotlin, we should be diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/domain/interactor/PowerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/power/domain/interactor/PowerInteractorTest.kt index 31d451227a9b..023ed061c642 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/domain/interactor/PowerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/power/domain/interactor/PowerInteractorTest.kt @@ -17,9 +17,14 @@ package com.android.systemui.power.domain.interactor +import android.os.PowerManager import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingCollector +import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.power.data.repository.FakePowerRepository +import com.android.systemui.statusbar.phone.ScreenOffAnimationController +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.launchIn @@ -29,6 +34,9 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import org.mockito.Mock +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations @SmallTest @RunWith(JUnit4::class) @@ -36,14 +44,25 @@ class PowerInteractorTest : SysuiTestCase() { private lateinit var underTest: PowerInteractor private lateinit var repository: FakePowerRepository + @Mock private lateinit var falsingCollector: FalsingCollector + @Mock private lateinit var screenOffAnimationController: ScreenOffAnimationController + @Mock private lateinit var statusBarStateController: StatusBarStateController @Before fun setUp() { + MockitoAnnotations.initMocks(this) + repository = FakePowerRepository( initialInteractive = true, ) - underTest = PowerInteractor(repository = repository) + underTest = + PowerInteractor( + repository, + falsingCollector, + screenOffAnimationController, + statusBarStateController, + ) } @Test @@ -72,6 +91,40 @@ class PowerInteractorTest : SysuiTestCase() { job.cancel() } + @Test + fun wakeUpIfDozing_notDozing_notWoken() { + whenever(statusBarStateController.isDozing).thenReturn(false) + whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(true) + + underTest.wakeUpIfDozing("why", PowerManager.WAKE_REASON_TAP) + + assertThat(repository.lastWakeWhy).isNull() + assertThat(repository.lastWakeReason).isNull() + } + + @Test + fun wakeUpIfDozing_notAllowed_notWoken() { + whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(false) + whenever(statusBarStateController.isDozing).thenReturn(true) + + underTest.wakeUpIfDozing("why", PowerManager.WAKE_REASON_TAP) + + assertThat(repository.lastWakeWhy).isNull() + assertThat(repository.lastWakeReason).isNull() + } + + @Test + fun wakeUpIfDozing_dozingAndAllowed_wokenAndFalsingNotified() { + whenever(statusBarStateController.isDozing).thenReturn(true) + whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(true) + + underTest.wakeUpIfDozing("testReason", PowerManager.WAKE_REASON_GESTURE) + + assertThat(repository.lastWakeWhy).isEqualTo("testReason") + assertThat(repository.lastWakeReason).isEqualTo(PowerManager.WAKE_REASON_GESTURE) + verify(falsingCollector).onScreenOnFromTouch() + } + companion object { private val IMMEDIATE = Dispatchers.Main.immediate } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index 87ca9dfdae11..fcda5f50cef2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -50,10 +50,8 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.systemui.R; import com.android.systemui.SysuiBaseFragmentTest; -import com.android.systemui.animation.ShadeInterpolation; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.media.controls.ui.MediaHost; import com.android.systemui.qs.customize.QSCustomizerController; import com.android.systemui.qs.dagger.QSFragmentComponent; @@ -169,9 +167,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { } @Test - public void transitionToFullShade_largeScreen_flagEnabled_alphaLargeScreenShadeInterpolator() { - when(mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(true); + public void transitionToFullShade_largeScreen_alphaLargeScreenShadeInterpolator() { QSFragment fragment = resumeAndGetFragment(); setIsLargeScreen(); setStatusBarCurrentAndUpcomingState(StatusBarState.SHADE); @@ -188,25 +184,6 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { } @Test - public void transitionToFullShade_largeScreen_flagDisabled_alphaStandardInterpolator() { - when(mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(false); - QSFragment fragment = resumeAndGetFragment(); - setIsLargeScreen(); - setStatusBarCurrentAndUpcomingState(StatusBarState.SHADE); - boolean isTransitioningToFullShade = true; - float transitionProgress = 0.5f; - float squishinessFraction = 0.5f; - when(mLargeScreenShadeInterpolator.getQsAlpha(transitionProgress)).thenReturn(123f); - - fragment.setTransitionToFullShadeProgress(isTransitioningToFullShade, transitionProgress, - squishinessFraction); - - assertThat(mQsFragmentView.getAlpha()) - .isEqualTo(ShadeInterpolation.getContentAlpha(transitionProgress)); - } - - @Test public void transitionToFullShade_onKeyguard_noBouncer_setsAlphaUsingLinearInterpolator() { QSFragment fragment = resumeAndGetFragment(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java index 810ab344e7d8..d98bcee1e01a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java @@ -67,8 +67,8 @@ import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.settings.UserFileManager; import com.android.systemui.settings.UserTracker; +import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.phone.AutoTileManager; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.tuner.TunerService; import com.android.systemui.util.FakeSharedPreferences; import com.android.systemui.util.concurrency.FakeExecutor; @@ -86,7 +86,6 @@ import org.mockito.stubbing.Answer; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; -import java.util.Optional; import java.util.concurrent.Executor; import javax.inject.Provider; @@ -110,7 +109,7 @@ public class QSTileHostTest extends SysuiTestCase { @Mock private Provider<AutoTileManager> mAutoTiles; @Mock - private CentralSurfaces mCentralSurfaces; + private ShadeController mShadeController; @Mock private QSLogger mQSLogger; @Mock @@ -161,7 +160,7 @@ public class QSTileHostTest extends SysuiTestCase { mSecureSettings = new FakeSettings(); saveSetting(""); mQSTileHost = new TestQSTileHost(mContext, mDefaultFactory, mMainExecutor, - mPluginManager, mTunerService, mAutoTiles, mCentralSurfaces, + mPluginManager, mTunerService, mAutoTiles, mShadeController, mQSLogger, mUserTracker, mSecureSettings, mCustomTileStatePersister, mTileLifecycleManagerFactory, mUserFileManager, mFeatureFlags); @@ -682,13 +681,13 @@ public class QSTileHostTest extends SysuiTestCase { QSFactory defaultFactory, Executor mainExecutor, PluginManager pluginManager, TunerService tunerService, Provider<AutoTileManager> autoTiles, - CentralSurfaces centralSurfaces, QSLogger qsLogger, + ShadeController shadeController, QSLogger qsLogger, UserTracker userTracker, SecureSettings secureSettings, CustomTileStatePersister customTileStatePersister, TileLifecycleManager.Factory tileLifecycleManagerFactory, UserFileManager userFileManager, FeatureFlags featureFlags) { super(context, defaultFactory, mainExecutor, pluginManager, - tunerService, autoTiles, Optional.of(centralSurfaces), qsLogger, + tunerService, autoTiles, shadeController, qsLogger, userTracker, secureSettings, customTileStatePersister, tileLifecycleManagerFactory, userFileManager, featureFlags); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt index 198ed4ac08fd..41240e51c9fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt @@ -35,7 +35,7 @@ import android.view.View import com.android.internal.logging.MetricsLogger import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ActivityLaunchAnimator -import com.android.systemui.animation.LaunchableFrameLayout +import com.android.systemui.animation.view.LaunchableFrameLayout import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.qs.QSTile diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractorImplTest.kt index 45783abe9ee4..6556cfd22901 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/pipeline/domain/interactor/PanelInteractorImplTest.kt @@ -18,8 +18,7 @@ package com.android.systemui.qs.pipeline.domain.interactor import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.statusbar.phone.CentralSurfaces -import java.util.Optional +import com.android.systemui.shade.ShadeController import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -31,7 +30,7 @@ import org.mockito.MockitoAnnotations @SmallTest class PanelInteractorImplTest : SysuiTestCase() { - @Mock private lateinit var centralSurfaces: CentralSurfaces + @Mock private lateinit var shadeController: ShadeController @Before fun setup() { @@ -40,37 +39,28 @@ class PanelInteractorImplTest : SysuiTestCase() { @Test fun openPanels_callsCentralSurfaces() { - val underTest = PanelInteractorImpl(Optional.of(centralSurfaces)) + val underTest = PanelInteractorImpl(shadeController) underTest.openPanels() - verify(centralSurfaces).postAnimateOpenPanels() + verify(shadeController).postAnimateExpandQs() } @Test fun collapsePanels_callsCentralSurfaces() { - val underTest = PanelInteractorImpl(Optional.of(centralSurfaces)) + val underTest = PanelInteractorImpl(shadeController) underTest.collapsePanels() - verify(centralSurfaces).postAnimateCollapsePanels() + verify(shadeController).postAnimateCollapseShade() } @Test fun forceCollapsePanels_callsCentralSurfaces() { - val underTest = PanelInteractorImpl(Optional.of(centralSurfaces)) + val underTest = PanelInteractorImpl(shadeController) underTest.forceCollapsePanels() - verify(centralSurfaces).postAnimateForceCollapsePanels() - } - - @Test - fun whenOptionalEmpty_doesnThrow() { - val underTest = PanelInteractorImpl(Optional.empty()) - - underTest.openPanels() - underTest.collapsePanels() - underTest.forceCollapsePanels() + verify(shadeController).postAnimateForceCollapseShade() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt index 105387d49bd4..05a16994e021 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt @@ -70,7 +70,7 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceUnlocked_switchesToGone() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() runCurrent() @@ -83,7 +83,7 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceLockedSecurely_switchesToBouncer() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java index 8744aa346f8d..59b595393749 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java @@ -16,9 +16,11 @@ package com.android.systemui.screenrecord; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -32,6 +34,7 @@ import android.content.Intent; import android.os.Binder; import android.os.Handler; import android.os.RemoteException; +import android.os.UserHandle; import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; @@ -41,7 +44,9 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.media.MediaProjectionCaptureTarget; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.settings.UserContextProvider; +import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; +import com.android.systemui.statusbar.policy.KeyguardStateController; import org.junit.Before; import org.junit.Test; @@ -77,20 +82,38 @@ public class RecordingServiceTest extends SysuiTestCase { private UserContextProvider mUserContextTracker; @Captor private ArgumentCaptor<Runnable> mRunnableCaptor; - private KeyguardDismissUtil mKeyguardDismissUtil = new KeyguardDismissUtil() { - public void executeWhenUnlocked(ActivityStarter.OnDismissAction action, - boolean requiresShadeOpen) { - action.onDismiss(); - } - }; + @Mock + private KeyguardStateController mKeyguardStateController; + @Mock + private SysuiStatusBarStateController mStatusBarStateController; + @Mock + private ActivityStarter mActivityStarter; + + private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; + + private KeyguardDismissUtil mKeyguardDismissUtil = new KeyguardDismissUtil( + mKeyguardStateController, mStatusBarStateController, mActivityStarter); private RecordingService mRecordingService; + private class RecordingServiceTestable extends RecordingService { + RecordingServiceTestable( + RecordingController controller, Executor executor, + Handler handler, UiEventLogger uiEventLogger, + NotificationManager notificationManager, + UserContextProvider userContextTracker, KeyguardDismissUtil keyguardDismissUtil) { + super(controller, executor, handler, + uiEventLogger, notificationManager, userContextTracker, keyguardDismissUtil); + attachBaseContext(mContext); + } + } + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mRecordingService = Mockito.spy(new RecordingService(mController, mExecutor, mHandler, - mUiEventLogger, mNotificationManager, mUserContextTracker, mKeyguardDismissUtil)); + mRecordingService = Mockito.spy(new RecordingServiceTestable(mController, mExecutor, + mHandler, mUiEventLogger, mNotificationManager, + mUserContextTracker, mKeyguardDismissUtil)); // Return actual context info doReturn(mContext).when(mRecordingService).getApplicationContext(); @@ -160,8 +183,7 @@ public class RecordingServiceTest extends SysuiTestCase { Intent startIntent = RecordingService.getStartIntent(mContext, 0, 0, false, null); mRecordingService.onStartCommand(startIntent, 0, 0); - // Then the state is set to not recording - verify(mController).updateState(false); + assertUpdateState(false); } @Test @@ -179,7 +201,7 @@ public class RecordingServiceTest extends SysuiTestCase { mRecordingService.onStopped(); - verify(mController).updateState(false); + assertUpdateState(false); } @Test @@ -235,8 +257,21 @@ public class RecordingServiceTest extends SysuiTestCase { verify(mExecutor).execute(mRunnableCaptor.capture()); mRunnableCaptor.getValue().run(); - // Then the state is set to not recording and we cancel the notification - verify(mController).updateState(false); + assertUpdateState(false); verify(mNotificationManager).cancelAsUser(any(), anyInt(), any()); } + + private void assertUpdateState(boolean state) { + // Then the state is set to not recording, and we cancel the notification + // non SYSTEM user doesn't have the reference to the correct controller, + // so a broadcast is sent in case of non SYSTEM user. + if (UserHandle.USER_SYSTEM == mContext.getUserId()) { + verify(mController).updateState(state); + } else { + ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mRecordingService).sendBroadcast(argumentCaptor.capture(), eq(PERMISSION_SELF)); + assertEquals(RecordingController.INTENT_UPDATE_STATE, + argumentCaptor.getValue().getAction()); + } + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java index 67b1099c1e0a..d8897e9048c3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsServiceTest.java @@ -16,14 +16,17 @@ package com.android.systemui.screenshot.appclips; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_FAILED; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_SUCCESS; +import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED; + import static com.android.systemui.flags.Flags.SCREENSHOT_APP_CLIPS; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; @@ -31,8 +34,6 @@ import android.content.Context; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; -import android.os.UserHandle; -import android.os.UserManager; import androidx.test.runner.AndroidJUnit4; @@ -46,7 +47,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.Optional; @@ -63,7 +63,6 @@ public final class AppClipsServiceTest extends SysuiTestCase { @Mock private Optional<Bubbles> mOptionalBubbles; @Mock private Bubbles mBubbles; @Mock private DevicePolicyManager mDevicePolicyManager; - @Mock private UserManager mUserManager; private AppClipsService mAppClipsService; @@ -81,51 +80,84 @@ public final class AppClipsServiceTest extends SysuiTestCase { } @Test + public void flagOff_internal_shouldReturnFailed() throws RemoteException { + when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(false); + + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); + } + + @Test public void emptyBubbles_shouldReturnFalse() throws RemoteException { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(true); + mockForEmptyBubbles(); assertThat(getInterfaceWithRealContext() .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isFalse(); } @Test + public void emptyBubbles_internal_shouldReturnFailed() throws RemoteException { + mockForEmptyBubbles(); + + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); + } + + @Test public void taskIdNotAppBubble_shouldReturnFalse() throws RemoteException { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(false); + mockForTaskIdNotAppBubble(); assertThat(getInterfaceWithRealContext() .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isFalse(); } @Test + public void taskIdNotAppBubble_internal_shouldReturnWindowUnsupported() throws RemoteException { + mockForTaskIdNotAppBubble(); + + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED); + } + + @Test public void dpmScreenshotBlocked_shouldReturnFalse() throws RemoteException { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(true); - when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(true); + mockForScreenshotBlocked(); assertThat(getInterfaceWithRealContext() .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isFalse(); } @Test + public void dpmScreenshotBlocked_internal_shouldReturnBlockedByAdmin() throws RemoteException { + mockForScreenshotBlocked(); + + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN); + } + + @Test public void configComponentNameNotValid_shouldReturnFalse() throws RemoteException { - when(mMockContext.getString(anyInt())).thenReturn(EMPTY); - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(true); - when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(false); + mockForInvalidConfigComponentName(); assertThat(getInterfaceWithMockContext() .canLaunchCaptureContentActivityForNote(FAKE_TASK_ID)).isFalse(); } @Test + public void configComponentNameNotValid_internal_shouldReturnFailed() throws RemoteException { + mockForInvalidConfigComponentName(); + + assertThat(getInterfaceWithMockContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); + } + + + @Test public void allPrerequisitesSatisfy_shouldReturnTrue() throws RemoteException { mockToSatisfyAllPrerequisites(); @@ -134,28 +166,44 @@ public final class AppClipsServiceTest extends SysuiTestCase { } @Test - public void isManagedProfile_shouldUseProxyConnection() throws RemoteException { - when(mUserManager.isManagedProfile()).thenReturn(true); - when(mUserManager.getMainUser()).thenReturn(UserHandle.SYSTEM); - IAppClipsService service = getInterfaceWithRealContext(); - mAppClipsService.mProxyConnectorToMainProfile = - Mockito.spy(mAppClipsService.mProxyConnectorToMainProfile); + public void allPrerequisitesSatisfy_internal_shouldReturnSuccess() throws RemoteException { + mockToSatisfyAllPrerequisites(); - service.canLaunchCaptureContentActivityForNote(FAKE_TASK_ID); + assertThat(getInterfaceWithRealContext() + .canLaunchCaptureContentActivityForNoteInternal(FAKE_TASK_ID)) + .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_SUCCESS); + } - verify(mAppClipsService.mProxyConnectorToMainProfile).postForResult(any()); + private void mockForEmptyBubbles() { + when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); + when(mOptionalBubbles.isEmpty()).thenReturn(true); } - @Test - public void isManagedProfile_noMainUser_shouldReturnFalse() { - when(mUserManager.isManagedProfile()).thenReturn(true); - when(mUserManager.getMainUser()).thenReturn(null); + private void mockForTaskIdNotAppBubble() { + when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); + when(mOptionalBubbles.isEmpty()).thenReturn(false); + when(mOptionalBubbles.get()).thenReturn(mBubbles); + when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(false); + } - getInterfaceWithRealContext(); + private void mockForScreenshotBlocked() { + when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); + when(mOptionalBubbles.isEmpty()).thenReturn(false); + when(mOptionalBubbles.get()).thenReturn(mBubbles); + when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(true); + when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(true); + } - assertThat(mAppClipsService.mProxyConnectorToMainProfile).isNull(); + private void mockForInvalidConfigComponentName() { + when(mMockContext.getString(anyInt())).thenReturn(EMPTY); + when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); + when(mOptionalBubbles.isEmpty()).thenReturn(false); + when(mOptionalBubbles.get()).thenReturn(mBubbles); + when(mBubbles.isAppBubbleTaskId(eq((FAKE_TASK_ID)))).thenReturn(true); + when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(false); } + private void mockToSatisfyAllPrerequisites() { when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); when(mOptionalBubbles.isEmpty()).thenReturn(false); @@ -166,13 +214,13 @@ public final class AppClipsServiceTest extends SysuiTestCase { private IAppClipsService getInterfaceWithRealContext() { mAppClipsService = new AppClipsService(getContext(), mFeatureFlags, - mOptionalBubbles, mDevicePolicyManager, mUserManager); + mOptionalBubbles, mDevicePolicyManager); return getInterfaceFromService(mAppClipsService); } private IAppClipsService getInterfaceWithMockContext() { mAppClipsService = new AppClipsService(mMockContext, mFeatureFlags, - mOptionalBubbles, mDevicePolicyManager, mUserManager); + mOptionalBubbles, mDevicePolicyManager); return getInterfaceFromService(mAppClipsService); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java index e9007ff84f13..7fad972d83fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java @@ -24,22 +24,19 @@ import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_USER_CANCELED; import static android.content.Intent.CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED; import static android.content.Intent.EXTRA_CAPTURE_CONTENT_FOR_NOTE_STATUS_CODE; -import static com.android.systemui.flags.Flags.SCREENSHOT_APP_CLIPS; +import static com.android.internal.infra.AndroidFuture.completedFuture; import static com.android.systemui.screenshot.appclips.AppClipsEvent.SCREENSHOT_FOR_NOTE_TRIGGERED; import static com.android.systemui.screenshot.appclips.AppClipsTrampolineActivity.EXTRA_SCREENSHOT_URI; -import static com.android.systemui.screenshot.appclips.AppClipsTrampolineActivity.EXTRA_USE_WP_USER; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assume.assumeFalse; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -52,20 +49,22 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; -import android.os.UserManager; import android.testing.AndroidTestingRunner; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.intercepting.SingleActivityFactory; +import com.android.internal.infra.ServiceConnector; import com.android.internal.logging.UiEventLogger; +import com.android.internal.statusbar.IAppClipsService; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.broadcast.BroadcastSender; +import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.flags.FeatureFlags; import com.android.systemui.notetask.NoteTaskController; -import com.android.systemui.settings.UserTracker; -import com.android.wm.shell.bubbles.Bubbles; + +import com.google.common.util.concurrent.MoreExecutors; import org.junit.After; import org.junit.Before; @@ -75,8 +74,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.List; -import java.util.Optional; +import java.util.concurrent.Executor; @RunWith(AndroidTestingRunner.class) public final class AppClipsTrampolineActivityTest extends SysuiTestCase { @@ -86,25 +84,19 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { private static final int TEST_UID = 42; private static final String TEST_CALLING_PACKAGE = "test-calling-package"; - @Mock - private DevicePolicyManager mDevicePolicyManager; - @Mock - private FeatureFlags mFeatureFlags; - @Mock - private Optional<Bubbles> mOptionalBubbles; - @Mock - private Bubbles mBubbles; + @Mock private ServiceConnector<IAppClipsService> mServiceConnector; @Mock private NoteTaskController mNoteTaskController; @Mock private PackageManager mPackageManager; @Mock - private UserTracker mUserTracker; - @Mock private UiEventLogger mUiEventLogger; @Mock - private UserManager mUserManager; - + private BroadcastSender mBroadcastSender; + @Background + private Executor mBgExecutor; + @Main + private Executor mMainExecutor; @Main private Handler mMainHandler; @@ -114,9 +106,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { new SingleActivityFactory<>(AppClipsTrampolineActivityTestable.class) { @Override protected AppClipsTrampolineActivityTestable create(Intent unUsed) { - return new AppClipsTrampolineActivityTestable(mDevicePolicyManager, - mFeatureFlags, mOptionalBubbles, mNoteTaskController, mPackageManager, - mUserTracker, mUiEventLogger, mUserManager, mMainHandler); + return new AppClipsTrampolineActivityTestable(mServiceConnector, + mNoteTaskController, mPackageManager, mUiEventLogger, mBroadcastSender, + mBgExecutor, mMainExecutor, mMainHandler); } }; @@ -133,6 +125,8 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)); MockitoAnnotations.initMocks(this); + mBgExecutor = MoreExecutors.directExecutor(); + mMainExecutor = MoreExecutors.directExecutor(); mMainHandler = mContext.getMainThreadHandler(); mActivityIntent = new Intent(mContext, AppClipsTrampolineActivityTestable.class); @@ -169,19 +163,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { } @Test - public void flagOff_shouldFinishWithResultCancel() { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(false); - - mActivityRule.launchActivity(mActivityIntent); - - assertThat(mActivityRule.getActivityResult().getResultCode()) - .isEqualTo(Activity.RESULT_CANCELED); - } - - @Test - public void bubblesEmpty_shouldFinishWithFailed() { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(true); + public void queryService_returnedFailed_shouldFinishWithFailed() { + when(mServiceConnector.postForResult(any())) + .thenReturn(completedFuture(CAPTURE_CONTENT_FOR_NOTE_FAILED)); mActivityRule.launchActivity(mActivityIntent); @@ -189,14 +173,13 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); assertThat(getStatusCodeExtra(actualResult.getResultData())) .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); + assertThat(mActivityRule.getActivity().isFinishing()).isTrue(); } @Test - public void taskIdNotAppBubble_shouldFinishWithWindowModeUnsupported() { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(anyInt())).thenReturn(false); + public void queryService_returnedWindowModeUnsupported_shouldFinishWithWindowModeUnsupported() { + when(mServiceConnector.postForResult(any())) + .thenReturn(completedFuture(CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED)); mActivityRule.launchActivity(mActivityIntent); @@ -204,15 +187,13 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); assertThat(getStatusCodeExtra(actualResult.getResultData())) .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_WINDOW_MODE_UNSUPPORTED); + assertThat(mActivityRule.getActivity().isFinishing()).isTrue(); } @Test - public void dpmScreenshotBlocked_shouldFinishWithBlockedByAdmin() { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(anyInt())).thenReturn(true); - when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(true); + public void queryService_returnedScreenshotBlocked_shouldFinishWithBlockedByAdmin() { + when(mServiceConnector.postForResult(any())) + .thenReturn(completedFuture(CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN)); mActivityRule.launchActivity(mActivityIntent); @@ -220,6 +201,7 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); assertThat(getStatusCodeExtra(actualResult.getResultData())) .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_BLOCKED_BY_ADMIN); + assertThat(mActivityRule.getActivity().isFinishing()).isTrue(); } @Test @@ -240,6 +222,7 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); assertThat(getStatusCodeExtra(actualResult.getResultData())) .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_USER_CANCELED); + assertThat(mActivityRule.getActivity().isFinishing()).isTrue(); } @Test @@ -261,6 +244,7 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { assertThat(getStatusCodeExtra(actualResult.getResultData())) .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_SUCCESS); assertThat(actualResult.getResultData().getData()).isEqualTo(TEST_URI); + assertThat(mActivityRule.getActivity().isFinishing()).isTrue(); } @Test @@ -274,48 +258,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { verify(mUiEventLogger).log(SCREENSHOT_FOR_NOTE_TRIGGERED, TEST_UID, TEST_CALLING_PACKAGE); } - @Test - public void startAppClipsActivity_throughWPUser_shouldStartMainUserActivity() - throws NameNotFoundException { - when(mUserManager.isManagedProfile()).thenReturn(true); - when(mUserManager.getMainUser()).thenReturn(UserHandle.SYSTEM); - mockToSatisfyAllPrerequisites(); - - AppClipsTrampolineActivityTestable activity = mActivityRule.launchActivity(mActivityIntent); - waitForIdleSync(); - - Intent actualIntent = activity.mStartedIntent; - assertThat(actualIntent.getComponent()).isEqualTo( - new ComponentName(mContext, AppClipsTrampolineActivity.class)); - assertThat(actualIntent.getFlags()).isEqualTo(Intent.FLAG_ACTIVITY_FORWARD_RESULT); - assertThat(actualIntent.getBooleanExtra(EXTRA_USE_WP_USER, false)).isTrue(); - assertThat(activity.mStartingUser).isEqualTo(UserHandle.SYSTEM); - } - - @Test - public void startAppClipsActivity_throughWPUser_noMainUser_shouldFinishWithFailed() - throws NameNotFoundException { - when(mUserManager.isManagedProfile()).thenReturn(true); - when(mUserManager.getMainUser()).thenReturn(null); - - mockToSatisfyAllPrerequisites(); - - mActivityRule.launchActivity(mActivityIntent); - waitForIdleSync(); - - ActivityResult actualResult = mActivityRule.getActivityResult(); - assertThat(actualResult.getResultCode()).isEqualTo(Activity.RESULT_OK); - assertThat(getStatusCodeExtra(actualResult.getResultData())) - .isEqualTo(CAPTURE_CONTENT_FOR_NOTE_FAILED); - } - private void mockToSatisfyAllPrerequisites() throws NameNotFoundException { - when(mFeatureFlags.isEnabled(SCREENSHOT_APP_CLIPS)).thenReturn(true); - when(mOptionalBubbles.isEmpty()).thenReturn(false); - when(mOptionalBubbles.get()).thenReturn(mBubbles); - when(mBubbles.isAppBubbleTaskId(anyInt())).thenReturn(true); - when(mDevicePolicyManager.getScreenCaptureDisabled(eq(null))).thenReturn(false); - when(mUserTracker.getUserProfiles()).thenReturn(List.of()); + when(mServiceConnector.postForResult(any())) + .thenReturn(completedFuture(CAPTURE_CONTENT_FOR_NOTE_SUCCESS)); ApplicationInfo testApplicationInfo = new ApplicationInfo(); testApplicationInfo.uid = TEST_UID; @@ -330,17 +275,14 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase { Intent mStartedIntent; UserHandle mStartingUser; - public AppClipsTrampolineActivityTestable(DevicePolicyManager devicePolicyManager, - FeatureFlags flags, - Optional<Bubbles> optionalBubbles, - NoteTaskController noteTaskController, - PackageManager packageManager, - UserTracker userTracker, - UiEventLogger uiEventLogger, - UserManager userManager, + public AppClipsTrampolineActivityTestable( + ServiceConnector<IAppClipsService> serviceServiceConnector, + NoteTaskController noteTaskController, PackageManager packageManager, + UiEventLogger uiEventLogger, BroadcastSender broadcastSender, + @Background Executor bgExecutor, @Main Executor mainExecutor, @Main Handler mainHandler) { - super(devicePolicyManager, flags, optionalBubbles, noteTaskController, packageManager, - userTracker, uiEventLogger, userManager, mainHandler); + super(serviceServiceConnector, noteTaskController, packageManager, uiEventLogger, + broadcastSender, bgExecutor, mainExecutor, mainHandler); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index fe89a143e880..46ced827cafd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -89,12 +89,13 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentService; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository; +import com.android.systemui.keyguard.KeyguardViewConfigurator; import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel; import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingTransitionViewModel; @@ -253,6 +254,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock protected UserManager mUserManager; @Mock protected UiEventLogger mUiEventLogger; @Mock protected LockIconViewController mLockIconViewController; + @Mock protected KeyguardViewConfigurator mKeyguardViewConfigurator; @Mock protected KeyguardMediaController mKeyguardMediaController; @Mock protected NavigationModeController mNavigationModeController; @Mock protected NavigationBarController mNavigationBarController; @@ -313,6 +315,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { protected final int mMaxUdfpsBurnInOffsetY = 5; protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor; + protected FakeKeyguardRepository mFakeKeyguardRepository; protected KeyguardInteractor mKeyguardInteractor; protected NotificationPanelViewController.TouchHandler mTouchHandler; protected ConfigurationController mConfigurationController; @@ -340,10 +343,12 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { public void setup() { MockitoAnnotations.initMocks(this); mMainDispatcher = getMainDispatcher(); - mKeyguardBottomAreaInteractor = new KeyguardBottomAreaInteractor( - new FakeKeyguardRepository()); - mKeyguardInteractor = new KeyguardInteractor(new FakeKeyguardRepository(), mCommandQueue, - mFeatureFlags, new FakeKeyguardBouncerRepository()); + KeyguardInteractorFactory.WithDependencies keyguardInteractorDeps = + KeyguardInteractorFactory.create(); + mFakeKeyguardRepository = keyguardInteractorDeps.getRepository(); + mKeyguardBottomAreaInteractor = new KeyguardBottomAreaInteractor(mFakeKeyguardRepository); + mKeyguardInteractor = keyguardInteractorDeps.getKeyguardInteractor(); + SystemClock systemClock = new FakeSystemClock(); mStatusBarStateController = new StatusBarStateControllerImpl(mUiEventLogger, mDumpManager, mInteractionJankMonitor, mShadeExpansionStateManager); @@ -611,6 +616,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mKeyuardLongPressViewModel, mKeyguardInteractor, mActivityStarter, + mKeyguardViewConfigurator, mKeyguardFaceAuthInteractor); mNotificationPanelViewController.initDependencies( mCentralSurfaces, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 8f2ee91d6a6a..470c824eb60f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -58,6 +58,9 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.FaceAuthApiRequestReason; import com.android.systemui.DejankUtils; import com.android.systemui.R; +import com.android.systemui.keyguard.shared.model.WakeSleepReason; +import com.android.systemui.keyguard.shared.model.WakefulnessModel; +import com.android.systemui.keyguard.shared.model.WakefulnessState; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener; @@ -1169,4 +1172,43 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo when(mUnlockedScreenOffAnimationController.isAnimationPlaying()).thenReturn(true); assertThat(mNotificationPanelViewController.isExpanded()).isTrue(); } + + @Test + public void getFalsingThreshold_deviceNotInteractive_isQsThreshold() { + mFakeKeyguardRepository.setWakefulnessModel( + new WakefulnessModel( + WakefulnessState.ASLEEP, + /* lastWakeReason= */ WakeSleepReason.TAP, + /* lastSleepReason= */ WakeSleepReason.POWER_BUTTON) + ); + when(mQsController.getFalsingThreshold()).thenReturn(14); + + assertThat(mNotificationPanelViewController.getFalsingThreshold()).isEqualTo(14); + } + + @Test + public void getFalsingThreshold_lastWakeNotDueToTouch_isQsThreshold() { + mFakeKeyguardRepository.setWakefulnessModel( + new WakefulnessModel( + WakefulnessState.AWAKE, + /* lastWakeReason= */ WakeSleepReason.POWER_BUTTON, + /* lastSleepReason= */ WakeSleepReason.POWER_BUTTON) + ); + when(mQsController.getFalsingThreshold()).thenReturn(14); + + assertThat(mNotificationPanelViewController.getFalsingThreshold()).isEqualTo(14); + } + + @Test + public void getFalsingThreshold_lastWakeDueToTouch_greaterThanQsThreshold() { + mFakeKeyguardRepository.setWakefulnessModel( + new WakefulnessModel( + WakefulnessState.AWAKE, + /* lastWakeReason= */ WakeSleepReason.TAP, + /* lastSleepReason= */ WakeSleepReason.POWER_BUTTON) + ); + when(mQsController.getFalsingThreshold()).thenReturn(14); + + assertThat(mNotificationPanelViewController.getFalsingThreshold()).isGreaterThan(14); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java index 526dc8d150fe..cde6ac08d5fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java @@ -126,7 +126,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { } }; mNotificationShadeWindowController.setScrimsVisibilityListener((visibility) -> {}); - mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView); + mNotificationShadeWindowController.setWindowRootView(mNotificationShadeWindowView); mNotificationShadeWindowController.attach(); verify(mWindowManager).addView(eq(mNotificationShadeWindowView), any()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 16277de850d6..af40e5b04866 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -21,6 +21,7 @@ import android.testing.TestableLooper.RunWithLooper import android.view.MotionEvent import android.view.ViewGroup import androidx.test.filters.SmallTest +import com.android.keyguard.KeyguardMessageAreaController import com.android.keyguard.KeyguardSecurityContainerController import com.android.keyguard.LockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent @@ -29,14 +30,20 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.classifier.FalsingCollectorFake import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.dock.DockManager +import com.android.systemui.dump.logcatLogBuffer import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.KeyguardUnlockAnimationController +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor +import com.android.systemui.bouncer.domain.interactor.CountDownTimerUtil +import com.android.systemui.bouncer.data.repository.FakeBouncerMessageRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.KeyguardBouncerViewModel +import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel +import com.android.systemui.log.BouncerLogger import com.android.systemui.multishade.data.remoteproxy.MultiShadeInputProxy import com.android.systemui.multishade.data.repository.MultiShadeRepository import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor @@ -54,6 +61,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarViewController import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager import com.android.systemui.statusbar.window.StatusBarWindowStateController import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.user.data.repository.FakeUserRepository import com.android.systemui.util.mockito.any import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat @@ -103,8 +111,8 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock lateinit var keyguardBouncerComponentFactory: KeyguardBouncerComponent.Factory @Mock lateinit var keyguardBouncerComponent: KeyguardBouncerComponent @Mock lateinit var keyguardSecurityContainerController: KeyguardSecurityContainerController - @Mock - private lateinit var unfoldTransitionProgressProvider: Optional<UnfoldTransitionProgressProvider> + @Mock private lateinit var unfoldTransitionProgressProvider: + Optional<UnfoldTransitionProgressProvider> @Mock lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor @Mock lateinit var primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel @@ -134,6 +142,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { featureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false) featureFlags.set(Flags.DUAL_SHADE, false) featureFlags.set(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION, true) + featureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true) val inputProxy = MultiShadeInputProxy() testScope = TestScope() @@ -170,6 +179,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { pulsingGestureListener, keyguardBouncerViewModel, keyguardBouncerComponentFactory, + mock(KeyguardMessageAreaController.Factory::class.java), keyguardTransitionInteractor, primaryBouncerToGoneTransitionViewModel, featureFlags, @@ -184,11 +194,16 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = FakeKeyguardTransitionRepository(), + scope = testScope.backgroundScope ), falsingManager = FalsingManagerFake(), shadeController = shadeController, ) }, + BouncerMessageInteractor(FakeBouncerMessageRepository(), + mock(BouncerMessageFactory::class.java), + FakeUserRepository(), CountDownTimerUtil(), featureFlags), + BouncerLogger(logcatLogBuffer("BouncerLog")) ) underTest.setupExpandedStatusBar() diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index 16af208fd531..d3ecc3d52fbd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -21,21 +21,28 @@ import android.testing.TestableLooper.RunWithLooper import android.view.MotionEvent import android.widget.FrameLayout import androidx.test.filters.SmallTest +import com.android.keyguard.KeyguardMessageAreaController import com.android.keyguard.KeyguardSecurityContainerController import com.android.keyguard.LockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent import com.android.systemui.R import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.factory.BouncerMessageFactory +import com.android.systemui.bouncer.data.repository.FakeBouncerMessageRepository +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor +import com.android.systemui.bouncer.domain.interactor.CountDownTimerUtil +import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel import com.android.systemui.classifier.FalsingCollectorFake import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.dock.DockManager +import com.android.systemui.dump.logcatLogBuffer import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.KeyguardUnlockAnimationController import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.ui.viewmodel.KeyguardBouncerViewModel import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel +import com.android.systemui.log.BouncerLogger import com.android.systemui.multishade.data.remoteproxy.MultiShadeInputProxy import com.android.systemui.multishade.data.repository.MultiShadeRepository import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor @@ -54,11 +61,13 @@ import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager import com.android.systemui.statusbar.window.StatusBarWindowStateController import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.user.data.repository.FakeUserRepository import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import java.util.Optional import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.test.TestScope @@ -69,10 +78,10 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Captor import org.mockito.Mock +import org.mockito.Mockito import org.mockito.Mockito.spy import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations -import java.util.Optional @OptIn(ExperimentalCoroutinesApi::class) @RunWith(AndroidTestingRunner::class) @@ -106,7 +115,8 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { @Mock private lateinit var keyguardSecurityContainerController: KeyguardSecurityContainerController @Mock - private lateinit var unfoldTransitionProgressProvider: Optional<UnfoldTransitionProgressProvider> + private lateinit var unfoldTransitionProgressProvider: + Optional<UnfoldTransitionProgressProvider> @Mock private lateinit var notificationInsetsController: NotificationInsetsController @Mock private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor @Mock @@ -146,6 +156,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { featureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false) featureFlags.set(Flags.DUAL_SHADE, false) featureFlags.set(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION, true) + featureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true) val inputProxy = MultiShadeInputProxy() testScope = TestScope() val multiShadeInteractor = @@ -181,6 +192,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { pulsingGestureListener, keyguardBouncerViewModel, keyguardBouncerComponentFactory, + Mockito.mock(KeyguardMessageAreaController.Factory::class.java), keyguardTransitionInteractor, primaryBouncerToGoneTransitionViewModel, featureFlags, @@ -195,11 +207,20 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { keyguardTransitionInteractor = KeyguardTransitionInteractor( repository = FakeKeyguardTransitionRepository(), + scope = testScope.backgroundScope ), falsingManager = FalsingManagerFake(), shadeController = shadeController, ) }, + BouncerMessageInteractor( + FakeBouncerMessageRepository(), + Mockito.mock(BouncerMessageFactory::class.java), + FakeUserRepository(), + CountDownTimerUtil(), + featureFlags + ), + BouncerLogger(logcatLogBuffer("BouncerLog")) ) controller.setupExpandedStatusBar() diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/PulsingGestureListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/PulsingGestureListenerTest.kt index d7c06a76bf0f..f1d56f9e3480 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/PulsingGestureListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/PulsingGestureListenerTest.kt @@ -25,22 +25,24 @@ import android.testing.TestableLooper.RunWithLooper import android.view.MotionEvent import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingCollector import com.android.systemui.dock.DockManager import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.power.data.repository.FakePowerRepository +import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.phone.CentralSurfaces +import com.android.systemui.statusbar.phone.ScreenOffAnimationController import com.android.systemui.tuner.TunerService import com.android.systemui.tuner.TunerService.Tunable import com.android.systemui.util.mockito.eq +import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers.anyInt -import org.mockito.ArgumentMatchers.anyLong -import org.mockito.ArgumentMatchers.anyString import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.verify @@ -54,12 +56,12 @@ class PulsingGestureListenerTest : SysuiTestCase() { @Mock private lateinit var view: NotificationShadeWindowView @Mock - private lateinit var centralSurfaces: CentralSurfaces - @Mock private lateinit var dockManager: DockManager @Mock private lateinit var falsingManager: FalsingManager @Mock + private lateinit var falsingCollector: FalsingCollector + @Mock private lateinit var ambientDisplayConfiguration: AmbientDisplayConfiguration @Mock private lateinit var tunerService: TunerService @@ -71,7 +73,10 @@ class PulsingGestureListenerTest : SysuiTestCase() { private lateinit var shadeLogger: ShadeLogger @Mock private lateinit var userTracker: UserTracker + @Mock + private lateinit var screenOffAnimationController: ScreenOffAnimationController + private lateinit var powerRepository: FakePowerRepository private lateinit var tunableCaptor: ArgumentCaptor<Tunable> private lateinit var underTest: PulsingGestureListener @@ -79,11 +84,18 @@ class PulsingGestureListenerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) + powerRepository = FakePowerRepository() + underTest = PulsingGestureListener( view, falsingManager, dockManager, - centralSurfaces, + PowerInteractor( + powerRepository, + falsingCollector, + screenOffAnimationController, + statusBarStateController, + ), ambientDisplayConfiguration, statusBarStateController, shadeLogger, @@ -92,6 +104,7 @@ class PulsingGestureListenerTest : SysuiTestCase() { dumpManager ) whenever(dockManager.isDocked).thenReturn(false) + whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(true) } @Test @@ -110,8 +123,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onSingleTapUp(upEv) // THEN wake up device if dozing - verify(centralSurfaces).wakeUpIfDozing( - anyLong(), anyString(), eq(PowerManager.WAKE_REASON_TAP)) + assertThat(powerRepository.lastWakeWhy).isNotNull() + assertThat(powerRepository.lastWakeReason).isEqualTo(PowerManager.WAKE_REASON_TAP) } @Test @@ -130,8 +143,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onDoubleTapEvent(upEv) // THEN wake up device if dozing - verify(centralSurfaces).wakeUpIfDozing( - anyLong(), anyString(), eq(PowerManager.WAKE_REASON_TAP)) + assertThat(powerRepository.lastWakeWhy).isNotNull() + assertThat(powerRepository.lastWakeReason).isEqualTo(PowerManager.WAKE_REASON_TAP) } @Test @@ -162,8 +175,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onSingleTapUp(upEv) // THEN the device doesn't wake up - verify(centralSurfaces, never()).wakeUpIfDozing( - anyLong(), anyString(), anyInt()) + assertThat(powerRepository.lastWakeWhy).isNull() + assertThat(powerRepository.lastWakeReason).isNull() } @Test @@ -210,8 +223,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onDoubleTapEvent(upEv) // THEN the device doesn't wake up - verify(centralSurfaces, never()).wakeUpIfDozing( - anyLong(), anyString(), anyInt()) + assertThat(powerRepository.lastWakeWhy).isNull() + assertThat(powerRepository.lastWakeReason).isNull() } @Test @@ -230,8 +243,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onSingleTapUp(upEv) // THEN the device doesn't wake up - verify(centralSurfaces, never()).wakeUpIfDozing( - anyLong(), anyString(), anyInt()) + assertThat(powerRepository.lastWakeWhy).isNull() + assertThat(powerRepository.lastWakeReason).isNull() } @Test @@ -250,8 +263,8 @@ class PulsingGestureListenerTest : SysuiTestCase() { underTest.onDoubleTapEvent(upEv) // THEN the device doesn't wake up - verify(centralSurfaces, never()).wakeUpIfDozing( - anyLong(), anyString(), anyInt()) + assertThat(powerRepository.lastWakeWhy).isNull() + assertThat(powerRepository.lastWakeReason).isNull() } fun updateSettings() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeControllerImplTest.kt new file mode 100644 index 000000000000..00a056708f07 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeControllerImplTest.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade + +import android.testing.AndroidTestingRunner +import android.view.Display +import android.view.WindowManager +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.assist.AssistManager +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.statusbar.CommandQueue +import com.android.systemui.statusbar.NotificationShadeWindowController +import com.android.systemui.statusbar.notification.row.NotificationGutsManager +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager +import com.android.systemui.statusbar.policy.DeviceProvisionedController +import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.statusbar.window.StatusBarWindowController +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.time.FakeSystemClock +import dagger.Lazy +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers +import org.mockito.Mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@RunWith(AndroidTestingRunner::class) +@SmallTest +class ShadeControllerImplTest : SysuiTestCase() { + @Mock private lateinit var commandQueue: CommandQueue + @Mock private lateinit var keyguardStateController: KeyguardStateController + @Mock private lateinit var statusBarStateController: StatusBarStateController + @Mock private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager + @Mock private lateinit var statusBarWindowController: StatusBarWindowController + @Mock private lateinit var deviceProvisionedController: DeviceProvisionedController + @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController + @Mock private lateinit var windowManager: WindowManager + @Mock private lateinit var assistManager: AssistManager + @Mock private lateinit var gutsManager: NotificationGutsManager + @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController + @Mock private lateinit var nswvc: NotificationShadeWindowViewController + @Mock private lateinit var display: Display + + private lateinit var shadeController: ShadeControllerImpl + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + whenever(windowManager.defaultDisplay).thenReturn(display) + whenever(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) + shadeController = + ShadeControllerImpl( + commandQueue, + FakeExecutor(FakeSystemClock()), + keyguardStateController, + statusBarStateController, + statusBarKeyguardViewManager, + statusBarWindowController, + deviceProvisionedController, + notificationShadeWindowController, + windowManager, + Lazy { assistManager }, + Lazy { gutsManager }, + ) + shadeController.setNotificationShadeWindowViewController(nswvc) + shadeController.setNotificationPanelViewController(notificationPanelViewController) + } + + @Test + fun testDisableNotificationShade() { + whenever(commandQueue.panelsEnabled()).thenReturn(false) + + // Trying to open it does nothing. + shadeController.animateExpandShade() + verify(notificationPanelViewController, never()).expandToNotifications() + shadeController.animateExpandQs() + verify(notificationPanelViewController, never()).expand(ArgumentMatchers.anyBoolean()) + } + + @Test + fun testEnableNotificationShade() { + whenever(commandQueue.panelsEnabled()).thenReturn(true) + + // Can now be opened. + shadeController.animateExpandShade() + verify(notificationPanelViewController).expandToNotifications() + shadeController.animateExpandQs() + verify(notificationPanelViewController).expandToQs() + } + + @Test + fun cancelExpansionAndCollapseShade_callsCancelCurrentTouch() { + // GIVEN the shade is tracking a touch + whenever(notificationPanelViewController.isTracking).thenReturn(true) + + // WHEN cancelExpansionAndCollapseShade is called + shadeController.cancelExpansionAndCollapseShade() + + // VERIFY that cancelCurrentTouch is called + verify(nswvc).cancelCurrentTouch() + } + + @Test + fun cancelExpansionAndCollapseShade_doesNotCallAnimateCollapseShade_whenCollapsed() { + // GIVEN the shade is tracking a touch + whenever(notificationPanelViewController.isTracking).thenReturn(false) + + // WHEN cancelExpansionAndCollapseShade is called + shadeController.cancelExpansionAndCollapseShade() + + // VERIFY that cancelCurrentTouch is NOT called + verify(nswvc, never()).cancelCurrentTouch() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt index cbf54854759b..a5bd2aea2d95 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt @@ -2,26 +2,16 @@ package com.android.systemui.shade.transition import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest -import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager -import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags -import com.android.systemui.shade.STATE_CLOSED -import com.android.systemui.shade.STATE_OPEN import com.android.systemui.shade.STATE_OPENING import com.android.systemui.shade.ShadeExpansionChangeEvent -import com.android.systemui.statusbar.StatusBarState -import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.phone.ScrimController -import com.android.systemui.statusbar.policy.FakeConfigurationController -import com.android.systemui.statusbar.policy.HeadsUpManager import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @@ -30,10 +20,6 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { @Mock private lateinit var scrimController: ScrimController @Mock private lateinit var dumpManager: DumpManager - @Mock private lateinit var statusBarStateController: SysuiStatusBarStateController - @Mock private lateinit var headsUpManager: HeadsUpManager - @Mock private lateinit var featureFlags: FeatureFlags - private val configurationController = FakeConfigurationController() private lateinit var controller: ScrimShadeTransitionController @@ -41,131 +27,25 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) context.ensureTestableResources() - controller = - ScrimShadeTransitionController( - configurationController, - dumpManager, - scrimController, - context.resources, - statusBarStateController, - headsUpManager, - featureFlags) + controller = ScrimShadeTransitionController(dumpManager, scrimController) controller.onPanelStateChanged(STATE_OPENING) } @Test - fun onPanelExpansionChanged_inSingleShade_setsFractionEqualToEventFraction() { - setSplitShadeEnabled(false) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_unlockedShade_setsFractionBasedOnDragDownAmount() { - whenever(statusBarStateController.currentOrUpcomingState).thenReturn(StatusBarState.SHADE) - val scrimShadeTransitionDistance = - context.resources.getDimensionPixelSize(R.dimen.split_shade_scrim_transition_distance) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - val expectedFraction = EXPANSION_EVENT.dragDownPxAmount / scrimShadeTransitionDistance - verify(scrimController).setRawPanelExpansionFraction(expectedFraction) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_largeDragDownAmount_fractionIsNotGreaterThan1() { - whenever(statusBarStateController.currentOrUpcomingState).thenReturn(StatusBarState.SHADE) - val scrimShadeTransitionDistance = - context.resources.getDimensionPixelSize(R.dimen.split_shade_scrim_transition_distance) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged( - EXPANSION_EVENT.copy(dragDownPxAmount = 100f * scrimShadeTransitionDistance)) - - verify(scrimController).setRawPanelExpansionFraction(1f) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_negativeDragDownAmount_fractionIsNotLessThan0() { - whenever(statusBarStateController.currentOrUpcomingState).thenReturn(StatusBarState.SHADE) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT.copy(dragDownPxAmount = -100f)) - - verify(scrimController).setRawPanelExpansionFraction(0f) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_onLockedShade_setsFractionEqualToEventFraction() { - whenever(statusBarStateController.currentOrUpcomingState) - .thenReturn(StatusBarState.SHADE_LOCKED) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_flagTrue_setsFractionEqualToEventFraction() { - whenever(featureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(true) - whenever(statusBarStateController.currentOrUpcomingState) - .thenReturn(StatusBarState.SHADE) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_onKeyguard_setsFractionEqualToEventFraction() { - whenever(statusBarStateController.currentOrUpcomingState) - .thenReturn(StatusBarState.KEYGUARD) - setSplitShadeEnabled(true) - + fun onPanelExpansionChanged_setsFractionEqualToEventFraction() { controller.onPanelExpansionChanged(EXPANSION_EVENT) verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) } - @Test - fun onPanelExpansionChanged_inSplitShade_panelOpen_setsFractionEqualToEventFraction() { - controller.onPanelStateChanged(STATE_OPEN) - whenever(statusBarStateController.currentOrUpcomingState) - .thenReturn(StatusBarState.KEYGUARD) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) - } - - @Test - fun onPanelExpansionChanged_inSplitShade_panelClosed_setsFractionEqualToEventFraction() { - controller.onPanelStateChanged(STATE_CLOSED) - whenever(statusBarStateController.currentOrUpcomingState) - .thenReturn(StatusBarState.KEYGUARD) - setSplitShadeEnabled(true) - - controller.onPanelExpansionChanged(EXPANSION_EVENT) - - verify(scrimController).setRawPanelExpansionFraction(EXPANSION_EVENT.fraction) - } - - private fun setSplitShadeEnabled(enabled: Boolean) { - overrideResource(R.bool.config_use_split_notification_shade, enabled) - configurationController.notifyConfigurationChanged() - } - companion object { val EXPANSION_EVENT = ShadeExpansionChangeEvent( - fraction = 0.5f, expanded = true, tracking = true, dragDownPxAmount = 10f) + fraction = 0.5f, + expanded = true, + tracking = true, + dragDownPxAmount = 10f + ) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt index 69d03d9b0e4c..f8e1a9d12657 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt @@ -71,7 +71,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { fun upTransitionSceneKey_deviceLocked_lockScreen() = testScope.runTest { val upTransitionSceneKey by collectLastValue(underTest.upDestinationSceneKey) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Lockscreen) @@ -81,7 +81,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { fun upTransitionSceneKey_deviceUnlocked_gone() = testScope.runTest { val upTransitionSceneKey by collectLastValue(underTest.upDestinationSceneKey) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Gone) @@ -91,7 +91,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceUnlocked_switchesToGone() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.unlockDevice() runCurrent() @@ -104,7 +104,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { fun onContentClicked_deviceLockedSecurely_switchesToBouncer() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene(CONTAINER_1)) - authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.PIN(1234)) + authenticationInteractor.setAuthenticationMethod(AuthenticationMethodModel.Pin(1234)) authenticationInteractor.lockDevice() runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/condition/ConditionMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/shared/condition/ConditionMonitorTest.java index b7241759ca24..0b1753ff72ff 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/condition/ConditionMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/condition/ConditionMonitorTest.java @@ -555,60 +555,6 @@ public class ConditionMonitorTest extends SysuiTestCase { } /** - * Ensures a subscription is predicated on its precondition. - */ - @Test - public void testPrecondition() { - mCondition1.fakeUpdateCondition(false); - final Monitor.Callback callback = - mock(Monitor.Callback.class); - - mCondition2.fakeUpdateCondition(false); - - // Create a nested condition - mConditionMonitor.addSubscription(new Monitor.Subscription.Builder(callback) - .addPrecondition(mCondition1) - .addCondition(mCondition2) - .build()); - - mExecutor.runAllReady(); - - // Ensure the nested condition callback is not called at all. - verify(callback, never()).onActiveChanged(anyBoolean()); - verify(callback, never()).onConditionsChanged(anyBoolean()); - - // Update the condition to true and ensure that the nested condition is not triggered. - mCondition2.fakeUpdateCondition(true); - verify(callback, never()).onConditionsChanged(anyBoolean()); - mCondition2.fakeUpdateCondition(false); - - // Set precondition and make sure the inner condition becomes active and reports that - // conditions aren't met - mCondition1.fakeUpdateCondition(true); - mExecutor.runAllReady(); - - verify(callback).onActiveChanged(eq(true)); - verify(callback).onConditionsChanged(eq(false)); - - Mockito.clearInvocations(callback); - - // Update the condition and make sure the callback is updated. - mCondition2.fakeUpdateCondition(true); - mExecutor.runAllReady(); - - verify(callback).onConditionsChanged(true); - - Mockito.clearInvocations(callback); - // Invalidate precondition and make sure callback is informed, but the last state is - // not affected. - mCondition1.fakeUpdateCondition(false); - mExecutor.runAllReady(); - - verify(callback).onActiveChanged(eq(false)); - verify(callback, never()).onConditionsChanged(anyBoolean()); - } - - /** * Ensure preconditions are applied to every subscription added to a monitor. */ @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutListSearchTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutListSearchTest.java index 109f185c625e..22c9e45d48af 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutListSearchTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutListSearchTest.java @@ -76,5 +76,6 @@ public class KeyboardShortcutListSearchTest extends SysuiTestCase { mKeyboardShortcutListSearch.toggle(mContext, DEVICE_ID); verify(mWindowManager).requestAppKeyboardShortcuts(any(), anyInt()); + verify(mWindowManager).requestImeKeyboardShortcuts(any(), anyInt()); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java index ea822aa00429..a3ecde0fe976 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java @@ -75,5 +75,6 @@ public class KeyboardShortcutsTest extends SysuiTestCase { mKeyboardShortcuts.toggle(mContext, DEVICE_ID); verify(mWindowManager).requestAppKeyboardShortcuts(any(), anyInt()); + verify(mWindowManager).requestImeKeyboardShortcuts(any(), anyInt()); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index 542e0cb728a3..01572f266e39 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -102,7 +102,8 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.keyguard.KeyguardIndication; import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController; import com.android.systemui.keyguard.ScreenLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.settings.UserTracker; @@ -297,7 +298,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { mFaceHelpMessageDeferral, mock(KeyguardLogger.class), mAlternateBouncerInteractor, mAlarmManager, - mUserTracker + mUserTracker, + mock(BouncerMessageInteractor.class) ); mController.init(); mController.setIndicationArea(mIndicationArea); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt index 2fbe87158eba..ea70e9e44c66 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt @@ -32,7 +32,6 @@ import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.StatusBarState -import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder @@ -46,11 +45,14 @@ import com.android.systemui.statusbar.notification.interruption.KeyguardNotifica import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.policy.HeadsUpManager import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.withArgCaptor import com.android.systemui.util.settings.FakeSettings import com.google.common.truth.Truth.assertThat +import java.util.function.Consumer +import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestCoroutineScheduler @@ -62,9 +64,8 @@ import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.same import org.mockito.Mockito.anyString import org.mockito.Mockito.clearInvocations +import org.mockito.Mockito.never import org.mockito.Mockito.verify -import java.util.function.Consumer -import kotlin.time.Duration.Companion.seconds import org.mockito.Mockito.`when` as whenever @SmallTest @@ -75,7 +76,6 @@ class KeyguardCoordinatorTest : SysuiTestCase() { private val keyguardNotifVisibilityProvider: KeyguardNotificationVisibilityProvider = mock() private val keyguardRepository = FakeKeyguardRepository() private val keyguardTransitionRepository = FakeKeyguardTransitionRepository() - private val notifPipelineFlags: NotifPipelineFlags = mock() private val notifPipeline: NotifPipeline = mock() private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider = mock() private val statusBarStateController: StatusBarStateController = mock() @@ -136,13 +136,8 @@ class KeyguardCoordinatorTest : SysuiTestCase() { ) testScheduler.runCurrent() - // WHEN: The shade is expanded - whenever(statusBarStateController.isExpanded).thenReturn(true) - statusBarStateListener.onExpandedChanged(true) - testScheduler.runCurrent() - - // THEN: The notification is still treated as "unseen" and is not filtered out. - assertThat(unseenFilter.shouldFilterOut(fakeEntry, 0L)).isFalse() + // THEN: We are no longer listening for shade expansions + verify(statusBarStateController, never()).addCallback(any()) } } @@ -152,6 +147,10 @@ class KeyguardCoordinatorTest : SysuiTestCase() { keyguardRepository.setKeyguardShowing(false) whenever(statusBarStateController.isExpanded).thenReturn(false) runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) + // WHEN: A notification is posted val fakeEntry = NotificationEntryBuilder().build() collectionListener.onEntryAdded(fakeEntry) @@ -162,6 +161,9 @@ class KeyguardCoordinatorTest : SysuiTestCase() { // WHEN: The keyguard is now showing keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.AOD) + ) testScheduler.runCurrent() // THEN: The notification is recognized as "seen" and is filtered out. @@ -169,6 +171,9 @@ class KeyguardCoordinatorTest : SysuiTestCase() { // WHEN: The keyguard goes away keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.AOD, to = KeyguardState.GONE) + ) testScheduler.runCurrent() // THEN: The notification is shown regardless @@ -182,9 +187,10 @@ class KeyguardCoordinatorTest : SysuiTestCase() { keyguardRepository.setKeyguardShowing(false) whenever(statusBarStateController.isExpanded).thenReturn(true) runKeyguardCoordinatorTest { - val fakeEntry = NotificationEntryBuilder() + val fakeEntry = + NotificationEntryBuilder() .setNotification(Notification.Builder(mContext, "id").setOngoing(true).build()) - .build() + .build() collectionListener.onEntryAdded(fakeEntry) // WHEN: The keyguard is now showing @@ -202,11 +208,13 @@ class KeyguardCoordinatorTest : SysuiTestCase() { keyguardRepository.setKeyguardShowing(false) whenever(statusBarStateController.isExpanded).thenReturn(true) runKeyguardCoordinatorTest { - val fakeEntry = NotificationEntryBuilder().build().apply { - row = mock<ExpandableNotificationRow>().apply { - whenever(isMediaRow).thenReturn(true) + val fakeEntry = + NotificationEntryBuilder().build().apply { + row = + mock<ExpandableNotificationRow>().apply { + whenever(isMediaRow).thenReturn(true) + } } - } collectionListener.onEntryAdded(fakeEntry) // WHEN: The keyguard is now showing @@ -299,14 +307,12 @@ class KeyguardCoordinatorTest : SysuiTestCase() { runKeyguardCoordinatorTest { // WHEN: A new notification is posted val fakeSummary = NotificationEntryBuilder().build() - val fakeChild = NotificationEntryBuilder() + val fakeChild = + NotificationEntryBuilder() .setGroup(context, "group") .setGroupSummary(context, false) .build() - GroupEntryBuilder() - .setSummary(fakeSummary) - .addChild(fakeChild) - .build() + GroupEntryBuilder().setSummary(fakeSummary).addChild(fakeChild).build() collectionListener.onEntryAdded(fakeSummary) collectionListener.onEntryAdded(fakeChild) @@ -331,6 +337,10 @@ class KeyguardCoordinatorTest : SysuiTestCase() { runKeyguardCoordinatorTest { val fakeEntry = NotificationEntryBuilder().build() collectionListener.onEntryAdded(fakeEntry) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.AOD, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() // WHEN: five seconds have passed testScheduler.advanceTimeBy(5.seconds) @@ -338,10 +348,16 @@ class KeyguardCoordinatorTest : SysuiTestCase() { // WHEN: Keyguard is no longer showing keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) testScheduler.runCurrent() // WHEN: Keyguard is shown again keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.AOD) + ) testScheduler.runCurrent() // THEN: The notification is now recognized as "seen" and is filtered out. @@ -354,11 +370,17 @@ class KeyguardCoordinatorTest : SysuiTestCase() { // GIVEN: Keyguard is showing, unseen notification is present keyguardRepository.setKeyguardShowing(true) runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) val fakeEntry = NotificationEntryBuilder().build() collectionListener.onEntryAdded(fakeEntry) // WHEN: Keyguard is no longer showing keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) // WHEN: Keyguard is shown again keyguardRepository.setKeyguardShowing(true) @@ -369,14 +391,212 @@ class KeyguardCoordinatorTest : SysuiTestCase() { } } + @Test + fun unseenNotificationIsNotMarkedAsSeenIfNotOnKeyguardLongEnough() { + // GIVEN: Keyguard is showing, not dozing, unseen notification is present + keyguardRepository.setKeyguardShowing(true) + keyguardRepository.setIsDozing(false) + runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + val firstEntry = NotificationEntryBuilder().setId(1).build() + collectionListener.onEntryAdded(firstEntry) + testScheduler.runCurrent() + + // WHEN: one second has passed + testScheduler.advanceTimeBy(1.seconds) + testScheduler.runCurrent() + + // WHEN: another unseen notification is posted + val secondEntry = NotificationEntryBuilder().setId(2).build() + collectionListener.onEntryAdded(secondEntry) + testScheduler.runCurrent() + + // WHEN: four more seconds have passed + testScheduler.advanceTimeBy(4.seconds) + testScheduler.runCurrent() + + // WHEN: the keyguard is no longer showing + keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) + testScheduler.runCurrent() + + // WHEN: Keyguard is shown again + keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // THEN: The first notification is considered seen and is filtered out. + assertThat(unseenFilter.shouldFilterOut(firstEntry, 0L)).isTrue() + + // THEN: The second notification is still considered unseen and is not filtered out + assertThat(unseenFilter.shouldFilterOut(secondEntry, 0L)).isFalse() + } + } + + @Test + fun unseenNotificationOnKeyguardNotMarkedAsSeenIfRemovedAfterThreshold() { + // GIVEN: Keyguard is showing, not dozing + keyguardRepository.setKeyguardShowing(true) + keyguardRepository.setIsDozing(false) + runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // WHEN: a new notification is posted + val entry = NotificationEntryBuilder().setId(1).build() + collectionListener.onEntryAdded(entry) + testScheduler.runCurrent() + + // WHEN: five more seconds have passed + testScheduler.advanceTimeBy(5.seconds) + testScheduler.runCurrent() + + // WHEN: the notification is removed + collectionListener.onEntryRemoved(entry, 0) + testScheduler.runCurrent() + + // WHEN: the notification is re-posted + collectionListener.onEntryAdded(entry) + testScheduler.runCurrent() + + // WHEN: one more second has passed + testScheduler.advanceTimeBy(1.seconds) + testScheduler.runCurrent() + + // WHEN: the keyguard is no longer showing + keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) + testScheduler.runCurrent() + + // WHEN: Keyguard is shown again + keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // THEN: The notification is considered unseen and is not filtered out. + assertThat(unseenFilter.shouldFilterOut(entry, 0L)).isFalse() + } + } + + @Test + fun unseenNotificationOnKeyguardNotMarkedAsSeenIfRemovedBeforeThreshold() { + // GIVEN: Keyguard is showing, not dozing + keyguardRepository.setKeyguardShowing(true) + keyguardRepository.setIsDozing(false) + runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // WHEN: a new notification is posted + val entry = NotificationEntryBuilder().setId(1).build() + collectionListener.onEntryAdded(entry) + testScheduler.runCurrent() + + // WHEN: one second has passed + testScheduler.advanceTimeBy(1.seconds) + testScheduler.runCurrent() + + // WHEN: the notification is removed + collectionListener.onEntryRemoved(entry, 0) + testScheduler.runCurrent() + + // WHEN: the notification is re-posted + collectionListener.onEntryAdded(entry) + testScheduler.runCurrent() + + // WHEN: one more second has passed + testScheduler.advanceTimeBy(1.seconds) + testScheduler.runCurrent() + + // WHEN: the keyguard is no longer showing + keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) + testScheduler.runCurrent() + + // WHEN: Keyguard is shown again + keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // THEN: The notification is considered unseen and is not filtered out. + assertThat(unseenFilter.shouldFilterOut(entry, 0L)).isFalse() + } + } + + @Test + fun unseenNotificationOnKeyguardNotMarkedAsSeenIfUpdatedBeforeThreshold() { + // GIVEN: Keyguard is showing, not dozing + keyguardRepository.setKeyguardShowing(true) + keyguardRepository.setIsDozing(false) + runKeyguardCoordinatorTest { + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // WHEN: a new notification is posted + val entry = NotificationEntryBuilder().setId(1).build() + collectionListener.onEntryAdded(entry) + testScheduler.runCurrent() + + // WHEN: one second has passed + testScheduler.advanceTimeBy(1.seconds) + testScheduler.runCurrent() + + // WHEN: the notification is updated + collectionListener.onEntryUpdated(entry) + testScheduler.runCurrent() + + // WHEN: four more seconds have passed + testScheduler.advanceTimeBy(4.seconds) + testScheduler.runCurrent() + + // WHEN: the keyguard is no longer showing + keyguardRepository.setKeyguardShowing(false) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE) + ) + testScheduler.runCurrent() + + // WHEN: Keyguard is shown again + keyguardRepository.setKeyguardShowing(true) + keyguardTransitionRepository.sendTransitionStep( + TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN) + ) + testScheduler.runCurrent() + + // THEN: The notification is considered unseen and is not filtered out. + assertThat(unseenFilter.shouldFilterOut(entry, 0L)).isFalse() + } + } + private fun runKeyguardCoordinatorTest( testBlock: suspend KeyguardCoordinatorTestScope.() -> Unit ) { val testDispatcher = UnconfinedTestDispatcher() val testScope = TestScope(testDispatcher) - val fakeSettings = FakeSettings().apply { - putInt(Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, 1) - } + val fakeSettings = + FakeSettings().apply { + putInt(Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, 1) + } val seenNotificationsProvider = SeenNotificationsProviderImpl() val keyguardCoordinator = KeyguardCoordinator( @@ -387,7 +607,6 @@ class KeyguardCoordinatorTest : SysuiTestCase() { keyguardRepository, keyguardTransitionRepository, mock<KeyguardCoordinatorLogger>(), - notifPipelineFlags, testScope.backgroundScope, sectionHeaderVisibilityProvider, fakeSettings, @@ -397,11 +616,12 @@ class KeyguardCoordinatorTest : SysuiTestCase() { keyguardCoordinator.attach(notifPipeline) testScope.runTest(dispatchTimeoutMs = 1.seconds.inWholeMilliseconds) { KeyguardCoordinatorTestScope( - keyguardCoordinator, - testScope, - seenNotificationsProvider, - fakeSettings, - ).testBlock() + keyguardCoordinator, + testScope, + seenNotificationsProvider, + fakeSettings, + ) + .testBlock() } } @@ -414,10 +634,9 @@ class KeyguardCoordinatorTest : SysuiTestCase() { val testScheduler: TestCoroutineScheduler get() = scope.testScheduler - val onStateChangeListener: Consumer<String> = - withArgCaptor { - verify(keyguardNotifVisibilityProvider).addOnStateChangedListener(capture()) - } + val onStateChangeListener: Consumer<String> = withArgCaptor { + verify(keyguardNotifVisibilityProvider).addOnStateChangedListener(capture()) + } val unseenFilter: NotifFilter get() = keyguardCoordinator.unseenNotifFilter @@ -426,11 +645,11 @@ class KeyguardCoordinatorTest : SysuiTestCase() { verify(notifPipeline).addCollectionListener(capture()) } - val onHeadsUpChangedListener: OnHeadsUpChangedListener get() = - withArgCaptor { verify(headsUpManager).addListener(capture()) } + val onHeadsUpChangedListener: OnHeadsUpChangedListener + get() = withArgCaptor { verify(headsUpManager).addListener(capture()) } - val statusBarStateListener: StatusBarStateController.StateListener get() = - withArgCaptor { verify(statusBarStateController).addCallback(capture()) } + val statusBarStateListener: StatusBarStateController.StateListener + get() = withArgCaptor { verify(statusBarStateController).addCallback(capture()) } var showOnlyUnseenNotifsOnKeyguardSetting: Boolean get() = diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragControllerTest.java index 915924f13197..bdc8135707bc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowDragControllerTest.java @@ -108,7 +108,7 @@ public class ExpandableNotificationRowDragControllerTest extends SysuiTestCase { mRow.doDragCallback(0, 0); verify(controller).startDragAndDrop(mRow); - verify(mShadeController).animateCollapsePanels(eq(0), eq(true), + verify(mShadeController).animateCollapseShade(eq(0), eq(true), eq(false), anyFloat()); verify(mNotificationPanelLogger, times(1)).logNotificationDrag(any()); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt index 05b70ebfbb3e..8c27a7dd1590 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt @@ -8,7 +8,6 @@ import com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerPr import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ShadeInterpolation import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.shade.transition.LargeScreenShadeInterpolator import com.android.systemui.statusbar.NotificationShelf import com.android.systemui.statusbar.StatusBarIconView @@ -311,9 +310,8 @@ class NotificationShelfTest : SysuiTestCase() { } @Test - fun updateState_flagTrue_largeScreen_expansionChanging_shelfAlphaUpdated_largeScreenValue() { + fun updateState_largeScreen_expansionChanging_shelfAlphaUpdated_largeScreenValue() { val expansionFraction = 0.6f - whenever(flags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)).thenReturn(true) whenever(ambientState.isSmallScreen).thenReturn(false) whenever(largeScreenShadeInterpolator.getNotificationContentAlpha(expansionFraction)) .thenReturn(0.123f) @@ -325,20 +323,6 @@ class NotificationShelfTest : SysuiTestCase() { } @Test - fun updateState_flagFalse_largeScreen_expansionChanging_shelfAlphaUpdated_standardValue() { - val expansionFraction = 0.6f - whenever(flags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)).thenReturn(false) - whenever(ambientState.isSmallScreen).thenReturn(false) - whenever(largeScreenShadeInterpolator.getNotificationContentAlpha(expansionFraction)) - .thenReturn(0.123f) - - updateState_expansionChanging_shelfAlphaUpdated( - expansionFraction = expansionFraction, - expectedAlpha = ShadeInterpolation.getContentAlpha(expansionFraction) - ) - } - - @Test fun updateState_expansionChangingWhileBouncerInTransit_shelfAlphaUpdated() { whenever(ambientState.isBouncerInTransit).thenReturn(true) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java index 02666e40b98d..0e966dc655f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java @@ -48,6 +48,7 @@ import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.media.controls.ui.KeyguardMediaController; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; @@ -71,6 +72,7 @@ import com.android.systemui.statusbar.notification.collection.render.GroupExpans import com.android.systemui.statusbar.notification.collection.render.NotifStats; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController; +import com.android.systemui.statusbar.notification.init.NotificationsController; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController.NotificationPanelEvent; @@ -106,6 +108,7 @@ import java.util.Optional; public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { @Mock private NotificationGutsManager mNotificationGutsManager; + @Mock private NotificationsController mNotificationsController; @Mock private NotificationVisibilityProvider mVisibilityProvider; @Mock private HeadsUpManagerPhone mHeadsUpManager; @Mock private NotificationRoundnessManager mNotificationRoundnessManager; @@ -118,6 +121,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { @Mock private KeyguardMediaController mKeyguardMediaController; @Mock private SysuiStatusBarStateController mSysuiStatusBarStateController; @Mock private KeyguardBypassController mKeyguardBypassController; + @Mock private KeyguardInteractor mKeyguardInteractor; @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager; @Mock private MetricsLogger mMetricsLogger; @Mock private DumpManager mDumpManager; @@ -532,6 +536,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { mNotificationStackScrollLayout, true, mNotificationGutsManager, + mNotificationsController, mVisibilityProvider, mHeadsUpManager, mNotificationRoundnessManager, @@ -542,6 +547,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { mSysuiStatusBarStateController, mKeyguardMediaController, mKeyguardBypassController, + mKeyguardInteractor, mZenModeController, mNotificationLockscreenUserManager, Optional.<NotificationListViewModel>empty(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java index 85b1ec108e98..ee02a7b6e090 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java @@ -80,9 +80,9 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; +import com.android.systemui.statusbar.notification.init.NotificationsController; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.FooterView; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; @@ -115,7 +115,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { private TestableResources mTestableResources; @Rule public MockitoRule mockito = MockitoJUnit.rule(); - @Mock private CentralSurfaces mCentralSurfaces; + @Mock private NotificationsController mNotificationsController; @Mock private SysuiStatusBarStateController mBarState; @Mock private GroupMembershipManager mGroupMembershipManger; @Mock private GroupExpansionManager mGroupExpansionManager; @@ -182,7 +182,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { mNotificationStackSizeCalculator); mStackScroller = spy(mStackScrollerInternal); mStackScroller.setShelfController(notificationShelfController); - mStackScroller.setCentralSurfaces(mCentralSurfaces); + mStackScroller.setNotificationsController(mNotificationsController); mStackScroller.setEmptyShadeView(mEmptyShadeView); when(mStackScrollLayoutController.isHistoryEnabled()).thenReturn(true); when(mStackScrollLayoutController.getNotificationRoundnessManager()) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt index e12d179c5aa5..7b1565edac40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt @@ -9,7 +9,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ShadeInterpolation.getContentAlpha import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.shade.transition.LargeScreenShadeInterpolator import com.android.systemui.statusbar.EmptyShadeView import com.android.systemui.statusbar.NotificationShelf @@ -160,12 +159,10 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test - fun resetViewStates_flagTrue_largeScreen_expansionChanging_alphaUpdated_largeScreenValue() { + fun resetViewStates_largeScreen_expansionChanging_alphaUpdated_largeScreenValue() { val expansionFraction = 0.6f val surfaceAlpha = 123f ambientState.isSmallScreen = false - whenever(featureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(true) whenever(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit).thenReturn(false) whenever(largeScreenShadeInterpolator.getNotificationContentAlpha(expansionFraction)) .thenReturn(surfaceAlpha) @@ -177,23 +174,6 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test - fun resetViewStates_flagFalse_largeScreen_expansionChanging_alphaUpdated_standardValue() { - val expansionFraction = 0.6f - val surfaceAlpha = 123f - ambientState.isSmallScreen = false - whenever(featureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(false) - whenever(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit).thenReturn(false) - whenever(largeScreenShadeInterpolator.getNotificationContentAlpha(expansionFraction)) - .thenReturn(surfaceAlpha) - - resetViewStates_expansionChanging_notificationAlphaUpdated( - expansionFraction = expansionFraction, - expectedAlpha = getContentAlpha(expansionFraction), - ) - } - - @Test fun expansionChanging_largeScreen_bouncerInTransit_alphaUpdated_bouncerValues() { ambientState.isSmallScreen = false whenever(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit).thenReturn(true) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt index 4a3080050a37..442ba0977cf6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.plugins.ActivityStarter.OnDismissAction import com.android.systemui.settings.UserTracker import com.android.systemui.shade.ShadeController import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.policy.DeviceProvisionedController @@ -68,6 +69,7 @@ class ActivityStarterImplTest : SysuiTestCase() { @Mock private lateinit var activityLaunchAnimator: ActivityLaunchAnimator @Mock private lateinit var lockScreenUserManager: NotificationLockscreenUserManager @Mock private lateinit var statusBarWindowController: StatusBarWindowController + @Mock private lateinit var notifShadeWindowController: NotificationShadeWindowController @Mock private lateinit var wakefulnessLifecycle: WakefulnessLifecycle @Mock private lateinit var keyguardStateController: KeyguardStateController @Mock private lateinit var statusBarStateController: SysuiStatusBarStateController @@ -90,6 +92,7 @@ class ActivityStarterImplTest : SysuiTestCase() { Lazy { keyguardViewMediator }, Lazy { shadeController }, Lazy { statusBarKeyguardViewManager }, + Lazy { notifShadeWindowController }, activityLaunchAnimator, context, lockScreenUserManager, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java index 3870d996d2ae..cb71fb8f703a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.phone; import static android.view.Display.DEFAULT_DISPLAY; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -153,12 +152,6 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { verify(mCentralSurfaces).updateQsExpansionEnabled(); verify(mShadeController).animateCollapseShade(); - - // Trying to open it does nothing. - mSbcqCallbacks.animateExpandNotificationsPanel(); - verify(mShadeViewController, never()).expandToNotifications(); - mSbcqCallbacks.animateExpandSettingsPanel(null); - verify(mShadeViewController, never()).expand(anyBoolean()); } @Test @@ -171,12 +164,6 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { StatusBarManager.DISABLE2_NONE, false); verify(mCentralSurfaces).updateQsExpansionEnabled(); verify(mShadeController, never()).animateCollapseShade(); - - // Can now be opened. - mSbcqCallbacks.animateExpandNotificationsPanel(); - verify(mShadeViewController).expandToNotifications(); - mSbcqCallbacks.animateExpandSettingsPanel(null); - verify(mShadeViewController).expandToQs(); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index 8062272a0042..5ed9a865de93 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -113,7 +113,7 @@ import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.notetask.NoteTaskController; @@ -287,7 +287,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { @Mock private StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; @Mock private ScreenPinningRequest mScreenPinningRequest; @Mock private PluginDependencyProvider mPluginDependencyProvider; - @Mock private KeyguardDismissUtil mKeyguardDismissUtil; @Mock private ExtensionController mExtensionController; @Mock private UserInfoControllerImpl mUserInfoControllerImpl; @Mock private PhoneStatusBarPolicy mPhoneStatusBarPolicy; @@ -350,7 +349,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { // For the Shade to animate during the Back gesture, we must enable the animation flag. mFeatureFlags.set(Flags.WM_SHADE_ANIMATE_BACK_GESTURE, true); mFeatureFlags.set(Flags.LIGHT_REVEAL_MIGRATION, true); - mFeatureFlags.set(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD, true); IThermalService thermalService = mock(IThermalService.class); mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService, @@ -433,10 +431,12 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mShadeController = spy(new ShadeControllerImpl( mCommandQueue, + mMainExecutor, mKeyguardStateController, mStatusBarStateController, mStatusBarKeyguardViewManager, mStatusBarWindowController, + mDeviceProvisionedController, mNotificationShadeWindowController, mContext.getSystemService(WindowManager.class), () -> mAssistManager, @@ -517,7 +517,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mInitController, new Handler(TestableLooper.get(this).getLooper()), mPluginDependencyProvider, - mKeyguardDismissUtil, mExtensionController, mUserInfoControllerImpl, mPhoneStatusBarPolicy, @@ -1060,7 +1059,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { // GIVEN device occluded and panel is NOT expanded mCentralSurfaces.setBarStateForTest(SHADE); // occluding on LS has StatusBarState = SHADE when(mKeyguardStateController.isOccluded()).thenReturn(true); - mCentralSurfaces.mPanelExpanded = false; + when(mNotificationPanelViewController.isPanelExpanded()).thenReturn(false); mCentralSurfaces.updateScrimController(); @@ -1074,7 +1073,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { // GIVEN device occluded and qs IS expanded mCentralSurfaces.setBarStateForTest(SHADE); // occluding on LS has StatusBarState = SHADE when(mKeyguardStateController.isOccluded()).thenReturn(true); - mCentralSurfaces.mPanelExpanded = true; + when(mNotificationPanelViewController.isPanelExpanded()).thenReturn(true); mCentralSurfaces.updateScrimController(); @@ -1143,32 +1142,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { } @Test - public void collapseShade_callsanimateCollapseShade_whenExpanded() { - // GIVEN the shade is expanded - mCentralSurfaces.onShadeExpansionFullyChanged(true); - mCentralSurfaces.setBarStateForTest(SHADE); - - // WHEN collapseShade is called - mCentralSurfaces.collapseShade(); - - // VERIFY that animateCollapseShade is called - verify(mShadeController).animateCollapseShade(); - } - - @Test - public void collapseShade_doesNotCallanimateCollapseShade_whenCollapsed() { - // GIVEN the shade is collapsed - mCentralSurfaces.onShadeExpansionFullyChanged(false); - mCentralSurfaces.setBarStateForTest(SHADE); - - // WHEN collapseShade is called - mCentralSurfaces.collapseShade(); - - // VERIFY that animateCollapseShade is NOT called - verify(mShadeController, never()).animateCollapseShade(); - } - - @Test public void deviceStateChange_unfolded_shadeOpen_setsLeaveOpenOnKeyguardHide() { setFoldedStates(FOLD_STATE_FOLDED); setGoToSleepStates(FOLD_STATE_FOLDED); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardDismissUtilTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardDismissUtilTest.java new file mode 100644 index 000000000000..b0aa2d3934cc --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardDismissUtilTest.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.policy.KeyguardStateController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class KeyguardDismissUtilTest extends SysuiTestCase { + @Mock + private KeyguardStateController mKeyguardStateController; + @Mock + private SysuiStatusBarStateController mStatusBarStateController; + @Mock + private ActivityStarter mActivityStarter; + @Mock + private ActivityStarter.OnDismissAction mAction; + + private KeyguardDismissUtil mKeyguardDismissUtil; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + mKeyguardDismissUtil = new KeyguardDismissUtil( + mKeyguardStateController, mStatusBarStateController, mActivityStarter); + } + + @Test + public void testSetLeaveOpenOnKeyguardHideWhenKeyGuardStateControllerIsShowing() { + doReturn(true).when(mKeyguardStateController).isShowing(); + + mKeyguardDismissUtil.executeWhenUnlocked(mAction, true /* requiresShadeOpen */, + true /* afterKeyguardGone */); + + verify(mStatusBarStateController).setLeaveOpenOnKeyguardHide(true); + + verify(mActivityStarter).dismissKeyguardThenExecute(mAction, null, true); + + } + + @Test + public void testSetLeaveOpenOnKeyguardHideWhenKeyGuardStateControllerIsNotShowing() { + doReturn(false).when(mKeyguardStateController).isShowing(); + + mKeyguardDismissUtil.executeWhenUnlocked(mAction, true /* requiresShadeOpen */, + true /* afterKeyguardGone */); + + //no interaction with mStatusBarStateController + verify(mStatusBarStateController, times(0)).setLeaveOpenOnKeyguardHide(true); + + verify(mActivityStarter).dismissKeyguardThenExecute(mAction, null, true); + + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index a9ed17531926..ab801588575d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -61,10 +61,9 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.ShadeInterpolation; import com.android.systemui.dock.DockManager; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; import com.android.systemui.keyguard.shared.model.KeyguardState; import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; @@ -697,9 +696,7 @@ public class ScrimControllerTest extends SysuiTestCase { } @Test - public void transitionToUnlocked_nonClippedQs_flagTrue_followsLargeScreensInterpolator() { - when(mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(true); + public void transitionToUnlocked_nonClippedQs_followsLargeScreensInterpolator() { mScrimController.setClipsQsScrim(false); mScrimController.setRawPanelExpansionFraction(0f); mScrimController.transitionTo(ScrimState.UNLOCKED); @@ -737,48 +734,6 @@ public class ScrimControllerTest extends SysuiTestCase { mScrimBehind, OPAQUE)); } - - @Test - public void transitionToUnlocked_nonClippedQs_flagFalse() { - when(mFeatureFlags.isEnabled(Flags.LARGE_SHADE_GRANULAR_ALPHA_INTERPOLATION)) - .thenReturn(false); - mScrimController.setClipsQsScrim(false); - mScrimController.setRawPanelExpansionFraction(0f); - mScrimController.transitionTo(ScrimState.UNLOCKED); - finishAnimationsImmediately(); - assertScrimAlpha(Map.of( - mScrimInFront, TRANSPARENT, - mNotificationsScrim, TRANSPARENT, - mScrimBehind, TRANSPARENT)); - - assertScrimTinted(Map.of( - mNotificationsScrim, false, - mScrimInFront, false, - mScrimBehind, true - )); - - // Back scrim should be visible after start dragging - mScrimController.setRawPanelExpansionFraction(0.29f); - assertScrimAlpha(Map.of( - mScrimInFront, TRANSPARENT, - mNotificationsScrim, TRANSPARENT, - mScrimBehind, SEMI_TRANSPARENT)); - - // Back scrim should be opaque at 30% - mScrimController.setRawPanelExpansionFraction(0.3f); - assertScrimAlpha(Map.of( - mScrimInFront, TRANSPARENT, - mNotificationsScrim, TRANSPARENT, - mScrimBehind, OPAQUE)); - - // Then, notification scrim should fade in - mScrimController.setRawPanelExpansionFraction(0.31f); - assertScrimAlpha(Map.of( - mScrimInFront, TRANSPARENT, - mNotificationsScrim, SEMI_TRANSPARENT, - mScrimBehind, OPAQUE)); - } - @Test public void scrimStateCallback() { mScrimController.transitionTo(ScrimState.UNLOCKED); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 3eea93c6ec2c..914e29579c79 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -16,8 +16,8 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; +import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -64,12 +64,12 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.dreams.DreamOverlayStateController; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; -import com.android.systemui.keyguard.data.BouncerView; -import com.android.systemui.keyguard.data.BouncerViewDelegate; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; +import com.android.systemui.bouncer.ui.BouncerView; +import com.android.systemui.bouncer.ui.BouncerViewDelegate; +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; +import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.TaskbarDelegate; import com.android.systemui.plugins.ActivityStarter; @@ -135,6 +135,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { @Mock private BouncerView mBouncerView; @Mock private BouncerViewDelegate mBouncerViewDelegate; @Mock private OnBackAnimationCallback mBouncerViewDelegateBackCallback; + @Mock private NotificationShadeWindowController mNotificationShadeWindowController; @Mock private NotificationShadeWindowView mNotificationShadeWindowView; @Mock private WindowInsetsController mWindowInsetsController; @Mock private TaskbarDelegate mTaskbarDelegate; @@ -168,7 +169,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { .isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_BOUNCER_ANIM)) .thenReturn(true); - when(mCentralSurfaces.getNotificationShadeWindowView()) + when(mNotificationShadeWindowController.getWindowRootView()) .thenReturn(mNotificationShadeWindowView); when(mNotificationShadeWindowView.getWindowInsetsController()) .thenReturn(mWindowInsetsController); @@ -184,7 +185,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mDreamOverlayStateController, mock(NavigationModeController.class), mock(DockManager.class), - mock(NotificationShadeWindowController.class), + mNotificationShadeWindowController, mKeyguardStateController, mock(NotificationMediaManager.class), mKeyguardMessageAreaFactory, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java index d6ae2b711583..d44af885a27e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java @@ -73,6 +73,7 @@ import com.android.systemui.statusbar.NotificationClickNotifier; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationRemoteInputManager; +import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -233,6 +234,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { mCentralSurfaces, mock(NotificationPresenter.class), mock(ShadeViewController.class), + mock(NotificationShadeWindowController.class), mActivityLaunchAnimator, notificationAnimationProvider, mock(LaunchFullScreenIntentProvider.class), diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java index fdfe028765ef..1724f27f63b8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java @@ -44,7 +44,6 @@ import com.android.systemui.shade.ShadeController; import com.android.systemui.shade.ShadeNotificationPresenter; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; @@ -122,7 +121,6 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { mock(NotificationShadeWindowController.class), mock(DynamicPrivacyController.class), mKeyguardStateController, - mock(KeyguardIndicationController.class), mCentralSurfaces, mock(LockscreenShadeTransitionController.class), mCommandQueue, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationControllerTest.kt index ea534bbd0794..2e9a6909e402 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationControllerTest.kt @@ -28,6 +28,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.shade.ShadeViewController import com.android.systemui.statusbar.LightRevealScrim +import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.StatusBarStateControllerImpl import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.mockito.eq @@ -65,6 +66,8 @@ class UnlockedScreenOffAnimationControllerTest : SysuiTestCase() { @Mock private lateinit var shadeViewController: ShadeViewController @Mock + private lateinit var notifShadeWindowController: NotificationShadeWindowController + @Mock private lateinit var lightRevealScrim: LightRevealScrim @Mock private lateinit var wakefulnessLifecycle: WakefulnessLifecycle @@ -89,6 +92,7 @@ class UnlockedScreenOffAnimationControllerTest : SysuiTestCase() { keyguardStateController, dagger.Lazy<DozeParameters> { dozeParameters }, globalSettings, + dagger.Lazy<NotificationShadeWindowController> { notifShadeWindowController }, interactionJankMonitor, powerManager, handler = handler diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt index c8c24a770a7a..6301fa0be463 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt @@ -47,7 +47,8 @@ class CollapsedStatusBarViewModelImplTest : SysuiTestCase() { testScope = TestScope(UnconfinedTestDispatcher()) keyguardTransitionRepository = FakeKeyguardTransitionRepository() - val interactor = KeyguardTransitionInteractor(keyguardTransitionRepository) + val interactor = + KeyguardTransitionInteractor(keyguardTransitionRepository, testScope.backgroundScope) underTest = CollapsedStatusBarViewModelImpl(interactor, testScope.backgroundScope) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java index 3b0d5120cca3..ae38958ecb44 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java @@ -51,9 +51,11 @@ import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter.OnDismissAction; +import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.SmartReplyController; +import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; @@ -107,14 +109,15 @@ public class SmartReplyViewTest extends SysuiTestCase { private SmartReplyInflaterImpl mSmartReplyInflater; private SmartActionInflaterImpl mSmartActionInflater; + private KeyguardDismissUtil mKeyguardDismissUtil; @Mock private SmartReplyConstants mConstants; @Mock private ActivityStarter mActivityStarter; @Mock private HeadsUpManager mHeadsUpManager; @Mock private NotificationRemoteInputManager mNotificationRemoteInputManager; @Mock private SmartReplyController mSmartReplyController; - - private final KeyguardDismissUtil mKeyguardDismissUtil = new KeyguardDismissUtil(); + @Mock private KeyguardStateController mKeyguardStateController; + @Mock private SysuiStatusBarStateController mStatusBarStateController; @Before public void setUp() { @@ -122,12 +125,15 @@ public class SmartReplyViewTest extends SysuiTestCase { mReceiver = new BlockingQueueIntentReceiver(); mContext.registerReceiver(mReceiver, new IntentFilter(TEST_ACTION), Context.RECEIVER_EXPORTED_UNAUDITED); - mKeyguardDismissUtil.setDismissHandler((action, unused, afterKgGone) -> action.onDismiss()); + mDependency.injectMockDependency(KeyguardUpdateMonitor.class); mDependency.injectMockDependency(ShadeController.class); mDependency.injectMockDependency(NotificationRemoteInputManager.class); mDependency.injectTestDependency(ActivityStarter.class, mActivityStarter); mDependency.injectTestDependency(SmartReplyConstants.class, mConstants); + mDependency.injectTestDependency(KeyguardStateController.class, mKeyguardStateController); + mDependency.injectTestDependency(StatusBarStateController.class, mStatusBarStateController); + // Any number of replies are fine. when(mConstants.getMinNumSystemGeneratedReplies()).thenReturn(0); @@ -153,6 +159,13 @@ public class SmartReplyViewTest extends SysuiTestCase { mActionIcon = Icon.createWithResource(mContext, R.drawable.ic_person); + mKeyguardDismissUtil = new KeyguardDismissUtil( + mKeyguardStateController, mStatusBarStateController, mActivityStarter) { + public void executeWhenUnlocked(ActivityStarter.OnDismissAction action, + boolean requiresShadeOpen, boolean afterKeyguardGone) { + action.onDismiss(); + } + }; mSmartReplyInflater = new SmartReplyInflaterImpl( mConstants, mKeyguardDismissUtil, @@ -185,7 +198,17 @@ public class SmartReplyViewTest extends SysuiTestCase { @Test public void testSendSmartReply_keyguardCancelled() throws InterruptedException { - mKeyguardDismissUtil.setDismissHandler((action, unused, afterKgGone) -> { }); + mKeyguardDismissUtil = new KeyguardDismissUtil( + mKeyguardStateController, mStatusBarStateController, mActivityStarter) { + public void executeWhenUnlocked(ActivityStarter.OnDismissAction action, + boolean requiresShadeOpen, boolean afterKeyguardGone) { }}; + mSmartReplyInflater = new SmartReplyInflaterImpl( + mConstants, + mKeyguardDismissUtil, + mNotificationRemoteInputManager, + mSmartReplyController, + mContext); + setSmartReplies(TEST_CHOICES); mView.getChildAt(2).performClick(); @@ -196,9 +219,20 @@ public class SmartReplyViewTest extends SysuiTestCase { @Test public void testSendSmartReply_waitsForKeyguard() throws InterruptedException { AtomicReference<OnDismissAction> actionRef = new AtomicReference<>(); + mKeyguardDismissUtil = new KeyguardDismissUtil( + mKeyguardStateController, mStatusBarStateController, mActivityStarter) { + public void executeWhenUnlocked(ActivityStarter.OnDismissAction action, + boolean requiresShadeOpen, boolean afterKeyguardGone) { + actionRef.set(action); + } + }; + mSmartReplyInflater = new SmartReplyInflaterImpl( + mConstants, + mKeyguardDismissUtil, + mNotificationRemoteInputManager, + mSmartReplyController, + mContext); - mKeyguardDismissUtil.setDismissHandler((action, unused, afterKgGone) - -> actionRef.set(action)); setSmartReplies(TEST_CHOICES); mView.getChildAt(2).performClick(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt index d9ee08157c84..813597a8b576 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt @@ -28,12 +28,10 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR import com.android.systemui.keyguard.WakefulnessLifecycle -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.shade.ShadeFoldAnimator import com.android.systemui.shade.ShadeViewController -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.unfold.util.FoldableDeviceStates @@ -80,8 +78,6 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { @Mock lateinit var viewTreeObserver: ViewTreeObserver - @Mock private lateinit var commandQueue: CommandQueue - @Mock lateinit var shadeFoldAnimator: ShadeFoldAnimator @Captor private lateinit var foldStateListenerCaptor: ArgumentCaptor<FoldStateListener> @@ -111,15 +107,10 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { onActionStarted.run() } - keyguardRepository = FakeKeyguardRepository() val featureFlags = FakeFeatureFlags().apply { set(FACE_AUTH_REFACTOR, true) } - val keyguardInteractor = - KeyguardInteractor( - repository = keyguardRepository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ) + val withDeps = KeyguardInteractorFactory.create(featureFlags = featureFlags) + val keyguardInteractor = withDeps.keyguardInteractor + keyguardRepository = withDeps.repository // Needs to be run on the main thread runBlocking(IMMEDIATE) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt index ca83d49b19ca..3fbbeda8f74d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt @@ -39,12 +39,10 @@ import com.android.systemui.common.shared.model.Text import com.android.systemui.coroutines.collectLastValue import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.plugins.ActivityStarter import com.android.systemui.qs.user.UserSwitchDialogController -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.telephony.data.repository.FakeTelephonyRepository import com.android.systemui.telephony.domain.interactor.TelephonyInteractor @@ -97,7 +95,6 @@ class UserInteractorTest : SysuiTestCase() { @Mock private lateinit var dialogShower: UserSwitchDialogController.DialogShower @Mock private lateinit var resumeSessionReceiver: GuestResumeSessionReceiver @Mock private lateinit var resetOrExitSessionReceiver: GuestResetOrExitSessionReceiver - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor private lateinit var underTest: UserInteractor @@ -126,8 +123,9 @@ class UserInteractorTest : SysuiTestCase() { set(Flags.FULL_SCREEN_USER_SWITCHER, false) set(Flags.FACE_AUTH_REFACTOR, true) } + val reply = KeyguardInteractorFactory.create(featureFlags = featureFlags) + keyguardRepository = reply.repository userRepository = FakeUserRepository() - keyguardRepository = FakeKeyguardRepository() telephonyRepository = FakeTelephonyRepository() val testDispatcher = StandardTestDispatcher() testScope = TestScope(testDispatcher) @@ -142,13 +140,7 @@ class UserInteractorTest : SysuiTestCase() { applicationContext = context, repository = userRepository, activityStarter = activityStarter, - keyguardInteractor = - KeyguardInteractor( - repository = keyguardRepository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ), + keyguardInteractor = reply.keyguardInteractor, manager = manager, headlessSystemUserMode = headlessSystemUserMode, applicationScope = testScope.backgroundScope, diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/StatusBarUserChipViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/StatusBarUserChipViewModelTest.kt index fd8c6c76720b..9cb26e05887d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/StatusBarUserChipViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/StatusBarUserChipViewModelTest.kt @@ -32,11 +32,8 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.common.shared.model.Text import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.telephony.data.repository.FakeTelephonyRepository import com.android.systemui.telephony.domain.interactor.TelephonyInteractor @@ -80,13 +77,11 @@ class StatusBarUserChipViewModelTest : SysuiTestCase() { @Mock private lateinit var uiEventLogger: UiEventLogger @Mock private lateinit var resumeSessionReceiver: GuestResumeSessionReceiver @Mock private lateinit var resetOrExitSessionReceiver: GuestResetOrExitSessionReceiver - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor private lateinit var underTest: StatusBarUserChipViewModel private val userRepository = FakeUserRepository() - private val keyguardRepository = FakeKeyguardRepository() private lateinit var guestUserInteractor: GuestUserInteractor private lateinit var refreshUsersScheduler: RefreshUsersScheduler @@ -250,12 +245,8 @@ class StatusBarUserChipViewModelTest : SysuiTestCase() { repository = userRepository, activityStarter = activityStarter, keyguardInteractor = - KeyguardInteractor( - repository = keyguardRepository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ), + KeyguardInteractorFactory.create(featureFlags = featureFlags) + .keyguardInteractor, featureFlags = featureFlags, manager = manager, headlessSystemUserMode = headlessSystemUserMode, diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModelTest.kt index 91550844ceca..e3f9fac27815 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModelTest.kt @@ -30,11 +30,9 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.common.shared.model.Text import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository -import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.telephony.data.repository.FakeTelephonyRepository import com.android.systemui.telephony.domain.interactor.TelephonyInteractor @@ -79,7 +77,6 @@ class UserSwitcherViewModelTest : SysuiTestCase() { @Mock private lateinit var uiEventLogger: UiEventLogger @Mock private lateinit var resumeSessionReceiver: GuestResumeSessionReceiver @Mock private lateinit var resetOrExitSessionReceiver: GuestResetOrExitSessionReceiver - @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor private lateinit var underTest: UserSwitcherViewModel @@ -112,7 +109,6 @@ class UserSwitcherViewModelTest : SysuiTestCase() { ) } - keyguardRepository = FakeKeyguardRepository() val refreshUsersScheduler = RefreshUsersScheduler( applicationScope = testScope.backgroundScope, @@ -140,38 +136,35 @@ class UserSwitcherViewModelTest : SysuiTestCase() { set(Flags.FULL_SCREEN_USER_SWITCHER, false) set(Flags.FACE_AUTH_REFACTOR, true) } + val reply = KeyguardInteractorFactory.create(featureFlags = featureFlags) + keyguardRepository = reply.repository + underTest = UserSwitcherViewModel( - userInteractor = - UserInteractor( - applicationContext = context, - repository = userRepository, - activityStarter = activityStarter, - keyguardInteractor = - KeyguardInteractor( - repository = keyguardRepository, - commandQueue = commandQueue, - featureFlags = featureFlags, - bouncerRepository = FakeKeyguardBouncerRepository(), - ), - featureFlags = featureFlags, - manager = manager, - headlessSystemUserMode = headlessSystemUserMode, - applicationScope = testScope.backgroundScope, - telephonyInteractor = - TelephonyInteractor( - repository = FakeTelephonyRepository(), - ), - broadcastDispatcher = fakeBroadcastDispatcher, - keyguardUpdateMonitor = keyguardUpdateMonitor, - backgroundDispatcher = testDispatcher, - activityManager = activityManager, - refreshUsersScheduler = refreshUsersScheduler, - guestUserInteractor = guestUserInteractor, - uiEventLogger = uiEventLogger, - ), - guestUserInteractor = guestUserInteractor, - ) + userInteractor = + UserInteractor( + applicationContext = context, + repository = userRepository, + activityStarter = activityStarter, + keyguardInteractor = reply.keyguardInteractor, + featureFlags = featureFlags, + manager = manager, + headlessSystemUserMode = headlessSystemUserMode, + applicationScope = testScope.backgroundScope, + telephonyInteractor = + TelephonyInteractor( + repository = FakeTelephonyRepository(), + ), + broadcastDispatcher = fakeBroadcastDispatcher, + keyguardUpdateMonitor = keyguardUpdateMonitor, + backgroundDispatcher = testDispatcher, + activityManager = activityManager, + refreshUsersScheduler = refreshUsersScheduler, + guestUserInteractor = guestUserInteractor, + uiEventLogger = uiEventLogger, + ), + guestUserInteractor = guestUserInteractor, + ) } @Test @@ -323,7 +316,7 @@ class UserSwitcherViewModelTest : SysuiTestCase() { setUsers(count = 2) val isFinishRequested = mutableListOf<Boolean>() val job = - launch(testDispatcher) { underTest.isFinishRequested.toList(isFinishRequested) } + launch(testDispatcher) { underTest.isFinishRequested.toList(isFinishRequested) } assertThat(isFinishRequested.last()).isFalse() underTest.onCancelButtonClicked() diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index 47a86b1fca5c..2158396b4e15 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -320,7 +320,7 @@ public class BubblesTest extends SysuiTestCase { mColorExtractor, mDumpManager, mKeyguardStateController, mScreenOffAnimationController, mAuthController, mShadeExpansionStateManager, mShadeWindowLogger); - mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView); + mNotificationShadeWindowController.setWindowRootView(mNotificationShadeWindowView); mNotificationShadeWindowController.attach(); mAppBubbleIntent = new Intent(mContext, BubblesTestActivity.class); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java index 9179efc9f39f..e470406499b6 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiBaseFragmentTest.java @@ -57,8 +57,7 @@ public abstract class SysuiBaseFragmentTest extends BaseFragmentTest { @Before public void sysuiSetup() throws ExecutionException, InterruptedException { - SystemUIInitializer initializer = - SystemUIInitializerFactory.createFromConfigNoAssert(mContext); + SystemUIInitializer initializer = new SystemUIInitializerImpl(mContext); initializer.init(true); mDependency = new TestableDependency(initializer.getSysUIComponent().createDependency()); Dependency.setInstance(mDependency); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java index 8bbd58dc8fe1..de177168e20f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java @@ -90,8 +90,7 @@ public abstract class SysuiTestCase { if (isRobolectricTest()) { mContext = mContext.createDefaultDisplayContext(); } - SystemUIInitializer initializer = - SystemUIInitializerFactory.createFromConfigNoAssert(mContext); + SystemUIInitializer initializer = new SystemUIInitializerImpl(mContext); initializer.init(true); mDependency = new TestableDependency(initializer.getSysUIComponent().createDependency()); Dependency.setInstance(mDependency); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBouncerMessageRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/data/repository/FakeBouncerMessageRepository.kt index b03b4ba3687d..d9b926d80589 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBouncerMessageRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/data/repository/FakeBouncerMessageRepository.kt @@ -14,10 +14,9 @@ * limitations under the License. */ -package com.android.systemui.keyguard.data.repository +package com.android.systemui.bouncer.data.repository -import com.android.systemui.keyguard.bouncer.data.repository.BouncerMessageRepository -import com.android.systemui.keyguard.bouncer.shared.model.BouncerMessageModel +import com.android.systemui.bouncer.shared.model.BouncerMessageModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardBouncerRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/data/repository/FakeKeyguardBouncerRepository.kt index 8a6d2aa7dd21..10529e68f00f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardBouncerRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/data/repository/FakeKeyguardBouncerRepository.kt @@ -1,24 +1,7 @@ -/* - * Copyright (C) 2022 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.keyguard.data.repository - -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN -import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel +package com.android.systemui.bouncer.data.repository + +import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants +import com.android.systemui.bouncer.shared.model.BouncerShowMessageModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -36,7 +19,7 @@ class FakeKeyguardBouncerRepository : KeyguardBouncerRepository { _primaryBouncerDisappearAnimation.asStateFlow() private val _primaryBouncerScrimmed = MutableStateFlow(false) override val primaryBouncerScrimmed = _primaryBouncerScrimmed.asStateFlow() - private val _panelExpansionAmount = MutableStateFlow(EXPANSION_HIDDEN) + private val _panelExpansionAmount = MutableStateFlow(KeyguardBouncerConstants.EXPANSION_HIDDEN) override val panelExpansionAmount = _panelExpansionAmount.asStateFlow() private val _keyguardPosition = MutableStateFlow(0f) override val keyguardPosition = _keyguardPosition.asStateFlow() diff --git a/packages/SystemUI/tests/src/com/android/systemui/common/ui/data/repository/FakeConfigurationRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/common/ui/data/repository/FakeConfigurationRepository.kt index b2a1668df7aa..b2a1668df7aa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/common/ui/data/repository/FakeConfigurationRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/common/ui/data/repository/FakeConfigurationRepository.kt diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt index b52a76839a99..f6cbb072495f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt @@ -81,7 +81,7 @@ class FakeKeyguardRepository : KeyguardRepository { MutableStateFlow( WakefulnessModel(WakefulnessState.ASLEEP, WakeSleepReason.OTHER, WakeSleepReason.OTHER) ) - override val wakefulness: Flow<WakefulnessModel> = _wakefulnessModel + override val wakefulness = _wakefulnessModel private val _isUdfpsSupported = MutableStateFlow(false) 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 new file mode 100644 index 000000000000..f13c98ddd5e2 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.domain.interactor + +import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.data.repository.FakeCommandQueue +import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository + +/** + * Simply put, I got tired of adding a constructor argument and then having to tweak dozens of + * files. This should alleviate some of the burden by providing defaults for testing. + */ +object KeyguardInteractorFactory { + + @JvmOverloads + @JvmStatic + fun create( + featureFlags: FakeFeatureFlags = createFakeFeatureFlags(), + repository: FakeKeyguardRepository = FakeKeyguardRepository(), + commandQueue: FakeCommandQueue = FakeCommandQueue(), + bouncerRepository: FakeKeyguardBouncerRepository = FakeKeyguardBouncerRepository(), + configurationRepository: FakeConfigurationRepository = FakeConfigurationRepository(), + ): WithDependencies { + return WithDependencies( + repository = repository, + commandQueue = commandQueue, + featureFlags = featureFlags, + bouncerRepository = bouncerRepository, + configurationRepository = configurationRepository, + KeyguardInteractor( + repository = repository, + commandQueue = commandQueue, + featureFlags = featureFlags, + bouncerRepository = bouncerRepository, + configurationRepository = configurationRepository, + ) + ) + } + + /** Provide defaults, otherwise tests will throw an error */ + fun createFakeFeatureFlags(): FakeFeatureFlags { + return FakeFeatureFlags().apply { set(Flags.FACE_AUTH_REFACTOR, false) } + } + + data class WithDependencies( + val repository: FakeKeyguardRepository, + val commandQueue: FakeCommandQueue, + val featureFlags: FakeFeatureFlags, + val bouncerRepository: FakeKeyguardBouncerRepository, + val configurationRepository: FakeConfigurationRepository, + val keyguardInteractor: KeyguardInteractor, + ) +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/power/data/repository/FakePowerRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/power/data/repository/FakePowerRepository.kt index 15465f4d40fe..3334f3e82c59 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/power/data/repository/FakePowerRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/power/data/repository/FakePowerRepository.kt @@ -17,6 +17,7 @@ package com.android.systemui.power.data.repository +import android.os.PowerManager import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow @@ -28,7 +29,15 @@ class FakePowerRepository( private val _isInteractive = MutableStateFlow(initialInteractive) override val isInteractive: Flow<Boolean> = _isInteractive.asStateFlow() + var lastWakeWhy: String? = null + var lastWakeReason: Int? = null + fun setInteractive(value: Boolean) { _isInteractive.value = value } + + override fun wakeUp(why: String, @PowerManager.WakeReason wakeReason: Int) { + lastWakeWhy = why + lastWakeReason = wakeReason + } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneTestUtils.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneTestUtils.kt index be3d54acd739..1b7542b42128 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneTestUtils.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneTestUtils.kt @@ -20,7 +20,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.authentication.data.repository.AuthenticationRepository import com.android.systemui.authentication.data.repository.AuthenticationRepositoryImpl import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor -import com.android.systemui.bouncer.data.repo.BouncerRepository +import com.android.systemui.bouncer.data.repository.BouncerRepository import com.android.systemui.bouncer.domain.interactor.BouncerInteractor import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel import com.android.systemui.keyguard.domain.interactor.LockscreenSceneInteractor diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationScaleProvider.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationScaleProvider.java index 8e1aa38be9e8..41c3dcb3e48e 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationScaleProvider.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationScaleProvider.java @@ -16,6 +16,9 @@ package com.android.server.accessibility.magnification; +import static com.android.internal.accessibility.common.MagnificationConstants.SCALE_MAX_VALUE; +import static com.android.internal.accessibility.common.MagnificationConstants.SCALE_MIN_VALUE; + import android.content.Context; import android.os.UserHandle; import android.provider.Settings; @@ -37,8 +40,9 @@ public class MagnificationScaleProvider { @VisibleForTesting protected static final float DEFAULT_MAGNIFICATION_SCALE = 2.0f; - public static final float MIN_SCALE = 1.0f; - public static final float MAX_SCALE = 8.0f; + + public static final float MIN_SCALE = SCALE_MIN_VALUE; + public static final float MAX_SCALE = SCALE_MAX_VALUE; private final Context mContext; // Stores the scale for non-default displays. @@ -134,6 +138,6 @@ public class MagnificationScaleProvider { } static float constrainScale(float scale) { - return MathUtils.constrain(scale, MIN_SCALE, MAX_SCALE); + return MathUtils.constrain(scale, SCALE_MIN_VALUE, SCALE_MAX_VALUE); } } diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index 995e557d8176..d5aee9284116 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -2859,8 +2859,7 @@ public class UserBackupManagerService { if (DEBUG) { Slog.d( TAG, - addUserIdToLogMessage( - mUserId, "Starting backup confirmation UI, token=" + token)); + addUserIdToLogMessage(mUserId, "Starting backup confirmation UI")); } if (!startConfirmationUi(token, FullBackup.FULL_BACKUP_INTENT_ACTION)) { Slog.e( diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index 61fc32d5fa15..ca1ab9bbfebc 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -50,6 +50,7 @@ import android.content.Context; import android.content.pm.ActivityPresentationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ParceledListSlice; import android.content.pm.UserInfo; import android.database.ContentObserver; import android.os.Binder; @@ -69,6 +70,7 @@ import android.provider.DeviceConfig; import android.provider.DeviceConfig.Properties; import android.provider.Settings; import android.service.contentcapture.ActivityEvent.ActivityEventType; +import android.service.contentcapture.ContentCaptureServiceInfo; import android.service.contentcapture.IDataShareCallback; import android.service.contentcapture.IDataShareReadAdapter; import android.service.voice.VoiceInteractionManagerInternal; @@ -79,6 +81,7 @@ import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; import android.view.contentcapture.ContentCaptureCondition; +import android.view.contentcapture.ContentCaptureEvent; import android.view.contentcapture.ContentCaptureHelper; import android.view.contentcapture.ContentCaptureManager; import android.view.contentcapture.DataRemovalRequest; @@ -88,11 +91,15 @@ import android.view.contentcapture.IContentCaptureOptionsCallback; import android.view.contentcapture.IDataShareWriteAdapter; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.infra.AbstractRemoteService; import com.android.internal.infra.GlobalWhitelistState; import com.android.internal.os.IResultReceiver; import com.android.internal.util.DumpUtils; import com.android.server.LocalServices; +import com.android.server.contentprotection.ContentProtectionBlocklistManager; +import com.android.server.contentprotection.ContentProtectionPackageManager; +import com.android.server.contentprotection.RemoteContentProtectionService; import com.android.server.infra.AbstractMasterSystemService; import com.android.server.infra.FrameworkResourcesServiceNameResolver; @@ -117,7 +124,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * with other sources to provide contextual data in other areas of the system * such as Autofill. */ -public final class ContentCaptureManagerService extends +public class ContentCaptureManagerService extends AbstractMasterSystemService<ContentCaptureManagerService, ContentCapturePerUserService> { private static final String TAG = ContentCaptureManagerService.class.getSimpleName(); @@ -163,13 +170,35 @@ public final class ContentCaptureManagerService extends private boolean mDisabledByDeviceConfig; // Device-config settings that are cached and passed back to apps - @GuardedBy("mLock") int mDevCfgLoggingLevel; - @GuardedBy("mLock") int mDevCfgMaxBufferSize; - @GuardedBy("mLock") int mDevCfgIdleFlushingFrequencyMs; - @GuardedBy("mLock") int mDevCfgTextChangeFlushingFrequencyMs; - @GuardedBy("mLock") int mDevCfgLogHistorySize; - @GuardedBy("mLock") int mDevCfgIdleUnbindTimeoutMs; - @GuardedBy("mLock") boolean mDevCfgDisableFlushForViewTreeAppearing; + @GuardedBy("mLock") + int mDevCfgLoggingLevel; + + @GuardedBy("mLock") + int mDevCfgMaxBufferSize; + + @GuardedBy("mLock") + int mDevCfgIdleFlushingFrequencyMs; + + @GuardedBy("mLock") + int mDevCfgTextChangeFlushingFrequencyMs; + + @GuardedBy("mLock") + int mDevCfgLogHistorySize; + + @GuardedBy("mLock") + int mDevCfgIdleUnbindTimeoutMs; + + @GuardedBy("mLock") + boolean mDevCfgDisableFlushForViewTreeAppearing; + + @GuardedBy("mLock") + boolean mDevCfgEnableContentProtectionReceiver; + + @GuardedBy("mLock") + int mDevCfgContentProtectionAppsBlocklistSize; + + @GuardedBy("mLock") + int mDevCfgContentProtectionBufferSize; private final Executor mDataShareExecutor = Executors.newCachedThreadPool(); private final Handler mHandler = new Handler(Looper.getMainLooper()); @@ -183,6 +212,10 @@ public final class ContentCaptureManagerService extends final GlobalContentCaptureOptions mGlobalContentCaptureOptions = new GlobalContentCaptureOptions(); + @Nullable private final ComponentName mContentProtectionServiceComponentName; + + @Nullable private final ContentProtectionBlocklistManager mContentProtectionBlocklistManager; + public ContentCaptureManagerService(@NonNull Context context) { super(context, new FrameworkResourcesServiceNameResolver(context, com.android.internal.R.string.config_defaultContentCaptureService), @@ -220,6 +253,20 @@ public final class ContentCaptureManagerService extends mServiceNameResolver.getServiceName(userId), mServiceNameResolver.isTemporary(userId)); } + + if (getEnableContentProtectionReceiverLocked()) { + mContentProtectionServiceComponentName = getContentProtectionServiceComponentName(); + if (mContentProtectionServiceComponentName != null) { + mContentProtectionBlocklistManager = createContentProtectionBlocklistManager(); + mContentProtectionBlocklistManager.updateBlocklist( + mDevCfgContentProtectionAppsBlocklistSize); + } else { + mContentProtectionBlocklistManager = null; + } + } else { + mContentProtectionServiceComponentName = null; + mContentProtectionBlocklistManager = null; + } } @Override // from AbstractMasterSystemService @@ -362,6 +409,11 @@ public final class ContentCaptureManagerService extends case ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_UNBIND_TIMEOUT: case ContentCaptureManager .DEVICE_CONFIG_PROPERTY_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING: + case ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_ENABLE_CONTENT_PROTECTION_RECEIVER: + case ContentCaptureManager.DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_BUFFER_SIZE: + case ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_APPS_BLOCKLIST_SIZE: setFineTuneParamsFromDeviceConfig(); return; default: @@ -370,41 +422,84 @@ public final class ContentCaptureManagerService extends } } - private void setFineTuneParamsFromDeviceConfig() { + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + protected void setFineTuneParamsFromDeviceConfig() { synchronized (mLock) { - mDevCfgMaxBufferSize = DeviceConfig.getInt( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager.DEVICE_CONFIG_PROPERTY_MAX_BUFFER_SIZE, - ContentCaptureManager.DEFAULT_MAX_BUFFER_SIZE); - mDevCfgIdleFlushingFrequencyMs = DeviceConfig.getInt( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_FLUSH_FREQUENCY, - ContentCaptureManager.DEFAULT_IDLE_FLUSHING_FREQUENCY_MS); - mDevCfgTextChangeFlushingFrequencyMs = DeviceConfig.getInt( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager.DEVICE_CONFIG_PROPERTY_TEXT_CHANGE_FLUSH_FREQUENCY, - ContentCaptureManager.DEFAULT_TEXT_CHANGE_FLUSHING_FREQUENCY_MS); - mDevCfgLogHistorySize = DeviceConfig.getInt( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager.DEVICE_CONFIG_PROPERTY_LOG_HISTORY_SIZE, 20); - mDevCfgIdleUnbindTimeoutMs = DeviceConfig.getInt( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_UNBIND_TIMEOUT, - (int) AbstractRemoteService.PERMANENT_BOUND_TIMEOUT_MS); - mDevCfgDisableFlushForViewTreeAppearing = DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_CONTENT_CAPTURE, - ContentCaptureManager - .DEVICE_CONFIG_PROPERTY_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING, - false); + mDevCfgMaxBufferSize = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager.DEVICE_CONFIG_PROPERTY_MAX_BUFFER_SIZE, + ContentCaptureManager.DEFAULT_MAX_BUFFER_SIZE); + mDevCfgIdleFlushingFrequencyMs = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_FLUSH_FREQUENCY, + ContentCaptureManager.DEFAULT_IDLE_FLUSHING_FREQUENCY_MS); + mDevCfgTextChangeFlushingFrequencyMs = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_TEXT_CHANGE_FLUSH_FREQUENCY, + ContentCaptureManager.DEFAULT_TEXT_CHANGE_FLUSHING_FREQUENCY_MS); + mDevCfgLogHistorySize = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager.DEVICE_CONFIG_PROPERTY_LOG_HISTORY_SIZE, + 20); + mDevCfgIdleUnbindTimeoutMs = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_UNBIND_TIMEOUT, + (int) AbstractRemoteService.PERMANENT_BOUND_TIMEOUT_MS); + mDevCfgDisableFlushForViewTreeAppearing = + DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_DISABLE_FLUSH_FOR_VIEW_TREE_APPEARING, + false); + mDevCfgEnableContentProtectionReceiver = + DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_ENABLE_CONTENT_PROTECTION_RECEIVER, + ContentCaptureManager.DEFAULT_ENABLE_CONTENT_PROTECTION_RECEIVER); + mDevCfgContentProtectionAppsBlocklistSize = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_APPS_BLOCKLIST_SIZE, + ContentCaptureManager.DEFAULT_CONTENT_PROTECTION_APPS_BLOCKLIST_SIZE); + // mContentProtectionBlocklistManager.updateBlocklist not called on purpose here to keep + // it immutable at this point + mDevCfgContentProtectionBufferSize = + DeviceConfig.getInt( + DeviceConfig.NAMESPACE_CONTENT_CAPTURE, + ContentCaptureManager + .DEVICE_CONFIG_PROPERTY_CONTENT_PROTECTION_BUFFER_SIZE, + ContentCaptureManager.DEFAULT_CONTENT_PROTECTION_BUFFER_SIZE); if (verbose) { - Slog.v(TAG, "setFineTuneParamsFromDeviceConfig(): " - + "bufferSize=" + mDevCfgMaxBufferSize - + ", idleFlush=" + mDevCfgIdleFlushingFrequencyMs - + ", textFluxh=" + mDevCfgTextChangeFlushingFrequencyMs - + ", logHistory=" + mDevCfgLogHistorySize - + ", idleUnbindTimeoutMs=" + mDevCfgIdleUnbindTimeoutMs - + ", disableFlushForViewTreeAppearing=" - + mDevCfgDisableFlushForViewTreeAppearing); + Slog.v( + TAG, + "setFineTuneParamsFromDeviceConfig(): " + + "bufferSize=" + + mDevCfgMaxBufferSize + + ", idleFlush=" + + mDevCfgIdleFlushingFrequencyMs + + ", textFluxh=" + + mDevCfgTextChangeFlushingFrequencyMs + + ", logHistory=" + + mDevCfgLogHistorySize + + ", idleUnbindTimeoutMs=" + + mDevCfgIdleUnbindTimeoutMs + + ", disableFlushForViewTreeAppearing=" + + mDevCfgDisableFlushForViewTreeAppearing + + ", enableContentProtectionReceiver=" + + mDevCfgEnableContentProtectionReceiver + + ", contentProtectionAppsBlocklistSize=" + + mDevCfgContentProtectionAppsBlocklistSize + + ", contentProtectionBufferSize=" + + mDevCfgContentProtectionBufferSize); } } } @@ -645,24 +740,137 @@ public final class ContentCaptureManagerService extends final String prefix2 = prefix + " "; - pw.print(prefix); pw.print("Users disabled by Settings: "); pw.println(mDisabledBySettings); - pw.print(prefix); pw.println("DeviceConfig Settings: "); - pw.print(prefix2); pw.print("disabled: "); pw.println(mDisabledByDeviceConfig); - pw.print(prefix2); pw.print("loggingLevel: "); pw.println(mDevCfgLoggingLevel); - pw.print(prefix2); pw.print("maxBufferSize: "); pw.println(mDevCfgMaxBufferSize); - pw.print(prefix2); pw.print("idleFlushingFrequencyMs: "); + pw.print(prefix); + pw.print("Users disabled by Settings: "); + pw.println(mDisabledBySettings); + pw.print(prefix); + pw.println("DeviceConfig Settings: "); + pw.print(prefix2); + pw.print("disabled: "); + pw.println(mDisabledByDeviceConfig); + pw.print(prefix2); + pw.print("loggingLevel: "); + pw.println(mDevCfgLoggingLevel); + pw.print(prefix2); + pw.print("maxBufferSize: "); + pw.println(mDevCfgMaxBufferSize); + pw.print(prefix2); + pw.print("idleFlushingFrequencyMs: "); pw.println(mDevCfgIdleFlushingFrequencyMs); - pw.print(prefix2); pw.print("textChangeFlushingFrequencyMs: "); + pw.print(prefix2); + pw.print("textChangeFlushingFrequencyMs: "); pw.println(mDevCfgTextChangeFlushingFrequencyMs); - pw.print(prefix2); pw.print("logHistorySize: "); pw.println(mDevCfgLogHistorySize); - pw.print(prefix2); pw.print("idleUnbindTimeoutMs: "); + pw.print(prefix2); + pw.print("logHistorySize: "); + pw.println(mDevCfgLogHistorySize); + pw.print(prefix2); + pw.print("idleUnbindTimeoutMs: "); pw.println(mDevCfgIdleUnbindTimeoutMs); - pw.print(prefix2); pw.print("disableFlushForViewTreeAppearing: "); + pw.print(prefix2); + pw.print("disableFlushForViewTreeAppearing: "); pw.println(mDevCfgDisableFlushForViewTreeAppearing); - pw.print(prefix); pw.println("Global Options:"); + pw.print(prefix2); + pw.print("enableContentProtectionReceiver: "); + pw.println(mDevCfgEnableContentProtectionReceiver); + pw.print(prefix2); + pw.print("contentProtectionAppsBlocklistSize: "); + pw.println(mDevCfgContentProtectionAppsBlocklistSize); + pw.print(prefix2); + pw.print("contentProtectionBufferSize: "); + pw.println(mDevCfgContentProtectionBufferSize); + pw.print(prefix); + pw.println("Global Options:"); mGlobalContentCaptureOptions.dump(prefix2, pw); } + /** + * Used by the constructor in order to be able to override the value in the tests. + * + * @hide + */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @GuardedBy("mLock") + protected boolean getEnableContentProtectionReceiverLocked() { + return mDevCfgEnableContentProtectionReceiver; + } + + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @NonNull + protected ContentProtectionBlocklistManager createContentProtectionBlocklistManager() { + return new ContentProtectionBlocklistManager( + new ContentProtectionPackageManager(getContext())); + } + + @Nullable + private ComponentName getContentProtectionServiceComponentName() { + String flatComponentName = getContentProtectionServiceFlatComponentName(); + return ComponentName.unflattenFromString(flatComponentName); + } + + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @Nullable + protected String getContentProtectionServiceFlatComponentName() { + return getContext() + .getString(com.android.internal.R.string.config_defaultContentProtectionService); + } + + /** + * Can also throw runtime exceptions such as {@link SecurityException}. + * + * @hide + */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @NonNull + protected ContentCaptureServiceInfo createContentProtectionServiceInfo( + @NonNull ComponentName componentName) throws PackageManager.NameNotFoundException { + return new ContentCaptureServiceInfo( + getContext(), componentName, /* isTemp= */ false, UserHandle.getCallingUserId()); + } + + @Nullable + private RemoteContentProtectionService createRemoteContentProtectionService() { + if (mContentProtectionServiceComponentName == null) { + // This case should not be possible but make sure + return null; + } + synchronized (mLock) { + if (!mDevCfgEnableContentProtectionReceiver) { + return null; + } + } + + // Check permissions by trying to construct {@link ContentCaptureServiceInfo} + try { + createContentProtectionServiceInfo(mContentProtectionServiceComponentName); + } catch (Exception ex) { + // Swallow, exception was already logged + return null; + } + + return createRemoteContentProtectionService(mContentProtectionServiceComponentName); + } + + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @NonNull + protected RemoteContentProtectionService createRemoteContentProtectionService( + @NonNull ComponentName componentName) { + return new RemoteContentProtectionService( + getContext(), + componentName, + UserHandle.getCallingUserId(), + isBindInstantServiceAllowed()); + } + + /** @hide */ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) + @NonNull + protected ContentCaptureManagerServiceStub getContentCaptureManagerServiceStub() { + return mContentCaptureManagerServiceStub; + } + final class ContentCaptureManagerServiceStub extends IContentCaptureManager.Stub { @Override @@ -896,6 +1104,19 @@ public final class ContentCaptureManagerService extends public void setDefaultServiceEnabled(@UserIdInt int userId, boolean enabled) { ContentCaptureManagerService.this.setDefaultServiceEnabled(userId, enabled); } + + @Override + public void onLoginDetected(@NonNull ParceledListSlice<ContentCaptureEvent> events) { + RemoteContentProtectionService service = createRemoteContentProtectionService(); + if (service == null) { + return; + } + try { + service.onLoginDetected(events); + } catch (Exception ex) { + Slog.e(TAG, "Failed to call remote service", ex); + } + } } private final class LocalService extends ContentCaptureManagerInternal { @@ -984,14 +1205,21 @@ public final class ContentCaptureManagerService extends @GuardedBy("mGlobalWhitelistStateLock") public ContentCaptureOptions getOptions(@UserIdInt int userId, @NonNull String packageName) { - boolean packageWhitelisted; + boolean isContentCaptureReceiverEnabled; + boolean isContentProtectionReceiverEnabled; ArraySet<ComponentName> whitelistedComponents = null; + synchronized (mGlobalWhitelistStateLock) { - packageWhitelisted = isWhitelisted(userId, packageName); - if (!packageWhitelisted) { - // Full package is not allowlisted: check individual components first + isContentCaptureReceiverEnabled = + isContentCaptureReceiverEnabled(userId, packageName); + isContentProtectionReceiverEnabled = + isContentProtectionReceiverEnabled(packageName); + + if (!isContentCaptureReceiverEnabled) { + // Full package is not allowlisted: check individual components next whitelistedComponents = getWhitelistedComponents(userId, packageName); - if (whitelistedComponents == null + if (!isContentProtectionReceiverEnabled + && whitelistedComponents == null && packageName.equals(mServicePackages.get(userId))) { // No components allowlisted either, but let it go because it's the // service's own package @@ -1010,7 +1238,9 @@ public final class ContentCaptureManagerService extends } } - if (!packageWhitelisted && whitelistedComponents == null) { + if (!isContentCaptureReceiverEnabled + && !isContentProtectionReceiverEnabled + && whitelistedComponents == null) { // No can do! if (verbose) { Slog.v(TAG, "getOptionsForPackage(" + packageName + "): not whitelisted"); @@ -1019,11 +1249,19 @@ public final class ContentCaptureManagerService extends } synchronized (mLock) { - final ContentCaptureOptions options = new ContentCaptureOptions(mDevCfgLoggingLevel, - mDevCfgMaxBufferSize, mDevCfgIdleFlushingFrequencyMs, - mDevCfgTextChangeFlushingFrequencyMs, mDevCfgLogHistorySize, - mDevCfgDisableFlushForViewTreeAppearing, - whitelistedComponents); + final ContentCaptureOptions options = + new ContentCaptureOptions( + mDevCfgLoggingLevel, + mDevCfgMaxBufferSize, + mDevCfgIdleFlushingFrequencyMs, + mDevCfgTextChangeFlushingFrequencyMs, + mDevCfgLogHistorySize, + mDevCfgDisableFlushForViewTreeAppearing, + isContentCaptureReceiverEnabled || whitelistedComponents != null, + new ContentCaptureOptions.ContentProtectionOptions( + isContentProtectionReceiverEnabled, + mDevCfgContentProtectionBufferSize), + whitelistedComponents); if (verbose) Slog.v(TAG, "getOptionsForPackage(" + packageName + "): " + options); return options; } @@ -1042,6 +1280,36 @@ public final class ContentCaptureManagerService extends } } } + + @Override // from GlobalWhitelistState + public boolean isWhitelisted(@UserIdInt int userId, @NonNull String packageName) { + return isContentCaptureReceiverEnabled(userId, packageName) + || isContentProtectionReceiverEnabled(packageName); + } + + @Override // from GlobalWhitelistState + public boolean isWhitelisted(@UserIdInt int userId, @NonNull ComponentName componentName) { + return super.isWhitelisted(userId, componentName) + || isContentProtectionReceiverEnabled(componentName.getPackageName()); + } + + private boolean isContentCaptureReceiverEnabled( + @UserIdInt int userId, @NonNull String packageName) { + return super.isWhitelisted(userId, packageName); + } + + private boolean isContentProtectionReceiverEnabled(@NonNull String packageName) { + if (mContentProtectionServiceComponentName == null + || mContentProtectionBlocklistManager == null) { + return false; + } + synchronized (mLock) { + if (!mDevCfgEnableContentProtectionReceiver) { + return false; + } + } + return mContentProtectionBlocklistManager.isAllowed(packageName); + } } private static class DataShareCallbackDelegate extends IDataShareCallback.Stub { diff --git a/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionBlocklistManager.java b/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionBlocklistManager.java new file mode 100644 index 000000000000..a0fd28b3f279 --- /dev/null +++ b/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionBlocklistManager.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.pm.PackageInfo; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Manages whether the content protection is enabled for an app using a blocklist. + * + * @hide + */ +public class ContentProtectionBlocklistManager { + + private static final String TAG = "ContentProtectionBlocklistManager"; + + private static final String PACKAGE_NAME_BLOCKLIST_FILENAME = + "/product/etc/res/raw/content_protection/package_name_blocklist.txt"; + + @NonNull private final ContentProtectionPackageManager mContentProtectionPackageManager; + + @Nullable private Set<String> mPackageNameBlocklist; + + public ContentProtectionBlocklistManager( + @NonNull ContentProtectionPackageManager contentProtectionPackageManager) { + mContentProtectionPackageManager = contentProtectionPackageManager; + } + + public boolean isAllowed(@NonNull String packageName) { + if (mPackageNameBlocklist == null) { + // List not loaded or failed to load, don't run on anything + return false; + } + if (mPackageNameBlocklist.contains(packageName)) { + return false; + } + PackageInfo packageInfo = mContentProtectionPackageManager.getPackageInfo(packageName); + if (packageInfo == null) { + return false; + } + if (!mContentProtectionPackageManager.hasRequestedInternetPermissions(packageInfo)) { + return false; + } + if (mContentProtectionPackageManager.isSystemApp(packageInfo)) { + return false; + } + if (mContentProtectionPackageManager.isUpdatedSystemApp(packageInfo)) { + return false; + } + return true; + } + + public void updateBlocklist(int blocklistSize) { + Slog.i(TAG, "Blocklist size updating to: " + blocklistSize); + mPackageNameBlocklist = readPackageNameBlocklist(blocklistSize); + } + + @Nullable + private Set<String> readPackageNameBlocklist(int blocklistSize) { + if (blocklistSize <= 0) { + // Explicitly requested an empty blocklist + return Collections.emptySet(); + } + List<String> lines = readLinesFromRawFile(PACKAGE_NAME_BLOCKLIST_FILENAME); + if (lines == null) { + return null; + } + return lines.stream().limit(blocklistSize).collect(Collectors.toSet()); + } + + @VisibleForTesting + @Nullable + protected List<String> readLinesFromRawFile(@NonNull String filename) { + try (FileReader fileReader = new FileReader(filename); + BufferedReader bufferedReader = new BufferedReader(fileReader)) { + return bufferedReader + .lines() + .map(line -> line.trim()) + .filter(line -> !line.isBlank()) + .collect(Collectors.toList()); + } catch (Exception ex) { + Slog.e(TAG, "Failed to read: " + filename, ex); + return null; + } + } +} diff --git a/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionPackageManager.java b/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionPackageManager.java new file mode 100644 index 000000000000..4ebac07ec3ea --- /dev/null +++ b/services/contentcapture/java/com/android/server/contentprotection/ContentProtectionPackageManager.java @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import android.Manifest; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManager.PackageInfoFlags; +import android.util.Slog; + +import java.util.Arrays; + +/** + * Basic package manager for content protection using content capture. + * + * @hide + */ +public class ContentProtectionPackageManager { + + private static final String TAG = "ContentProtectionPackageManager"; + + private static final PackageInfoFlags PACKAGE_INFO_FLAGS = + PackageInfoFlags.of(PackageManager.GET_PERMISSIONS); + + @NonNull private final PackageManager mPackageManager; + + public ContentProtectionPackageManager(@NonNull Context context) { + mPackageManager = context.getPackageManager(); + } + + @Nullable + public PackageInfo getPackageInfo(@NonNull String packageName) { + try { + return mPackageManager.getPackageInfo(packageName, PACKAGE_INFO_FLAGS); + } catch (NameNotFoundException ex) { + Slog.w(TAG, "Package info not found for: " + packageName, ex); + return null; + } + } + + public boolean isSystemApp(@NonNull PackageInfo packageInfo) { + return packageInfo.applicationInfo != null && isSystemApp(packageInfo.applicationInfo); + } + + private boolean isSystemApp(@NonNull ApplicationInfo applicationInfo) { + return (applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; + } + + public boolean isUpdatedSystemApp(@NonNull PackageInfo packageInfo) { + return packageInfo.applicationInfo != null + && isUpdatedSystemApp(packageInfo.applicationInfo); + } + + private boolean isUpdatedSystemApp(@NonNull ApplicationInfo applicationInfo) { + return (applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0; + } + + public boolean hasRequestedInternetPermissions(@NonNull PackageInfo packageInfo) { + return packageInfo.requestedPermissions != null + && Arrays.asList(packageInfo.requestedPermissions) + .contains(Manifest.permission.INTERNET); + } +} diff --git a/services/contentcapture/java/com/android/server/contentprotection/RemoteContentProtectionService.java b/services/contentcapture/java/com/android/server/contentprotection/RemoteContentProtectionService.java new file mode 100644 index 000000000000..dd5545dcccc7 --- /dev/null +++ b/services/contentcapture/java/com/android/server/contentprotection/RemoteContentProtectionService.java @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import android.annotation.NonNull; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ParceledListSlice; +import android.service.contentcapture.ContentCaptureService; +import android.service.contentcapture.IContentProtectionService; +import android.util.Slog; +import android.view.contentcapture.ContentCaptureEvent; + +import com.android.internal.infra.ServiceConnector; + +import java.time.Duration; + +/** + * Connector for the remote content protection service. + * + * @hide + */ +public class RemoteContentProtectionService + extends ServiceConnector.Impl<IContentProtectionService> { + + private static final String TAG = RemoteContentProtectionService.class.getSimpleName(); + + private static final Duration AUTO_DISCONNECT_TIMEOUT = Duration.ofSeconds(3); + + @NonNull private final ComponentName mComponentName; + + public RemoteContentProtectionService( + @NonNull Context context, + @NonNull ComponentName componentName, + int userId, + boolean bindAllowInstant) { + super( + context, + new Intent(ContentCaptureService.PROTECTION_SERVICE_INTERFACE) + .setComponent(componentName), + bindAllowInstant ? Context.BIND_ALLOW_INSTANT : 0, + userId, + IContentProtectionService.Stub::asInterface); + mComponentName = componentName; + } + + @Override // from ServiceConnector.Impl + protected long getAutoDisconnectTimeoutMs() { + return AUTO_DISCONNECT_TIMEOUT.toMillis(); + } + + @Override // from ServiceConnector.Impl + protected void onServiceConnectionStatusChanged( + @NonNull IContentProtectionService service, boolean isConnected) { + Slog.i( + TAG, + "Connection status for: " + + mComponentName + + " changed to: " + + (isConnected ? "connected" : "disconnected")); + } + + public void onLoginDetected(@NonNull ParceledListSlice<ContentCaptureEvent> events) { + run(service -> service.onLoginDetected(events)); + } +} diff --git a/services/core/java/com/android/server/WallpaperUpdateReceiver.java b/services/core/java/com/android/server/WallpaperUpdateReceiver.java index 99178920cc52..2812233815a6 100644 --- a/services/core/java/com/android/server/WallpaperUpdateReceiver.java +++ b/services/core/java/com/android/server/WallpaperUpdateReceiver.java @@ -88,7 +88,7 @@ public class WallpaperUpdateReceiver extends BroadcastReceiver { } else { //live wallpaper ComponentName currCN = info.getComponent(); - ComponentName defaultCN = WallpaperManager.getDefaultWallpaperComponent(context); + ComponentName defaultCN = WallpaperManager.getCmfDefaultWallpaperComponent(context); if (!currCN.equals(defaultCN)) { return true; } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b99e619e19fa..7e70c6d17ba2 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19563,7 +19563,7 @@ public class ActivityManagerService extends IActivityManager.Stub for (Display display : allDisplays) { int displayId = display.getDisplayId(); // TODO(b/247592632): check other properties like isSecure or proper display type - if (display.isValid() + if (display.isValid() && ((display.getFlags() & Display.FLAG_PRIVATE) == 0) && (allowOnDefaultDisplay || displayId != Display.DEFAULT_DISPLAY)) { displayIds[numberValidDisplays++] = displayId; } diff --git a/services/core/java/com/android/server/cpu/CpuInfoReader.java b/services/core/java/com/android/server/cpu/CpuInfoReader.java index 70d7bde2e53a..984ad1dd7288 100644 --- a/services/core/java/com/android/server/cpu/CpuInfoReader.java +++ b/services/core/java/com/android/server/cpu/CpuInfoReader.java @@ -203,15 +203,15 @@ public final class CpuInfoReader { continue; } if (dynamicPolicyInfo.curCpuFreqKHz == CpuInfo.MISSING_FREQUENCY - || staticPolicyInfo.maxCpuFreqKHz == CpuInfo.MISSING_FREQUENCY) { + || dynamicPolicyInfo.maxCpuFreqKHz == CpuInfo.MISSING_FREQUENCY) { Slogf.w(TAG, "Current and maximum CPU frequency information mismatch/missing for" + " policy ID %d", policyId); continue; } - if (dynamicPolicyInfo.curCpuFreqKHz > staticPolicyInfo.maxCpuFreqKHz) { + if (dynamicPolicyInfo.curCpuFreqKHz > dynamicPolicyInfo.maxCpuFreqKHz) { Slogf.w(TAG, "Current CPU frequency (%d) is greater than maximum CPU frequency" + " (%d) for policy ID (%d). Skipping CPU frequency policy", - dynamicPolicyInfo.curCpuFreqKHz, staticPolicyInfo.maxCpuFreqKHz, policyId); + dynamicPolicyInfo.curCpuFreqKHz, dynamicPolicyInfo.maxCpuFreqKHz, policyId); continue; } for (int coreIdx = 0; coreIdx < staticPolicyInfo.relatedCpuCores.size(); coreIdx++) { @@ -234,7 +234,8 @@ public final class CpuInfoReader { if (dynamicPolicyInfo.affectedCpuCores.indexOf(relatedCpuCore) < 0) { cpuInfoByCpus.append(relatedCpuCore, new CpuInfo(relatedCpuCore, cpusetCategories, /* isOnline= */false, CpuInfo.MISSING_FREQUENCY, - staticPolicyInfo.maxCpuFreqKHz, CpuInfo.MISSING_FREQUENCY, usageStats)); + dynamicPolicyInfo.maxCpuFreqKHz, CpuInfo.MISSING_FREQUENCY, + usageStats)); continue; } // If a CPU core is online, it must have the usage stats. When the usage stats is @@ -245,7 +246,7 @@ public final class CpuInfoReader { continue; } CpuInfo cpuInfo = new CpuInfo(relatedCpuCore, cpusetCategories, /* isOnline= */true, - dynamicPolicyInfo.curCpuFreqKHz, staticPolicyInfo.maxCpuFreqKHz, + dynamicPolicyInfo.curCpuFreqKHz, dynamicPolicyInfo.maxCpuFreqKHz, dynamicPolicyInfo.avgTimeInStateCpuFreqKHz, usageStats); cpuInfoByCpus.append(relatedCpuCore, cpuInfo); if (DEBUG) { @@ -423,12 +424,6 @@ public final class CpuInfoReader { for (int i = 0; i < mCpuFreqPolicyDirsById.size(); i++) { int policyId = mCpuFreqPolicyDirsById.keyAt(i); File policyDir = mCpuFreqPolicyDirsById.valueAt(i); - long maxCpuFreqKHz = readCpuFreqKHz(new File(policyDir, MAX_SCALING_FREQ_FILE)); - if (maxCpuFreqKHz == CpuInfo.MISSING_FREQUENCY) { - Slogf.w(TAG, "Missing max CPU frequency information at %s", - policyDir.getAbsolutePath()); - continue; - } File cpuCoresFile = new File(policyDir, RELATED_CPUS_FILE); IntArray relatedCpuCores = readCpuCores(cpuCoresFile); if (relatedCpuCores == null || relatedCpuCores.size() == 0) { @@ -436,8 +431,7 @@ public final class CpuInfoReader { cpuCoresFile.getAbsolutePath()); continue; } - StaticPolicyInfo staticPolicyInfo = new StaticPolicyInfo(maxCpuFreqKHz, - relatedCpuCores); + StaticPolicyInfo staticPolicyInfo = new StaticPolicyInfo(relatedCpuCores); mStaticPolicyInfoById.append(policyId, staticPolicyInfo); if (DEBUG) { Slogf.d(TAG, "Added static policy info %s for policy id %d", staticPolicyInfo, @@ -464,8 +458,14 @@ public final class CpuInfoReader { Slogf.e(TAG, "Failed to read CPU cores from %s", cpuCoresFile.getAbsolutePath()); continue; } + long maxCpuFreqKHz = readCpuFreqKHz(new File(policyDir, MAX_SCALING_FREQ_FILE)); + if (maxCpuFreqKHz == CpuInfo.MISSING_FREQUENCY) { + Slogf.w(TAG, "Missing max CPU frequency information at %s", + policyDir.getAbsolutePath()); + continue; + } DynamicPolicyInfo dynamicPolicyInfo = new DynamicPolicyInfo(curCpuFreqKHz, - avgTimeInStateCpuFreqKHz, affectedCpuCores); + maxCpuFreqKHz, avgTimeInStateCpuFreqKHz, affectedCpuCores); dynamicPolicyInfoById.append(policyId, dynamicPolicyInfo); if (DEBUG) { Slogf.d(TAG, "Read dynamic policy info %s for policy id %d", dynamicPolicyInfo, @@ -593,9 +593,12 @@ public final class CpuInfoReader { List<String> lines = Files.readAllLines(file.toPath()); IntArray cpuCores = new IntArray(0); for (int i = 0; i < lines.size(); i++) { - String line = lines.get(i); - String[] pairs = line.contains(",") ? line.trim().split(",") - : line.trim().split(" "); + String line = lines.get(i).trim(); + if (line.isEmpty()) { + continue; + } + String[] pairs = line.contains(",") ? line.split(",") + : line.split(" "); for (int j = 0; j < pairs.length; j++) { String[] minMaxPairs = pairs[j].split("-"); if (minMaxPairs.length >= 2) { @@ -615,6 +618,9 @@ public final class CpuInfoReader { } } return cpuCores; + } catch (NumberFormatException e) { + Slogf.e(TAG, e, "Failed to read CPU cores from %s due to incorrect file format", + file.getAbsolutePath()); } catch (Exception e) { Slogf.e(TAG, e, "Failed to read CPU cores from %s", file.getAbsolutePath()); } @@ -889,29 +895,28 @@ public final class CpuInfoReader { } private static final class StaticPolicyInfo { - public final long maxCpuFreqKHz; public final IntArray relatedCpuCores; - StaticPolicyInfo(long maxCpuFreqKHz, IntArray relatedCpuCores) { - this.maxCpuFreqKHz = maxCpuFreqKHz; + StaticPolicyInfo(IntArray relatedCpuCores) { this.relatedCpuCores = relatedCpuCores; } @Override public String toString() { - return "StaticPolicyInfo{maxCpuFreqKHz = " + maxCpuFreqKHz + ", relatedCpuCores = " - + relatedCpuCores + '}'; + return "StaticPolicyInfo{relatedCpuCores = " + relatedCpuCores + '}'; } } private static final class DynamicPolicyInfo { public final long curCpuFreqKHz; + public final long maxCpuFreqKHz; public final long avgTimeInStateCpuFreqKHz; public final IntArray affectedCpuCores; - DynamicPolicyInfo(long curCpuFreqKHz, long avgTimeInStateCpuFreqKHz, + DynamicPolicyInfo(long curCpuFreqKHz, long maxCpuFreqKHz, long avgTimeInStateCpuFreqKHz, IntArray affectedCpuCores) { this.curCpuFreqKHz = curCpuFreqKHz; + this.maxCpuFreqKHz = maxCpuFreqKHz; this.avgTimeInStateCpuFreqKHz = avgTimeInStateCpuFreqKHz; this.affectedCpuCores = affectedCpuCores; } @@ -919,6 +924,7 @@ public final class CpuInfoReader { @Override public String toString() { return "DynamicPolicyInfo{curCpuFreqKHz = " + curCpuFreqKHz + + ", maxCpuFreqKHz = " + maxCpuFreqKHz + ", avgTimeInStateCpuFreqKHz = " + avgTimeInStateCpuFreqKHz + ", affectedCpuCores = " + affectedCpuCores + '}'; } diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 75709fbb365a..d647757442e0 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -223,11 +223,11 @@ public class AutomaticBrightnessController { private final ShortTermModel mShortTermModel; private final ShortTermModel mPausedShortTermModel; - // Controls High Brightness Mode. - private HighBrightnessModeController mHbmController; + // Controls Brightness range (including High Brightness Mode). + private final BrightnessRangeController mBrightnessRangeController; // Throttles (caps) maximum allowed brightness - private BrightnessThrottler mBrightnessThrottler; + private final BrightnessThrottler mBrightnessThrottler; private boolean mIsBrightnessThrottled; // Context-sensitive brightness configurations require keeping track of the foreground app's @@ -257,7 +257,8 @@ public class AutomaticBrightnessController { HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, + BrightnessRangeController brightnessModeController, + BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, float userBrightness) { this(new Injector(), callbacks, looper, sensorManager, lightSensor, @@ -267,7 +268,7 @@ public class AutomaticBrightnessController { darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds, screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, context, - hbmController, brightnessThrottler, idleModeBrightnessMapper, + brightnessModeController, brightnessThrottler, idleModeBrightnessMapper, ambientLightHorizonShort, ambientLightHorizonLong, userLux, userBrightness ); } @@ -283,7 +284,8 @@ public class AutomaticBrightnessController { HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, + BrightnessRangeController brightnessModeController, + BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, float userBrightness) { mInjector = injector; @@ -326,7 +328,7 @@ public class AutomaticBrightnessController { mPendingForegroundAppPackageName = null; mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - mHbmController = hbmController; + mBrightnessRangeController = brightnessModeController; mBrightnessThrottler = brightnessThrottler; mInteractiveModeBrightnessMapper = interactiveModeBrightnessMapper; mIdleModeBrightnessMapper = idleModeBrightnessMapper; @@ -607,10 +609,11 @@ public class AutomaticBrightnessController { pw.println(); pw.println(" mInteractiveMapper="); - mInteractiveModeBrightnessMapper.dump(pw, mHbmController.getNormalBrightnessMax()); + mInteractiveModeBrightnessMapper.dump(pw, + mBrightnessRangeController.getNormalBrightnessMax()); if (mIdleModeBrightnessMapper != null) { pw.println(" mIdleMapper="); - mIdleModeBrightnessMapper.dump(pw, mHbmController.getNormalBrightnessMax()); + mIdleModeBrightnessMapper.dump(pw, mBrightnessRangeController.getNormalBrightnessMax()); } pw.println(); @@ -736,7 +739,7 @@ public class AutomaticBrightnessController { mAmbientDarkeningThreshold = mAmbientBrightnessThresholds.getDarkeningThreshold(lux); } - mHbmController.onAmbientLuxChange(mAmbientLux); + mBrightnessRangeController.onAmbientLuxChange(mAmbientLux); // If the short term model was invalidated and the change is drastic enough, reset it. @@ -976,9 +979,9 @@ public class AutomaticBrightnessController { // Clamps values with float range [0.0-1.0] private float clampScreenBrightness(float value) { - final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(), + final float minBrightness = Math.min(mBrightnessRangeController.getCurrentBrightnessMin(), mBrightnessThrottler.getBrightnessCap()); - final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(), + final float maxBrightness = Math.min(mBrightnessRangeController.getCurrentBrightnessMax(), mBrightnessThrottler.getBrightnessCap()); return MathUtils.constrain(value, minBrightness, maxBrightness); } diff --git a/services/core/java/com/android/server/display/BrightnessRangeController.java b/services/core/java/com/android/server/display/BrightnessRangeController.java new file mode 100644 index 000000000000..47cde1517450 --- /dev/null +++ b/services/core/java/com/android/server/display/BrightnessRangeController.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.display; + +import android.hardware.display.BrightnessInfo; +import android.os.IBinder; + +import java.io.PrintWriter; +import java.util.function.BooleanSupplier; + +class BrightnessRangeController { + + private static final boolean NBM_FEATURE_FLAG = false; + + private final HighBrightnessModeController mHbmController; + private final NormalBrightnessModeController mNormalBrightnessModeController = + new NormalBrightnessModeController(); + + private final Runnable mModeChangeCallback; + + BrightnessRangeController(HighBrightnessModeController hbmController, + Runnable modeChangeCallback) { + mHbmController = hbmController; + mModeChangeCallback = modeChangeCallback; + } + + + void dump(PrintWriter pw) { + mHbmController.dump(pw); + } + + void onAmbientLuxChange(float ambientLux) { + applyChanges( + () -> mNormalBrightnessModeController.onAmbientLuxChange(ambientLux), + () -> mHbmController.onAmbientLuxChange(ambientLux) + ); + } + + float getNormalBrightnessMax() { + return mHbmController.getNormalBrightnessMax(); + } + + void loadFromConfig(HighBrightnessModeMetadata hbmMetadata, IBinder token, + DisplayDeviceInfo info, DisplayDeviceConfig displayDeviceConfig) { + applyChanges( + () -> mNormalBrightnessModeController.resetNbmData( + displayDeviceConfig.getLuxThrottlingData()), + () -> { + mHbmController.setHighBrightnessModeMetadata(hbmMetadata); + mHbmController.resetHbmData(info.width, info.height, token, info.uniqueId, + displayDeviceConfig.getHighBrightnessModeData(), + displayDeviceConfig::getHdrBrightnessFromSdr); + } + ); + } + + void stop() { + mHbmController.stop(); + } + + void setAutoBrightnessEnabled(int state) { + applyChanges( + () -> mNormalBrightnessModeController.setAutoBrightnessState(state), + () -> mHbmController.setAutoBrightnessEnabled(state) + ); + } + + void onBrightnessChanged(float brightness, float unthrottledBrightness, + @BrightnessInfo.BrightnessMaxReason int throttlingReason) { + mHbmController.onBrightnessChanged(brightness, unthrottledBrightness, throttlingReason); + } + + float getCurrentBrightnessMin() { + return mHbmController.getCurrentBrightnessMin(); + } + + + float getCurrentBrightnessMax() { + if (NBM_FEATURE_FLAG && mHbmController.getHighBrightnessMode() + == BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF) { + return Math.min(mHbmController.getCurrentBrightnessMax(), + mNormalBrightnessModeController.getCurrentBrightnessMax()); + } + return mHbmController.getCurrentBrightnessMax(); + } + + int getHighBrightnessMode() { + return mHbmController.getHighBrightnessMode(); + } + + float getHdrBrightnessValue() { + return mHbmController.getHdrBrightnessValue(); + } + + float getTransitionPoint() { + return mHbmController.getTransitionPoint(); + } + + private void applyChanges(BooleanSupplier nbmChangesFunc, Runnable hbmChangesFunc) { + if (NBM_FEATURE_FLAG) { + boolean nbmTransitionChanged = nbmChangesFunc.getAsBoolean(); + hbmChangesFunc.run(); + // if nbm transition changed - trigger callback + // HighBrightnessModeController handles sending changes itself + if (nbmTransitionChanged) { + mModeChangeCallback.run(); + } + } else { + hbmChangesFunc.run(); + } + } +} diff --git a/services/core/java/com/android/server/display/BrightnessSetting.java b/services/core/java/com/android/server/display/BrightnessSetting.java index de42370e6d84..651828b6b9e2 100644 --- a/services/core/java/com/android/server/display/BrightnessSetting.java +++ b/services/core/java/com/android/server/display/BrightnessSetting.java @@ -40,6 +40,7 @@ public class BrightnessSetting { private final LogicalDisplay mLogicalDisplay; + private int mUserSerial; private final Handler mHandler = new Handler(Looper.getMainLooper()) { @Override public void handleMessage(Message msg) { @@ -56,13 +57,15 @@ public class BrightnessSetting { @GuardedBy("mSyncRoot") private float mBrightness; - BrightnessSetting(@NonNull PersistentDataStore persistentDataStore, + BrightnessSetting(int userSerial, + @NonNull PersistentDataStore persistentDataStore, @NonNull LogicalDisplay logicalDisplay, DisplayManagerService.SyncRoot syncRoot) { mPersistentDataStore = persistentDataStore; mLogicalDisplay = logicalDisplay; + mUserSerial = userSerial; mBrightness = mPersistentDataStore.getBrightness( - mLogicalDisplay.getPrimaryDisplayDeviceLocked()); + mLogicalDisplay.getPrimaryDisplayDeviceLocked(), userSerial); mSyncRoot = syncRoot; } @@ -96,8 +99,13 @@ public class BrightnessSetting { mListeners.remove(l); } + /** Sets the user serial for the brightness setting */ + public void setUserSerial(int userSerial) { + mUserSerial = userSerial; + } + /** - * Sets the brigtness and broadcasts the change to the listeners. + * Sets the brightness and broadcasts the change to the listeners. * @param brightness The value to which the brightness is to be set. */ public void setBrightness(float brightness) { @@ -112,7 +120,8 @@ public class BrightnessSetting { // changed. if (brightness != mBrightness) { mPersistentDataStore.setBrightness(mLogicalDisplay.getPrimaryDisplayDeviceLocked(), - brightness); + brightness, mUserSerial + ); } mBrightness = brightness; int toSend = Float.floatToIntBits(mBrightness); diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 7a797dd2250c..7ccfb448cf61 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -41,6 +41,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.display.BrightnessSynchronizer; import com.android.server.display.config.AutoBrightness; import com.android.server.display.config.BlockingZoneConfig; +import com.android.server.display.config.BrightnessLimitMap; import com.android.server.display.config.BrightnessThresholds; import com.android.server.display.config.BrightnessThrottlingMap; import com.android.server.display.config.BrightnessThrottlingPoint; @@ -51,8 +52,11 @@ import com.android.server.display.config.DisplayQuirks; import com.android.server.display.config.HbmTiming; import com.android.server.display.config.HighBrightnessMode; import com.android.server.display.config.IntegerArray; +import com.android.server.display.config.LuxThrottling; import com.android.server.display.config.NitsMap; +import com.android.server.display.config.NonNegativeFloatToFloatPoint; import com.android.server.display.config.Point; +import com.android.server.display.config.PredefinedBrightnessLimitNames; import com.android.server.display.config.RefreshRateConfigs; import com.android.server.display.config.RefreshRateRange; import com.android.server.display.config.RefreshRateThrottlingMap; @@ -219,6 +223,22 @@ import javax.xml.datatype.DatatypeConfigurationException; * <allowInLowPowerMode>false</allowInLowPowerMode> * </highBrightnessMode> * + * <luxThrottling> + * <brightnessLimitMap> + * <type>default</type> + * <map> + * <point> + * <first>5000</first> + * <second>0.3</second> + * </point> + * <point> + * <first>5000</first> + * <second>0.3</second> + * </point> + * </map> + * </brightnessPeakMap> + * </luxThrottling> + * * <quirks> * <quirk>canSetBrightnessViaHwc</quirk> * </quirks> @@ -693,6 +713,9 @@ public class DisplayDeviceConfig { private final Map<String, SparseArray<SurfaceControl.RefreshRateRange>> mRefreshRateThrottlingMap = new HashMap<>(); + private final Map<BrightnessLimitMapType, Map<Float, Float>> + mLuxThrottlingData = new HashMap<>(); + @Nullable private HostUsiVersion mHostUsiVersion; @@ -1344,6 +1367,11 @@ public class DisplayDeviceConfig { return hbmData; } + @NonNull + public Map<BrightnessLimitMapType, Map<Float, Float>> getLuxThrottlingData() { + return mLuxThrottlingData; + } + public List<RefreshRateLimitation> getRefreshRateLimitations() { return mRefreshRateLimitations; } @@ -1530,6 +1558,7 @@ public class DisplayDeviceConfig { + ", mBrightnessDefault=" + mBrightnessDefault + ", mQuirks=" + mQuirks + ", isHbmEnabled=" + mIsHighBrightnessModeEnabled + + ", mLuxThrottlingData=" + mLuxThrottlingData + ", mHbmData=" + mHbmData + ", mSdrToHdrRatioSpline=" + mSdrToHdrRatioSpline + ", mThermalBrightnessThrottlingDataMapByThrottlingId=" @@ -1676,6 +1705,7 @@ public class DisplayDeviceConfig { loadBrightnessMap(config); loadThermalThrottlingConfig(config); loadHighBrightnessModeData(config); + loadLuxThrottling(config); loadQuirks(config); loadBrightnessRamps(config); loadAmbientLightSensorFromDdc(config); @@ -2428,6 +2458,54 @@ public class DisplayDeviceConfig { } } + private void loadLuxThrottling(DisplayConfiguration config) { + LuxThrottling cfg = config.getLuxThrottling(); + if (cfg != null) { + HighBrightnessMode hbm = config.getHighBrightnessMode(); + float hbmTransitionPoint = hbm != null ? hbm.getTransitionPoint_all().floatValue() + : PowerManager.BRIGHTNESS_MAX; + List<BrightnessLimitMap> limitMaps = cfg.getBrightnessLimitMap(); + for (BrightnessLimitMap map : limitMaps) { + PredefinedBrightnessLimitNames type = map.getType(); + BrightnessLimitMapType mappedType = BrightnessLimitMapType.convert(type); + if (mappedType == null) { + Slog.wtf(TAG, "Invalid NBM config: unsupported map type=" + type); + continue; + } + if (mLuxThrottlingData.containsKey(mappedType)) { + Slog.wtf(TAG, "Invalid NBM config: duplicate map type=" + mappedType); + continue; + } + Map<Float, Float> luxToTransitionPointMap = new HashMap<>(); + + List<NonNegativeFloatToFloatPoint> points = map.getMap().getPoint(); + for (NonNegativeFloatToFloatPoint point : points) { + float lux = point.getFirst().floatValue(); + float maxBrightness = point.getSecond().floatValue(); + if (maxBrightness > hbmTransitionPoint) { + Slog.wtf(TAG, + "Invalid NBM config: maxBrightness is greater than hbm" + + ".transitionPoint. type=" + + type + "; lux=" + lux + "; maxBrightness=" + + maxBrightness); + continue; + } + if (luxToTransitionPointMap.containsKey(lux)) { + Slog.wtf(TAG, + "Invalid NBM config: duplicate lux key. type=" + type + "; lux=" + + lux); + continue; + } + luxToTransitionPointMap.put(lux, + mBacklightToBrightnessSpline.interpolate(maxBrightness)); + } + if (!luxToTransitionPointMap.isEmpty()) { + mLuxThrottlingData.put(mappedType, luxToTransitionPointMap); + } + } + } + } + private void loadBrightnessRamps(DisplayConfiguration config) { // Priority 1: Value in the display device config (float) // Priority 2: Value in the config.xml (int) @@ -3155,4 +3233,19 @@ public class DisplayDeviceConfig { } } } + + public enum BrightnessLimitMapType { + DEFAULT, ADAPTIVE; + + @Nullable + private static BrightnessLimitMapType convert(PredefinedBrightnessLimitNames type) { + switch (type) { + case _default: + return DEFAULT; + case adaptive: + return ADAPTIVE; + } + return null; + } + } } diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index da8eb23cbeae..3832e6e372c5 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -653,6 +653,12 @@ public final class DisplayManagerService extends SystemService { logicalDisplay.getPrimaryDisplayDeviceLocked().getUniqueId(), userSerial); dpc.setBrightnessConfiguration(config, /* shouldResetShortTermModel= */ true); + // change the brightness value according to the selected user. + final DisplayDevice device = logicalDisplay.getPrimaryDisplayDeviceLocked(); + if (device != null) { + dpc.setBrightness( + mPersistentDataStore.getBrightness(device, userSerial), userSerial); + } } dpc.onSwitchUser(newUserId); }); @@ -3135,8 +3141,9 @@ public final class DisplayManagerService extends SystemService { mBrightnessTracker = new BrightnessTracker(mContext, null); } - final BrightnessSetting brightnessSetting = new BrightnessSetting(mPersistentDataStore, - display, mSyncRoot); + final int userSerial = getUserManager().getUserSerialNumber(mContext.getUserId()); + final BrightnessSetting brightnessSetting = new BrightnessSetting(userSerial, + mPersistentDataStore, display, mSyncRoot); final DisplayPowerControllerInterface displayPowerController; // If display is internal and has a HighBrightnessModeMetadata mapping, use that. @@ -4621,6 +4628,22 @@ public final class DisplayManagerService extends SystemService { } @Override + public AmbientLightSensorData getAmbientLightSensorData(int displayId) { + synchronized (mSyncRoot) { + final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId); + if (display == null) { + return null; + } + final DisplayDevice device = display.getPrimaryDisplayDeviceLocked(); + if (device == null) { + return null; + } + SensorData data = device.getDisplayDeviceConfig().getAmbientLightSensor(); + return new AmbientLightSensorData(data.name, data.type); + } + } + + @Override public IntArray getDisplayGroupIds() { Set<Integer> visitedIds = new ArraySet<>(); IntArray displayGroupIds = new IntArray(); diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 9d31572c7d76..80114ccd6568 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -445,7 +445,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private final ColorDisplayServiceInternal mCdsi; private float[] mNitsRange; - private final HighBrightnessModeController mHbmController; + private final BrightnessRangeController mBrightnessRangeController; private final HighBrightnessModeMetadata mHighBrightnessModeMetadata; private final BrightnessThrottler mBrightnessThrottler; @@ -654,8 +654,19 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call loadBrightnessRampRates(); mSkipScreenOnBrightnessRamp = resources.getBoolean( com.android.internal.R.bool.config_skipScreenOnBrightnessRamp); + Runnable modeChangeCallback = () -> { + sendUpdatePowerState(); + postBrightnessChangeRunnable(); + // TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern. + if (mAutomaticBrightnessController != null) { + mAutomaticBrightnessController.update(); + } + }; - mHbmController = createHbmControllerLocked(); + HighBrightnessModeController hbmController = createHbmControllerLocked(modeChangeCallback); + + mBrightnessRangeController = new BrightnessRangeController(hbmController, + modeChangeCallback); mBrightnessThrottler = createBrightnessThrottlerLocked(); @@ -802,7 +813,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @Override public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) { - mHbmController.onAmbientLuxChange(ambientLux); + mBrightnessRangeController.onAmbientLuxChange(ambientLux); if (nits < 0) { mBrightnessToFollow = leadDisplayBrightness; } else { @@ -1039,17 +1050,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mBrightnessRampIncreaseMaxTimeMillis, mBrightnessRampDecreaseMaxTimeMillis); } - mHbmController.setHighBrightnessModeMetadata(hbmMetadata); - mHbmController.resetHbmData(info.width, info.height, token, info.uniqueId, - mDisplayDeviceConfig.getHighBrightnessModeData(), - new HighBrightnessModeController.HdrBrightnessDeviceConfig() { - @Override - public float getHdrBrightnessFromSdr( - float sdrBrightness, float maxDesiredHdrSdrRatio) { - return mDisplayDeviceConfig.getHdrBrightnessFromSdr( - sdrBrightness, maxDesiredHdrSdrRatio); - } - }); + mBrightnessRangeController.loadFromConfig(hbmMetadata, token, info, mDisplayDeviceConfig); mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId(), mThermalBrightnessThrottlingDataId, mUniqueDisplayId); @@ -1264,7 +1265,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp, ambientBrightnessThresholds, screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, mContext, - mHbmController, mBrightnessThrottler, mIdleModeBrightnessMapper, + mBrightnessRangeController, mBrightnessThrottler, mIdleModeBrightnessMapper, mDisplayDeviceConfig.getAmbientHorizonShort(), mDisplayDeviceConfig.getAmbientHorizonLong(), userLux, userBrightness); @@ -1364,7 +1365,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call /** Clean up all resources that are accessed via the {@link #mHandler} thread. */ private void cleanupHandlerThreadAfterStop() { setProximitySensorEnabled(false); - mHbmController.stop(); + mBrightnessRangeController.stop(); mBrightnessThrottler.stop(); mHandler.removeCallbacksAndMessages(null); @@ -1647,7 +1648,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mShouldResetShortTermModel); mShouldResetShortTermModel = false; } - mHbmController.setAutoBrightnessEnabled(mUseAutoBrightness + mBrightnessRangeController.setAutoBrightnessEnabled(mUseAutoBrightness ? AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED : AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED); @@ -1820,7 +1821,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // here instead of having HbmController listen to the brightness setting because certain // brightness sources (such as an app override) are not saved to the setting, but should be // reflected in HBM calculations. - mHbmController.onBrightnessChanged(brightnessState, unthrottledBrightnessState, + mBrightnessRangeController.onBrightnessChanged(brightnessState, unthrottledBrightnessState, mBrightnessThrottler.getBrightnessMaxReason()); // Animate the screen brightness when the screen is on or dozing. @@ -1874,13 +1875,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call float sdrAnimateValue = animateValue; // TODO(b/216365040): The decision to prevent HBM for HDR in low power mode should be // done in HighBrightnessModeController. - if (mHbmController.getHighBrightnessMode() == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR + if (mBrightnessRangeController.getHighBrightnessMode() + == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR && (mBrightnessReasonTemp.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 && (mBrightnessReasonTemp.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) == 0) { // We want to scale HDR brightness level with the SDR level, we also need to restore // SDR brightness immediately when entering dim or low power mode. - animateValue = mHbmController.getHdrBrightnessValue(); + animateValue = mBrightnessRangeController.getHdrBrightnessValue(); } final float currentBrightness = mPowerState.getScreenBrightness(); @@ -1942,8 +1944,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mTempBrightnessEvent.setBrightness(brightnessState); mTempBrightnessEvent.setPhysicalDisplayId(mUniqueDisplayId); mTempBrightnessEvent.setReason(mBrightnessReason); - mTempBrightnessEvent.setHbmMax(mHbmController.getCurrentBrightnessMax()); - mTempBrightnessEvent.setHbmMode(mHbmController.getHighBrightnessMode()); + mTempBrightnessEvent.setHbmMax(mBrightnessRangeController.getCurrentBrightnessMax()); + mTempBrightnessEvent.setHbmMode(mBrightnessRangeController.getHighBrightnessMode()); mTempBrightnessEvent.setFlags(mTempBrightnessEvent.getFlags() | (mIsRbcActive ? BrightnessEvent.FLAG_RBC : 0) | (mPowerRequest.lowPowerMode ? BrightnessEvent.FLAG_LOW_POWER_MODE : 0)); @@ -2104,9 +2106,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private boolean saveBrightnessInfo(float brightness, float adjustedBrightness) { synchronized (mCachedBrightnessInfo) { - final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(), + final float minBrightness = Math.min( + mBrightnessRangeController.getCurrentBrightnessMin(), mBrightnessThrottler.getBrightnessCap()); - final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(), + final float maxBrightness = Math.min( + mBrightnessRangeController.getCurrentBrightnessMax(), mBrightnessThrottler.getBrightnessCap()); boolean changed = false; @@ -2124,10 +2128,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call maxBrightness); changed |= mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.hbmMode, - mHbmController.getHighBrightnessMode()); + mBrightnessRangeController.getHighBrightnessMode()); changed |= mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.hbmTransitionPoint, - mHbmController.getTransitionPoint()); + mBrightnessRangeController.getTransitionPoint()); changed |= mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.brightnessMaxReason, mBrightnessThrottler.getBrightnessMaxReason()); @@ -2137,10 +2141,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } void postBrightnessChangeRunnable() { - mHandler.post(mOnBrightnessChangeRunnable); + if (!mHandler.hasCallbacks(mOnBrightnessChangeRunnable)) { + mHandler.post(mOnBrightnessChangeRunnable); + } } - private HighBrightnessModeController createHbmControllerLocked() { + private HighBrightnessModeController createHbmControllerLocked( + Runnable modeChangeCallback) { final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); final DisplayDeviceConfig ddConfig = device.getDisplayDeviceConfig(); final IBinder displayToken = @@ -2159,15 +2166,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call return mDisplayDeviceConfig.getHdrBrightnessFromSdr( sdrBrightness, maxDesiredHdrSdrRatio); } - }, - () -> { - sendUpdatePowerState(); - postBrightnessChangeRunnable(); - // TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern. - if (mAutomaticBrightnessController != null) { - mAutomaticBrightnessController.update(); - } - }, mHighBrightnessModeMetadata, mContext); + }, modeChangeCallback, mHighBrightnessModeMetadata, mContext); } private BrightnessThrottler createBrightnessThrottlerLocked() { @@ -2328,8 +2327,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (Float.isNaN(value)) { value = PowerManager.BRIGHTNESS_MIN; } - return MathUtils.constrain(value, - mHbmController.getCurrentBrightnessMin(), mHbmController.getCurrentBrightnessMax()); + return MathUtils.constrain(value, mBrightnessRangeController.getCurrentBrightnessMin(), + mBrightnessRangeController.getCurrentBrightnessMax()); } // Checks whether the brightness is within the valid brightness range, not including off. @@ -2667,9 +2666,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } @Override - public void setBrightness(float brightnessValue) { + public void setBrightness(float brightnessValue, int userSerial) { // Update the setting, which will eventually call back into DPC to have us actually update // the display with the new value. + mBrightnessSetting.setUserSerial(userSerial); mBrightnessSetting.setBrightness(brightnessValue); if (mDisplayId == Display.DEFAULT_DISPLAY && mPersistBrightnessNitsForDefaultDisplay) { float nits = convertToNits(brightnessValue); @@ -3003,8 +3003,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mScreenOffBrightnessSensorController.dump(pw); } - if (mHbmController != null) { - mHbmController.dump(pw); + if (mBrightnessRangeController != null) { + mBrightnessRangeController.dump(pw); } if (mBrightnessThrottler != null) { @@ -3471,7 +3471,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, + BrightnessRangeController brightnessRangeController, + BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, float userBrightness) { return new AutomaticBrightnessController(callbacks, looper, sensorManager, lightSensor, @@ -3480,9 +3481,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call brighteningLightDebounceConfig, darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds, screenBrightnessThresholds, ambientBrightnessThresholdsIdle, - screenBrightnessThresholdsIdle, context, hbmController, brightnessThrottler, - idleModeBrightnessMapper, ambientLightHorizonShort, ambientLightHorizonLong, - userLux, userBrightness); + screenBrightnessThresholdsIdle, context, brightnessRangeController, + brightnessThrottler, idleModeBrightnessMapper, ambientLightHorizonShort, + ambientLightHorizonLong, userLux, userBrightness); } BrightnessMappingStrategy getInteractiveModeBrightnessMapper(Resources resources, diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 41e4671df1a7..c8b0a724ffed 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -376,8 +376,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal private final ColorDisplayServiceInternal mCdsi; private float[] mNitsRange; - private final HighBrightnessModeController mHbmController; - private final HighBrightnessModeMetadata mHighBrightnessModeMetadata; + private final BrightnessRangeController mBrightnessRangeController; private final BrightnessThrottler mBrightnessThrottler; @@ -489,7 +488,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mDisplayPowerProximityStateController = mInjector.getDisplayPowerProximityStateController( mWakelockController, mDisplayDeviceConfig, mHandler.getLooper(), () -> updatePowerState(), mDisplayId, mSensorManager); - mHighBrightnessModeMetadata = hbmMetadata; mDisplayStateController = new DisplayStateController(mDisplayPowerProximityStateController); mAutomaticBrightnessStrategy = new AutomaticBrightnessStrategy(context, mDisplayId); mTag = "DisplayPowerController2[" + mDisplayId + "]"; @@ -532,9 +530,22 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mSkipScreenOnBrightnessRamp = resources.getBoolean( R.bool.config_skipScreenOnBrightnessRamp); - mHbmController = createHbmControllerLocked(); + Runnable modeChangeCallback = () -> { + sendUpdatePowerState(); + postBrightnessChangeRunnable(); + // TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern. + if (mAutomaticBrightnessController != null) { + mAutomaticBrightnessController.update(); + } + }; + HighBrightnessModeController hbmController = createHbmControllerLocked(hbmMetadata, + modeChangeCallback); mBrightnessThrottler = createBrightnessThrottlerLocked(); + + mBrightnessRangeController = new BrightnessRangeController(hbmController, + modeChangeCallback); + mDisplayBrightnessController = new DisplayBrightnessController(context, null, mDisplayId, mLogicalDisplay.getDisplayInfoLocked().brightnessDefault, @@ -848,17 +859,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mBrightnessRampIncreaseMaxTimeMillis, mBrightnessRampDecreaseMaxTimeMillis); } - mHbmController.setHighBrightnessModeMetadata(hbmMetadata); - mHbmController.resetHbmData(info.width, info.height, token, info.uniqueId, - mDisplayDeviceConfig.getHighBrightnessModeData(), - new HighBrightnessModeController.HdrBrightnessDeviceConfig() { - @Override - public float getHdrBrightnessFromSdr( - float sdrBrightness, float maxDesiredHdrSdrRatio) { - return mDisplayDeviceConfig.getHdrBrightnessFromSdr( - sdrBrightness, maxDesiredHdrSdrRatio); - } - }); + + mBrightnessRangeController.loadFromConfig(hbmMetadata, token, info, mDisplayDeviceConfig); mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig( mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId(), mThermalBrightnessThrottlingDataId, mUniqueDisplayId); @@ -1076,7 +1078,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp, ambientBrightnessThresholds, screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, mContext, - mHbmController, mBrightnessThrottler, mIdleModeBrightnessMapper, + mBrightnessRangeController, mBrightnessThrottler, mIdleModeBrightnessMapper, mDisplayDeviceConfig.getAmbientHorizonShort(), mDisplayDeviceConfig.getAmbientHorizonLong(), userLux, userBrightness); mDisplayBrightnessController.setAutomaticBrightnessController( @@ -1180,7 +1182,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal /** Clean up all resources that are accessed via the {@link #mHandler} thread. */ private void cleanupHandlerThreadAfterStop() { mDisplayPowerProximityStateController.cleanup(); - mHbmController.stop(); + mBrightnessRangeController.stop(); mBrightnessThrottler.stop(); mHandler.removeCallbacksAndMessages(null); @@ -1295,7 +1297,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal && (mAutomaticBrightnessStrategy.getAutoBrightnessAdjustmentChanged() || userSetBrightnessChanged); - mHbmController.setAutoBrightnessEnabled(mAutomaticBrightnessStrategy + mBrightnessRangeController.setAutoBrightnessEnabled(mAutomaticBrightnessStrategy .shouldUseAutoBrightness() ? AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED : AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED); @@ -1452,7 +1454,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // here instead of having HbmController listen to the brightness setting because certain // brightness sources (such as an app override) are not saved to the setting, but should be // reflected in HBM calculations. - mHbmController.onBrightnessChanged(brightnessState, unthrottledBrightnessState, + mBrightnessRangeController.onBrightnessChanged(brightnessState, unthrottledBrightnessState, mBrightnessThrottler.getBrightnessMaxReason()); // Animate the screen brightness when the screen is on or dozing. @@ -1509,13 +1511,14 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal float sdrAnimateValue = animateValue; // TODO(b/216365040): The decision to prevent HBM for HDR in low power mode should be // done in HighBrightnessModeController. - if (mHbmController.getHighBrightnessMode() == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR + if (mBrightnessRangeController.getHighBrightnessMode() + == BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR && (mBrightnessReasonTemp.getModifier() & BrightnessReason.MODIFIER_DIMMED) == 0 && (mBrightnessReasonTemp.getModifier() & BrightnessReason.MODIFIER_LOW_POWER) == 0) { // We want to scale HDR brightness level with the SDR level, we also need to restore // SDR brightness immediately when entering dim or low power mode. - animateValue = mHbmController.getHdrBrightnessValue(); + animateValue = mBrightnessRangeController.getHdrBrightnessValue(); } final float currentBrightness = mPowerState.getScreenBrightness(); @@ -1579,8 +1582,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal mTempBrightnessEvent.setBrightness(brightnessState); mTempBrightnessEvent.setPhysicalDisplayId(mUniqueDisplayId); mTempBrightnessEvent.setReason(mBrightnessReason); - mTempBrightnessEvent.setHbmMax(mHbmController.getCurrentBrightnessMax()); - mTempBrightnessEvent.setHbmMode(mHbmController.getHighBrightnessMode()); + mTempBrightnessEvent.setHbmMax(mBrightnessRangeController.getCurrentBrightnessMax()); + mTempBrightnessEvent.setHbmMode(mBrightnessRangeController.getHighBrightnessMode()); mTempBrightnessEvent.setFlags(mTempBrightnessEvent.getFlags() | (mIsRbcActive ? BrightnessEvent.FLAG_RBC : 0) | (mPowerRequest.lowPowerMode ? BrightnessEvent.FLAG_LOW_POWER_MODE : 0)); @@ -1750,9 +1753,11 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal private boolean saveBrightnessInfo(float brightness, float adjustedBrightness) { synchronized (mCachedBrightnessInfo) { - final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(), + final float minBrightness = Math.min( + mBrightnessRangeController.getCurrentBrightnessMin(), mBrightnessThrottler.getBrightnessCap()); - final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(), + final float maxBrightness = Math.min( + mBrightnessRangeController.getCurrentBrightnessMax(), mBrightnessThrottler.getBrightnessCap()); boolean changed = false; @@ -1770,10 +1775,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal maxBrightness); changed |= mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.hbmMode, - mHbmController.getHighBrightnessMode()); + mBrightnessRangeController.getHighBrightnessMode()); changed |= mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.hbmTransitionPoint, - mHbmController.getTransitionPoint()); + mBrightnessRangeController.getTransitionPoint()); changed |= mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.brightnessMaxReason, mBrightnessThrottler.getBrightnessMaxReason()); @@ -1783,10 +1788,13 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal } void postBrightnessChangeRunnable() { - mHandler.post(mOnBrightnessChangeRunnable); + if (!mHandler.hasCallbacks(mOnBrightnessChangeRunnable)) { + mHandler.post(mOnBrightnessChangeRunnable); + } } - private HighBrightnessModeController createHbmControllerLocked() { + private HighBrightnessModeController createHbmControllerLocked( + HighBrightnessModeMetadata hbmMetadata, Runnable modeChangeCallback) { final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); final DisplayDeviceConfig ddConfig = device.getDisplayDeviceConfig(); final IBinder displayToken = @@ -1798,22 +1806,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal final DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked(); return new HighBrightnessModeController(mHandler, info.width, info.height, displayToken, displayUniqueId, PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, hbmData, - new HighBrightnessModeController.HdrBrightnessDeviceConfig() { - @Override - public float getHdrBrightnessFromSdr( - float sdrBrightness, float maxDesiredHdrSdrRatio) { - return mDisplayDeviceConfig.getHdrBrightnessFromSdr( - sdrBrightness, maxDesiredHdrSdrRatio); - } - }, - () -> { - sendUpdatePowerState(); - postBrightnessChangeRunnable(); - // TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern. - if (mAutomaticBrightnessController != null) { - mAutomaticBrightnessController.update(); - } - }, mHighBrightnessModeMetadata, mContext); + (sdrBrightness, maxDesiredHdrSdrRatio) -> + mDisplayDeviceConfig.getHdrBrightnessFromSdr(sdrBrightness, + maxDesiredHdrSdrRatio), modeChangeCallback, hbmMetadata, mContext); } private BrightnessThrottler createBrightnessThrottlerLocked() { @@ -1960,8 +1955,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal if (Float.isNaN(value)) { value = PowerManager.BRIGHTNESS_MIN; } - return MathUtils.constrain(value, - mHbmController.getCurrentBrightnessMin(), mHbmController.getCurrentBrightnessMax()); + return MathUtils.constrain(value, mBrightnessRangeController.getCurrentBrightnessMin(), + mBrightnessRangeController.getCurrentBrightnessMax()); } private void animateScreenBrightness(float target, float sdrTarget, float rate) { @@ -2179,8 +2174,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal } @Override - public void setBrightness(float brightnessValue) { - mDisplayBrightnessController.setBrightness(brightnessValue); + public void setBrightness(float brightnessValue, int userSerial) { + mDisplayBrightnessController.setBrightness(brightnessValue, userSerial); } @Override @@ -2195,7 +2190,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal @Override public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) { - mHbmController.onAmbientLuxChange(ambientLux); + mBrightnessRangeController.onAmbientLuxChange(ambientLux); if (nits < 0) { mDisplayBrightnessController.setBrightnessToFollow(leadDisplayBrightness); } else { @@ -2374,8 +2369,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal dumpRbcEvents(pw); - if (mHbmController != null) { - mHbmController.dump(pw); + if (mBrightnessRangeController != null) { + mBrightnessRangeController.dump(pw); } if (mBrightnessThrottler != null) { @@ -2840,7 +2835,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, + BrightnessRangeController brightnessModeController, + BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, float userBrightness) { return new AutomaticBrightnessController(callbacks, looper, sensorManager, lightSensor, @@ -2849,9 +2845,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal brighteningLightDebounceConfig, darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds, screenBrightnessThresholds, ambientBrightnessThresholdsIdle, - screenBrightnessThresholdsIdle, context, hbmController, brightnessThrottler, - idleModeBrightnessMapper, ambientLightHorizonShort, ambientLightHorizonLong, - userLux, userBrightness); + screenBrightnessThresholdsIdle, context, brightnessModeController, + brightnessThrottler, idleModeBrightnessMapper, ambientLightHorizonShort, + ambientLightHorizonLong, userLux, userBrightness); } BrightnessMappingStrategy getInteractiveModeBrightnessMapper(Resources resources, diff --git a/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java b/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java index 73edb970ff95..5fbbcbd2959f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java +++ b/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java @@ -29,7 +29,7 @@ import java.io.PrintWriter; * An interface to manage the display's power state and brightness */ public interface DisplayPowerControllerInterface { - + int DEFAULT_USER_SERIAL = -1; /** * Notified when the display is changed. * @@ -98,7 +98,17 @@ public interface DisplayPowerControllerInterface { * Set the screen brightness of the associated display * @param brightness The value to which the brightness is to be set */ - void setBrightness(float brightness); + default void setBrightness(float brightness) { + setBrightness(brightness, DEFAULT_USER_SERIAL); + } + + /** + * Set the screen brightness of the associated display + * @param brightness The value to which the brightness is to be set + * @param userSerial The user for which the brightness value is to be set. Use userSerial = -1, + * if brightness needs to be updated for the current user. + */ + void setBrightness(float brightness, int userSerial); /** * Checks if the proximity sensor is available diff --git a/services/core/java/com/android/server/display/NormalBrightnessModeController.java b/services/core/java/com/android/server/display/NormalBrightnessModeController.java new file mode 100644 index 000000000000..dbabc2441224 --- /dev/null +++ b/services/core/java/com/android/server/display/NormalBrightnessModeController.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.display; + +import android.annotation.NonNull; +import android.os.PowerManager; + +import com.android.server.display.DisplayDeviceConfig.BrightnessLimitMapType; + +import java.util.HashMap; +import java.util.Map; + +/** + * Limits brightness for normal-brightness mode, based on ambient lux + **/ +class NormalBrightnessModeController { + @NonNull + private Map<BrightnessLimitMapType, Map<Float, Float>> mMaxBrightnessLimits = new HashMap<>(); + private float mAmbientLux = Float.MAX_VALUE; + private boolean mAutoBrightnessEnabled = false; + + // brightness limit in normal brightness mode, based on ambient lux. + private float mMaxBrightness = PowerManager.BRIGHTNESS_MAX; + + boolean onAmbientLuxChange(float ambientLux) { + mAmbientLux = ambientLux; + return recalculateMaxBrightness(); + } + + boolean setAutoBrightnessState(int state) { + boolean isEnabled = state == AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED; + if (isEnabled != mAutoBrightnessEnabled) { + mAutoBrightnessEnabled = isEnabled; + return recalculateMaxBrightness(); + } + return false; + } + + float getCurrentBrightnessMax() { + return mMaxBrightness; + } + + boolean resetNbmData( + @NonNull Map<BrightnessLimitMapType, Map<Float, Float>> maxBrightnessLimits) { + mMaxBrightnessLimits = maxBrightnessLimits; + return recalculateMaxBrightness(); + } + + private boolean recalculateMaxBrightness() { + float foundAmbientBoundary = Float.MAX_VALUE; + float foundMaxBrightness = PowerManager.BRIGHTNESS_MAX; + + Map<Float, Float> maxBrightnessPoints = null; + + if (mAutoBrightnessEnabled) { + maxBrightnessPoints = mMaxBrightnessLimits.get(BrightnessLimitMapType.ADAPTIVE); + } + + if (maxBrightnessPoints == null) { + maxBrightnessPoints = mMaxBrightnessLimits.get(BrightnessLimitMapType.DEFAULT); + } + + if (maxBrightnessPoints != null) { + for (Map.Entry<Float, Float> brightnessPoint : maxBrightnessPoints.entrySet()) { + float ambientBoundary = brightnessPoint.getKey(); + // find ambient lux upper boundary closest to current ambient lux + if (ambientBoundary > mAmbientLux && ambientBoundary < foundAmbientBoundary) { + foundMaxBrightness = brightnessPoint.getValue(); + foundAmbientBoundary = ambientBoundary; + } + } + } + + if (mMaxBrightness != foundMaxBrightness) { + mMaxBrightness = foundMaxBrightness; + return true; + } + return false; + } +} diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java index 6d6ed726161b..2d7792d01c53 100644 --- a/services/core/java/com/android/server/display/PersistentDataStore.java +++ b/services/core/java/com/android/server/display/PersistentDataStore.java @@ -133,6 +133,7 @@ final class PersistentDataStore { private static final String TAG_BRIGHTNESS_NITS_FOR_DEFAULT_DISPLAY = "brightness-nits-for-default-display"; + public static final int DEFAULT_USER_ID = -1; // Remembered Wifi display devices. private ArrayList<WifiDisplay> mRememberedWifiDisplays = new ArrayList<WifiDisplay>(); @@ -294,7 +295,7 @@ final class PersistentDataStore { return false; } - public float getBrightness(DisplayDevice device) { + public float getBrightness(DisplayDevice device, int userSerial) { if (device == null || !device.hasStableUniqueId()) { return Float.NaN; } @@ -302,10 +303,10 @@ final class PersistentDataStore { if (state == null) { return Float.NaN; } - return state.getBrightness(); + return state.getBrightness(userSerial); } - public boolean setBrightness(DisplayDevice displayDevice, float brightness) { + public boolean setBrightness(DisplayDevice displayDevice, float brightness, int userSerial) { if (displayDevice == null || !displayDevice.hasStableUniqueId()) { return false; } @@ -314,7 +315,7 @@ final class PersistentDataStore { return false; } final DisplayState state = getDisplayState(displayDeviceUniqueId, true); - if (state.setBrightness(brightness)) { + if (state.setBrightness(brightness, userSerial)) { setDirty(); return true; } @@ -611,6 +612,7 @@ final class PersistentDataStore { state.saveToXml(serializer); serializer.endTag(null, TAG_DISPLAY); } + serializer.endTag(null, TAG_DISPLAY_STATES); serializer.startTag(null, TAG_STABLE_DEVICE_VALUES); mStableDeviceValues.saveToXml(serializer); @@ -649,7 +651,8 @@ final class PersistentDataStore { private static final class DisplayState { private int mColorMode; - private float mBrightness = Float.NaN; + + private SparseArray<Float> mPerUserBrightness = new SparseArray<>(); private int mWidth; private int mHeight; private float mRefreshRate; @@ -670,16 +673,25 @@ final class PersistentDataStore { return mColorMode; } - public boolean setBrightness(float brightness) { - if (brightness == mBrightness) { + public boolean setBrightness(float brightness, int userSerial) { + // Remove the default user brightness, before setting a new user-specific value. + // This is a one-time operation, required to restructure the config after user-specific + // brightness was introduced. + mPerUserBrightness.remove(DEFAULT_USER_ID); + + if (getBrightness(userSerial) == brightness) { return false; } - mBrightness = brightness; + mPerUserBrightness.set(userSerial, brightness); return true; } - public float getBrightness() { - return mBrightness; + public float getBrightness(int userSerial) { + float brightness = mPerUserBrightness.get(userSerial, Float.NaN); + if (Float.isNaN(brightness)) { + brightness = mPerUserBrightness.get(DEFAULT_USER_ID, Float.NaN); + } + return brightness; } public boolean setBrightnessConfiguration(BrightnessConfiguration configuration, @@ -729,12 +741,7 @@ final class PersistentDataStore { mColorMode = Integer.parseInt(value); break; case TAG_BRIGHTNESS_VALUE: - String brightness = parser.nextText(); - try { - mBrightness = Float.parseFloat(brightness); - } catch (NumberFormatException e) { - mBrightness = Float.NaN; - } + loadBrightnessFromXml(parser); break; case TAG_BRIGHTNESS_CONFIGURATIONS: mDisplayBrightnessConfigurations.loadFromXml(parser); @@ -760,11 +767,12 @@ final class PersistentDataStore { serializer.text(Integer.toString(mColorMode)); serializer.endTag(null, TAG_COLOR_MODE); - serializer.startTag(null, TAG_BRIGHTNESS_VALUE); - if (!Float.isNaN(mBrightness)) { - serializer.text(Float.toString(mBrightness)); + for (int i = 0; i < mPerUserBrightness.size(); i++) { + serializer.startTag(null, TAG_BRIGHTNESS_VALUE); + serializer.attributeInt(null, ATTR_USER_SERIAL, mPerUserBrightness.keyAt(i)); + serializer.text(Float.toString(mPerUserBrightness.valueAt(i))); + serializer.endTag(null, TAG_BRIGHTNESS_VALUE); } - serializer.endTag(null, TAG_BRIGHTNESS_VALUE); serializer.startTag(null, TAG_BRIGHTNESS_CONFIGURATIONS); mDisplayBrightnessConfigurations.saveToXml(serializer); @@ -785,12 +793,33 @@ final class PersistentDataStore { public void dump(final PrintWriter pw, final String prefix) { pw.println(prefix + "ColorMode=" + mColorMode); - pw.println(prefix + "BrightnessValue=" + mBrightness); + pw.println(prefix + "BrightnessValues: "); + for (int i = 0; i < mPerUserBrightness.size(); i++) { + pw.println("User: " + mPerUserBrightness.keyAt(i) + + " Value: " + mPerUserBrightness.valueAt(i)); + } pw.println(prefix + "DisplayBrightnessConfigurations: "); mDisplayBrightnessConfigurations.dump(pw, prefix); pw.println(prefix + "Resolution=" + mWidth + " " + mHeight); pw.println(prefix + "RefreshRate=" + mRefreshRate); } + + private void loadBrightnessFromXml(TypedXmlPullParser parser) + throws IOException, XmlPullParserException { + int userSerial; + try { + userSerial = parser.getAttributeInt(null, ATTR_USER_SERIAL); + } catch (NumberFormatException | XmlPullParserException e) { + userSerial = DEFAULT_USER_ID; + Slog.e(TAG, "Failed to read user serial", e); + } + String brightness = parser.nextText(); + try { + mPerUserBrightness.set(userSerial, Float.parseFloat(brightness)); + } catch (NumberFormatException nfe) { + Slog.e(TAG, "Failed to read brightness", nfe); + } + } } private static final class StableDeviceValues { diff --git a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java index 7574de841440..2f52b708dfb5 100644 --- a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java +++ b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java @@ -38,6 +38,8 @@ import java.io.PrintWriter; * display. Applies the chosen brightness. */ public final class DisplayBrightnessController { + private static final int DEFAULT_USER_SERIAL = -1; + // The ID of the display tied to this DisplayBrightnessController private final int mDisplayId; @@ -274,8 +276,16 @@ public final class DisplayBrightnessController { * Notifies the brightnessSetting to persist the supplied brightness value. */ public void setBrightness(float brightnessValue) { + setBrightness(brightnessValue, DEFAULT_USER_SERIAL); + } + + /** + * Notifies the brightnessSetting to persist the supplied brightness value for a user. + */ + public void setBrightness(float brightnessValue, int userSerial) { // Update the setting, which will eventually call back into DPC to have us actually // update the display with the new value. + mBrightnessSetting.setUserSerial(userSerial); mBrightnessSetting.setBrightness(brightnessValue); if (mDisplayId == Display.DEFAULT_DISPLAY && mPersistBrightnessNitsForDefaultDisplay) { float nits = convertToNits(brightnessValue); diff --git a/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java b/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java new file mode 100644 index 000000000000..ce868497b0e4 --- /dev/null +++ b/services/core/java/com/android/server/input/AmbientKeyboardBacklightController.java @@ -0,0 +1,431 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import android.annotation.MainThread; +import android.annotation.Nullable; +import android.content.Context; +import android.content.res.Resources; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; +import android.hardware.display.DisplayManager; +import android.hardware.display.DisplayManagerInternal; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.util.Log; +import android.util.Slog; +import android.util.TypedValue; +import android.view.Display; +import android.view.DisplayInfo; + +import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; +import com.android.server.LocalServices; +import com.android.server.display.utils.SensorUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * A thread-safe component of {@link InputManagerService} responsible for managing the keyboard + * backlight based on ambient light sensor. + */ +final class AmbientKeyboardBacklightController implements DisplayManager.DisplayListener, + SensorEventListener { + + private static final String TAG = "KbdBacklightController"; + + // To enable these logs, run: + // 'adb shell setprop log.tag.KbdBacklightController DEBUG' (requires restart) + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + // Number of light sensor responses required to overcome temporal hysteresis. + @VisibleForTesting + public static final int HYSTERESIS_THRESHOLD = 2; + + private static final int MSG_BRIGHTNESS_CALLBACK = 0; + private static final int MSG_SETUP_DISPLAY_AND_SENSOR = 1; + + private static final Object sAmbientControllerLock = new Object(); + + private final Context mContext; + private final Handler mHandler; + + @Nullable + @GuardedBy("sAmbientControllerLock") + private Sensor mLightSensor; + @GuardedBy("sAmbientControllerLock") + private String mCurrentDefaultDisplayUniqueId; + + // List of currently registered ambient backlight listeners + @GuardedBy("sAmbientControllerLock") + private final List<AmbientKeyboardBacklightListener> mAmbientKeyboardBacklightListeners = + new ArrayList<>(); + + private BrightnessStep[] mBrightnessSteps; + private int mCurrentBrightnessStepIndex; + private HysteresisState mHysteresisState; + private int mHysteresisCount = 0; + private float mSmoothingConstant; + private int mSmoothedLux; + private int mSmoothedLuxAtLastAdjustment; + + private enum HysteresisState { + // The most-recent mSmoothedLux matched mSmoothedLuxAtLastAdjustment. + STABLE, + // The most-recent mSmoothedLux was less than mSmoothedLuxAtLastAdjustment. + DECREASING, + // The most-recent mSmoothedLux was greater than mSmoothedLuxAtLastAdjustment. + INCREASING, + // The brightness should be adjusted immediately after the next sensor reading. + IMMEDIATE, + } + + AmbientKeyboardBacklightController(Context context, Looper looper) { + mContext = context; + mHandler = new Handler(looper, this::handleMessage); + initConfiguration(); + } + + public void systemRunning() { + mHandler.sendEmptyMessage(MSG_SETUP_DISPLAY_AND_SENSOR); + DisplayManager displayManager = Objects.requireNonNull( + mContext.getSystemService(DisplayManager.class)); + displayManager.registerDisplayListener(this, mHandler); + } + + public void registerAmbientBacklightListener(AmbientKeyboardBacklightListener listener) { + synchronized (sAmbientControllerLock) { + if (mAmbientKeyboardBacklightListeners.contains(listener)) { + throw new IllegalStateException( + "AmbientKeyboardBacklightListener was already registered, listener = " + + listener); + } + if (mAmbientKeyboardBacklightListeners.isEmpty()) { + // Add sensor listener when we add the first ambient backlight listener. + addSensorListener(mLightSensor); + } + mAmbientKeyboardBacklightListeners.add(listener); + } + } + + public void unregisterAmbientBacklightListener(AmbientKeyboardBacklightListener listener) { + synchronized (sAmbientControllerLock) { + if (!mAmbientKeyboardBacklightListeners.contains(listener)) { + throw new IllegalStateException( + "AmbientKeyboardBacklightListener was never registered, listener = " + + listener); + } + mAmbientKeyboardBacklightListeners.remove(listener); + if (mAmbientKeyboardBacklightListeners.isEmpty()) { + removeSensorListener(mLightSensor); + } + } + } + + private void sendBrightnessAdjustment(int brightnessValue) { + Message msg = Message.obtain(mHandler, MSG_BRIGHTNESS_CALLBACK, brightnessValue); + mHandler.sendMessage(msg); + } + + @MainThread + private void handleBrightnessCallback(int brightnessValue) { + synchronized (sAmbientControllerLock) { + for (AmbientKeyboardBacklightListener listener : mAmbientKeyboardBacklightListeners) { + listener.onKeyboardBacklightValueChanged(brightnessValue); + } + } + } + + @MainThread + private void handleAmbientLuxChange(float rawLux) { + if (rawLux < 0) { + Slog.w(TAG, "Light sensor doesn't have valid value"); + return; + } + updateSmoothedLux(rawLux); + + if (mHysteresisState != HysteresisState.IMMEDIATE + && mSmoothedLux == mSmoothedLuxAtLastAdjustment) { + mHysteresisState = HysteresisState.STABLE; + return; + } + + int newStepIndex = Math.max(0, mCurrentBrightnessStepIndex); + int numSteps = mBrightnessSteps.length; + + if (mSmoothedLux > mSmoothedLuxAtLastAdjustment) { + if (mHysteresisState != HysteresisState.IMMEDIATE + && mHysteresisState != HysteresisState.INCREASING) { + if (DEBUG) { + Slog.d(TAG, "ALS transitioned to brightness increasing state"); + } + mHysteresisState = HysteresisState.INCREASING; + mHysteresisCount = 0; + } + for (; newStepIndex < numSteps; newStepIndex++) { + if (mSmoothedLux < mBrightnessSteps[newStepIndex].mIncreaseLuxThreshold) { + break; + } + } + } else if (mSmoothedLux < mSmoothedLuxAtLastAdjustment) { + if (mHysteresisState != HysteresisState.IMMEDIATE + && mHysteresisState != HysteresisState.DECREASING) { + if (DEBUG) { + Slog.d(TAG, "ALS transitioned to brightness decreasing state"); + } + mHysteresisState = HysteresisState.DECREASING; + mHysteresisCount = 0; + } + for (; newStepIndex >= 0; newStepIndex--) { + if (mSmoothedLux > mBrightnessSteps[newStepIndex].mDecreaseLuxThreshold) { + break; + } + } + } + + if (mHysteresisState == HysteresisState.IMMEDIATE) { + mCurrentBrightnessStepIndex = newStepIndex; + mSmoothedLuxAtLastAdjustment = mSmoothedLux; + mHysteresisState = HysteresisState.STABLE; + mHysteresisCount = 0; + sendBrightnessAdjustment(mBrightnessSteps[newStepIndex].mBrightnessValue); + return; + } + + if (newStepIndex == mCurrentBrightnessStepIndex) { + return; + } + + mHysteresisCount++; + if (DEBUG) { + Slog.d(TAG, "Incremented hysteresis count to " + mHysteresisCount + " (lux went from " + + mSmoothedLuxAtLastAdjustment + " to " + mSmoothedLux + ")"); + } + if (mHysteresisCount >= HYSTERESIS_THRESHOLD) { + mCurrentBrightnessStepIndex = newStepIndex; + mSmoothedLuxAtLastAdjustment = mSmoothedLux; + mHysteresisCount = 1; + sendBrightnessAdjustment(mBrightnessSteps[newStepIndex].mBrightnessValue); + } + } + + @MainThread + private void handleDisplayChange() { + DisplayManagerInternal displayManagerInternal = LocalServices.getService( + DisplayManagerInternal.class); + DisplayInfo displayInfo = displayManagerInternal.getDisplayInfo(Display.DEFAULT_DISPLAY); + synchronized (sAmbientControllerLock) { + if (Objects.equals(mCurrentDefaultDisplayUniqueId, displayInfo.uniqueId)) { + return; + } + if (DEBUG) { + Slog.d(TAG, "Default display changed: resetting the light sensor"); + } + // Keep track of current default display + mCurrentDefaultDisplayUniqueId = displayInfo.uniqueId; + // Clear all existing sensor listeners + if (!mAmbientKeyboardBacklightListeners.isEmpty()) { + removeSensorListener(mLightSensor); + } + mLightSensor = getAmbientLightSensor( + displayManagerInternal.getAmbientLightSensorData(Display.DEFAULT_DISPLAY)); + // Re-add sensor listeners if required; + if (!mAmbientKeyboardBacklightListeners.isEmpty()) { + addSensorListener(mLightSensor); + } + } + } + + private Sensor getAmbientLightSensor( + DisplayManagerInternal.AmbientLightSensorData ambientSensor) { + SensorManager sensorManager = Objects.requireNonNull( + mContext.getSystemService(SensorManager.class)); + if (DEBUG) { + Slog.d(TAG, "Ambient Light sensor data: " + ambientSensor); + } + return SensorUtils.findSensor(sensorManager, ambientSensor.sensorType, + ambientSensor.sensorName, Sensor.TYPE_LIGHT); + } + + private void updateSmoothedLux(float rawLux) { + // For the first sensor reading, use raw lux value directly without smoothing. + if (mHysteresisState == HysteresisState.IMMEDIATE) { + mSmoothedLux = (int) rawLux; + } else { + mSmoothedLux = + (int) (mSmoothingConstant * rawLux + (1 - mSmoothingConstant) * mSmoothedLux); + } + if (DEBUG) { + Slog.d(TAG, "Current smoothed lux from ALS = " + mSmoothedLux); + } + } + + @VisibleForTesting + public void addSensorListener(@Nullable Sensor sensor) { + SensorManager sensorManager = mContext.getSystemService(SensorManager.class); + if (sensorManager == null || sensor == null) { + return; + } + // Reset values before registering listener + reset(); + sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL, mHandler); + if (DEBUG) { + Slog.d(TAG, "Registering ALS listener"); + } + } + + private void removeSensorListener(@Nullable Sensor sensor) { + SensorManager sensorManager = mContext.getSystemService(SensorManager.class); + if (sensorManager == null || sensor == null) { + return; + } + sensorManager.unregisterListener(this, sensor); + if (DEBUG) { + Slog.d(TAG, "Unregistering ALS listener"); + } + } + + private void initConfiguration() { + Resources res = mContext.getResources(); + int[] brightnessValueArray = res.getIntArray( + com.android.internal.R.array.config_autoKeyboardBacklightBrightnessValues); + int[] decreaseThresholdArray = res.getIntArray( + com.android.internal.R.array.config_autoKeyboardBacklightDecreaseLuxThreshold); + int[] increaseThresholdArray = res.getIntArray( + com.android.internal.R.array.config_autoKeyboardBacklightIncreaseLuxThreshold); + if (brightnessValueArray.length != decreaseThresholdArray.length + || decreaseThresholdArray.length != increaseThresholdArray.length) { + throw new IllegalArgumentException( + "The config files for auto keyboard backlight brightness must contain arrays " + + "of equal lengths"); + } + final int size = brightnessValueArray.length; + mBrightnessSteps = new BrightnessStep[size]; + for (int i = 0; i < size; i++) { + int increaseThreshold = + increaseThresholdArray[i] < 0 ? Integer.MAX_VALUE : increaseThresholdArray[i]; + int decreaseThreshold = + decreaseThresholdArray[i] < 0 ? Integer.MIN_VALUE : decreaseThresholdArray[i]; + mBrightnessSteps[i] = new BrightnessStep(brightnessValueArray[i], increaseThreshold, + decreaseThreshold); + } + + int numSteps = mBrightnessSteps.length; + if (numSteps == 0 || mBrightnessSteps[0].mDecreaseLuxThreshold != Integer.MIN_VALUE + || mBrightnessSteps[numSteps - 1].mIncreaseLuxThreshold != Integer.MAX_VALUE) { + throw new IllegalArgumentException( + "The config files for auto keyboard backlight brightness must contain arrays " + + "of length > 0 and have -1 or Integer.MIN_VALUE as lower bound for " + + "decrease thresholds and -1 or Integer.MAX_VALUE as upper bound for " + + "increase thresholds"); + } + + final TypedValue smoothingConstantValue = new TypedValue(); + res.getValue( + com.android.internal.R.dimen.config_autoKeyboardBrightnessSmoothingConstant, + smoothingConstantValue, + true /*resolveRefs*/); + mSmoothingConstant = smoothingConstantValue.getFloat(); + if (mSmoothingConstant <= 0.0 || mSmoothingConstant > 1.0) { + throw new IllegalArgumentException( + "The config files for auto keyboard backlight brightness must contain " + + "smoothing constant in range (0.0, 1.0]."); + } + + if (DEBUG) { + Log.d(TAG, "Brightness steps: " + Arrays.toString(mBrightnessSteps) + + " Smoothing constant = " + mSmoothingConstant); + } + } + + private void reset() { + mHysteresisState = HysteresisState.IMMEDIATE; + mSmoothedLux = 0; + mSmoothedLuxAtLastAdjustment = 0; + mCurrentBrightnessStepIndex = -1; + } + + private boolean handleMessage(Message msg) { + switch (msg.what) { + case MSG_BRIGHTNESS_CALLBACK: + handleBrightnessCallback((int) msg.obj); + return true; + case MSG_SETUP_DISPLAY_AND_SENSOR: + handleDisplayChange(); + return true; + } + return false; + } + + @Override + public void onSensorChanged(SensorEvent event) { + handleAmbientLuxChange(event.values[0]); + } + + @Override + public void onAccuracyChanged(Sensor sensor, int accuracy) { + } + + @Override + public void onDisplayAdded(int displayId) { + handleDisplayChange(); + } + + @Override + public void onDisplayRemoved(int displayId) { + handleDisplayChange(); + } + + @Override + public void onDisplayChanged(int displayId) { + handleDisplayChange(); + } + + public interface AmbientKeyboardBacklightListener { + /** + * @param value between [0, 255] to which keyboard backlight needs to be set according + * to Ambient light sensor. + */ + void onKeyboardBacklightValueChanged(int value); + } + + private static class BrightnessStep { + private final int mBrightnessValue; + private final int mIncreaseLuxThreshold; + private final int mDecreaseLuxThreshold; + + private BrightnessStep(int brightnessValue, int increaseLuxThreshold, + int decreaseLuxThreshold) { + mBrightnessValue = brightnessValue; + mIncreaseLuxThreshold = increaseLuxThreshold; + mDecreaseLuxThreshold = decreaseLuxThreshold; + } + + @Override + public String toString() { + return "BrightnessStep{" + "mBrightnessValue=" + mBrightnessValue + + ", mIncreaseThreshold=" + mIncreaseLuxThreshold + ", mDecreaseThreshold=" + + mDecreaseLuxThreshold + '}'; + } + } +} diff --git a/services/core/java/com/android/server/input/BatteryController.java b/services/core/java/com/android/server/input/BatteryController.java index ff9ce6f16075..38a0d37c5679 100644 --- a/services/core/java/com/android/server/input/BatteryController.java +++ b/services/core/java/com/android/server/input/BatteryController.java @@ -46,7 +46,6 @@ import android.view.InputDevice; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.input.BatteryController.UEventManager.UEventBatteryListener; import java.io.PrintWriter; import java.util.Arrays; @@ -102,8 +101,9 @@ final class BatteryController { @GuardedBy("mLock") private BluetoothBatteryManager.BluetoothBatteryListener mBluetoothBatteryListener; - BatteryController(Context context, NativeInputManagerService nativeService, Looper looper) { - this(context, nativeService, looper, new UEventManager() {}, + BatteryController(Context context, NativeInputManagerService nativeService, Looper looper, + UEventManager uEventManager) { + this(context, nativeService, looper, uEventManager, new LocalBluetoothBatteryManager(context, looper)); } @@ -567,7 +567,7 @@ final class BatteryController { private BluetoothAdapter.OnMetadataChangedListener mBluetoothMetadataListener; @Nullable - private UEventBatteryListener mUEventBatteryListener; + private BatteryController.UEventBatteryListener mUEventBatteryListener; DeviceMonitor(int deviceId) { mState = new State(deviceId); @@ -630,7 +630,7 @@ final class BatteryController { return; } final int deviceId = mState.deviceId; - mUEventBatteryListener = new UEventBatteryListener() { + mUEventBatteryListener = new BatteryController.UEventBatteryListener() { @Override public void onBatteryUEvent(long eventTime) { handleUEventNotification(deviceId, eventTime); @@ -898,40 +898,25 @@ final class BatteryController { } } - // An interface used to change the API of UEventObserver to a more test-friendly format. @VisibleForTesting - interface UEventManager { - - @VisibleForTesting - abstract class UEventBatteryListener { - private final UEventObserver mObserver = new UEventObserver() { - @Override - public void onUEvent(UEvent event) { - final long eventTime = SystemClock.uptimeMillis(); - if (DEBUG) { - Slog.d(TAG, - "UEventListener: Received UEvent: " - + event + " eventTime: " + eventTime); - } - if (!"CHANGE".equalsIgnoreCase(event.get("ACTION")) - || !"POWER_SUPPLY".equalsIgnoreCase(event.get("SUBSYSTEM"))) { - // Disregard any UEvents that do not correspond to battery changes. - return; - } - UEventBatteryListener.this.onBatteryUEvent(eventTime); - } - }; - - public abstract void onBatteryUEvent(long eventTime); - } - - default void addListener(UEventBatteryListener listener, String match) { - listener.mObserver.startObserving(match); + abstract static class UEventBatteryListener extends UEventManager.UEventListener { + @Override + public void onUEvent(UEventObserver.UEvent event) { + final long eventTime = SystemClock.uptimeMillis(); + if (DEBUG) { + Slog.d(TAG, + "UEventListener: Received UEvent: " + + event + " eventTime: " + eventTime); + } + if (!"CHANGE".equalsIgnoreCase(event.get("ACTION")) + || !"POWER_SUPPLY".equalsIgnoreCase(event.get("SUBSYSTEM"))) { + // Disregard any UEvents that do not correspond to battery changes. + return; + } + UEventBatteryListener.this.onBatteryUEvent(eventTime); } - default void removeListener(UEventBatteryListener listener) { - listener.mObserver.stopObserving(); - } + public abstract void onBatteryUEvent(long eventTime); } // An interface used to change the API of adding a bluetooth battery listener to a more diff --git a/services/core/java/com/android/server/input/InputFeatureFlagProvider.java b/services/core/java/com/android/server/input/InputFeatureFlagProvider.java new file mode 100644 index 000000000000..a646d1e9bcb0 --- /dev/null +++ b/services/core/java/com/android/server/input/InputFeatureFlagProvider.java @@ -0,0 +1,101 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import android.sysprop.InputProperties; + +import java.util.Optional; + +/** + * A component of {@link InputManagerService} responsible for managing the input sysprop flags + * + * @hide + */ +@SuppressWarnings("OptionalUsedAsFieldOrParameterType") +public final class InputFeatureFlagProvider { + + // To disable Keyboard backlight control via Framework, run: + // 'adb shell setprop persist.input.keyboard_backlight_control.enabled false' (requires restart) + private static final boolean KEYBOARD_BACKLIGHT_CONTROL_ENABLED = + InputProperties.enable_keyboard_backlight_control().orElse(true); + + // To disable Framework controlled keyboard backlight animation run: + // adb shell setprop persist.input.keyboard.backlight_animation.enabled false (requires restart) + private static final boolean KEYBOARD_BACKLIGHT_ANIMATION_ENABLED = + InputProperties.enable_keyboard_backlight_animation().orElse(false); + + // To disable Custom keyboard backlight levels support via IDC files run: + // adb shell setprop persist.input.keyboard.backlight_custom_levels.enabled false (requires + // restart) + private static final boolean KEYBOARD_BACKLIGHT_CUSTOM_LEVELS_ENABLED = + InputProperties.enable_keyboard_backlight_custom_levels().orElse(true); + + // To disable als based ambient keyboard backlight control run: + // adb shell setprop persist.input.keyboard.ambient_backlight_control.enabled false (requires + // restart) + private static final boolean AMBIENT_KEYBOARD_BACKLIGHT_CONTROL_ENABLED = + InputProperties.enable_ambient_keyboard_backlight_control().orElse(true); + + private static Optional<Boolean> sKeyboardBacklightControlOverride = Optional.empty(); + private static Optional<Boolean> sKeyboardBacklightAnimationOverride = Optional.empty(); + private static Optional<Boolean> sKeyboardBacklightCustomLevelsOverride = Optional.empty(); + private static Optional<Boolean> sAmbientKeyboardBacklightControlOverride = Optional.empty(); + + public static boolean isKeyboardBacklightControlEnabled() { + return sKeyboardBacklightControlOverride.orElse(KEYBOARD_BACKLIGHT_CONTROL_ENABLED); + } + + public static boolean isKeyboardBacklightAnimationEnabled() { + return sKeyboardBacklightAnimationOverride.orElse(KEYBOARD_BACKLIGHT_ANIMATION_ENABLED); + } + + public static boolean isKeyboardBacklightCustomLevelsEnabled() { + return sKeyboardBacklightCustomLevelsOverride.orElse( + KEYBOARD_BACKLIGHT_CUSTOM_LEVELS_ENABLED); + } + + public static boolean isAmbientKeyboardBacklightControlEnabled() { + return sAmbientKeyboardBacklightControlOverride.orElse( + AMBIENT_KEYBOARD_BACKLIGHT_CONTROL_ENABLED); + } + + public static void setKeyboardBacklightControlEnabled(boolean enabled) { + sKeyboardBacklightControlOverride = Optional.of(enabled); + } + + public static void setKeyboardBacklightAnimationEnabled(boolean enabled) { + sKeyboardBacklightAnimationOverride = Optional.of(enabled); + } + + public static void setKeyboardBacklightCustomLevelsEnabled(boolean enabled) { + sKeyboardBacklightCustomLevelsOverride = Optional.of(enabled); + } + + public static void setAmbientKeyboardBacklightControlEnabled(boolean enabled) { + sAmbientKeyboardBacklightControlOverride = Optional.of(enabled); + } + + /** + * Clears all input feature flag overrides. + */ + public static void clearOverrides() { + sKeyboardBacklightControlOverride = Optional.empty(); + sKeyboardBacklightAnimationOverride = Optional.empty(); + sKeyboardBacklightCustomLevelsOverride = Optional.empty(); + sAmbientKeyboardBacklightControlOverride = Optional.empty(); + } +} diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 4cb22dbcf308..6a177e03102f 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -74,7 +74,6 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ShellCallback; -import android.os.SystemProperties; import android.os.UserHandle; import android.os.VibrationEffect; import android.os.vibrator.StepSegment; @@ -160,11 +159,6 @@ public class InputManagerService extends IInputManager.Stub private static final AdditionalDisplayInputProperties DEFAULT_ADDITIONAL_DISPLAY_INPUT_PROPERTIES = new AdditionalDisplayInputProperties(); - // To disable Keyboard backlight control via Framework, run: - // 'adb shell setprop persist.input.keyboard_backlight_control.enabled false' (requires restart) - private static final boolean KEYBOARD_BACKLIGHT_CONTROL_ENABLED = SystemProperties.getBoolean( - "persist.input.keyboard.backlight_control.enabled", true); - private final NativeInputManagerService mNative; private final Context mContext; @@ -399,10 +393,12 @@ public class InputManagerService extends IInputManager.Stub static class Injector { private final Context mContext; private final Looper mLooper; + private final UEventManager mUEventManager; - Injector(Context context, Looper looper) { + Injector(Context context, Looper looper, UEventManager uEventManager) { mContext = context; mLooper = looper; + mUEventManager = uEventManager; } Context getContext() { @@ -413,6 +409,10 @@ public class InputManagerService extends IInputManager.Stub return mLooper; } + UEventManager getUEventManager() { + return mUEventManager; + } + NativeInputManagerService getNativeService(InputManagerService service) { return new NativeInputManagerService.NativeImpl(service, mLooper.getQueue()); } @@ -423,7 +423,7 @@ public class InputManagerService extends IInputManager.Stub } public InputManagerService(Context context) { - this(new Injector(context, DisplayThread.get().getLooper())); + this(new Injector(context, DisplayThread.get().getLooper(), new UEventManager() {})); } @VisibleForTesting @@ -438,11 +438,12 @@ public class InputManagerService extends IInputManager.Stub mSettingsObserver = new InputSettingsObserver(mContext, mHandler, this, mNative); mKeyboardLayoutManager = new KeyboardLayoutManager(mContext, mNative, mDataStore, injector.getLooper()); - mBatteryController = new BatteryController(mContext, mNative, injector.getLooper()); - mKeyboardBacklightController = - KEYBOARD_BACKLIGHT_CONTROL_ENABLED ? new KeyboardBacklightController(mContext, - mNative, mDataStore, injector.getLooper()) - : new KeyboardBacklightControllerInterface() {}; + mBatteryController = new BatteryController(mContext, mNative, injector.getLooper(), + injector.getUEventManager()); + mKeyboardBacklightController = InputFeatureFlagProvider.isKeyboardBacklightControlEnabled() + ? new KeyboardBacklightController(mContext, mNative, mDataStore, + injector.getLooper(), injector.getUEventManager()) + : new KeyboardBacklightControllerInterface() {}; mKeyRemapper = new KeyRemapper(mContext, mNative, mDataStore, injector.getLooper()); mUseDevInputEventForAudioJack = diff --git a/services/core/java/com/android/server/input/InputSettingsObserver.java b/services/core/java/com/android/server/input/InputSettingsObserver.java index 651063e8841b..42591f40b22e 100644 --- a/services/core/java/com/android/server/input/InputSettingsObserver.java +++ b/services/core/java/com/android/server/input/InputSettingsObserver.java @@ -115,35 +115,34 @@ class InputSettingsObserver extends ContentObserver { return setting != 0; } - private int getPointerSpeedValue(String settingName) { - int speed = Settings.System.getIntForUser(mContext.getContentResolver(), - settingName, InputSettings.DEFAULT_POINTER_SPEED, UserHandle.USER_CURRENT); + private int constrainPointerSpeedValue(int speed) { return Math.min(Math.max(speed, InputSettings.MIN_POINTER_SPEED), InputSettings.MAX_POINTER_SPEED); } private void updateMousePointerSpeed() { - mNative.setPointerSpeed(getPointerSpeedValue(Settings.System.POINTER_SPEED)); + int speed = Settings.System.getIntForUser(mContext.getContentResolver(), + Settings.System.POINTER_SPEED, InputSettings.DEFAULT_POINTER_SPEED, + UserHandle.USER_CURRENT); + mNative.setPointerSpeed(constrainPointerSpeedValue(speed)); } private void updateTouchpadPointerSpeed() { mNative.setTouchpadPointerSpeed( - getPointerSpeedValue(Settings.System.TOUCHPAD_POINTER_SPEED)); + constrainPointerSpeedValue(InputSettings.getTouchpadPointerSpeed(mContext))); } private void updateTouchpadNaturalScrollingEnabled() { mNative.setTouchpadNaturalScrollingEnabled( - getBoolean(Settings.System.TOUCHPAD_NATURAL_SCROLLING, true)); + InputSettings.useTouchpadNaturalScrolling(mContext)); } private void updateTouchpadTapToClickEnabled() { - mNative.setTouchpadTapToClickEnabled( - getBoolean(Settings.System.TOUCHPAD_TAP_TO_CLICK, true)); + mNative.setTouchpadTapToClickEnabled(InputSettings.useTouchpadTapToClick(mContext)); } private void updateTouchpadRightClickZoneEnabled() { - mNative.setTouchpadRightClickZoneEnabled( - getBoolean(Settings.System.TOUCHPAD_RIGHT_CLICK_ZONE, false)); + mNative.setTouchpadRightClickZoneEnabled(InputSettings.useTouchpadRightClickZone(mContext)); } private void updateShowTouches() { diff --git a/services/core/java/com/android/server/input/KeyboardBacklightController.java b/services/core/java/com/android/server/input/KeyboardBacklightController.java index 48c346a2fe22..c3205afe14f2 100644 --- a/services/core/java/com/android/server/input/KeyboardBacklightController.java +++ b/services/core/java/com/android/server/input/KeyboardBacklightController.java @@ -16,7 +16,9 @@ package com.android.server.input; +import android.animation.ValueAnimator; import android.annotation.BinderThread; +import android.annotation.Nullable; import android.content.Context; import android.graphics.Color; import android.hardware.input.IKeyboardBacklightListener; @@ -45,6 +47,7 @@ import java.time.Duration; import java.util.Arrays; import java.util.Objects; import java.util.OptionalInt; +import java.util.TreeSet; /** * A thread-safe component of {@link InputManagerService} responsible for managing the keyboard @@ -69,7 +72,11 @@ final class KeyboardBacklightController implements private static final int MSG_NOTIFY_USER_INACTIVITY = 5; private static final int MSG_INTERACTIVE_STATE_CHANGED = 6; private static final int MAX_BRIGHTNESS = 255; - private static final int NUM_BRIGHTNESS_CHANGE_STEPS = 10; + private static final int DEFAULT_NUM_BRIGHTNESS_CHANGE_STEPS = 10; + @VisibleForTesting + static final int MAX_BRIGHTNESS_CHANGE_STEPS = 10; + private static final long TRANSITION_ANIMATION_DURATION_MILLIS = + Duration.ofSeconds(1).toMillis(); private static final String UEVENT_KEYBOARD_BACKLIGHT_TAG = "kbd_backlight"; @@ -77,7 +84,8 @@ final class KeyboardBacklightController implements static final long USER_INACTIVITY_THRESHOLD_MILLIS = Duration.ofSeconds(30).toMillis(); @VisibleForTesting - static final int[] BRIGHTNESS_VALUE_FOR_LEVEL = new int[NUM_BRIGHTNESS_CHANGE_STEPS + 1]; + static final int[] DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL = + new int[DEFAULT_NUM_BRIGHTNESS_CHANGE_STEPS + 1]; private final Context mContext; private final NativeInputManagerService mNative; @@ -85,6 +93,8 @@ final class KeyboardBacklightController implements @GuardedBy("mDataStore") private final PersistentDataStore mDataStore; private final Handler mHandler; + private final AnimatorFactory mAnimatorFactory; + private final UEventManager mUEventManager; // Always access on handler thread or need to lock this for synchronization. private final SparseArray<KeyboardBacklightState> mKeyboardBacklights = new SparseArray<>(1); // Maintains state if all backlights should be on or turned off @@ -97,22 +107,38 @@ final class KeyboardBacklightController implements private final SparseArray<KeyboardBacklightListenerRecord> mKeyboardBacklightListenerRecords = new SparseArray<>(); + private final AmbientKeyboardBacklightController mAmbientController; + @Nullable + private AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener mAmbientListener; + + private int mAmbientBacklightValue = 0; + static { // Fixed brightness levels to avoid issues when converting back and forth from the // device brightness range to [0-255] - // Levels are: 0, 25, 51, ..., 255 - for (int i = 0; i <= NUM_BRIGHTNESS_CHANGE_STEPS; i++) { - BRIGHTNESS_VALUE_FOR_LEVEL[i] = (int) Math.floor( - ((float) i * MAX_BRIGHTNESS) / NUM_BRIGHTNESS_CHANGE_STEPS); + // Levels are: 0, 51, ..., 255 + for (int i = 0; i <= DEFAULT_NUM_BRIGHTNESS_CHANGE_STEPS; i++) { + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[i] = (int) Math.floor( + ((float) i * MAX_BRIGHTNESS) / DEFAULT_NUM_BRIGHTNESS_CHANGE_STEPS); } } KeyboardBacklightController(Context context, NativeInputManagerService nativeService, - PersistentDataStore dataStore, Looper looper) { + PersistentDataStore dataStore, Looper looper, UEventManager uEventManager) { + this(context, nativeService, dataStore, looper, ValueAnimator::ofInt, uEventManager); + } + + @VisibleForTesting + KeyboardBacklightController(Context context, NativeInputManagerService nativeService, + PersistentDataStore dataStore, Looper looper, AnimatorFactory animatorFactory, + UEventManager uEventManager) { mContext = context; mNative = nativeService; mDataStore = dataStore; mHandler = new Handler(looper, this::handleMessage); + mAnimatorFactory = animatorFactory; + mAmbientController = new AmbientKeyboardBacklightController(context, looper); + mUEventManager = uEventManager; } @Override @@ -129,13 +155,17 @@ final class KeyboardBacklightController implements // We want to observe creation of such LED nodes since they might be created after device // FD created and InputDevice creation logic doesn't initialize LED nodes which leads to // backlight not working. - UEventObserver observer = new UEventObserver() { + mUEventManager.addListener(new UEventManager.UEventListener() { @Override - public void onUEvent(UEvent event) { + public void onUEvent(UEventObserver.UEvent event) { onKeyboardBacklightUEvent(event); } - }; - observer.startObserving(UEVENT_KEYBOARD_BACKLIGHT_TAG); + }, UEVENT_KEYBOARD_BACKLIGHT_TAG); + + if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { + // Start ambient backlight controller + mAmbientController.systemRunning(); + } } @Override @@ -168,43 +198,89 @@ final class KeyboardBacklightController implements if (inputDevice == null || state == null) { return; } - Light keyboardBacklight = state.mLight; // Follow preset levels of brightness defined in BRIGHTNESS_LEVELS - final int currBrightnessLevel = state.mBrightnessLevel; + final int currBrightnessLevel; + if (state.mUseAmbientController) { + int index = Arrays.binarySearch(state.mBrightnessValueForLevel, mAmbientBacklightValue); + // Set current level to the lower bound of the ambient value in the brightness array. + if (index < 0) { + int lowerBound = Math.max(0, -(index + 1) - 1); + currBrightnessLevel = + direction == Direction.DIRECTION_UP ? lowerBound : lowerBound + 1; + } else { + currBrightnessLevel = index; + } + } else { + currBrightnessLevel = state.mBrightnessLevel; + } final int newBrightnessLevel; if (direction == Direction.DIRECTION_UP) { - newBrightnessLevel = Math.min(currBrightnessLevel + 1, NUM_BRIGHTNESS_CHANGE_STEPS); + newBrightnessLevel = Math.min(currBrightnessLevel + 1, + state.getNumBrightnessChangeSteps()); } else { newBrightnessLevel = Math.max(currBrightnessLevel - 1, 0); } - updateBacklightState(deviceId, keyboardBacklight, newBrightnessLevel, - true /* isTriggeredByKeyPress */); + state.setBrightnessLevel(newBrightnessLevel); + + // Might need to stop listening to ALS since user has manually selected backlight + // level through keyboard up/down button + updateAmbientLightListener(); + + maybeBackupBacklightBrightness(inputDevice, state.mLight, + state.mBrightnessValueForLevel[newBrightnessLevel]); + + if (DEBUG) { + Slog.d(TAG, + "Changing state from " + state.mBrightnessLevel + " to " + newBrightnessLevel); + } + + synchronized (mKeyboardBacklightListenerRecords) { + for (int i = 0; i < mKeyboardBacklightListenerRecords.size(); i++) { + IKeyboardBacklightState callbackState = new IKeyboardBacklightState(); + callbackState.brightnessLevel = newBrightnessLevel; + callbackState.maxBrightnessLevel = state.getNumBrightnessChangeSteps(); + mKeyboardBacklightListenerRecords.valueAt(i).notifyKeyboardBacklightChanged( + deviceId, callbackState, true); + } + } + } + + private void maybeBackupBacklightBrightness(InputDevice inputDevice, Light keyboardBacklight, + int brightnessValue) { + // Don't back up or restore when ALS based keyboard backlight is enabled + if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { + return; + } synchronized (mDataStore) { try { mDataStore.setKeyboardBacklightBrightness(inputDevice.getDescriptor(), keyboardBacklight.getId(), - BRIGHTNESS_VALUE_FOR_LEVEL[newBrightnessLevel]); + brightnessValue); } finally { mDataStore.saveIfNeeded(); } } } - private void restoreBacklightBrightness(InputDevice inputDevice, Light keyboardBacklight) { + private void maybeRestoreBacklightBrightness(InputDevice inputDevice, Light keyboardBacklight) { + // Don't back up or restore when ALS based keyboard backlight is enabled + if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { + return; + } + KeyboardBacklightState state = mKeyboardBacklights.get(inputDevice.getId()); OptionalInt brightness; synchronized (mDataStore) { brightness = mDataStore.getKeyboardBacklightBrightness( inputDevice.getDescriptor(), keyboardBacklight.getId()); } - if (brightness.isPresent()) { + if (state != null && brightness.isPresent()) { int brightnessValue = Math.max(0, Math.min(MAX_BRIGHTNESS, brightness.getAsInt())); - int index = Arrays.binarySearch(BRIGHTNESS_VALUE_FOR_LEVEL, brightnessValue); - if (index < 0) { - index = Math.min(NUM_BRIGHTNESS_CHANGE_STEPS, -(index + 1)); + int newLevel = Arrays.binarySearch(state.mBrightnessValueForLevel, brightnessValue); + if (newLevel < 0) { + newLevel = Math.min(state.getNumBrightnessChangeSteps(), -(newLevel + 1)); } - updateBacklightState(inputDevice.getId(), keyboardBacklight, index, - false /* isTriggeredByKeyPress */); + state.setBrightnessLevel(newLevel); if (DEBUG) { Slog.d(TAG, "Restoring brightness level " + brightness.getAsInt()); } @@ -217,14 +293,10 @@ final class KeyboardBacklightController implements if (!mIsInteractive) { return; } - if (!mIsBacklightOn) { - mIsBacklightOn = true; - for (int i = 0; i < mKeyboardBacklights.size(); i++) { - int deviceId = mKeyboardBacklights.keyAt(i); - KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); - updateBacklightState(deviceId, state.mLight, state.mBrightnessLevel, - false /* isTriggeredByKeyPress */); - } + mIsBacklightOn = true; + for (int i = 0; i < mKeyboardBacklights.size(); i++) { + KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); + state.onBacklightStateChanged(); } mHandler.removeMessages(MSG_NOTIFY_USER_INACTIVITY); mHandler.sendEmptyMessageAtTime(MSG_NOTIFY_USER_INACTIVITY, @@ -232,14 +304,10 @@ final class KeyboardBacklightController implements } private void handleUserInactivity() { - if (mIsBacklightOn) { - mIsBacklightOn = false; - for (int i = 0; i < mKeyboardBacklights.size(); i++) { - int deviceId = mKeyboardBacklights.keyAt(i); - KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); - updateBacklightState(deviceId, state.mLight, state.mBrightnessLevel, - false /* isTriggeredByKeyPress */); - } + mIsBacklightOn = false; + for (int i = 0; i < mKeyboardBacklights.size(); i++) { + KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); + state.onBacklightStateChanged(); } } @@ -253,6 +321,16 @@ final class KeyboardBacklightController implements } else { handleUserInactivity(); } + updateAmbientLightListener(); + } + + @VisibleForTesting + public void handleAmbientLightValueChanged(int brightnessValue) { + mAmbientBacklightValue = brightnessValue; + for (int i = 0; i < mKeyboardBacklights.size(); i++) { + KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); + state.onAmbientBacklightValueChanged(); + } } private boolean handleMessage(Message msg) { @@ -285,12 +363,14 @@ final class KeyboardBacklightController implements @Override public void onInputDeviceAdded(int deviceId) { onInputDeviceChanged(deviceId); + updateAmbientLightListener(); } @VisibleForTesting @Override public void onInputDeviceRemoved(int deviceId) { mKeyboardBacklights.remove(deviceId); + updateAmbientLightListener(); } @VisibleForTesting @@ -310,8 +390,8 @@ final class KeyboardBacklightController implements return; } // The keyboard backlight was added or changed. - mKeyboardBacklights.put(deviceId, new KeyboardBacklightState(keyboardBacklight)); - restoreBacklightBrightness(inputDevice, keyboardBacklight); + mKeyboardBacklights.put(deviceId, new KeyboardBacklightState(deviceId, keyboardBacklight)); + maybeRestoreBacklightBrightness(inputDevice, keyboardBacklight); } private InputDevice getInputDevice(int deviceId) { @@ -372,33 +452,6 @@ final class KeyboardBacklightController implements } } - private void updateBacklightState(int deviceId, Light light, int brightnessLevel, - boolean isTriggeredByKeyPress) { - KeyboardBacklightState state = mKeyboardBacklights.get(deviceId); - if (state == null) { - return; - } - - mNative.setLightColor(deviceId, light.getId(), - mIsBacklightOn ? Color.argb(BRIGHTNESS_VALUE_FOR_LEVEL[brightnessLevel], 0, 0, 0) - : 0); - if (DEBUG) { - Slog.d(TAG, "Changing state from " + state.mBrightnessLevel + " to " + brightnessLevel - + "(isBacklightOn = " + mIsBacklightOn + ")"); - } - state.mBrightnessLevel = brightnessLevel; - - synchronized (mKeyboardBacklightListenerRecords) { - for (int i = 0; i < mKeyboardBacklightListenerRecords.size(); i++) { - IKeyboardBacklightState callbackState = new IKeyboardBacklightState(); - callbackState.brightnessLevel = brightnessLevel; - callbackState.maxBrightnessLevel = NUM_BRIGHTNESS_CHANGE_STEPS; - mKeyboardBacklightListenerRecords.valueAt(i).notifyKeyboardBacklightChanged( - deviceId, callbackState, isTriggeredByKeyPress); - } - } - } - private void onKeyboardBacklightListenerDied(int pid) { synchronized (mKeyboardBacklightListenerRecords) { mKeyboardBacklightListenerRecords.remove(pid); @@ -416,6 +469,25 @@ final class KeyboardBacklightController implements } } + private void updateAmbientLightListener() { + if (!InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { + return; + } + boolean needToListenAmbientLightSensor = false; + for (int i = 0; i < mKeyboardBacklights.size(); i++) { + needToListenAmbientLightSensor |= mKeyboardBacklights.valueAt(i).mUseAmbientController; + } + needToListenAmbientLightSensor &= mIsInteractive; + if (needToListenAmbientLightSensor && mAmbientListener == null) { + mAmbientListener = this::handleAmbientLightValueChanged; + mAmbientController.registerAmbientBacklightListener(mAmbientListener); + } + if (!needToListenAmbientLightSensor && mAmbientListener != null) { + mAmbientController.unregisterAmbientBacklightListener(mAmbientListener); + mAmbientListener = null; + } + } + private static boolean isValidBacklightNodePath(String devPath) { if (TextUtils.isEmpty(devPath)) { return false; @@ -436,10 +508,7 @@ final class KeyboardBacklightController implements @Override public void dump(PrintWriter pw) { IndentingPrintWriter ipw = new IndentingPrintWriter(pw); - ipw.println( - TAG + ": " + mKeyboardBacklights.size() + " keyboard backlights, isBacklightOn = " - + mIsBacklightOn); - + ipw.println(TAG + ": " + mKeyboardBacklights.size() + " keyboard backlights"); ipw.increaseIndent(); for (int i = 0; i < mKeyboardBacklights.size(); i++) { KeyboardBacklightState state = mKeyboardBacklights.valueAt(i); @@ -478,12 +547,99 @@ final class KeyboardBacklightController implements } } - private static class KeyboardBacklightState { + private class KeyboardBacklightState { + private final int mDeviceId; private final Light mLight; private int mBrightnessLevel; + private ValueAnimator mAnimator; + private final int[] mBrightnessValueForLevel; + private boolean mUseAmbientController = + InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled(); - KeyboardBacklightState(Light light) { + KeyboardBacklightState(int deviceId, Light light) { + mDeviceId = deviceId; mLight = light; + mBrightnessValueForLevel = setupBrightnessLevels(); + } + + private int[] setupBrightnessLevels() { + if (!InputFeatureFlagProvider.isKeyboardBacklightCustomLevelsEnabled()) { + return DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL; + } + int[] customLevels = mLight.getPreferredBrightnessLevels(); + if (customLevels == null || customLevels.length == 0) { + return DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL; + } + TreeSet<Integer> brightnessLevels = new TreeSet<>(); + brightnessLevels.add(0); + for (int level : customLevels) { + if (level > 0 && level < MAX_BRIGHTNESS) { + brightnessLevels.add(level); + } + } + brightnessLevels.add(MAX_BRIGHTNESS); + int brightnessChangeSteps = brightnessLevels.size() - 1; + if (brightnessChangeSteps > MAX_BRIGHTNESS_CHANGE_STEPS) { + return DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL; + } + int[] result = new int[brightnessLevels.size()]; + int index = 0; + for (int val : brightnessLevels) { + result[index++] = val; + } + return result; + } + + private int getNumBrightnessChangeSteps() { + return mBrightnessValueForLevel.length - 1; + } + + private void onBacklightStateChanged() { + int toValue = mUseAmbientController ? mAmbientBacklightValue + : mBrightnessValueForLevel[mBrightnessLevel]; + setBacklightValue(mIsBacklightOn ? toValue : 0); + } + private void setBrightnessLevel(int brightnessLevel) { + // Once we manually set level, disregard ambient light controller + mUseAmbientController = false; + if (mIsBacklightOn) { + setBacklightValue(mBrightnessValueForLevel[brightnessLevel]); + } + mBrightnessLevel = brightnessLevel; + } + + private void onAmbientBacklightValueChanged() { + if (mIsBacklightOn && mUseAmbientController) { + setBacklightValue(mAmbientBacklightValue); + } + } + + private void cancelAnimation() { + if (mAnimator != null && mAnimator.isRunning()) { + mAnimator.cancel(); + } + } + + private void setBacklightValue(int toValue) { + int fromValue = Color.alpha(mNative.getLightColor(mDeviceId, mLight.getId())); + if (fromValue == toValue) { + return; + } + if (InputFeatureFlagProvider.isKeyboardBacklightAnimationEnabled()) { + startAnimation(fromValue, toValue); + } else { + mNative.setLightColor(mDeviceId, mLight.getId(), Color.argb(toValue, 0, 0, 0)); + } + } + + private void startAnimation(int fromValue, int toValue) { + // Cancel any ongoing animation before starting a new one + cancelAnimation(); + mAnimator = mAnimatorFactory.makeIntAnimator(fromValue, toValue); + mAnimator.addUpdateListener( + (animation) -> mNative.setLightColor(mDeviceId, mLight.getId(), + Color.argb((int) animation.getAnimatedValue(), 0, 0, 0))); + mAnimator.setDuration(TRANSITION_ANIMATION_DURATION_MILLIS).start(); } @Override @@ -493,4 +649,9 @@ final class KeyboardBacklightController implements + "}"; } } + + @VisibleForTesting + interface AnimatorFactory { + ValueAnimator makeIntAnimator(int from, int to); + } } diff --git a/services/core/java/com/android/server/input/KeyboardLayoutManager.java b/services/core/java/com/android/server/input/KeyboardLayoutManager.java index 6ec4022fe15a..611a61a2e272 100644 --- a/services/core/java/com/android/server/input/KeyboardLayoutManager.java +++ b/services/core/java/com/android/server/input/KeyboardLayoutManager.java @@ -252,6 +252,8 @@ final class KeyboardLayoutManager implements InputManager.InputDeviceListener { if (needToShowNotification) { maybeUpdateNotification(); } + // TODO (b/280421650): Implement logging statements using KeyboardMetricsCollector + // for KeyboardConfigured atom } private String getDefaultKeyboardLayout(final InputDevice inputDevice) { diff --git a/services/core/java/com/android/server/input/KeyboardMetricsCollector.java b/services/core/java/com/android/server/input/KeyboardMetricsCollector.java new file mode 100644 index 000000000000..b8f57f555c0e --- /dev/null +++ b/services/core/java/com/android/server/input/KeyboardMetricsCollector.java @@ -0,0 +1,162 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import android.annotation.IntDef; +import android.hardware.input.KeyboardLayout; +import android.util.proto.ProtoOutputStream; +import android.view.InputDevice; + +import com.android.internal.os.KeyboardConfiguredProto.KeyboardLayoutConfig; +import com.android.internal.os.KeyboardConfiguredProto.RepeatedKeyboardLayoutConfig; +import com.android.internal.util.FrameworkStatsLog; + +import java.lang.annotation.Retention; +import java.util.List; + +/** + * Collect Keyboard metrics + */ +public final class KeyboardMetricsCollector { + private static final String TAG = "KeyboardMetricCollector"; + + /** + * Log keyboard system shortcuts for the proto + * {@link com.android.os.input.KeyboardSystemsEventReported} + * defined in "stats/atoms/input/input_extension_atoms.proto" + */ + public static void logKeyboardSystemsEventReportedAtom(InputDevice inputDevice, + int keyboardSystemEvent, int[] keyCode, int modifierState) { + int vendor_id = inputDevice.getVendorId(); + int product_id = inputDevice.getProductId(); + FrameworkStatsLog.write(FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED, + vendor_id, product_id, keyboardSystemEvent, keyCode, modifierState); + } + + /** + * Function to log the KeyboardConfigured + * {@link com.android.os.input.KeyboardConfigured} atom + * + * @param inputDevice Input device + * @param keyboardLayoutConfigurations List of keyboard configurations + * @param isFirstTimeConfiguration Whether keyboard is configured for the first time + */ + public static void logKeyboardConfiguredAtom(InputDevice inputDevice, + List<KeyboardLayoutConfiguration> keyboardLayoutConfigurations, + boolean isFirstTimeConfiguration) { + int vendor_id = inputDevice.getVendorId(); + int product_id = inputDevice.getProductId(); + + // Creating proto to log nested field KeyboardLayoutConfig in atom + ProtoOutputStream proto = new ProtoOutputStream(); + + for (KeyboardLayoutConfiguration keyboardLayoutConfiguration : + keyboardLayoutConfigurations) { + addKeyboardLayoutConfigurationToProto(proto, keyboardLayoutConfiguration); + } + // Push the atom to Statsd + FrameworkStatsLog.write(FrameworkStatsLog.KEYBOARD_CONFIGURED, + isFirstTimeConfiguration, vendor_id, product_id, proto.getBytes()); + } + + /** + * Populate the KeyboardLayoutConfig proto which is a repeated proto + * in the RepeatedKeyboardLayoutConfig proto with values from the + * {@link KeyboardLayoutConfiguration} class + * The proto definitions can be found at: + * "frameworks/proto_logging/stats/atoms/input/input_extension_atoms.proto" + * + * @param proto Representing the nested proto RepeatedKeyboardLayoutConfig + * @param keyboardLayoutConfiguration Class containing the fields for populating the + * KeyboardLayoutConfig proto + */ + private static void addKeyboardLayoutConfigurationToProto(ProtoOutputStream proto, + KeyboardLayoutConfiguration keyboardLayoutConfiguration) { + // Start a new KeyboardLayoutConfig proto. + long keyboardLayoutConfigToken = proto.start( + RepeatedKeyboardLayoutConfig.KEYBOARD_LAYOUT_CONFIG); + proto.write(KeyboardLayoutConfig.KEYBOARD_LANGUAGE_TAG, + keyboardLayoutConfiguration.getKeyboardLanguageTag()); + proto.write(KeyboardLayoutConfig.KEYBOARD_LAYOUT_TYPE, + keyboardLayoutConfiguration.getKeyboardLayoutType()); + proto.write(KeyboardLayoutConfig.KEYBOARD_LAYOUT_NAME, + keyboardLayoutConfiguration.getKeyboardLayoutName()); + proto.write(KeyboardLayoutConfig.LAYOUT_SELECTION_CRITERIA, + keyboardLayoutConfiguration.getLayoutSelectionCriteria()); + proto.end(keyboardLayoutConfigToken); + } + + /** + * Java class representing the proto KeyboardLayoutConfig defined in + * "frameworks/proto_logging/stats/atoms/input/input_extension_atoms.proto" + * + * @see com.android.os.input.KeyboardConfigured + */ + public static class KeyboardLayoutConfiguration { + // KeyboardLayoutType in "frameworks/base/core/res/res/values/attrs.xml" + // contains mapping for enums to int + int mKeyboardLayoutType; + String mKeyboardLanguageTag; + KeyboardLayout mKeyboardLayout; + @LayoutSelectionCriteria int mLayoutSelectionCriteria; + + @Retention(SOURCE) + @IntDef(prefix = { "LAYOUT_SELECTION_CRITERIA_" }, value = { + LAYOUT_SELECTION_CRITERIA_USER, + LAYOUT_SELECTION_CRITERIA_DEVICE, + LAYOUT_SELECTION_CRITERIA_VIRTUAL_KEYBOARD + }) + public @interface LayoutSelectionCriteria {} + + /** Manual selection by user */ + public static final int LAYOUT_SELECTION_CRITERIA_USER = 0; + + /** Auto-detection based on device provided language tag and layout type */ + public static final int LAYOUT_SELECTION_CRITERIA_DEVICE = 1; + + /** Auto-detection based on IME provided language tag and layout type */ + public static final int LAYOUT_SELECTION_CRITERIA_VIRTUAL_KEYBOARD = 2; + + KeyboardLayoutConfiguration(int keyboardLayoutType, + String keyboardLanguageTag, + KeyboardLayout keyboardLayout, + @LayoutSelectionCriteria int layoutSelectionCriteria) { + mKeyboardLayoutType = keyboardLayoutType; + mKeyboardLanguageTag = keyboardLanguageTag; + mKeyboardLayout = keyboardLayout; + mLayoutSelectionCriteria = layoutSelectionCriteria; + } + int getKeyboardLayoutType() { + return mKeyboardLayoutType; + } + + String getKeyboardLanguageTag() { + return mKeyboardLanguageTag; + } + + String getKeyboardLayoutName() { + return mKeyboardLayout.getLabel(); + } + + @LayoutSelectionCriteria int getLayoutSelectionCriteria() { + return mLayoutSelectionCriteria; + } + } +} + diff --git a/services/core/java/com/android/server/input/UEventManager.java b/services/core/java/com/android/server/input/UEventManager.java new file mode 100644 index 000000000000..17d87e4f0596 --- /dev/null +++ b/services/core/java/com/android/server/input/UEventManager.java @@ -0,0 +1,42 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import android.os.UEventObserver; + +/** An interface used to change the API of UEventObserver to a more test-friendly format. */ +interface UEventManager { + + abstract class UEventListener { + private final UEventObserver mObserver = new UEventObserver() { + @Override + public void onUEvent(UEvent event) { + UEventListener.this.onUEvent(event); + } + }; + + public abstract void onUEvent(UEventObserver.UEvent event); + } + + default void addListener(UEventListener listener, String match) { + listener.mObserver.startObserving(match); + } + + default void removeListener(UEventListener listener) { + listener.mObserver.stopObserving(); + } +} diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubService.java b/services/core/java/com/android/server/location/contexthub/ContextHubService.java index 5f783742bd26..93c66a19c89d 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubService.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubService.java @@ -52,6 +52,7 @@ import android.os.ResultReceiver; import android.os.ShellCallback; import android.os.SystemClock; import android.os.UserHandle; +import android.os.UserManager; import android.provider.Settings; import android.util.Log; import android.util.Pair; @@ -169,6 +170,8 @@ public class ContextHubService extends IContextHubService.Stub { private SensorPrivacyManagerInternal mSensorPrivacyManagerInternal; + private UserManager mUserManager = null; + private final Map<Integer, AtomicLong> mLastRestartTimestampMap = new HashMap<>(); /** @@ -491,6 +494,14 @@ public class ContextHubService extends IContextHubService.Stub { return; } + if (mUserManager == null) { + mUserManager = mContext.getSystemService(UserManager.class); + if (mUserManager == null) { + Log.e(TAG, "Unable to get the UserManager service"); + return; + } + } + sendMicrophoneDisableSettingUpdateForCurrentUser(); if (mSensorPrivacyManagerInternal == null) { Log.e(TAG, "Unable to add a sensor privacy listener for all users"); @@ -499,8 +510,9 @@ public class ContextHubService extends IContextHubService.Stub { mSensorPrivacyManagerInternal.addSensorPrivacyListenerForAllUsers( SensorPrivacyManager.Sensors.MICROPHONE, (userId, enabled) -> { - if (userId == getCurrentUserId()) { - Log.d(TAG, "User: " + userId + "mic privacy: " + enabled); + // If we are in HSUM mode, any user can change the microphone setting + if (mUserManager.isHeadlessSystemUserMode() || userId == getCurrentUserId()) { + Log.d(TAG, "User: " + userId + " mic privacy: " + enabled); sendMicrophoneDisableSettingUpdate(enabled); } }); diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index d29d9c84501d..7c3ff7ef39a9 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -2344,6 +2344,7 @@ public class NotificationManagerService extends SystemService { mRankingHandler, mZenModeHelper, mPermissionHelper, + mPermissionManager, mNotificationChannelLogger, mAppOps, new SysUiStatsEvent.BuilderFactory(), @@ -6772,6 +6773,8 @@ public class NotificationManagerService extends SystemService { return false; } + mUsageStats.registerEnqueuedByAppAndAccepted(pkg); + if (info != null) { // Cache the shortcut synchronously after the associated notification is posted in case // the app unpublishes this shortcut immediately after posting the notification. If the @@ -7210,11 +7213,12 @@ public class NotificationManagerService extends SystemService { + " cannot create notifications"); } - // rate limit updates that aren't completed progress notifications - if (mNotificationsByKey.get(r.getSbn().getKey()) != null - && !r.getNotification().hasCompletedProgress() - && !isAutogroup) { - + // Rate limit updates that aren't completed progress notifications + // Search for the original one in the posted and not-yet-posted (enqueued) lists. + boolean isUpdate = mNotificationsByKey.get(r.getSbn().getKey()) != null + || findNotificationByListLocked(mEnqueuedNotifications, r.getSbn().getKey()) + != null; + if (isUpdate && !r.getNotification().hasCompletedProgress() && !isAutogroup) { final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg); if (appEnqueueRate > mMaxPackageEnqueueRate) { mUsageStats.registerOverRateQuota(pkg); @@ -7839,15 +7843,8 @@ public class NotificationManagerService extends SystemService { boolean posted = false; synchronized (mNotificationLock) { try { - NotificationRecord r = null; - int N = mEnqueuedNotifications.size(); - for (int i = 0; i < N; i++) { - final NotificationRecord enqueued = mEnqueuedNotifications.get(i); - if (Objects.equals(key, enqueued.getKey())) { - r = enqueued; - break; - } - } + NotificationRecord r = findNotificationByListLocked(mEnqueuedNotifications, + key); if (r == null) { Slog.i(TAG, "Cannot find enqueued record for key: " + key); return false; @@ -9512,7 +9509,7 @@ public class NotificationManagerService extends SystemService { * Determine whether the userId applies to the notification in question, either because * they match exactly, or one of them is USER_ALL (which is treated as a wildcard). */ - private boolean notificationMatchesUserId(NotificationRecord r, int userId) { + private static boolean notificationMatchesUserId(NotificationRecord r, int userId) { return // looking for USER_ALL notifications? match everything userId == UserHandle.USER_ALL @@ -9871,9 +9868,9 @@ public class NotificationManagerService extends SystemService { return null; } - @GuardedBy("mNotificationLock") - private NotificationRecord findNotificationByListLocked(ArrayList<NotificationRecord> list, - String pkg, String tag, int id, int userId) { + @Nullable + private static NotificationRecord findNotificationByListLocked( + ArrayList<NotificationRecord> list, String pkg, String tag, int id, int userId) { final int len = list.size(); for (int i = 0; i < len; i++) { NotificationRecord r = list.get(i); @@ -9886,8 +9883,7 @@ public class NotificationManagerService extends SystemService { return null; } - @GuardedBy("mNotificationLock") - private List<NotificationRecord> findNotificationsByListLocked( + private static List<NotificationRecord> findNotificationsByListLocked( ArrayList<NotificationRecord> list, String pkg, String tag, int id, int userId) { List<NotificationRecord> matching = new ArrayList<>(); final int len = list.size(); @@ -9902,9 +9898,9 @@ public class NotificationManagerService extends SystemService { return matching; } - @GuardedBy("mNotificationLock") - private NotificationRecord findNotificationByListLocked(ArrayList<NotificationRecord> list, - String key) { + @Nullable + private static NotificationRecord findNotificationByListLocked( + ArrayList<NotificationRecord> list, String key) { final int N = list.size(); for (int i = 0; i < N; i++) { if (key.equals(list.get(i).getKey())) { @@ -9914,29 +9910,6 @@ public class NotificationManagerService extends SystemService { return null; } - /** - * There may be multiple records that match your criteria. For instance if there have been - * multiple notifications posted which are enqueued for the same pkg, tag, id, userId. This - * method will find all of them in the given list - * @return - */ - @GuardedBy("mNotificationLock") - private List<NotificationRecord> findEnqueuedNotificationsForCriteria( - String pkg, String tag, int id, int userId) { - final ArrayList<NotificationRecord> records = new ArrayList<>(); - final int n = mEnqueuedNotifications.size(); - for (int i = 0; i < n; i++) { - NotificationRecord r = mEnqueuedNotifications.get(i); - if (notificationMatchesUserId(r, userId) - && r.getSbn().getId() == id - && TextUtils.equals(r.getSbn().getTag(), tag) - && r.getSbn().getPackageName().equals(pkg)) { - records.add(r); - } - } - return records; - } - @GuardedBy("mNotificationLock") int indexOfNotificationLocked(String key) { final int N = mNotificationList.size(); diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index c9a6c630d41b..0292a99f1122 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -27,6 +27,7 @@ import static android.service.notification.NotificationListenerService.Ranking.U import android.annotation.Nullable; import android.app.ActivityManager; import android.app.IActivityManager; +import android.app.KeyguardManager; import android.app.Notification; import android.app.NotificationChannel; import android.app.Person; @@ -46,6 +47,7 @@ import android.os.Binder; import android.os.Build; import android.os.Bundle; import android.os.IBinder; +import android.os.PowerManager; import android.os.UserHandle; import android.os.VibrationEffect; import android.provider.Settings; @@ -101,7 +103,8 @@ public final class NotificationRecord { final int mTargetSdkVersion; final int mOriginalFlags; private final Context mContext; - + private final KeyguardManager mKeyguardManager; + private final PowerManager mPowerManager; NotificationUsageStats.SingleNotificationStats stats; boolean isCanceled; IBinder permissionOwner; @@ -228,6 +231,8 @@ public final class NotificationRecord { mUpdateTimeMs = mCreationTimeMs; mInterruptionTimeMs = mCreationTimeMs; mContext = context; + mKeyguardManager = mContext.getSystemService(KeyguardManager.class); + mPowerManager = mContext.getSystemService(PowerManager.class); stats = new NotificationUsageStats.SingleNotificationStats(); mChannel = channel; mPreChannelsNotification = isPreChannelsNotification(); @@ -1619,6 +1624,11 @@ public final class NotificationRecord { return mPhoneNumbers; } + boolean isLocked() { + return mKeyguardManager.isKeyguardLocked() + || !mPowerManager.isInteractive(); // Unlocked AOD + } + @VisibleForTesting static final class Light { public final int color; diff --git a/services/core/java/com/android/server/notification/NotificationRecordLogger.java b/services/core/java/com/android/server/notification/NotificationRecordLogger.java index 0cc4fc4e0516..5ca882cc1bb9 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLogger.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLogger.java @@ -31,9 +31,12 @@ import android.os.Bundle; import android.service.notification.NotificationListenerService; import android.service.notification.NotificationStats; +import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags; +import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags; import com.android.internal.logging.InstanceId; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; +import com.android.internal.util.FrameworkStatsLog; import java.util.ArrayList; import java.util.Objects; @@ -500,6 +503,8 @@ interface NotificationRecordLogger { final boolean is_foreground_service; final long timeout_millis; final boolean is_non_dismissible; + final int fsi_state; + final boolean is_locked; @DurationMillisLong long post_duration_millis; // Not final; calculated at the end. NotificationReported(NotificationRecordPair p, @@ -530,6 +535,20 @@ interface NotificationRecordLogger { this.is_foreground_service = NotificationRecordLogger.isForegroundService(p.r); this.timeout_millis = p.r.getSbn().getNotification().getTimeoutAfter(); this.is_non_dismissible = NotificationRecordLogger.isNonDismissible(p.r); + + final boolean isStickyHunFlagEnabled = SystemUiSystemPropertiesFlags.getResolver() + .isEnabled(NotificationFlags.SHOW_STICKY_HUN_FOR_DENIED_FSI); + + final boolean hasFullScreenIntent = + p.r.getSbn().getNotification().fullScreenIntent != null; + + final boolean hasFsiRequestedButDeniedFlag = (p.r.getSbn().getNotification().flags + & Notification.FLAG_FSI_REQUESTED_BUT_DENIED) != 0; + + this.fsi_state = NotificationRecordLogger.getFsiState(isStickyHunFlagEnabled, + hasFullScreenIntent, hasFsiRequestedButDeniedFlag, eventType); + + this.is_locked = p.r.isLocked(); } } @@ -558,7 +577,6 @@ interface NotificationRecordLogger { } /** - * @param r NotificationRecord * @return Whether the notification is a non-dismissible notification. */ static boolean isNonDismissible(@NonNull NotificationRecord r) { @@ -567,4 +585,28 @@ interface NotificationRecordLogger { } return (r.getNotification().flags & Notification.FLAG_NO_DISMISS) != 0; } + + /** + * @return FrameworkStatsLog enum of the state of the full screen intent posted with this + * notification. + */ + static int getFsiState(boolean isStickyHunFlagEnabled, + boolean hasFullScreenIntent, + boolean hasFsiRequestedButDeniedFlag, + NotificationReportedEvent eventType) { + + if (!isStickyHunFlagEnabled + || eventType == NotificationReportedEvent.NOTIFICATION_UPDATED) { + // Zeroes in protos take zero bandwidth, but non-zero numbers take bandwidth, + // so we should log 0 when possible. + return 0; + } + if (hasFullScreenIntent) { + return FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__FSI_ALLOWED; + } + if (hasFsiRequestedButDeniedFlag) { + return FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__FSI_DENIED; + } + return FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__NO_FSI; + } } diff --git a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java index feb75efe25f6..9da0e98c1775 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java @@ -75,7 +75,9 @@ class NotificationRecordLoggerImpl implements NotificationRecordLogger { notificationReported.is_foreground_service, notificationReported.timeout_millis, notificationReported.is_non_dismissible, - notificationReported.post_duration_millis); + notificationReported.post_duration_millis, + notificationReported.fsi_state, + notificationReported.is_locked); } @Override diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java index ffe33a832ce4..e960f4ba11fd 100644 --- a/services/core/java/com/android/server/notification/NotificationUsageStats.java +++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java @@ -16,23 +16,16 @@ package com.android.server.notification; -import static android.app.NotificationManager.IMPORTANCE_HIGH; - import android.app.Notification; -import android.content.ContentValues; import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteFullException; -import android.database.sqlite.SQLiteOpenHelper; import android.os.Handler; -import android.os.HandlerThread; import android.os.Message; import android.os.SystemClock; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; +import com.android.internal.annotations.GuardedBy; import com.android.internal.logging.MetricsLogger; import com.android.server.notification.NotificationManagerService.DumpFilter; @@ -42,8 +35,6 @@ import org.json.JSONObject; import java.io.PrintWriter; import java.util.ArrayDeque; -import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -63,7 +54,6 @@ public class NotificationUsageStats { private static final String TAG = "NotificationUsageStats"; private static final boolean ENABLE_AGGREGATED_IN_MEMORY_STATS = true; - private static final boolean ENABLE_SQLITE_LOG = true; private static final AggregatedStats[] EMPTY_AGGREGATED_STATS = new AggregatedStats[0]; private static final String DEVICE_GLOBAL_STATS = "__global"; // packages start with letters private static final int MSG_EMIT = 1; @@ -73,12 +63,15 @@ public class NotificationUsageStats { public static final int FOUR_HOURS = 1000 * 60 * 60 * 4; private static final long EMIT_PERIOD = DEBUG ? TEN_SECONDS : FOUR_HOURS; - // Guarded by synchronized(this). + @GuardedBy("this") private final Map<String, AggregatedStats> mStats = new HashMap<>(); + @GuardedBy("this") private final ArrayDeque<AggregatedStats[]> mStatsArrays = new ArrayDeque<>(); + @GuardedBy("this") private ArraySet<String> mStatExpiredkeys = new ArraySet<>(); private final Context mContext; private final Handler mHandler; + @GuardedBy("this") private long mLastEmitTime; public NotificationUsageStats(Context context) { @@ -105,11 +98,7 @@ public class NotificationUsageStats { */ public synchronized float getAppEnqueueRate(String packageName) { AggregatedStats stats = getOrCreateAggregatedStatsLocked(packageName); - if (stats != null) { - return stats.getEnqueueRate(SystemClock.elapsedRealtime()); - } else { - return 0f; - } + return stats.getEnqueueRate(SystemClock.elapsedRealtime()); } /** @@ -117,11 +106,7 @@ public class NotificationUsageStats { */ public synchronized boolean isAlertRateLimited(String packageName) { AggregatedStats stats = getOrCreateAggregatedStatsLocked(packageName); - if (stats != null) { - return stats.isAlertRateLimited(); - } else { - return false; - } + return stats.isAlertRateLimited(); } /** @@ -136,16 +121,32 @@ public class NotificationUsageStats { } /** + * Called when a notification that was enqueued by an app is effectively enqueued to be + * posted. This is after rate checking, to update the rate. + * + * <p>Note that if we updated the arrival estimate <em>before</em> checking it, then an app + * enqueueing at slightly above the acceptable rate would never get their notifications + * accepted; updating afterwards allows the rate to dip below the threshold and thus lets + * through some of them. + */ + public synchronized void registerEnqueuedByAppAndAccepted(String packageName) { + final long now = SystemClock.elapsedRealtime(); + AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(packageName); + for (AggregatedStats stats : aggregatedStatsArray) { + stats.updateInterarrivalEstimate(now); + } + releaseAggregatedStatsLocked(aggregatedStatsArray); + } + + /** * Called when a notification has been posted. */ public synchronized void registerPostedByApp(NotificationRecord notification) { - final long now = SystemClock.elapsedRealtime(); - notification.stats.posttimeElapsedMs = now; + notification.stats.posttimeElapsedMs = SystemClock.elapsedRealtime(); AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(notification); for (AggregatedStats stats : aggregatedStatsArray) { stats.numPostedByApp++; - stats.updateInterarrivalEstimate(now); stats.countApiUse(notification); stats.numUndecoratedRemoteViews += (notification.hasUndecoratedRemoteView() ? 1 : 0); } @@ -161,7 +162,6 @@ public class NotificationUsageStats { AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(notification); for (AggregatedStats stats : aggregatedStatsArray) { stats.numUpdatedByApp++; - stats.updateInterarrivalEstimate(SystemClock.elapsedRealtime()); stats.countApiUse(notification); } releaseAggregatedStatsLocked(aggregatedStatsArray); @@ -257,12 +257,12 @@ public class NotificationUsageStats { } } - // Locked by this. + @GuardedBy("this") private AggregatedStats[] getAggregatedStatsLocked(NotificationRecord record) { return getAggregatedStatsLocked(record.getSbn().getPackageName()); } - // Locked by this. + @GuardedBy("this") private AggregatedStats[] getAggregatedStatsLocked(String packageName) { if (!ENABLE_AGGREGATED_IN_MEMORY_STATS) { return EMPTY_AGGREGATED_STATS; @@ -277,7 +277,7 @@ public class NotificationUsageStats { return array; } - // Locked by this. + @GuardedBy("this") private void releaseAggregatedStatsLocked(AggregatedStats[] array) { for(int i = 0; i < array.length; i++) { array[i] = null; @@ -285,7 +285,7 @@ public class NotificationUsageStats { mStatsArrays.offer(array); } - // Locked by this. + @GuardedBy("this") private AggregatedStats getOrCreateAggregatedStatsLocked(String key) { AggregatedStats result = mStats.get(key); if (result == null) { diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java index 4399a3ca46c5..838a0fb63a35 100644 --- a/services/core/java/com/android/server/notification/PreferencesHelper.java +++ b/services/core/java/com/android/server/notification/PreferencesHelper.java @@ -30,6 +30,9 @@ import static android.util.StatsLog.ANNOTATION_ID_IS_UID; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED; import android.annotation.IntDef; import android.annotation.NonNull; @@ -41,6 +44,7 @@ import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.NotificationManager; +import android.content.AttributionSource; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -53,6 +57,7 @@ import android.os.Binder; import android.os.Build; import android.os.Process; import android.os.UserHandle; +import android.permission.PermissionManager; import android.provider.Settings; import android.service.notification.ConversationChannelWrapper; import android.service.notification.NotificationListenerService; @@ -72,6 +77,8 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags; +import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags; import com.android.internal.logging.MetricsLogger; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; @@ -183,6 +190,7 @@ public class PreferencesHelper implements RankingConfig { private final RankingHandler mRankingHandler; private final ZenModeHelper mZenModeHelper; private final PermissionHelper mPermissionHelper; + private final PermissionManager mPermissionManager; private final NotificationChannelLogger mNotificationChannelLogger; private final AppOpsManager mAppOps; @@ -198,7 +206,7 @@ public class PreferencesHelper implements RankingConfig { private boolean mAllowInvalidShortcuts = false; public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler, - ZenModeHelper zenHelper, PermissionHelper permHelper, + ZenModeHelper zenHelper, PermissionHelper permHelper, PermissionManager permManager, NotificationChannelLogger notificationChannelLogger, AppOpsManager appOpsManager, SysUiStatsEvent.BuilderFactory statsEventBuilderFactory, @@ -207,6 +215,7 @@ public class PreferencesHelper implements RankingConfig { mZenModeHelper = zenHelper; mRankingHandler = rankingHandler; mPermissionHelper = permHelper; + mPermissionManager = permManager; mPm = pm; mNotificationChannelLogger = notificationChannelLogger; mAppOps = appOpsManager; @@ -2027,6 +2036,43 @@ public class PreferencesHelper implements RankingConfig { } /** + * @return State of the full screen intent permission for this package. + */ + @VisibleForTesting + int getFsiState(String pkg, int uid, boolean requestedFSIPermission, boolean isFlagEnabled) { + if (!isFlagEnabled) { + return 0; + } + if (!requestedFSIPermission) { + return PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED; + } + final AttributionSource attributionSource = + new AttributionSource.Builder(uid).setPackageName(pkg).build(); + + final int result = mPermissionManager.checkPermissionForPreflight( + android.Manifest.permission.USE_FULL_SCREEN_INTENT, attributionSource); + + if (result == PermissionManager.PERMISSION_GRANTED) { + return PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED; + } + return PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED; + } + + /** + * @return True if the current full screen intent permission state for this package was set by + * the user. + */ + @VisibleForTesting + boolean isFsiPermissionUserSet(String pkg, int uid, int fsiState, int currentPermissionFlags, + boolean isStickyHunFlagEnabled) { + if (!isStickyHunFlagEnabled + || fsiState == PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED) { + return false; + } + return (currentPermissionFlags & PackageManager.FLAG_PERMISSION_USER_SET) != 0; + } + + /** * Fills out {@link PackageNotificationPreferences} proto and wraps it in a {@link StatsEvent}. */ public void pullPackagePreferencesStats(List<StatsEvent> events, @@ -2070,7 +2116,33 @@ public class PreferencesHelper implements RankingConfig { event.writeInt(r.visibility); event.writeInt(r.lockedAppFields); - event.writeBoolean(importanceIsUserSet); // optional bool user_set_importance = 5; + + // optional bool user_set_importance = 5; + event.writeBoolean(importanceIsUserSet); + + // optional FsiState fsi_state = 6; + final boolean isStickyHunFlagEnabled = SystemUiSystemPropertiesFlags.getResolver() + .isEnabled(NotificationFlags.SHOW_STICKY_HUN_FOR_DENIED_FSI); + + final boolean requestedFSIPermission = mPermissionHelper.hasRequestedPermission( + android.Manifest.permission.USE_FULL_SCREEN_INTENT, r.pkg, r.uid); + + final int fsiState = getFsiState(r.pkg, r.uid, requestedFSIPermission, + isStickyHunFlagEnabled); + + event.writeInt(fsiState); + + // optional bool is_fsi_permission_user_set = 7; + final int currentPermissionFlags = mPm.getPermissionFlags( + android.Manifest.permission.USE_FULL_SCREEN_INTENT, r.pkg, + UserHandle.getUserHandleForUid(r.uid)); + + final boolean isUserSet = + isFsiPermissionUserSet(r.pkg, r.uid, fsiState, currentPermissionFlags, + isStickyHunFlagEnabled); + + event.writeBoolean(isUserSet); + events.add(event.build()); } } diff --git a/services/core/java/com/android/server/notification/RateEstimator.java b/services/core/java/com/android/server/notification/RateEstimator.java index a2f93dce2bca..eda96ac84b16 100644 --- a/services/core/java/com/android/server/notification/RateEstimator.java +++ b/services/core/java/com/android/server/notification/RateEstimator.java @@ -22,9 +22,10 @@ package com.android.server.notification; * * {@hide} */ -public class RateEstimator { - private static final double RATE_ALPHA = 0.8; +class RateEstimator { + private static final double RATE_ALPHA = 0.7; private static final double MINIMUM_DT = 0.0005; + private Long mLastEventTime; private double mInterarrivalTime; @@ -34,18 +35,12 @@ public class RateEstimator { } /** Update the estimate to account for an event that just happened. */ - public float update(long now) { - float rate; - if (mLastEventTime == null) { - // No last event time, rate is zero. - rate = 0f; - } else { + public void update(long now) { + if (mLastEventTime != null) { // Calculate the new inter-arrival time based on last event time. mInterarrivalTime = getInterarrivalEstimate(now); - rate = (float) (1.0 / mInterarrivalTime); } mLastEventTime = now; - return rate; } /** @return the estimated rate if there were a new event right now. */ diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 3e81f465a6c2..3d72bae03012 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -124,6 +124,7 @@ import android.hardware.hdmi.HdmiAudioSystemClient; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiPlaybackClient; import android.hardware.hdmi.HdmiPlaybackClient.OneTouchPlayCallback; +import android.hardware.input.InputManager; import android.media.AudioManager; import android.media.AudioManagerInternal; import android.media.AudioSystem; @@ -205,6 +206,7 @@ import com.android.internal.policy.PhoneWindow; import com.android.internal.policy.TransitionAnimation; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.widget.LockPatternUtils; import com.android.server.AccessibilityManagerInternal; import com.android.server.ExtconStateObserver; @@ -215,6 +217,7 @@ import com.android.server.SystemServiceManager; import com.android.server.UiThread; import com.android.server.display.BrightnessUtils; import com.android.server.input.InputManagerInternal; +import com.android.server.input.KeyboardMetricsCollector; import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.pm.UserManagerInternal; import com.android.server.policy.KeyCombinationManager.TwoKeysCombinationRule; @@ -536,10 +539,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { int mShortPressOnSleepBehavior; int mShortPressOnWindowBehavior; int mPowerVolUpBehavior; - int mShortPressOnStemPrimaryBehavior; - int mDoublePressOnStemPrimaryBehavior; - int mTriplePressOnStemPrimaryBehavior; - int mLongPressOnStemPrimaryBehavior; boolean mStylusButtonsEnabled = true; boolean mHasSoftInput = false; boolean mHapticTextHandleEnabled; @@ -553,6 +552,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { int mSearchKeyBehavior; ComponentName mSearchKeyTargetActivity; + // Key Behavior - Stem Primary + private int mShortPressOnStemPrimaryBehavior; + private int mDoublePressOnStemPrimaryBehavior; + private int mTriplePressOnStemPrimaryBehavior; + private int mLongPressOnStemPrimaryBehavior; + private boolean mHandleVolumeKeysInWM; private boolean mPendingKeyguardOccluded; @@ -595,8 +600,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // What we do when the user double-taps on home private int mDoubleTapOnHomeBehavior; - // Whether to lock the device after the next app transition has finished. - boolean mLockAfterAppTransitionFinished; + // Whether to lock the device after the next dreaming transition has finished. + private boolean mLockAfterDreamingTransitionFinished; // Allowed theater mode wake actions private boolean mAllowTheaterModeWakeFromKey; @@ -676,6 +681,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private static final int MSG_LAUNCH_ASSIST = 23; private static final int MSG_RINGER_TOGGLE_CHORD = 24; private static final int MSG_SWITCH_KEYBOARD_LAYOUT = 25; + private static final int MSG_LOG_KEYBOARD_SYSTEM_EVENT = 26; private class PolicyHandler extends Handler { @Override @@ -749,6 +755,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { case MSG_SWITCH_KEYBOARD_LAYOUT: handleSwitchKeyboardLayout(msg.arg1, msg.arg2); break; + case MSG_LOG_KEYBOARD_SYSTEM_EVENT: + handleKeyboardSystemEvent(msg.arg2, (KeyEvent) msg.obj); + break; } } } @@ -815,7 +824,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void onChange(boolean selfChange) { updateSettings(); - updateRotation(false); } } @@ -1095,7 +1103,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { synchronized (mLock) { // If the setting to lock instantly on power button press is true, then set the flag to // lock after the dream transition has finished. - mLockAfterAppTransitionFinished = + mLockAfterDreamingTransitionFinished = mLockPatternUtils.getPowerButtonInstantlyLocks(mCurrentUserId); } @@ -1991,6 +1999,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { Supplier<GlobalActions> getGlobalActionsFactory() { return () -> new GlobalActions(mContext, mWindowManagerFuncs); } + + KeyguardServiceDelegate getKeyguardServiceDelegate() { + return new KeyguardServiceDelegate(mContext, + new StateCallback() { + @Override + public void onTrustedChanged() { + mWindowManagerFuncs.notifyKeyguardTrustedChanged(); + } + + @Override + public void onShowingChanged() { + mWindowManagerFuncs.onKeyguardShowingAndNotOccludedChanged(); + } + }); + } } /** {@inheritDoc} */ @@ -2229,37 +2252,28 @@ public class PhoneWindowManager implements WindowManagerPolicy { true /* notifyOccluded */); synchronized (mLock) { - mLockAfterAppTransitionFinished = false; + mLockAfterDreamingTransitionFinished = false; } } @Override public void onAppTransitionFinishedLocked(IBinder token) { synchronized (mLock) { - if (!mLockAfterAppTransitionFinished) { - return; + final DreamManagerInternal dreamManagerInternal = getDreamManagerInternal(); + // check both isDreaming and mLockAfterDreamingTransitionFinished before lockNow + // so it won't relock after dreaming has stopped + if (dreamManagerInternal != null && dreamManagerInternal.isDreaming() + && mLockAfterDreamingTransitionFinished) { + lockNow(null); } - mLockAfterAppTransitionFinished = false; + mLockAfterDreamingTransitionFinished = false; } - - lockNow(null); } }); mKeyguardDrawnTimeout = mContext.getResources().getInteger( com.android.internal.R.integer.config_keyguardDrawnTimeout); - mKeyguardDelegate = new KeyguardServiceDelegate(mContext, - new StateCallback() { - @Override - public void onTrustedChanged() { - mWindowManagerFuncs.notifyKeyguardTrustedChanged(); - } - - @Override - public void onShowingChanged() { - mWindowManagerFuncs.onKeyguardShowingAndNotOccludedChanged(); - } - }); + mKeyguardDelegate = injector.getKeyguardServiceDelegate(); initKeyCombinationRules(); initSingleKeyGestureRules(); mSideFpsEventHandler = new SideFpsEventHandler(mContext, mHandler, mPowerManager); @@ -2284,6 +2298,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { cancelPendingScreenshotChordAction(); } }); + if (mHasFeatureWatch) { mKeyCombinationManager.addRule( new TwoKeysCombinationRule(KEYCODE_POWER, KEYCODE_STEM_PRIMARY) { @@ -2903,7 +2918,30 @@ public class PhoneWindowManager implements WindowManagerPolicy { WindowManager.LayoutParams.TYPE_SYSTEM_ERROR, }; + /** + * Log the keyboard shortcuts without blocking the current thread. + * + * We won't log keyboard events when the input device is null + * or when it is virtual. + */ + private void handleKeyboardSystemEvent(int keyboardSystemEvent, KeyEvent event) { + final InputManager inputManager = mContext.getSystemService(InputManager.class); + final InputDevice inputDevice = inputManager != null + ? inputManager.getInputDevice(event.getDeviceId()) : null; + if (inputDevice != null && !inputDevice.isVirtual()) { + KeyboardMetricsCollector.logKeyboardSystemsEventReportedAtom( + inputDevice, keyboardSystemEvent, + new int[]{event.getKeyCode()}, event.getMetaState()); + } + } + + private void logKeyboardSystemsEvent(KeyEvent event, int keyboardSystemEvent) { + mHandler.obtainMessage(MSG_LOG_KEYBOARD_SYSTEM_EVENT, 0, keyboardSystemEvent, event) + .sendToTarget(); + } + // TODO(b/117479243): handle it in InputPolicy + // TODO (b/283241997): Add the remaining keyboard shortcut logging after refactoring /** {@inheritDoc} */ @Override public long interceptKeyBeforeDispatching(IBinder focusedToken, KeyEvent event, @@ -2957,6 +2995,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { switch(keyCode) { case KeyEvent.KEYCODE_HOME: + logKeyboardSystemsEvent(event, FrameworkStatsLog + .KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__HOME); return handleHomeShortcuts(displayId, focusedToken, event); case KeyEvent.KEYCODE_MENU: // Hijack modified menu keys for debugging features @@ -2974,6 +3014,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_RECENT_APPS: if (down && repeatCount == 0) { showRecentApps(false /* triggeredFromAltTab */); + logKeyboardSystemsEvent(event, FrameworkStatsLog + .KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__RECENT_APPS); } return key_consumed; case KeyEvent.KEYCODE_APP_SWITCH: @@ -3005,6 +3047,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { return key_consumed; } break; + case KeyEvent.KEYCODE_L: + if (down && event.isMetaPressed() && repeatCount == 0) { + lockNow(null /* options */); + return key_consumed; + } + break; case KeyEvent.KEYCODE_N: if (down && event.isMetaPressed()) { if (event.isCtrlPressed()) { diff --git a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java index 3e498d7d14ee..1133dba27ace 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java @@ -87,7 +87,7 @@ class WallpaperDataParser { mImageWallpaper = ComponentName.unflattenFromString( context.getResources().getString(R.string.image_wallpaper_component)); mIsLockscreenLiveWallpaperEnabled = - SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false); + SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true); } private JournaledFile makeJournaledFile(int userId) { diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index af9132143785..38b6b40aa1ae 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -1462,6 +1462,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } } + synchronized (mLock) { + saveSettingsLocked(mNewWallpaper.userId); + } + if (DEBUG) { Slog.v(TAG, "--- wallpaper changed --"); Slog.v(TAG, "new sysWp: " + mWallpaperMap.get(mCurrentUserId)); @@ -1633,7 +1637,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub mShuttingDown = false; mImageWallpaper = ComponentName.unflattenFromString( context.getResources().getString(R.string.image_wallpaper_component)); - mDefaultWallpaperComponent = WallpaperManager.getDefaultWallpaperComponent(context); + mDefaultWallpaperComponent = WallpaperManager.getCmfDefaultWallpaperComponent(context); mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class); mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); mIPackageManager = AppGlobals.getPackageManager(); @@ -1649,7 +1653,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub mWallpaperCropper); mIsLockscreenLiveWallpaperEnabled = - SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false); + SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true); mIsMultiCropEnabled = SystemProperties.getBoolean("persist.wm.debug.wallpaper_multi_crop", false); LocalServices.addService(WallpaperManagerInternal.class, new LocalService()); @@ -1820,21 +1824,23 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (record.exists()) { Slog.w(TAG, "User:" + userID + ", wallpaper tyep = " + type + ", wallpaper fail detect!! reset to default wallpaper"); - clearWallpaperData(userID, type); + clearWallpaperBitmaps(userID, type); record.delete(); } }); } - private void clearWallpaperData(int userID, int wallpaperType) { + private void clearWallpaperBitmaps(int userID, int wallpaperType) { final WallpaperData wallpaper = new WallpaperData(userID, wallpaperType); - if (wallpaper.sourceExists()) { - wallpaper.wallpaperFile.delete(); - } - if (wallpaper.cropExists()) { - wallpaper.cropFile.delete(); - } + clearWallpaperBitmaps(wallpaper); + } + private boolean clearWallpaperBitmaps(WallpaperData wallpaper) { + boolean sourceExists = wallpaper.sourceExists(); + boolean cropExists = wallpaper.cropExists(); + if (sourceExists) wallpaper.wallpaperFile.delete(); + if (cropExists) wallpaper.cropFile.delete(); + return sourceExists || cropExists; } @Override @@ -2011,10 +2017,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub // files from the previous static wallpaper may still be stored in memory. // delete them in order to show the default wallpaper. - if (wallpaper.wallpaperFile.exists()) { - wallpaper.wallpaperFile.delete(); - wallpaper.cropFile.delete(); - } + clearWallpaperBitmaps(wallpaper); bindWallpaperComponentLocked(mImageWallpaper, true, false, fallback, reply); if ((wallpaper.mWhich & FLAG_SYSTEM) != 0) mHomeWallpaperWaitingForUnlock = true; @@ -2079,9 +2082,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub final long ident = Binder.clearCallingIdentity(); try { - if (wallpaper.wallpaperFile.exists()) { - wallpaper.wallpaperFile.delete(); - wallpaper.cropFile.delete(); + if (clearWallpaperBitmaps(wallpaper)) { if (which == FLAG_LOCK) { mLockWallpaperMap.remove(userId); final IWallpaperManagerCallback cb = mKeyguardListener; @@ -3152,9 +3153,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } } catch (ErrnoException e) { Slog.e(TAG, "Can't migrate system wallpaper: " + e.getMessage()); - lockWP.wallpaperFile.delete(); - lockWP.cropFile.delete(); - return; + clearWallpaperBitmaps(lockWP); } } @@ -3296,6 +3295,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub }); } } + if (!mImageWallpaper.equals(newWallpaper.wallpaperComponent)) { + clearWallpaperBitmaps(newWallpaper); + } newWallpaper.wallpaperId = makeWallpaperIdLocked(); notifyCallbacksLocked(newWallpaper); shouldNotifyColors = true; diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index a0a45e67e77b..3ba410c65ab8 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -898,6 +898,11 @@ class ActivityStarter { } mLastStartReason = request.reason; mLastStartActivityTimeMs = System.currentTimeMillis(); + // Reset the ActivityRecord#mCurrentLaunchCanTurnScreenOn state of last start activity in + // case the state is not yet consumed during rapid activity launch. + if (mLastStartActivityRecord != null) { + mLastStartActivityRecord.setCurrentLaunchCanTurnScreenOn(false); + } mLastStartActivityRecord = null; final IApplicationThread caller = request.caller; @@ -1686,7 +1691,9 @@ class ActivityStarter { } // When running transient transition, the transient launch target should keep on top. // So disallow the transient hide activity to move itself to front, e.g. trampoline. - if (!mAvoidMoveToFront && r.mTransitionController.isTransientHide(targetTask)) { + if (!mAvoidMoveToFront && (mService.mHomeProcess == null + || mService.mHomeProcess.mUid != realCallingUid) + && r.mTransitionController.isTransientHide(targetTask)) { mAvoidMoveToFront = true; } mPriorAboveTask = TaskDisplayArea.getRootTaskAbove(targetTask.getRootTask()); @@ -2928,15 +2935,6 @@ class ActivityStarter { } } - // If the matching task is already in the adjacent task of the launch target. Adjust to use - // the adjacent task as its launch target. So the existing task will be launched into the - // closer one and won't be reparent redundantly. - final Task adjacentTargetTask = mTargetRootTask.getAdjacentTask(); - if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask) - && intentTask.isOnTop()) { - mTargetRootTask = adjacentTargetTask; - } - // If the target task is not in the front, then we need to bring it to the front... // except... well, with SINGLE_TASK_LAUNCH it's not entirely clear. We'd like to have // the same behavior as if a new instance was being started, which means not bringing it @@ -2977,7 +2975,9 @@ class ActivityStarter { // should be START_DELIVERED_TO_TOP instead of START_TASK_TO_FRONT. final boolean wasTopOfVisibleRootTask = intentActivity.isVisibleRequested() && intentActivity.inMultiWindowMode() - && intentActivity == mTargetRootTask.topRunningActivity(); + && intentActivity == mTargetRootTask.topRunningActivity() + && !intentActivity.mTransitionController.isTransientHide( + mTargetRootTask); // We only want to move to the front, if we aren't going to launch on a // different root task. If we launch on a different root task, we will put the // task on top there. diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 47b51ac164b9..4a658d6abaf4 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -1411,29 +1411,39 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final long origId = Binder.clearCallingIdentity(); // TODO(b/64750076): Check if calling pid should really be -1. - final int res = getActivityStartController() - .obtainStarter(intent, "startNextMatchingActivity") - .setCaller(r.app.getThread()) - .setResolvedType(r.resolvedType) - .setActivityInfo(aInfo) - .setResultTo(resultTo != null ? resultTo.token : null) - .setResultWho(resultWho) - .setRequestCode(requestCode) - .setCallingPid(-1) - .setCallingUid(r.launchedFromUid) - .setCallingPackage(r.launchedFromPackage) - .setCallingFeatureId(r.launchedFromFeatureId) - .setRealCallingPid(-1) - .setRealCallingUid(r.launchedFromUid) - .setActivityOptions(options) - .execute(); - Binder.restoreCallingIdentity(origId); + try { + if (options == null) { + options = new SafeActivityOptions(ActivityOptions.makeBasic()); + } - r.finishing = wasFinishing; - if (res != ActivityManager.START_SUCCESS) { - return false; + // Fixes b/230492947 + // Prevents background activity launch through #startNextMatchingActivity + // An activity going into the background could still go back to the foreground + // if the intent used matches both: + // - the activity in the background + // - a second activity. + options.getOptions(r).setAvoidMoveToFront(); + final int res = getActivityStartController() + .obtainStarter(intent, "startNextMatchingActivity") + .setCaller(r.app.getThread()) + .setResolvedType(r.resolvedType) + .setActivityInfo(aInfo) + .setResultTo(resultTo != null ? resultTo.token : null) + .setResultWho(resultWho) + .setRequestCode(requestCode) + .setCallingPid(-1) + .setCallingUid(r.launchedFromUid) + .setCallingPackage(r.launchedFromPackage) + .setCallingFeatureId(r.launchedFromFeatureId) + .setRealCallingPid(-1) + .setRealCallingUid(r.launchedFromUid) + .setActivityOptions(options) + .execute(); + r.finishing = wasFinishing; + return res == ActivityManager.START_SUCCESS; + } finally { + Binder.restoreCallingIdentity(origId); } - return true; } } diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index 0171c200b56c..738797b809a5 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -1891,7 +1891,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { // DestroyActivityItem may be called first. final ActivityRecord top = task.getTopMostActivity(); if (top != null && top.finishing && !top.mAppStopped && top.lastVisibleTime > 0 - && !task.mKillProcessesOnDestroyed) { + && !task.mKillProcessesOnDestroyed && top.hasProcess()) { task.mKillProcessesOnDestroyed = true; mHandler.sendMessageDelayed( mHandler.obtainMessage(KILL_TASK_PROCESSES_TIMEOUT_MSG, task), @@ -2367,6 +2367,10 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { final ActivityRecord prevTopActivity = mTopResumedActivity; final Task topRootTask = mRootWindowContainer.getTopDisplayFocusedRootTask(); if (topRootTask == null || topRootTask.getTopResumedActivity() == prevTopActivity) { + if (topRootTask == null) { + // There's no focused task and there won't have any resumed activity either. + scheduleTopResumedActivityStateLossIfNeeded(); + } if (mService.isSleepingLocked()) { // There won't be a next resumed activity. The top process should still be updated // according to the current top focused activity. @@ -2376,16 +2380,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { } // Ask previous activity to release the top state. - final boolean prevActivityReceivedTopState = - prevTopActivity != null && !mTopResumedActivityWaitingForPrev; - // mTopResumedActivityWaitingForPrev == true at this point would mean that an activity - // before the prevTopActivity one hasn't reported back yet. So server never sent the top - // resumed state change message to prevTopActivity. - if (prevActivityReceivedTopState - && prevTopActivity.scheduleTopResumedActivityChanged(false /* onTop */)) { - scheduleTopResumedStateLossTimeout(prevTopActivity); - mTopResumedActivityWaitingForPrev = true; - } + scheduleTopResumedActivityStateLossIfNeeded(); // Update the current top activity. mTopResumedActivity = topRootTask.getTopResumedActivity(); @@ -2410,6 +2405,23 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { mService.updateTopApp(mTopResumedActivity); } + /** Schedule current top resumed activity state loss */ + private void scheduleTopResumedActivityStateLossIfNeeded() { + if (mTopResumedActivity == null) { + return; + } + + // mTopResumedActivityWaitingForPrev == true at this point would mean that an activity + // before the prevTopActivity one hasn't reported back yet. So server never sent the top + // resumed state change message to prevTopActivity. + if (!mTopResumedActivityWaitingForPrev + && mTopResumedActivity.scheduleTopResumedActivityChanged(false /* onTop */)) { + scheduleTopResumedStateLossTimeout(mTopResumedActivity); + mTopResumedActivityWaitingForPrev = true; + mTopResumedActivity = null; + } + } + /** Schedule top resumed state change if previous top activity already reported back. */ private void scheduleTopResumedActivityStateIfNeeded() { if (mTopResumedActivity != null && !mTopResumedActivityWaitingForPrev) { diff --git a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java index e91c9d427c80..2b6b62e0d81a 100644 --- a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java +++ b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java @@ -80,8 +80,8 @@ public class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { appendLog("not in bounds phase, skipping"); return RESULT_SKIP; } - if (!task.isActivityTypeStandard()) { - appendLog("not standard activity type, skipping"); + if (!task.isActivityTypeStandardOrUndefined()) { + appendLog("not standard or undefined activity type, skipping"); return RESULT_SKIP; } if (!currentParams.mBounds.isEmpty()) { diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 65771d1ce373..dd62b21bc7d1 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -176,7 +176,7 @@ public class DisplayPolicy { // TODO(b/266197298): Remove this by a more general protocol from the insets providers. private static final boolean USE_CACHED_INSETS_FOR_DISPLAY_SWITCH = - SystemProperties.getBoolean("persist.wm.debug.cached_insets_switch", false); + SystemProperties.getBoolean("persist.wm.debug.cached_insets_switch", true); private final WindowManagerService mService; private final Context mContext; @@ -271,13 +271,13 @@ public class DisplayPolicy { private WindowState mSystemUiControllingWindow; // Candidate window to determine the color of navigation bar. The window needs to be top - // fullscreen-app windows or dim layers that are intersecting with the window frame of status - // bar. + // fullscreen-app windows or dim layers that are intersecting with the window frame of + // navigation bar. private WindowState mNavBarColorWindowCandidate; - // The window to determine opacity and background of translucent navigation bar. The window - // needs to be opaque. - private WindowState mNavBarBackgroundWindow; + // Candidate window to determine opacity and background of translucent navigation bar. + // The window frame must intersect the frame of navigation bar. + private WindowState mNavBarBackgroundWindowCandidate; /** * A collection of {@link AppearanceRegion} to indicate that which region of status bar applies @@ -961,12 +961,6 @@ public class DisplayPolicy { if (!win.mSession.mCanSetUnrestrictedGestureExclusion) { attrs.privateFlags &= ~PRIVATE_FLAG_UNRESTRICTED_GESTURE_EXCLUSION; } - - final InsetsSourceProvider provider = win.getControllableInsetProvider(); - if (provider != null && provider.getSource().insetsRoundedCornerFrame() - != attrs.insetsRoundedCornerFrame) { - provider.getSource().setInsetsRoundedCornerFrame(attrs.insetsRoundedCornerFrame); - } } /** @@ -1104,9 +1098,11 @@ public class DisplayPolicy { } else { overrideProviders = null; } - mDisplayContent.getInsetsStateController().getOrCreateSourceProvider( - provider.getId(), provider.getType()).setWindowContainer( - win, frameProvider, overrideProviders); + final InsetsSourceProvider sourceProvider = mDisplayContent + .getInsetsStateController().getOrCreateSourceProvider(provider.getId(), + provider.getType()); + sourceProvider.getSource().setFlags(provider.getFlags()); + sourceProvider.setWindowContainer(win, frameProvider, overrideProviders); mInsetsSourceWindowsExceptIme.add(win); } } @@ -1387,7 +1383,7 @@ public class DisplayPolicy { mBottomGestureHost = null; mTopFullscreenOpaqueWindowState = null; mNavBarColorWindowCandidate = null; - mNavBarBackgroundWindow = null; + mNavBarBackgroundWindowCandidate = null; mStatusBarAppearanceRegionList.clear(); mLetterboxDetails.clear(); mStatusBarBackgroundWindows.clear(); @@ -1514,8 +1510,8 @@ public class DisplayPolicy { mNavBarColorWindowCandidate = win; addSystemBarColorApp(win); } - if (mNavBarBackgroundWindow == null) { - mNavBarBackgroundWindow = win; + if (mNavBarBackgroundWindowCandidate == null) { + mNavBarBackgroundWindowCandidate = win; } } @@ -1539,12 +1535,19 @@ public class DisplayPolicy { } if (isOverlappingWithNavBar(win) && mNavBarColorWindowCandidate == null) { mNavBarColorWindowCandidate = win; + addSystemBarColorApp(win); } - } else if (appWindow && attached == null && mNavBarColorWindowCandidate == null + } else if (appWindow && attached == null + && (mNavBarColorWindowCandidate == null || mNavBarBackgroundWindowCandidate == null) && win.getFrame().contains( getBarContentFrameForWindow(win, Type.navigationBars()))) { - mNavBarColorWindowCandidate = win; - addSystemBarColorApp(win); + if (mNavBarColorWindowCandidate == null) { + mNavBarColorWindowCandidate = win; + addSystemBarColorApp(win); + } + if (mNavBarBackgroundWindowCandidate == null) { + mNavBarBackgroundWindowCandidate = win; + } } } @@ -2483,7 +2486,7 @@ public class DisplayPolicy { return win.isFullyTransparentBarAllowed(getBarContentFrameForWindow(win, type)); } - private boolean drawsBarBackground(WindowState win) { + private static boolean drawsBarBackground(WindowState win) { if (win == null) { return true; } @@ -2523,7 +2526,14 @@ public class DisplayPolicy { */ private int configureNavBarOpacity(int appearance, boolean multiWindowTaskVisible, boolean freeformRootTaskVisible) { - final boolean drawBackground = drawsBarBackground(mNavBarBackgroundWindow); + final WindowState navBackgroundWin = chooseNavigationBackgroundWindow( + mNavBarBackgroundWindowCandidate, + mDisplayContent.mInputMethodWindow, + mNavigationBarPosition); + final boolean drawBackground = navBackgroundWin != null + // There is no app window showing underneath nav bar. (e.g., The screen is locked.) + // Let system windows (ex: notification shade) draw nav bar background. + || mNavBarBackgroundWindowCandidate == null; if (mNavBarOpacityMode == NAV_BAR_FORCE_TRANSPARENT) { if (drawBackground) { @@ -2543,7 +2553,7 @@ public class DisplayPolicy { } } - if (!isFullyTransparentAllowed(mNavBarBackgroundWindow, Type.navigationBars())) { + if (!isFullyTransparentAllowed(navBackgroundWin, Type.navigationBars())) { appearance |= APPEARANCE_SEMI_TRANSPARENT_NAVIGATION_BARS; } @@ -2554,6 +2564,20 @@ public class DisplayPolicy { return appearance & ~APPEARANCE_OPAQUE_NAVIGATION_BARS; } + @VisibleForTesting + @Nullable + static WindowState chooseNavigationBackgroundWindow(WindowState candidate, + WindowState imeWindow, @NavigationBarPosition int navBarPosition) { + if (imeWindow != null && imeWindow.isVisible() && navBarPosition == NAV_BAR_BOTTOM + && drawsBarBackground(imeWindow)) { + return imeWindow; + } + if (drawsBarBackground(candidate)) { + return candidate; + } + return null; + } + private boolean isImmersiveMode(WindowState win) { if (win == null) { return false; @@ -2726,9 +2750,9 @@ public class DisplayPolicy { pw.print(prefix); pw.print("mNavBarColorWindowCandidate="); pw.println(mNavBarColorWindowCandidate); } - if (mNavBarBackgroundWindow != null) { - pw.print(prefix); pw.print("mNavBarBackgroundWindow="); - pw.println(mNavBarBackgroundWindow); + if (mNavBarBackgroundWindowCandidate != null) { + pw.print(prefix); pw.print("mNavBarBackgroundWindowCandidate="); + pw.println(mNavBarBackgroundWindowCandidate); } if (mLastStatusBarAppearanceRegions != null) { pw.print(prefix); pw.println("mLastStatusBarAppearanceRegions="); diff --git a/services/core/java/com/android/server/wm/DragDropController.java b/services/core/java/com/android/server/wm/DragDropController.java index 258351436188..4a3d0c142e1d 100644 --- a/services/core/java/com/android/server/wm/DragDropController.java +++ b/services/core/java/com/android/server/wm/DragDropController.java @@ -181,7 +181,11 @@ class DragDropController { } } finally { if (surface != null) { - surface.release(); + try (final SurfaceControl.Transaction transaction = + mService.mTransactionFactory.get()) { + transaction.remove(surface); + transaction.apply(); + } } } } diff --git a/services/core/java/com/android/server/wm/EmbeddedWindowController.java b/services/core/java/com/android/server/wm/EmbeddedWindowController.java index 44d67687e260..98027bbed37f 100644 --- a/services/core/java/com/android/server/wm/EmbeddedWindowController.java +++ b/services/core/java/com/android/server/wm/EmbeddedWindowController.java @@ -23,6 +23,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowStateProto.IDENTIFIER; +import android.annotation.NonNull; import android.annotation.Nullable; import android.os.IBinder; import android.os.RemoteException; @@ -217,10 +218,10 @@ class EmbeddedWindowController { mHostWindowState.mInputWindowHandle.getInputApplicationHandle()); } - InputChannel openInputChannel() { + void openInputChannel(@NonNull InputChannel outInputChannel) { final String name = toString(); mInputChannel = mWmService.mInputManager.createInputChannel(name); - return mInputChannel; + mInputChannel.copyTo(outInputChannel); } void onRemoved() { diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index ddf96c53323d..698c9abee1f5 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -440,8 +440,8 @@ class InsetsPolicy { return originalState; } - void onInsetsModified(InsetsControlTarget caller) { - mStateController.onInsetsModified(caller); + void onRequestedVisibleTypesChanged(InsetsControlTarget caller) { + mStateController.onRequestedVisibleTypesChanged(caller); checkAbortTransient(caller); updateBarControlTarget(mFocusedWin); } diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index 5e2618b00e2e..e1c865bb85be 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -175,7 +175,7 @@ class InsetsSourceProvider { if (windowContainer == null) { setServerVisible(false); mSource.setVisibleFrame(null); - mSource.setInsetsRoundedCornerFrame(false); + mSource.setFlags(0, 0xffffffff); mSourceFrame.setEmpty(); } else { mWindowContainer.getInsetsSourceProviders().put(mSource.getId(), this); diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index 249ead0a8509..addb5219c663 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -190,7 +190,7 @@ class InsetsStateController { } } - void onInsetsModified(InsetsControlTarget caller) { + void onRequestedVisibleTypesChanged(InsetsControlTarget caller) { boolean changed = false; for (int i = mProviders.size() - 1; i >= 0; i--) { changed |= mProviders.valueAt(i).updateClientVisibility(caller); @@ -352,7 +352,7 @@ class InsetsStateController { // to the clients, so that the clients can change the current visibilities to the // requested visibilities with animations. for (int i = newControlTargets.size() - 1; i >= 0; i--) { - onInsetsModified(newControlTargets.valueAt(i)); + onRequestedVisibleTypesChanged(newControlTargets.valueAt(i)); } newControlTargets.clear(); }); diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index d83c8612b9e9..c2439888db43 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -1428,7 +1428,8 @@ final class LetterboxUiController { for (int i = state.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = state.sourceAt(i); if (source.getType() == WindowInsets.Type.navigationBars() - && source.insetsRoundedCornerFrame() && source.isVisible()) { + && source.hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER) + && source.isVisible()) { return source; } } diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index e47787e97f20..9ef5ed051a13 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -1104,6 +1104,10 @@ class RecentTasks { // front unless overridden by the provided activity options mTasks.remove(taskIndex); mTasks.add(0, task); + if (taskIndex != 0) { + // Only notify when position changes + mTaskNotificationController.notifyTaskListUpdated(); + } if (DEBUG_RECENTS) { Slog.d(TAG_RECENTS, "addRecent: moving to top " + task @@ -1552,7 +1556,7 @@ class RecentTasks { task.affinity != null && task.affinity.equals(t.affinity); final boolean sameIntent = intent != null && intent.filterEquals(trIntent); boolean multiTasksAllowed = false; - final int flags = intent.getFlags(); + final int flags = intent != null ? intent.getFlags() : 0; if ((flags & (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_NEW_DOCUMENT)) != 0 && (flags & FLAG_ACTIVITY_MULTIPLE_TASK) != 0) { multiTasksAllowed = true; diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 7b10c6372b0e..b49c5fb2c25d 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -687,11 +687,11 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public void updateRequestedVisibleTypes(IWindow window, @InsetsType int requestedVisibleTypes) { synchronized (mService.mGlobalLock) { - final WindowState windowState = mService.windowForClientLocked(this, window, + final WindowState win = mService.windowForClientLocked(this, window, false /* throwOnError */); - if (windowState != null) { - windowState.setRequestedVisibleTypes(requestedVisibleTypes); - windowState.getDisplayContent().getInsetsPolicy().onInsetsModified(windowState); + if (win != null) { + win.setRequestedVisibleTypes(requestedVisibleTypes); + win.getDisplayContent().getInsetsPolicy().onRequestedVisibleTypesChanged(win); } } } diff --git a/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java b/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java index 878b33fa55ef..100735784fb1 100644 --- a/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java +++ b/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java @@ -20,6 +20,8 @@ import static android.view.DisplayCutout.BOUNDS_POSITION_BOTTOM; import static android.view.DisplayCutout.BOUNDS_POSITION_LEFT; import static android.view.DisplayCutout.BOUNDS_POSITION_RIGHT; import static android.view.DisplayCutout.BOUNDS_POSITION_TOP; +import static android.view.MotionEvent.AXIS_GESTURE_SWIPE_FINGER_COUNT; +import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE; import android.annotation.NonNull; import android.content.Context; @@ -59,6 +61,12 @@ class SystemGesturesPointerEventListener implements PointerEventListener { private static final int SWIPE_FROM_RIGHT = 3; private static final int SWIPE_FROM_LEFT = 4; + private static final int TRACKPAD_SWIPE_NONE = 0; + private static final int TRACKPAD_SWIPE_FROM_TOP = 1; + private static final int TRACKPAD_SWIPE_FROM_BOTTOM = 2; + private static final int TRACKPAD_SWIPE_FROM_RIGHT = 3; + private static final int TRACKPAD_SWIPE_FROM_LEFT = 4; + private final Context mContext; private final Handler mHandler; private int mDisplayCutoutTouchableRegionSize; @@ -207,6 +215,25 @@ class SystemGesturesPointerEventListener implements PointerEventListener { break; case MotionEvent.ACTION_MOVE: if (mSwipeFireable) { + int trackpadSwipe = detectTrackpadThreeFingerSwipe(event); + mSwipeFireable = trackpadSwipe == TRACKPAD_SWIPE_NONE; + if (!mSwipeFireable) { + if (trackpadSwipe == TRACKPAD_SWIPE_FROM_TOP) { + if (DEBUG) Slog.d(TAG, "Firing onSwipeFromTop from trackpad"); + mCallbacks.onSwipeFromTop(); + } else if (trackpadSwipe == TRACKPAD_SWIPE_FROM_BOTTOM) { + if (DEBUG) Slog.d(TAG, "Firing onSwipeFromBottom from trackpad"); + mCallbacks.onSwipeFromBottom(); + } else if (trackpadSwipe == TRACKPAD_SWIPE_FROM_RIGHT) { + if (DEBUG) Slog.d(TAG, "Firing onSwipeFromRight from trackpad"); + mCallbacks.onSwipeFromRight(); + } else if (trackpadSwipe == TRACKPAD_SWIPE_FROM_LEFT) { + if (DEBUG) Slog.d(TAG, "Firing onSwipeFromLeft from trackpad"); + mCallbacks.onSwipeFromLeft(); + } + break; + } + final int swipe = detectSwipe(event); mSwipeFireable = swipe == SWIPE_NONE; if (swipe == SWIPE_FROM_TOP) { @@ -300,6 +327,31 @@ class SystemGesturesPointerEventListener implements PointerEventListener { return mDownPointers - 1; } + private int detectTrackpadThreeFingerSwipe(MotionEvent move) { + if (!isTrackpadThreeFingerSwipe(move)) { + return TRACKPAD_SWIPE_NONE; + } + + float dx = move.getX() - mDownX[0]; + float dy = move.getY() - mDownY[0]; + if (Math.abs(dx) < Math.abs(dy)) { + if (Math.abs(dy) > mSwipeDistanceThreshold) { + return dy > 0 ? TRACKPAD_SWIPE_FROM_TOP : TRACKPAD_SWIPE_FROM_BOTTOM; + } + } else { + if (Math.abs(dx) > mSwipeDistanceThreshold) { + return dx > 0 ? TRACKPAD_SWIPE_FROM_LEFT : TRACKPAD_SWIPE_FROM_RIGHT; + } + } + + return TRACKPAD_SWIPE_NONE; + } + + private static boolean isTrackpadThreeFingerSwipe(MotionEvent event) { + return event.getClassification() == CLASSIFICATION_MULTI_FINGER_SWIPE + && event.getAxisValue(AXIS_GESTURE_SWIPE_FINGER_COUNT) == 3; + } + private int detectSwipe(MotionEvent move) { final int historySize = move.getHistorySize(); final int pointerCount = move.getPointerCount(); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 7104739068e4..bfdf84e383a3 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -49,6 +49,7 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; +import static android.view.InsetsSource.FLAG_INSETS_ROUNDED_CORNER; import static android.view.SurfaceControl.METADATA_TASK_ID; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; @@ -1271,6 +1272,10 @@ class Task extends TaskFragment { if (isPersistable) { mLastTimeMoved = System.currentTimeMillis(); } + if (toTop && inRecents) { + // If task is in recents, ensure it is at the top + mTaskSupervisor.mRecentTasks.add(this); + } } // Close up recents linked list. @@ -1842,6 +1847,9 @@ class Task extends TaskFragment { td.setEnsureStatusBarContrastWhenTransparent( atd.getEnsureStatusBarContrastWhenTransparent()); } + if (td.getStatusBarAppearance() == 0) { + td.setStatusBarAppearance(atd.getStatusBarAppearance()); + } if (td.getNavigationBarColor() == 0) { td.setNavigationBarColor(atd.getNavigationBarColor()); td.setEnsureNavigationBarContrastWhenTransparent( @@ -2858,7 +2866,7 @@ class Task extends TaskFragment { getDisplayContent().getInsetsStateController().getRawInsetsState(); for (int i = state.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = state.sourceAt(i); - if (source.insetsRoundedCornerFrame()) { + if (source.hasFlags(FLAG_INSETS_ROUNDED_CORNER)) { animationBounds.inset(source.calculateVisibleInsets(animationBounds)); } } diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 7f41ff1a3d9b..f54a962e4897 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -254,7 +254,7 @@ class WallpaperController { resources.getBoolean( com.android.internal.R.bool.config_offsetWallpaperToCenterOfLargestDisplay); mIsLockscreenLiveWallpaperEnabled = - SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false); + SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", true); } void resetLargestDisplay(Display display) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 0152666a830d..4bc4c266c114 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -4141,7 +4141,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< getDisplayContent().getInsetsStateController().getSourceProviders(); for (int i = providers.size(); i >= 0; i--) { final InsetsSourceProvider insetProvider = providers.valueAt(i); - if (!insetProvider.getSource().insetsRoundedCornerFrame()) { + if (!insetProvider.getSource().hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)) { return; } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 67572bfcad18..bb3d10912724 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -4539,7 +4539,8 @@ public class WindowManagerService extends IWindowManager.Stub return; } dc.mRemoteInsetsControlTarget.setRequestedVisibleTypes(requestedVisibleTypes); - dc.getInsetsStateController().onInsetsModified(dc.mRemoteInsetsControlTarget); + dc.getInsetsStateController().onRequestedVisibleTypesChanged( + dc.mRemoteInsetsControlTarget); } } finally { Binder.restoreCallingIdentity(origId); @@ -7186,15 +7187,45 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) { - mContext.enforceCallingOrSelfPermission(REGISTER_WINDOW_MANAGER_LISTENERS, - "requestAppKeyboardShortcuts"); + enforceRegisterWindowManagerListenersPermission("requestAppKeyboardShortcuts"); + WindowState focusedWindow = getFocusedWindow(); + if (focusedWindow == null || focusedWindow.mClient == null) { + notifyReceiverWithEmptyBundle(receiver); + return; + } try { - WindowState focusedWindow = getFocusedWindow(); - if (focusedWindow != null && focusedWindow.mClient != null) { - getFocusedWindow().mClient.requestAppKeyboardShortcuts(receiver, deviceId); - } + focusedWindow.mClient.requestAppKeyboardShortcuts(receiver, deviceId); } catch (RemoteException e) { + notifyReceiverWithEmptyBundle(receiver); + } + } + + @Override + public void requestImeKeyboardShortcuts(IResultReceiver receiver, int deviceId) { + enforceRegisterWindowManagerListenersPermission("requestImeKeyboardShortcuts"); + + WindowState imeWindow = mRoot.getCurrentInputMethodWindow(); + if (imeWindow == null || imeWindow.mClient == null) { + notifyReceiverWithEmptyBundle(receiver); + return; + } + try { + imeWindow.mClient.requestAppKeyboardShortcuts(receiver, deviceId); + } catch (RemoteException e) { + notifyReceiverWithEmptyBundle(receiver); + } + } + + private void enforceRegisterWindowManagerListenersPermission(String message) { + mContext.enforceCallingOrSelfPermission(REGISTER_WINDOW_MANAGER_LISTENERS, message); + } + + private static void notifyReceiverWithEmptyBundle(IResultReceiver receiver) { + try { + receiver.send(0, Bundle.EMPTY); + } catch (RemoteException e) { + ProtoLog.e(WM_ERROR, "unable to call receiver for empty keyboard shortcuts"); } } @@ -8271,6 +8302,13 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void addTrustedTaskOverlay(int taskId, SurfaceControlViewHost.SurfacePackage overlay) { + if (overlay == null) { + throw new IllegalArgumentException("Invalid overlay passed in for task=" + taskId); + } else if (overlay.getSurfaceControl() == null + || !overlay.getSurfaceControl().isValid()) { + throw new IllegalArgumentException( + "Invalid overlay surfacecontrol passed in for task=" + taskId); + } synchronized (mGlobalLock) { final Task task = mRoot.getRootTask(taskId); if (task == null) { @@ -8283,6 +8321,13 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void removeTrustedTaskOverlay(int taskId, SurfaceControlViewHost.SurfacePackage overlay) { + if (overlay == null) { + throw new IllegalArgumentException("Invalid overlay passed in for task=" + taskId); + } else if (overlay.getSurfaceControl() == null + || !overlay.getSurfaceControl().isValid()) { + throw new IllegalArgumentException( + "Invalid overlay surfacecontrol passed in for task=" + taskId); + } synchronized (mGlobalLock) { final Task task = mRoot.getRootTask(taskId); if (task == null) { @@ -8748,24 +8793,22 @@ public class WindowManagerService extends IWindowManager.Stub final int sanitizedType = sanitizeWindowType(session, displayId, windowToken, type); final InputApplicationHandle applicationHandle; final String name; - final InputChannel clientChannel; + Objects.requireNonNull(outInputChannel); synchronized (mGlobalLock) { EmbeddedWindowController.EmbeddedWindow win = new EmbeddedWindowController.EmbeddedWindow(session, this, window, mInputToWindowMap.get(hostInputToken), callingUid, callingPid, sanitizedType, displayId, focusGrantToken, inputHandleName, (flags & FLAG_NOT_FOCUSABLE) == 0); - clientChannel = win.openInputChannel(); - mEmbeddedWindowController.add(clientChannel.getToken(), win); + win.openInputChannel(outInputChannel); + mEmbeddedWindowController.add(outInputChannel.getToken(), win); applicationHandle = win.getApplicationHandle(); name = win.toString(); } - updateInputChannel(clientChannel.getToken(), callingUid, callingPid, displayId, surface, + updateInputChannel(outInputChannel.getToken(), callingUid, callingPid, displayId, surface, name, applicationHandle, flags, privateFlags, inputFeatures, sanitizedType, null /* region */, window); - - clientChannel.copyTo(outInputChannel); } boolean transferEmbeddedTouchFocusToHost(IWindow embeddedWindow) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 8f49384f6101..b52935e9da9b 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1445,6 +1445,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP Slog.v(TAG_WM, "Win " + this + " config changed: " + getConfiguration()); } + final boolean dragResizingChanged = !mDragResizingChangeReported && isDragResizeChanged(); + final boolean attachedFrameChanged = LOCAL_LAYOUT && mLayoutAttached && getParentWindow().frameChanged(); @@ -1458,6 +1460,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (didFrameInsetsChange || configChanged || insetsChanged + || dragResizingChanged || shouldSendRedrawForSync() || attachedFrameChanged) { ProtoLog.v(WM_DEBUG_RESIZE, @@ -1478,7 +1481,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // Reset the drawn state if the window need to redraw for the change, so the transition // can wait until it has finished drawing to start. - if ((configChanged || getOrientationChanging()) && isVisibleRequested()) { + if ((configChanged || getOrientationChanging() || dragResizingChanged) + && isVisibleRequested()) { winAnimator.mDrawState = DRAW_PENDING; if (mActivityRecord != null) { mActivityRecord.clearAllDrawn(); diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index f0d718a30535..52615295f38a 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -355,6 +355,8 @@ public: void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override; void setPointerCapture(const PointerCaptureRequest& request) override; void notifyDropWindow(const sp<IBinder>& token, float x, float y) override; + void notifyDeviceInteraction(int32_t deviceId, nsecs_t timestamp, + const std::set<int32_t>& uids) override; /* --- PointerControllerPolicyInterface implementation --- */ @@ -966,6 +968,15 @@ void NativeInputManager::notifyDropWindow(const sp<IBinder>& token, float x, flo checkAndClearExceptionFromCallback(env, "notifyDropWindow"); } +void NativeInputManager::notifyDeviceInteraction(int32_t deviceId, nsecs_t timestamp, + const std::set<int32_t>& uids) { + static const bool ENABLE_INPUT_DEVICE_USAGE_METRICS = + sysprop::InputProperties::enable_input_device_usage_metrics().value_or(false); + if (!ENABLE_INPUT_DEVICE_USAGE_METRICS) return; + + mInputManager->getMetricsCollector().notifyDeviceInteraction(deviceId, timestamp, uids); +} + void NativeInputManager::notifySensorEvent(int32_t deviceId, InputDeviceSensorType sensorType, InputDeviceSensorAccuracy accuracy, nsecs_t timestamp, const std::vector<float>& values) { @@ -1596,8 +1607,8 @@ PointerIconStyle NativeInputManager::getDefaultPointerIconId() { } PointerIconStyle NativeInputManager::getDefaultStylusIconId() { - // TODO: add resource for default stylus icon and change this - return PointerIconStyle::TYPE_CROSSHAIR; + // Use the empty icon as the default pointer icon for a hovering stylus. + return PointerIconStyle::TYPE_NULL; } PointerIconStyle NativeInputManager::getCustomPointerIconId() { @@ -2214,13 +2225,25 @@ static jobject nativeGetLights(JNIEnv* env, jobject nativeImplObj, jint deviceId jCapability |= env->GetStaticIntField(gLightClassInfo.clazz, gLightClassInfo.lightCapabilityColorRgb); } + + ScopedLocalRef<jintArray> jPreferredBrightnessLevels{env}; + if (!lightInfo.preferredBrightnessLevels.empty()) { + std::vector<int32_t> vec; + for (auto it : lightInfo.preferredBrightnessLevels) { + vec.push_back(ftl::to_underlying(it)); + } + jPreferredBrightnessLevels.reset(env->NewIntArray(vec.size())); + env->SetIntArrayRegion(jPreferredBrightnessLevels.get(), 0, vec.size(), vec.data()); + } + ScopedLocalRef<jobject> lightObj(env, env->NewObject(gLightClassInfo.clazz, gLightClassInfo.constructor, static_cast<jint>(lightInfo.id), env->NewStringUTF(lightInfo.name.c_str()), static_cast<jint>(lightInfo.ordinal), - jTypeId, jCapability)); + jTypeId, jCapability, + jPreferredBrightnessLevels.get())); // Add light object to list env->CallBooleanMethod(jLights, gArrayListClassInfo.add, lightObj.get()); } @@ -2846,7 +2869,7 @@ int register_android_server_InputManager(JNIEnv* env) { FIND_CLASS(gLightClassInfo.clazz, "android/hardware/lights/Light"); gLightClassInfo.clazz = jclass(env->NewGlobalRef(gLightClassInfo.clazz)); GET_METHOD_ID(gLightClassInfo.constructor, gLightClassInfo.clazz, "<init>", - "(ILjava/lang/String;III)V"); + "(ILjava/lang/String;III[I)V"); gLightClassInfo.clazz = jclass(env->NewGlobalRef(gLightClassInfo.clazz)); gLightClassInfo.lightTypeInput = diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index f96ca582c28f..7104a80c668d 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -46,6 +46,8 @@ <xs:annotation name="nonnull"/> <xs:annotation name="final"/> </xs:element> + <xs:element type="luxThrottling" name="luxThrottling" minOccurs="0" + maxOccurs="1"/> <xs:element type="highBrightnessMode" name="highBrightnessMode" minOccurs="0" maxOccurs="1"/> <xs:element type="displayQuirks" name="quirks" minOccurs="0" maxOccurs="1"/> @@ -137,6 +139,39 @@ </xs:sequence> </xs:complexType> + <xs:complexType name="luxThrottling"> + <xs:sequence> + <xs:element name="brightnessLimitMap" type="brightnessLimitMap" + maxOccurs="unbounded"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="brightnessLimitMap"> + <xs:sequence> + <xs:element name="type" type="PredefinedBrightnessLimitNames"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + <!-- lux level from light sensor to screen brightness recommended max value map. + Screen brightness recommended max value is to highBrightnessMode.transitionPoint and must be below that --> + <xs:element name="map" type="nonNegativeFloatToFloatMap"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> + + <!-- Predefined type names as defined by DisplayDeviceConfig.BrightnessLimitMapType --> + <xs:simpleType name="PredefinedBrightnessLimitNames"> + <xs:restriction base="xs:string"> + <xs:enumeration value="default"/> + <xs:enumeration value="adaptive"/> + </xs:restriction> + </xs:simpleType> + <xs:complexType name="highBrightnessMode"> <xs:all> <xs:element name="transitionPoint" type="nonNegativeDecimal" minOccurs="1" @@ -575,4 +610,27 @@ <xs:annotation name="final"/> </xs:element> </xs:complexType> + + <!-- generic types --> + <xs:complexType name="nonNegativeFloatToFloatPoint"> + <xs:sequence> + <xs:element name="first" type="nonNegativeDecimal"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + <xs:element name="second" type="nonNegativeDecimal"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="nonNegativeFloatToFloatMap"> + <xs:sequence> + <xs:element name="point" type="nonNegativeFloatToFloatPoint" maxOccurs="unbounded"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> </xs:schema> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index ad6434e0c545..507c9dccda59 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -26,6 +26,14 @@ package com.android.server.display.config { method public final java.util.List<com.android.server.display.config.DisplayBrightnessPoint> getDisplayBrightnessPoint(); } + public class BrightnessLimitMap { + ctor public BrightnessLimitMap(); + method @NonNull public final com.android.server.display.config.NonNegativeFloatToFloatMap getMap(); + method @NonNull public final com.android.server.display.config.PredefinedBrightnessLimitNames getType(); + method public final void setMap(@NonNull com.android.server.display.config.NonNegativeFloatToFloatMap); + method public final void setType(@NonNull com.android.server.display.config.PredefinedBrightnessLimitNames); + } + public class BrightnessThresholds { ctor public BrightnessThresholds(); method public final com.android.server.display.config.ThresholdPoints getBrightnessThresholdPoints(); @@ -89,6 +97,7 @@ package com.android.server.display.config { method public final com.android.server.display.config.Thresholds getDisplayBrightnessChangeThresholdsIdle(); method public com.android.server.display.config.HighBrightnessMode getHighBrightnessMode(); method public final com.android.server.display.config.SensorDetails getLightSensor(); + method public com.android.server.display.config.LuxThrottling getLuxThrottling(); method @Nullable public final String getName(); method public final com.android.server.display.config.SensorDetails getProxSensor(); method public com.android.server.display.config.DisplayQuirks getQuirks(); @@ -115,6 +124,7 @@ package com.android.server.display.config { method public final void setDisplayBrightnessChangeThresholdsIdle(com.android.server.display.config.Thresholds); method public void setHighBrightnessMode(com.android.server.display.config.HighBrightnessMode); method public final void setLightSensor(com.android.server.display.config.SensorDetails); + method public void setLuxThrottling(com.android.server.display.config.LuxThrottling); method public final void setName(@Nullable String); method public final void setProxSensor(com.android.server.display.config.SensorDetails); method public void setQuirks(com.android.server.display.config.DisplayQuirks); @@ -173,6 +183,11 @@ package com.android.server.display.config { method public java.util.List<java.math.BigInteger> getItem(); } + public class LuxThrottling { + ctor public LuxThrottling(); + method @NonNull public final java.util.List<com.android.server.display.config.BrightnessLimitMap> getBrightnessLimitMap(); + } + public class NitsMap { ctor public NitsMap(); method public String getInterpolation(); @@ -180,6 +195,19 @@ package com.android.server.display.config { method public void setInterpolation(String); } + public class NonNegativeFloatToFloatMap { + ctor public NonNegativeFloatToFloatMap(); + method @NonNull public final java.util.List<com.android.server.display.config.NonNegativeFloatToFloatPoint> getPoint(); + } + + public class NonNegativeFloatToFloatPoint { + ctor public NonNegativeFloatToFloatPoint(); + method @NonNull public final java.math.BigDecimal getFirst(); + method @NonNull public final java.math.BigDecimal getSecond(); + method public final void setFirst(@NonNull java.math.BigDecimal); + method public final void setSecond(@NonNull java.math.BigDecimal); + } + public class Point { ctor public Point(); method @NonNull public final java.math.BigDecimal getNits(); @@ -188,6 +216,12 @@ package com.android.server.display.config { method public final void setValue(@NonNull java.math.BigDecimal); } + public enum PredefinedBrightnessLimitNames { + method public String getRawName(); + enum_constant public static final com.android.server.display.config.PredefinedBrightnessLimitNames _default; + enum_constant public static final com.android.server.display.config.PredefinedBrightnessLimitNames adaptive; + } + public class RefreshRateConfigs { ctor public RefreshRateConfigs(); method public final java.math.BigInteger getDefaultPeakRefreshRate(); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 29275efc2ccb..417fc3949f2c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -13598,6 +13598,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { : SecurityLog.TAG_USER_RESTRICTION_REMOVED; SecurityLog.writeEvent(eventTag, caller.getPackageName(), caller.getUserId(), key); } + + Slogf.i(LOG_TAG, "Changing user restriction %s to: %b caller: %s", + key, enabled, caller.toString()); } private void saveUserRestrictionsLocked(int userId) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index af841808992e..991248aceb4b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -3255,6 +3255,12 @@ public final class SystemServer implements Dumpable { Slog.d(TAG, "ContentCaptureService disabled because resource is not overlaid"); return; } + if (!deviceHasConfigString(context, R.string.config_defaultContentProtectionService)) { + Slog.d( + TAG, + "ContentProtectionService disabled because resource is not overlaid," + + " ContentCaptureService still enabled"); + } } t.traceBegin("StartContentCaptureService"); diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/affected_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/affected_cpus new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/affected_cpus @@ -0,0 +1 @@ + diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/related_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/related_cpus new file mode 100644 index 000000000000..c227083464fb --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/related_cpus @@ -0,0 +1 @@ +0
\ No newline at end of file diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_cur_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_cur_freq new file mode 100644 index 000000000000..dadd9737778d --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_cur_freq @@ -0,0 +1 @@ +1230000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_max_freq new file mode 100644 index 000000000000..a93d6f7b2c09 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/scaling_max_freq @@ -0,0 +1 @@ +2500000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/stats/time_in_state b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/stats/time_in_state new file mode 100644 index 000000000000..5121f6661a7e --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy0/stats/time_in_state @@ -0,0 +1,4 @@ +200000 500 +350000 500 +500000 1000 +2500000 100 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/affected_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/affected_cpus new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/affected_cpus @@ -0,0 +1 @@ +1 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/related_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/related_cpus new file mode 100644 index 000000000000..56a6051ca2b0 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/related_cpus @@ -0,0 +1 @@ +1
\ No newline at end of file diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_cur_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_cur_freq new file mode 100644 index 000000000000..2bc4ce96ec98 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_cur_freq @@ -0,0 +1 @@ +1450000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_max_freq new file mode 100644 index 000000000000..c754f1a461ab --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/scaling_max_freq @@ -0,0 +1 @@ +2800000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/stats/time_in_state b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/stats/time_in_state new file mode 100644 index 000000000000..7ed12cfce58d --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_affected_cpus/policy1/stats/time_in_state @@ -0,0 +1,4 @@ +200000 500 +350000 500 +500000 1000 +2800000 100 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/affected_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/affected_cpus new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/affected_cpus @@ -0,0 +1 @@ +0 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/related_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/related_cpus new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/related_cpus @@ -0,0 +1 @@ + diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_cur_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_cur_freq new file mode 100644 index 000000000000..dadd9737778d --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_cur_freq @@ -0,0 +1 @@ +1230000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_max_freq new file mode 100644 index 000000000000..a93d6f7b2c09 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/scaling_max_freq @@ -0,0 +1 @@ +2500000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/stats/time_in_state b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/stats/time_in_state new file mode 100644 index 000000000000..5121f6661a7e --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy0/stats/time_in_state @@ -0,0 +1,4 @@ +200000 500 +350000 500 +500000 1000 +2500000 100 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/affected_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/affected_cpus new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/affected_cpus @@ -0,0 +1 @@ +1 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/related_cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/related_cpus new file mode 100644 index 000000000000..56a6051ca2b0 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/related_cpus @@ -0,0 +1 @@ +1
\ No newline at end of file diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_cur_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_cur_freq new file mode 100644 index 000000000000..2bc4ce96ec98 --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_cur_freq @@ -0,0 +1 @@ +1450000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_max_freq new file mode 100644 index 000000000000..c754f1a461ab --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/scaling_max_freq @@ -0,0 +1 @@ +2800000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/stats/time_in_state b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/stats/time_in_state new file mode 100644 index 000000000000..7ed12cfce58d --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_empty_related_cpus/policy1/stats/time_in_state @@ -0,0 +1,4 @@ +200000 500 +350000 500 +500000 1000 +2800000 100 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy0/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy0/scaling_max_freq index a93d6f7b2c09..d17275fcb4fc 100644 --- a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy0/scaling_max_freq +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy0/scaling_max_freq @@ -1 +1 @@ -2500000 +2600000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy1/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy1/scaling_max_freq index c754f1a461ab..79c41c7d3c28 100644 --- a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy1/scaling_max_freq +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy1/scaling_max_freq @@ -1 +1 @@ -2800000 +2900000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy2/scaling_max_freq b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy2/scaling_max_freq index deebb18c2f77..526a7175060a 100644 --- a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy2/scaling_max_freq +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpufreq_with_time_in_state_2/policy2/scaling_max_freq @@ -1 +1 @@ -2000000 +2100000 diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/background/cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/background/cpus new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/background/cpus @@ -0,0 +1 @@ + diff --git a/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/top-app/cpus b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/top-app/cpus new file mode 100644 index 000000000000..40c7bb2f1a2a --- /dev/null +++ b/services/tests/mockingservicestests/assets/CpuInfoReaderTest/valid_cpuset_with_empty_cpus/top-app/cpus @@ -0,0 +1 @@ +0-3 diff --git a/services/tests/mockingservicestests/src/com/android/server/cpu/CpuInfoReaderTest.java b/services/tests/mockingservicestests/src/com/android/server/cpu/CpuInfoReaderTest.java index 04f6f8b2e9f0..2fbe8aab73d0 100644 --- a/services/tests/mockingservicestests/src/com/android/server/cpu/CpuInfoReaderTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/cpu/CpuInfoReaderTest.java @@ -48,6 +48,11 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { private static final String TAG = CpuInfoReaderTest.class.getSimpleName(); private static final String ROOT_DIR_NAME = "CpuInfoReaderTest"; private static final String VALID_CPUSET_DIR = "valid_cpuset"; + private static final String VALID_CPUSET_WITH_EMPTY_CPUS = "valid_cpuset_with_empty_cpus"; + private static final String VALID_CPUFREQ_WITH_EMPTY_AFFECTED_CPUS = + "valid_cpufreq_with_empty_affected_cpus"; + private static final String VALID_CPUFREQ_WITH_EMPTY_RELATED_CPUS = + "valid_cpufreq_with_empty_related_cpus"; private static final String VALID_CPUFREQ_WITH_TIME_IN_STATE_DIR = "valid_cpufreq_with_time_in_state"; private static final String VALID_CPUFREQ_WITH_TIME_IN_STATE_2_DIR = @@ -142,8 +147,8 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { expectedCpuInfos.clear(); expectedCpuInfos.append(0, new CpuInfoReader.CpuInfo(/* cpuCore= */ 0, FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_000_000, - /* maxCpuFreqKHz= */ 2_500_000, /* avgTimeInStateCpuFreqKHz= */ 419_354, - /* normalizedAvailableCpuFreqKHz= */ 2_425_919, + /* maxCpuFreqKHz= */ 2_600_000, /* avgTimeInStateCpuFreqKHz= */ 419_354, + /* normalizedAvailableCpuFreqKHz= */ 2_525_919, new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 10_000_000, /* niceTimeMillis= */ 1_000_000, /* systemTimeMillis= */ 10_000_000, /* idleTimeMillis= */ 110_000_000, /* iowaitTimeMillis= */ 1_100_000, @@ -152,8 +157,8 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { /* guestNiceTimeMillis= */ 0))); expectedCpuInfos.append(1, new CpuInfoReader.CpuInfo(/* cpuCore= */ 1, FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 2_800_000, - /* maxCpuFreqKHz= */ 2_800_000, /* avgTimeInStateCpuFreqKHz= */ 429_032, - /* normalizedAvailableCpuFreqKHz= */ 2_403_009, + /* maxCpuFreqKHz= */ 2_900_000, /* avgTimeInStateCpuFreqKHz= */ 429_032, + /* normalizedAvailableCpuFreqKHz= */ 2_503_009, new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 900_000, /* niceTimeMillis= */ 1_000_000, /* systemTimeMillis= */ 10_000_000, /* idleTimeMillis= */ 1_000_000, /* iowaitTimeMillis= */ 90_000, @@ -163,8 +168,8 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { expectedCpuInfos.append(2, new CpuInfoReader.CpuInfo(/* cpuCore= */ 2, FLAG_CPUSET_CATEGORY_TOP_APP | FLAG_CPUSET_CATEGORY_BACKGROUND, /* isOnline= */ true, /* curCpuFreqKHz= */ 2_000_000, - /* maxCpuFreqKHz= */ 2_000_000, /* avgTimeInStateCpuFreqKHz= */ 403_225, - /* normalizedAvailableCpuFreqKHz= */ 1_688_209, + /* maxCpuFreqKHz= */ 2_100_000, /* avgTimeInStateCpuFreqKHz= */ 403_225, + /* normalizedAvailableCpuFreqKHz= */ 1_788_209, new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 10_000_000, /* niceTimeMillis= */ 2_000_000, /* systemTimeMillis= */ 0, /* idleTimeMillis= */ 10_000_000, /* iowaitTimeMillis= */ 1_000_000, @@ -174,7 +179,7 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { expectedCpuInfos.append(3, new CpuInfoReader.CpuInfo(/* cpuCore= */ 3, FLAG_CPUSET_CATEGORY_TOP_APP | FLAG_CPUSET_CATEGORY_BACKGROUND, /* isOnline= */ false, /* curCpuFreqKHz= */ MISSING_FREQUENCY, - /* maxCpuFreqKHz= */ 2_000_000, /* avgTimeInStateCpuFreqKHz= */ MISSING_FREQUENCY, + /* maxCpuFreqKHz= */ 2_100_000, /* avgTimeInStateCpuFreqKHz= */ MISSING_FREQUENCY, /* normalizedAvailableCpuFreqKHz= */ MISSING_FREQUENCY, new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 2_000_000, /* niceTimeMillis= */ 1_000_000, /* systemTimeMillis= */ 1_000_000, @@ -403,6 +408,104 @@ public final class CpuInfoReaderTest extends ExpectableTestCase { } @Test + public void testReadCpuInfoWithEmptyRelatedCpus() throws Exception { + CpuInfoReader cpuInfoReader = newCpuInfoReader(getCacheFile(VALID_CPUSET_DIR), + getCacheFile(VALID_CPUFREQ_WITH_EMPTY_RELATED_CPUS), + getCacheFile(VALID_PROC_STAT)); + + SparseArray<CpuInfoReader.CpuInfo> actualCpuInfos = cpuInfoReader.readCpuInfos(); + SparseArray<CpuInfoReader.CpuInfo> expectedCpuInfos = new SparseArray<>(); + + expectedCpuInfos.append(1, new CpuInfoReader.CpuInfo(/* cpuCore= */ 1, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_450_000, + /* maxCpuFreqKHz= */ 2_800_000, /* avgTimeInStateCpuFreqKHz= */ 502_380, + /* normalizedAvailableCpuFreqKHz= */ 2_693_525, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 28_949_280, + /* niceTimeMillis= */ 7_799_450, /* systemTimeMillis= */ 54_004_020, + /* idleTimeMillis= */ 402_707_120, /* iowaitTimeMillis= */ 1_186_960, + /* irqTimeMillis= */ 14_786_940, /* softirqTimeMillis= */ 1_498_130, + /* stealTimeMillis= */ 78_780, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + + compareCpuInfos("CPU infos with policy 0 containing an empty related_cpus file", + expectedCpuInfos, actualCpuInfos); + } + + @Test + public void testReadCpuInfoWithEmptyCpusetCpus() throws Exception { + CpuInfoReader cpuInfoReader = newCpuInfoReader(getCacheFile(VALID_CPUSET_WITH_EMPTY_CPUS), + getCacheFile(VALID_CPUFREQ_WITH_TIME_IN_STATE_DIR), + getCacheFile(VALID_PROC_STAT)); + + SparseArray<CpuInfoReader.CpuInfo> actualCpuInfos = cpuInfoReader.readCpuInfos(); + SparseArray<CpuInfoReader.CpuInfo> expectedCpuInfos = new SparseArray<>(); + expectedCpuInfos.append(0, new CpuInfoReader.CpuInfo(/* cpuCore= */ 0, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_230_000, + /* maxCpuFreqKHz= */ 2_500_000, /* avgTimeInStateCpuFreqKHz= */ 488_095, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 32_249_610, + /* niceTimeMillis= */ 7_950_930, /* systemTimeMillis= */ 52_227_050, + /* idleTimeMillis= */ 409_036_950, /* iowaitTimeMillis= */ 1_322_810, + /* irqTimeMillis= */ 8_146_740, /* softirqTimeMillis= */ 428_970, + /* stealTimeMillis= */ 81_950, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + expectedCpuInfos.append(1, new CpuInfoReader.CpuInfo(/* cpuCore= */ 1, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_450_000, + /* maxCpuFreqKHz= */ 2_800_000, /* avgTimeInStateCpuFreqKHz= */ 502_380, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 28_949_280, + /* niceTimeMillis= */ 7_799_450, /* systemTimeMillis= */ 54_004_020, + /* idleTimeMillis= */ 402_707_120, /* iowaitTimeMillis= */ 1_186_960, + /* irqTimeMillis= */ 14_786_940, /* softirqTimeMillis= */ 1_498_130, + /* stealTimeMillis= */ 78_780, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + expectedCpuInfos.append(2, new CpuInfoReader.CpuInfo(/* cpuCore= */ 2, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_000_000, + /* maxCpuFreqKHz= */ 2_000_000, /* avgTimeInStateCpuFreqKHz= */ 464_285, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 28_959_280, + /* niceTimeMillis= */ 7_789_450, /* systemTimeMillis= */ 54_014_020, + /* idleTimeMillis= */ 402_717_120, /* iowaitTimeMillis= */ 1_166_960, + /* irqTimeMillis= */ 14_796_940, /* softirqTimeMillis= */ 1_478_130, + /* stealTimeMillis= */ 88_780, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + expectedCpuInfos.append(3, new CpuInfoReader.CpuInfo(/* cpuCore= */ 3, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_000_000, + /* maxCpuFreqKHz= */ 2_000_000, /* avgTimeInStateCpuFreqKHz= */ 464_285, + /* normalizedAvailableCpuFreqKHz= */ 1_907_125, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 32_349_610, + /* niceTimeMillis= */ 7_850_930, /* systemTimeMillis= */ 52_127_050, + /* idleTimeMillis= */ 409_136_950, /* iowaitTimeMillis= */ 1_332_810, + /* irqTimeMillis= */ 8_136_740, /* softirqTimeMillis= */ 438_970, + /* stealTimeMillis= */ 71_950, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + + compareCpuInfos("CPU infos with empty background cpu set", expectedCpuInfos, + actualCpuInfos); + } + + @Test + public void testReadCpuInfoWithEmptyAffectedCpus() throws Exception { + CpuInfoReader cpuInfoReader = newCpuInfoReader(getCacheFile(VALID_CPUSET_DIR), + getCacheFile(VALID_CPUFREQ_WITH_EMPTY_AFFECTED_CPUS), + getCacheFile(VALID_PROC_STAT)); + + SparseArray<CpuInfoReader.CpuInfo> actualCpuInfos = cpuInfoReader.readCpuInfos(); + SparseArray<CpuInfoReader.CpuInfo> expectedCpuInfos = new SparseArray<>(); + + expectedCpuInfos.append(1, new CpuInfoReader.CpuInfo(/* cpuCore= */ 1, + FLAG_CPUSET_CATEGORY_TOP_APP, /* isOnline= */ true, /* curCpuFreqKHz= */ 1_450_000, + /* maxCpuFreqKHz= */ 2_800_000, /* avgTimeInStateCpuFreqKHz= */ 502_380, + /* normalizedAvailableCpuFreqKHz= */ 2_693_525, + new CpuInfoReader.CpuUsageStats(/* userTimeMillis= */ 28_949_280, + /* niceTimeMillis= */ 7_799_450, /* systemTimeMillis= */ 54_004_020, + /* idleTimeMillis= */ 402_707_120, /* iowaitTimeMillis= */ 1_186_960, + /* irqTimeMillis= */ 14_786_940, /* softirqTimeMillis= */ 1_498_130, + /* stealTimeMillis= */ 78_780, /* guestTimeMillis= */ 0, + /* guestNiceTimeMillis= */ 0))); + + compareCpuInfos("CPU infos with policy 0 containing an empty affected_cpus file", + expectedCpuInfos, actualCpuInfos); + } + + @Test public void testReadCpuInfoWithEmptyProcStat() throws Exception { File emptyFile = getCacheFile(EMPTY_FILE); assertWithMessage("Create empty file %s", emptyFile).that(emptyFile.createNewFile()) diff --git a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java index fd9671d9142d..ed68fb9a4d54 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java @@ -813,7 +813,7 @@ public final class DisplayPowerController2Test { any(HysteresisLevels.class), any(HysteresisLevels.class), eq(mContext), - any(HighBrightnessModeController.class), + any(BrightnessRangeController.class), any(BrightnessThrottler.class), isNull(), anyInt(), @@ -1062,7 +1062,7 @@ public final class DisplayPowerController2Test { HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, + BrightnessRangeController brightnessRangeController, BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, diff --git a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java index 6c80f7b5f4ab..95bc26ac99ed 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -819,7 +819,7 @@ public final class DisplayPowerControllerTest { any(HysteresisLevels.class), any(HysteresisLevels.class), eq(mContext), - any(HighBrightnessModeController.class), + any(BrightnessRangeController.class), any(BrightnessThrottler.class), isNull(), anyInt(), @@ -1038,7 +1038,7 @@ public final class DisplayPowerControllerTest { HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - HighBrightnessModeController hbmController, + BrightnessRangeController brightnessRangeController, BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong, float userLux, diff --git a/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java index 206af5b6aea6..bc5e72095a1c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java @@ -92,7 +92,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -175,12 +174,12 @@ public class WallpaperManagerServiceTests { sImageWallpaperComponentName = ComponentName.unflattenFromString( sContext.getResources().getString(R.string.image_wallpaper_component)); // Mock default wallpaper as image wallpaper if there is no pre-defined default wallpaper. - sDefaultWallpaperComponent = WallpaperManager.getDefaultWallpaperComponent(sContext); + sDefaultWallpaperComponent = WallpaperManager.getCmfDefaultWallpaperComponent(sContext); if (sDefaultWallpaperComponent == null) { sDefaultWallpaperComponent = sImageWallpaperComponentName; doReturn(sImageWallpaperComponentName).when(() -> - WallpaperManager.getDefaultWallpaperComponent(any())); + WallpaperManager.getCmfDefaultWallpaperComponent(any())); } else { sContext.addMockService(sDefaultWallpaperComponent, sWallpaperService); } @@ -300,10 +299,8 @@ public class WallpaperManagerServiceTests { /** * Tests setWallpaperComponent and clearWallpaper should work as expected. - * TODO ignored since the assumption never passes. to be investigated. */ @Test - @Ignore("b/264533465") public void testSetThenClearComponent() { // Skip if there is no pre-defined default wallpaper component. assumeThat(sDefaultWallpaperComponent, diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 16e1b457ad96..ee3a773580a3 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -28,6 +28,7 @@ android_test { "services.accessibility", "services.appwidget", "services.autofill", + "services.contentcapture", "services.backup", "services.companion", "services.core", diff --git a/services/tests/servicestests/src/com/android/server/contentcapture/ContentCaptureManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/contentcapture/ContentCaptureManagerServiceTest.java new file mode 100644 index 000000000000..e4571194b37d --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentcapture/ContentCaptureManagerServiceTest.java @@ -0,0 +1,427 @@ +/* + * Copyright (C) 2013 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.contentcapture; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; + +import android.annotation.NonNull; +import android.content.ComponentName; +import android.content.ContentCaptureOptions; +import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ParceledListSlice; +import android.content.pm.UserInfo; +import android.service.contentcapture.ContentCaptureServiceInfo; +import android.view.contentcapture.ContentCaptureEvent; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.server.LocalServices; +import com.android.server.contentprotection.ContentProtectionBlocklistManager; +import com.android.server.contentprotection.RemoteContentProtectionService; +import com.android.server.pm.UserManagerInternal; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +/** + * Test for {@link ContentCaptureManagerService}. + * + * <p>Run with: {@code atest + * FrameworksServicesTests:com.android.server.contentcapture.ContentCaptureManagerServiceTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +@SuppressWarnings("GuardedBy") // Service not really running, no need to expose locks +public class ContentCaptureManagerServiceTest { + + private static final int USER_ID = 1234; + + private static final String PACKAGE_NAME = "com.test.package"; + + private static final ComponentName COMPONENT_NAME = + new ComponentName(PACKAGE_NAME, "TestClass"); + + private static final ContentCaptureEvent EVENT = + new ContentCaptureEvent(/* sessionId= */ 100, /* type= */ 200); + + private static final ParceledListSlice<ContentCaptureEvent> PARCELED_EVENTS = + new ParceledListSlice<>(ImmutableList.of(EVENT)); + + private static final Context sContext = ApplicationProvider.getApplicationContext(); + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private UserManagerInternal mMockUserManagerInternal; + + @Mock private ContentProtectionBlocklistManager mMockContentProtectionBlocklistManager; + + @Mock private ContentCaptureServiceInfo mMockContentCaptureServiceInfo; + + @Mock private RemoteContentProtectionService mMockRemoteContentProtectionService; + + private boolean mDevCfgEnableContentProtectionReceiver; + + private int mContentProtectionBlocklistManagersCreated; + + private int mContentProtectionServiceInfosCreated; + + private int mRemoteContentProtectionServicesCreated; + + private String mConfigDefaultContentProtectionService = COMPONENT_NAME.flattenToString(); + + private boolean mContentProtectionServiceInfoConstructorShouldThrow; + + private ContentCaptureManagerService mContentCaptureManagerService; + + @Before + public void setup() { + when(mMockUserManagerInternal.getUserInfos()).thenReturn(new UserInfo[0]); + LocalServices.removeServiceForTest(UserManagerInternal.class); + LocalServices.addService(UserManagerInternal.class, mMockUserManagerInternal); + mContentCaptureManagerService = new TestContentCaptureManagerService(); + } + + @Test + public void constructor_contentProtection_flagDisabled_noBlocklistManager() { + assertThat(mContentProtectionBlocklistManagersCreated).isEqualTo(0); + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(0); + verifyZeroInteractions(mMockContentProtectionBlocklistManager); + } + + @Test + public void constructor_contentProtection_componentNameNull_noBlocklistManager() { + mConfigDefaultContentProtectionService = null; + + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + assertThat(mContentProtectionBlocklistManagersCreated).isEqualTo(0); + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(0); + verifyZeroInteractions(mMockContentProtectionBlocklistManager); + } + + @Test + public void constructor_contentProtection_componentNameBlank_noBlocklistManager() { + mConfigDefaultContentProtectionService = " "; + + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + assertThat(mContentProtectionBlocklistManagersCreated).isEqualTo(0); + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(0); + verifyZeroInteractions(mMockContentProtectionBlocklistManager); + } + + @Test + public void constructor_contentProtection_enabled_createsBlocklistManager() { + mDevCfgEnableContentProtectionReceiver = true; + + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + assertThat(mContentProtectionBlocklistManagersCreated).isEqualTo(1); + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(0); + verify(mMockContentProtectionBlocklistManager).updateBlocklist(anyInt()); + } + + @Test + public void setFineTuneParamsFromDeviceConfig_doesNotUpdateContentProtectionBlocklist() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mDevCfgContentProtectionAppsBlocklistSize += 100; + verify(mMockContentProtectionBlocklistManager).updateBlocklist(anyInt()); + + mContentCaptureManagerService.setFineTuneParamsFromDeviceConfig(); + + verifyNoMoreInteractions(mMockContentProtectionBlocklistManager); + } + + @Test + public void getOptions_contentCaptureDisabled_contentProtectionDisabled() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + ContentCaptureOptions actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.getOptions( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isNull(); + verify(mMockContentProtectionBlocklistManager).isAllowed(PACKAGE_NAME); + } + + @Test + public void getOptions_contentCaptureDisabled_contentProtectionEnabled() { + when(mMockContentProtectionBlocklistManager.isAllowed(PACKAGE_NAME)).thenReturn(true); + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + ContentCaptureOptions actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.getOptions( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isNotNull(); + assertThat(actual.enableReceiver).isFalse(); + assertThat(actual.contentProtectionOptions).isNotNull(); + assertThat(actual.contentProtectionOptions.enableReceiver).isTrue(); + assertThat(actual.whitelistedComponents).isNull(); + } + + @Test + public void getOptions_contentCaptureEnabled_contentProtectionDisabled() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mGlobalContentCaptureOptions.setWhitelist( + USER_ID, ImmutableList.of(PACKAGE_NAME), /* components= */ null); + + ContentCaptureOptions actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.getOptions( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isNotNull(); + assertThat(actual.enableReceiver).isTrue(); + assertThat(actual.contentProtectionOptions).isNotNull(); + assertThat(actual.contentProtectionOptions.enableReceiver).isFalse(); + assertThat(actual.whitelistedComponents).isNull(); + verify(mMockContentProtectionBlocklistManager).isAllowed(PACKAGE_NAME); + } + + @Test + public void getOptions_contentCaptureEnabled_contentProtectionEnabled() { + when(mMockContentProtectionBlocklistManager.isAllowed(PACKAGE_NAME)).thenReturn(true); + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mGlobalContentCaptureOptions.setWhitelist( + USER_ID, ImmutableList.of(PACKAGE_NAME), /* components= */ null); + + ContentCaptureOptions actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.getOptions( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isNotNull(); + assertThat(actual.enableReceiver).isTrue(); + assertThat(actual.contentProtectionOptions).isNotNull(); + assertThat(actual.contentProtectionOptions.enableReceiver).isTrue(); + assertThat(actual.whitelistedComponents).isNull(); + } + + @Test + public void isWhitelisted_packageName_contentCaptureDisabled_contentProtectionDisabled() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionBlocklistManager).isAllowed(PACKAGE_NAME); + } + + @Test + public void isWhitelisted_packageName_contentCaptureDisabled_contentProtectionEnabled() { + when(mMockContentProtectionBlocklistManager.isAllowed(PACKAGE_NAME)).thenReturn(true); + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isTrue(); + } + + @Test + public void isWhitelisted_packageName_contentCaptureEnabled_contentProtectionNotChecked() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mGlobalContentCaptureOptions.setWhitelist( + USER_ID, ImmutableList.of(PACKAGE_NAME), /* components= */ null); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isTrue(); + verify(mMockContentProtectionBlocklistManager, never()).isAllowed(anyString()); + } + + @Test + public void isWhitelisted_componentName_contentCaptureDisabled_contentProtectionDisabled() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, COMPONENT_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionBlocklistManager).isAllowed(PACKAGE_NAME); + } + + @Test + public void isWhitelisted_componentName_contentCaptureDisabled_contentProtectionEnabled() { + when(mMockContentProtectionBlocklistManager.isAllowed(PACKAGE_NAME)).thenReturn(true); + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, COMPONENT_NAME); + + assertThat(actual).isTrue(); + } + + @Test + public void isWhitelisted_componentName_contentCaptureEnabled_contentProtectionNotChecked() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mGlobalContentCaptureOptions.setWhitelist( + USER_ID, /* packageNames= */ null, ImmutableList.of(COMPONENT_NAME)); + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, COMPONENT_NAME); + + assertThat(actual).isTrue(); + verify(mMockContentProtectionBlocklistManager, never()).isAllowed(anyString()); + } + + @Test + public void isContentProtectionReceiverEnabled_withoutBlocklistManager() { + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionBlocklistManager, never()).isAllowed(anyString()); + } + + @Test + public void isContentProtectionReceiverEnabled_disabledWithFlag() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mDevCfgEnableContentProtectionReceiver = false; + + boolean actual = + mContentCaptureManagerService.mGlobalContentCaptureOptions.isWhitelisted( + USER_ID, PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionBlocklistManager, never()).isAllowed(anyString()); + } + + @Test + public void onLoginDetected_disabledAfterConstructor() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + mContentCaptureManagerService.mDevCfgEnableContentProtectionReceiver = false; + + mContentCaptureManagerService + .getContentCaptureManagerServiceStub() + .onLoginDetected(PARCELED_EVENTS); + + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(0); + assertThat(mRemoteContentProtectionServicesCreated).isEqualTo(0); + verifyZeroInteractions(mMockRemoteContentProtectionService); + } + + @Test + public void onLoginDetected_invalidPermissions() { + mDevCfgEnableContentProtectionReceiver = true; + mContentProtectionServiceInfoConstructorShouldThrow = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + mContentCaptureManagerService + .getContentCaptureManagerServiceStub() + .onLoginDetected(PARCELED_EVENTS); + + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(1); + assertThat(mRemoteContentProtectionServicesCreated).isEqualTo(0); + verifyZeroInteractions(mMockRemoteContentProtectionService); + } + + @Test + public void onLoginDetected_enabled() { + mDevCfgEnableContentProtectionReceiver = true; + mContentCaptureManagerService = new TestContentCaptureManagerService(); + + mContentCaptureManagerService + .getContentCaptureManagerServiceStub() + .onLoginDetected(PARCELED_EVENTS); + + assertThat(mContentProtectionServiceInfosCreated).isEqualTo(1); + assertThat(mRemoteContentProtectionServicesCreated).isEqualTo(1); + verify(mMockRemoteContentProtectionService).onLoginDetected(PARCELED_EVENTS); + } + + private class TestContentCaptureManagerService extends ContentCaptureManagerService { + + TestContentCaptureManagerService() { + super(sContext); + this.mDevCfgEnableContentProtectionReceiver = + ContentCaptureManagerServiceTest.this.mDevCfgEnableContentProtectionReceiver; + } + + @Override + protected boolean getEnableContentProtectionReceiverLocked() { + return ContentCaptureManagerServiceTest.this.mDevCfgEnableContentProtectionReceiver; + } + + @Override + protected ContentProtectionBlocklistManager createContentProtectionBlocklistManager() { + mContentProtectionBlocklistManagersCreated++; + return mMockContentProtectionBlocklistManager; + } + + @Override + protected String getContentProtectionServiceFlatComponentName() { + return mConfigDefaultContentProtectionService; + } + + @Override + protected ContentCaptureServiceInfo createContentProtectionServiceInfo( + @NonNull ComponentName componentName) throws PackageManager.NameNotFoundException { + mContentProtectionServiceInfosCreated++; + if (mContentProtectionServiceInfoConstructorShouldThrow) { + throw new RuntimeException("TEST RUNTIME EXCEPTION"); + } + return mMockContentCaptureServiceInfo; + } + + @Override + protected RemoteContentProtectionService createRemoteContentProtectionService( + @NonNull ComponentName componentName) { + mRemoteContentProtectionServicesCreated++; + return mMockRemoteContentProtectionService; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionBlocklistManagerTest.java b/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionBlocklistManagerTest.java new file mode 100644 index 000000000000..ba9956a63dca --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionBlocklistManagerTest.java @@ -0,0 +1,236 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; + +import android.annotation.NonNull; +import android.content.pm.PackageInfo; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.List; + +/** + * Test for {@link ContentProtectionBlocklistManager}. + * + * <p>Run with: {@code atest + * FrameworksServicesTests: + * com.android.server.contentprotection.ContentProtectionBlocklistManagerTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class ContentProtectionBlocklistManagerTest { + + private static final String FIRST_PACKAGE_NAME = "com.test.first.package.name"; + + private static final String SECOND_PACKAGE_NAME = "com.test.second.package.name"; + + private static final String UNLISTED_PACKAGE_NAME = "com.test.unlisted.package.name"; + + private static final String PACKAGE_NAME_BLOCKLIST_FILENAME = + "/product/etc/res/raw/content_protection/package_name_blocklist.txt"; + + private static final PackageInfo PACKAGE_INFO = new PackageInfo(); + + private static final List<String> LINES = + ImmutableList.of(FIRST_PACKAGE_NAME, SECOND_PACKAGE_NAME); + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private ContentProtectionPackageManager mMockContentProtectionPackageManager; + + private final List<String> mReadRawFiles = new ArrayList<>(); + + private ContentProtectionBlocklistManager mContentProtectionBlocklistManager; + + @Before + public void setup() { + mContentProtectionBlocklistManager = new TestContentProtectionBlocklistManager(); + } + + @Test + public void isAllowed_blocklistNotLoaded() { + boolean actual = mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + + assertThat(actual).isFalse(); + assertThat(mReadRawFiles).isEmpty(); + verifyZeroInteractions(mMockContentProtectionPackageManager); + } + + @Test + public void isAllowed_inBlocklist() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + + assertThat(actual).isFalse(); + verifyZeroInteractions(mMockContentProtectionPackageManager); + } + + @Test + public void isAllowed_packageInfoNotFound() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + when(mMockContentProtectionPackageManager.getPackageInfo(UNLISTED_PACKAGE_NAME)) + .thenReturn(null); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(UNLISTED_PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionPackageManager, never()) + .hasRequestedInternetPermissions(any()); + verify(mMockContentProtectionPackageManager, never()).isSystemApp(any()); + verify(mMockContentProtectionPackageManager, never()).isUpdatedSystemApp(any()); + } + + @Test + public void isAllowed_notRequestedInternet() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + when(mMockContentProtectionPackageManager.getPackageInfo(UNLISTED_PACKAGE_NAME)) + .thenReturn(PACKAGE_INFO); + when(mMockContentProtectionPackageManager.hasRequestedInternetPermissions(PACKAGE_INFO)) + .thenReturn(false); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(UNLISTED_PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionPackageManager, never()).isSystemApp(any()); + verify(mMockContentProtectionPackageManager, never()).isUpdatedSystemApp(any()); + } + + @Test + public void isAllowed_systemApp() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + when(mMockContentProtectionPackageManager.getPackageInfo(UNLISTED_PACKAGE_NAME)) + .thenReturn(PACKAGE_INFO); + when(mMockContentProtectionPackageManager.hasRequestedInternetPermissions(PACKAGE_INFO)) + .thenReturn(true); + when(mMockContentProtectionPackageManager.isSystemApp(PACKAGE_INFO)).thenReturn(true); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(UNLISTED_PACKAGE_NAME); + + assertThat(actual).isFalse(); + verify(mMockContentProtectionPackageManager, never()).isUpdatedSystemApp(any()); + } + + @Test + public void isAllowed_updatedSystemApp() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + when(mMockContentProtectionPackageManager.getPackageInfo(UNLISTED_PACKAGE_NAME)) + .thenReturn(PACKAGE_INFO); + when(mMockContentProtectionPackageManager.hasRequestedInternetPermissions(PACKAGE_INFO)) + .thenReturn(true); + when(mMockContentProtectionPackageManager.isSystemApp(PACKAGE_INFO)).thenReturn(true); + when(mMockContentProtectionPackageManager.isUpdatedSystemApp(PACKAGE_INFO)) + .thenReturn(true); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(UNLISTED_PACKAGE_NAME); + + assertThat(actual).isFalse(); + } + + @Test + public void isAllowed_allowed() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size()); + when(mMockContentProtectionPackageManager.getPackageInfo(UNLISTED_PACKAGE_NAME)) + .thenReturn(PACKAGE_INFO); + when(mMockContentProtectionPackageManager.hasRequestedInternetPermissions(PACKAGE_INFO)) + .thenReturn(true); + when(mMockContentProtectionPackageManager.isSystemApp(PACKAGE_INFO)).thenReturn(false); + when(mMockContentProtectionPackageManager.isUpdatedSystemApp(PACKAGE_INFO)) + .thenReturn(false); + + boolean actual = mContentProtectionBlocklistManager.isAllowed(UNLISTED_PACKAGE_NAME); + + assertThat(actual).isTrue(); + } + + @Test + public void updateBlocklist_negativeSize() { + mContentProtectionBlocklistManager.updateBlocklist(/* blocklistSize= */ -1); + assertThat(mReadRawFiles).isEmpty(); + + mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + verify(mMockContentProtectionPackageManager).getPackageInfo(FIRST_PACKAGE_NAME); + } + + @Test + public void updateBlocklist_zeroSize() { + mContentProtectionBlocklistManager.updateBlocklist(/* blocklistSize= */ 0); + assertThat(mReadRawFiles).isEmpty(); + + mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + verify(mMockContentProtectionPackageManager).getPackageInfo(FIRST_PACKAGE_NAME); + } + + @Test + public void updateBlocklist_positiveSize_belowTotal() { + mContentProtectionBlocklistManager.updateBlocklist(/* blocklistSize= */ 1); + assertThat(mReadRawFiles).containsExactly(PACKAGE_NAME_BLOCKLIST_FILENAME); + + mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + mContentProtectionBlocklistManager.isAllowed(SECOND_PACKAGE_NAME); + + verify(mMockContentProtectionPackageManager, never()).getPackageInfo(FIRST_PACKAGE_NAME); + verify(mMockContentProtectionPackageManager).getPackageInfo(SECOND_PACKAGE_NAME); + } + + @Test + public void updateBlocklist_positiveSize_aboveTotal() { + mContentProtectionBlocklistManager.updateBlocklist(LINES.size() + 1); + assertThat(mReadRawFiles).containsExactly(PACKAGE_NAME_BLOCKLIST_FILENAME); + + mContentProtectionBlocklistManager.isAllowed(FIRST_PACKAGE_NAME); + mContentProtectionBlocklistManager.isAllowed(SECOND_PACKAGE_NAME); + + verify(mMockContentProtectionPackageManager, never()).getPackageInfo(FIRST_PACKAGE_NAME); + verify(mMockContentProtectionPackageManager, never()).getPackageInfo(SECOND_PACKAGE_NAME); + } + + private final class TestContentProtectionBlocklistManager + extends ContentProtectionBlocklistManager { + + TestContentProtectionBlocklistManager() { + super(mMockContentProtectionPackageManager); + } + + @Override + protected List<String> readLinesFromRawFile(@NonNull String filename) { + mReadRawFiles.add(filename); + return LINES; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionPackageManagerTest.java b/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionPackageManagerTest.java new file mode 100644 index 000000000000..7d45ea4ce39a --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionPackageManagerTest.java @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; + +import android.Manifest.permission; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManager.PackageInfoFlags; +import android.testing.TestableContext; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +/** + * Test for {@link ContentProtectionPackageManager}. + * + * <p>Run with: {@code atest + * FrameworksServicesTests:com.android.server.contentprotection.ContentProtectionPackageManagerTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class ContentProtectionPackageManagerTest { + private static final String PACKAGE_NAME = "PACKAGE_NAME"; + + private static final PackageInfo EMPTY_PACKAGE_INFO = new PackageInfo(); + + private static final PackageInfo SYSTEM_APP_PACKAGE_INFO = createSystemAppPackageInfo(); + + private static final PackageInfo UPDATED_SYSTEM_APP_PACKAGE_INFO = + createUpdatedSystemAppPackageInfo(); + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Rule + public final TestableContext mContext = + new TestableContext(ApplicationProvider.getApplicationContext()); + + @Mock private PackageManager mMockPackageManager; + + private ContentProtectionPackageManager mContentProtectionPackageManager; + + @Before + public void setup() { + mContext.setMockPackageManager(mMockPackageManager); + mContentProtectionPackageManager = new ContentProtectionPackageManager(mContext); + } + + @Test + public void getPackageInfo_found() throws Exception { + PackageInfo expected = createPackageInfo(/* flags= */ 0); + when(mMockPackageManager.getPackageInfo(eq(PACKAGE_NAME), any(PackageInfoFlags.class))) + .thenReturn(expected); + + PackageInfo actual = mContentProtectionPackageManager.getPackageInfo(PACKAGE_NAME); + + assertThat(actual).isEqualTo(expected); + } + + @Test + public void getPackageInfo_notFound() throws Exception { + when(mMockPackageManager.getPackageInfo(eq(PACKAGE_NAME), any(PackageInfoFlags.class))) + .thenThrow(new NameNotFoundException()); + + PackageInfo actual = mContentProtectionPackageManager.getPackageInfo(PACKAGE_NAME); + + assertThat(actual).isNull(); + } + + @Test + public void getPackageInfo_null() { + PackageInfo actual = mContentProtectionPackageManager.getPackageInfo(PACKAGE_NAME); + + assertThat(actual).isNull(); + } + + @Test + public void isSystemApp_true() { + boolean actual = mContentProtectionPackageManager.isSystemApp(SYSTEM_APP_PACKAGE_INFO); + + assertThat(actual).isTrue(); + } + + @Test + public void isSystemApp_false() { + boolean actual = + mContentProtectionPackageManager.isSystemApp(UPDATED_SYSTEM_APP_PACKAGE_INFO); + + assertThat(actual).isFalse(); + } + + @Test + public void isSystemApp_noApplicationInfo() { + boolean actual = mContentProtectionPackageManager.isSystemApp(EMPTY_PACKAGE_INFO); + + assertThat(actual).isFalse(); + } + + @Test + public void isUpdatedSystemApp_true() { + boolean actual = + mContentProtectionPackageManager.isUpdatedSystemApp( + UPDATED_SYSTEM_APP_PACKAGE_INFO); + + assertThat(actual).isTrue(); + } + + @Test + public void isUpdatedSystemApp_false() { + boolean actual = + mContentProtectionPackageManager.isUpdatedSystemApp(SYSTEM_APP_PACKAGE_INFO); + + assertThat(actual).isFalse(); + } + + @Test + public void isUpdatedSystemApp_noApplicationInfo() { + boolean actual = mContentProtectionPackageManager.isUpdatedSystemApp(EMPTY_PACKAGE_INFO); + + assertThat(actual).isFalse(); + } + + @Test + public void hasRequestedInternetPermissions_true() { + PackageInfo packageInfo = createPackageInfo(new String[] {permission.INTERNET}); + + boolean actual = + mContentProtectionPackageManager.hasRequestedInternetPermissions(packageInfo); + + assertThat(actual).isTrue(); + } + + @Test + public void hasRequestedInternetPermissions_false() { + PackageInfo packageInfo = createPackageInfo(new String[] {permission.ACCESS_FINE_LOCATION}); + + boolean actual = + mContentProtectionPackageManager.hasRequestedInternetPermissions(packageInfo); + + assertThat(actual).isFalse(); + } + + @Test + public void hasRequestedInternetPermissions_noRequestedPermissions() { + boolean actual = + mContentProtectionPackageManager.hasRequestedInternetPermissions( + EMPTY_PACKAGE_INFO); + + assertThat(actual).isFalse(); + } + + private static PackageInfo createSystemAppPackageInfo() { + return createPackageInfo(ApplicationInfo.FLAG_SYSTEM); + } + + private static PackageInfo createUpdatedSystemAppPackageInfo() { + return createPackageInfo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP); + } + + private static PackageInfo createPackageInfo(int flags) { + return createPackageInfo(flags, /* requestedPermissions= */ new String[0]); + } + + private static PackageInfo createPackageInfo(String[] requestedPermissions) { + return createPackageInfo(/* flags= */ 0, requestedPermissions); + } + + private static PackageInfo createPackageInfo(int flags, String[] requestedPermissions) { + PackageInfo packageInfo = new PackageInfo(); + packageInfo.packageName = PACKAGE_NAME; + packageInfo.applicationInfo = new ApplicationInfo(); + packageInfo.applicationInfo.packageName = PACKAGE_NAME; + packageInfo.applicationInfo.flags = flags; + packageInfo.requestedPermissions = requestedPermissions; + return packageInfo; + } +} diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/RemoteContentProtectionServiceTest.java b/services/tests/servicestests/src/com/android/server/contentprotection/RemoteContentProtectionServiceTest.java new file mode 100644 index 000000000000..9135ef3a1286 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentprotection/RemoteContentProtectionServiceTest.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.contentprotection; + +import static com.google.common.truth.Truth.assertThat; + +import static org.junit.Assert.fail; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; + +import android.annotation.NonNull; +import android.content.ComponentName; +import android.content.Context; +import android.content.pm.ParceledListSlice; +import android.os.UserHandle; +import android.service.contentcapture.IContentProtectionService; +import android.view.contentcapture.ContentCaptureEvent; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.internal.infra.AndroidFuture; +import com.android.internal.infra.ServiceConnector; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +/** + * Test for {@link RemoteContentProtectionService}. + * + * <p>Run with: {@code atest + * FrameworksServicesTests:com.android.server.contentprotection.RemoteContentProtectionServiceTest} + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class RemoteContentProtectionServiceTest { + + private final Context mContext = ApplicationProvider.getApplicationContext(); + + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private IContentProtectionService mMockContentProtectionService; + + private RemoteContentProtectionService mRemoteContentProtectionService; + + private int mConnectCallCount = 0; + + @Before + public void setup() { + ComponentName componentName = new ComponentName(mContext.getPackageName(), "TestClass"); + mRemoteContentProtectionService = + new TestRemoteContentProtectionService(mContext, componentName); + } + + @Test + public void doesNotAutoConnect() { + assertThat(mConnectCallCount).isEqualTo(0); + verifyZeroInteractions(mMockContentProtectionService); + } + + @Test + public void getAutoDisconnectTimeoutMs() { + long actual = mRemoteContentProtectionService.getAutoDisconnectTimeoutMs(); + + assertThat(actual).isEqualTo(3000L); + } + + @Test + public void onLoginDetected() throws Exception { + ContentCaptureEvent event = + new ContentCaptureEvent(/* sessionId= */ 1111, /* type= */ 2222); + ParceledListSlice<ContentCaptureEvent> events = + new ParceledListSlice<>(ImmutableList.of(event)); + + mRemoteContentProtectionService.onLoginDetected(events); + + verify(mMockContentProtectionService).onLoginDetected(events); + } + + private final class TestRemoteContentProtectionService extends RemoteContentProtectionService { + + TestRemoteContentProtectionService(Context context, ComponentName componentName) { + super(context, componentName, UserHandle.myUserId(), /* bindAllowInstant= */ false); + } + + @Override // from ServiceConnector + public synchronized AndroidFuture<IContentProtectionService> connect() { + mConnectCallCount++; + return AndroidFuture.completedFuture(mMockContentProtectionService); + } + + @Override // from ServiceConnector + public boolean run(@NonNull ServiceConnector.VoidJob<IContentProtectionService> job) { + try { + job.run(mMockContentProtectionService); + } catch (Exception ex) { + fail("Unexpected exception: " + ex); + } + return true; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java index 962e86776ea2..a6acd60f3bd7 100644 --- a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java @@ -85,7 +85,7 @@ public class AutomaticBrightnessControllerTest { @Mock HysteresisLevels mAmbientBrightnessThresholdsIdle; @Mock HysteresisLevels mScreenBrightnessThresholdsIdle; @Mock Handler mNoOpHandler; - @Mock HighBrightnessModeController mHbmController; + @Mock BrightnessRangeController mBrightnessRangeController; @Mock BrightnessThrottler mBrightnessThrottler; @Before @@ -134,12 +134,15 @@ public class AutomaticBrightnessControllerTest { DARKENING_LIGHT_DEBOUNCE_CONFIG, RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG, mAmbientBrightnessThresholds, mScreenBrightnessThresholds, mAmbientBrightnessThresholdsIdle, mScreenBrightnessThresholdsIdle, - mContext, mHbmController, mBrightnessThrottler, mIdleBrightnessMappingStrategy, - AMBIENT_LIGHT_HORIZON_SHORT, AMBIENT_LIGHT_HORIZON_LONG, userLux, userBrightness + mContext, mBrightnessRangeController, mBrightnessThrottler, + mIdleBrightnessMappingStrategy, AMBIENT_LIGHT_HORIZON_SHORT, + AMBIENT_LIGHT_HORIZON_LONG, userLux, userBrightness ); - when(mHbmController.getCurrentBrightnessMax()).thenReturn(BRIGHTNESS_MAX_FLOAT); - when(mHbmController.getCurrentBrightnessMin()).thenReturn(BRIGHTNESS_MIN_FLOAT); + when(mBrightnessRangeController.getCurrentBrightnessMax()).thenReturn( + BRIGHTNESS_MAX_FLOAT); + when(mBrightnessRangeController.getCurrentBrightnessMin()).thenReturn( + BRIGHTNESS_MIN_FLOAT); // Disable brightness throttling by default. Individual tests can enable it as needed. when(mBrightnessThrottler.getBrightnessCap()).thenReturn(BRIGHTNESS_MAX_FLOAT); when(mBrightnessThrottler.isThrottled()).thenReturn(false); diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java index 5837b21b89fd..708421d2a431 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -52,6 +52,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; @SmallTest @RunWith(AndroidJUnit4.class) @@ -376,6 +377,116 @@ public final class DisplayDeviceConfigTest { assertEquals(90, testMap.get(Temperature.THROTTLING_EMERGENCY).max, SMALL_DELTA); } + @Test + public void testValidLuxThrottling() throws Exception { + setupDisplayDeviceConfigFromDisplayConfigFile(); + + Map<DisplayDeviceConfig.BrightnessLimitMapType, Map<Float, Float>> luxThrottlingData = + mDisplayDeviceConfig.getLuxThrottlingData(); + assertEquals(2, luxThrottlingData.size()); + + Map<Float, Float> adaptiveOnBrightnessPoints = luxThrottlingData.get( + DisplayDeviceConfig.BrightnessLimitMapType.ADAPTIVE); + assertEquals(2, adaptiveOnBrightnessPoints.size()); + assertEquals(0.3f, adaptiveOnBrightnessPoints.get(1000f), SMALL_DELTA); + assertEquals(0.5f, adaptiveOnBrightnessPoints.get(5000f), SMALL_DELTA); + + Map<Float, Float> adaptiveOffBrightnessPoints = luxThrottlingData.get( + DisplayDeviceConfig.BrightnessLimitMapType.DEFAULT); + assertEquals(2, adaptiveOffBrightnessPoints.size()); + assertEquals(0.35f, adaptiveOffBrightnessPoints.get(1500f), SMALL_DELTA); + assertEquals(0.55f, adaptiveOffBrightnessPoints.get(5500f), SMALL_DELTA); + } + + @Test + public void testInvalidLuxThrottling() throws Exception { + setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getInvalidLuxThrottling())); + + Map<DisplayDeviceConfig.BrightnessLimitMapType, Map<Float, Float>> luxThrottlingData = + mDisplayDeviceConfig.getLuxThrottlingData(); + assertEquals(1, luxThrottlingData.size()); + + Map<Float, Float> adaptiveOnBrightnessPoints = luxThrottlingData.get( + DisplayDeviceConfig.BrightnessLimitMapType.ADAPTIVE); + assertEquals(1, adaptiveOnBrightnessPoints.size()); + assertEquals(0.3f, adaptiveOnBrightnessPoints.get(1000f), SMALL_DELTA); + } + + private String getValidLuxThrottling() { + return "<luxThrottling>\n" + + " <brightnessLimitMap>\n" + + " <type>adaptive</type>\n" + + " <map>\n" + + " <point>" + + " <first>1000</first>\n" + + " <second>0.3</second>\n" + + " </point>" + + " <point>" + + " <first>5000</first>\n" + + " <second>0.5</second>\n" + + " </point>" + + " </map>\n" + + " </brightnessLimitMap>\n" + + " <brightnessLimitMap>\n" + + " <type>default</type>\n" + + " <map>\n" + + " <point>" + + " <first>1500</first>\n" + + " <second>0.35</second>\n" + + " </point>" + + " <point>" + + " <first>5500</first>\n" + + " <second>0.55</second>\n" + + " </point>" + + " </map>\n" + + " </brightnessLimitMap>\n" + + "</luxThrottling>"; + } + + private String getInvalidLuxThrottling() { + return "<luxThrottling>\n" + + " <brightnessLimitMap>\n" + + " <type>adaptive</type>\n" + + " <map>\n" + + " <point>" + + " <first>1000</first>\n" + + " <second>0.3</second>\n" + + " </point>" + + " <point>" // second > hbm.transitionPoint, skipped + + " <first>1500</first>\n" + + " <second>0.9</second>\n" + + " </point>" + + " <point>" // same lux value, skipped + + " <first>1000</first>\n" + + " <second>0.5</second>\n" + + " </point>" + + " </map>\n" + + " </brightnessLimitMap>\n" + + " <brightnessLimitMap>\n" // Same type, skipped + + " <type>adaptive</type>\n" + + " <map>\n" + + " <point>" + + " <first>2000</first>\n" + + " <second>0.35</second>\n" + + " </point>" + + " <point>" + + " <first>6000</first>\n" + + " <second>0.55</second>\n" + + " </point>" + + " </map>\n" + + " </brightnessLimitMap>\n" + + " <brightnessLimitMap>\n" // Invalid points only, skipped + + " <type>default</type>\n" + + " <map>\n" + + " <point>" + + " <first>2500</first>\n" + + " <second>0.99</second>\n" + + " </point>" + + " </map>\n" + + " </brightnessLimitMap>\n" + + "</luxThrottling>"; + } + private String getRefreshThermalThrottlingMaps() { return "<refreshRateThrottlingMap>\n" + " <refreshRateThrottlingPoint>\n" @@ -405,6 +516,10 @@ public final class DisplayDeviceConfigTest { } private String getContent() { + return getContent(getValidLuxThrottling()); + } + + private String getContent(String brightnessCapConfig) { return "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + "<displayConfiguration>\n" + "<name>Example Display</name>" @@ -462,6 +577,7 @@ public final class DisplayDeviceConfigTest { + "</point>\n" + "</sdrHdrRatioMap>\n" + "</highBrightnessMode>\n" + + brightnessCapConfig + "<screenOffBrightnessSensor>\n" + "<type>sensor_12345</type>\n" + "<name>Sensor 12345</name>\n" @@ -731,8 +847,12 @@ public final class DisplayDeviceConfigTest { } private void setupDisplayDeviceConfigFromDisplayConfigFile() throws IOException { + setupDisplayDeviceConfigFromDisplayConfigFile(getContent()); + } + + private void setupDisplayDeviceConfigFromDisplayConfigFile(String content) throws IOException { Path tempFile = Files.createTempFile("display_config", ".tmp"); - Files.write(tempFile, getContent().getBytes(StandardCharsets.UTF_8)); + Files.write(tempFile, content.getBytes(StandardCharsets.UTF_8)); mDisplayDeviceConfig = new DisplayDeviceConfig(mContext); mDisplayDeviceConfig.initFromFile(tempFile.toFile()); } diff --git a/services/tests/servicestests/src/com/android/server/display/NormalBrightnessModeControllerTest.java b/services/tests/servicestests/src/com/android/server/display/NormalBrightnessModeControllerTest.java new file mode 100644 index 000000000000..c379d6b79ee7 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/display/NormalBrightnessModeControllerTest.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.display; + +import static org.junit.Assert.assertEquals; + +import android.os.PowerManager; + +import androidx.test.filters.SmallTest; + +import com.android.internal.annotations.Keep; +import com.android.server.display.DisplayDeviceConfig.BrightnessLimitMapType; + +import com.google.common.collect.ImmutableMap; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.HashMap; +import java.util.Map; + +import junitparams.JUnitParamsRunner; +import junitparams.Parameters; + +@SmallTest +@RunWith(JUnitParamsRunner.class) +public class NormalBrightnessModeControllerTest { + private static final float FLOAT_TOLERANCE = 0.001f; + + private final NormalBrightnessModeController mController = new NormalBrightnessModeController(); + + @Keep + private static Object[][] brightnessData() { + return new Object[][]{ + // no brightness config + {0, AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED, new HashMap<>(), + PowerManager.BRIGHTNESS_MAX}, + {0, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, new HashMap<>(), + PowerManager.BRIGHTNESS_MAX}, + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, new HashMap<>(), + PowerManager.BRIGHTNESS_MAX}, + // Auto brightness - on, config only for default + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, ImmutableMap.of( + BrightnessLimitMapType.DEFAULT, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f) + ), 0.2f}, + // Auto brightness - off, config only for default + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED, ImmutableMap.of( + BrightnessLimitMapType.DEFAULT, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f) + ), 0.2f}, + // Auto brightness - off, config only for adaptive + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED, ImmutableMap.of( + BrightnessLimitMapType.ADAPTIVE, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f) + ), PowerManager.BRIGHTNESS_MAX}, + // Auto brightness - on, config only for adaptive + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, ImmutableMap.of( + BrightnessLimitMapType.ADAPTIVE, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f) + ), 0.2f}, + // Auto brightness - on, config for both + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, ImmutableMap.of( + BrightnessLimitMapType.DEFAULT, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f), + BrightnessLimitMapType.ADAPTIVE, + ImmutableMap.of(99f, 0.3f, 101f, 0.4f) + ), 0.4f}, + // Auto brightness - off, config for both + {100, AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED, ImmutableMap.of( + BrightnessLimitMapType.DEFAULT, + ImmutableMap.of(99f, 0.1f, 101f, 0.2f), + BrightnessLimitMapType.ADAPTIVE, + ImmutableMap.of(99f, 0.3f, 101f, 0.4f) + ), 0.2f}, + // Auto brightness - on, config for both, ambient high + {1000, AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED, ImmutableMap.of( + BrightnessLimitMapType.DEFAULT, + ImmutableMap.of(1000f, 0.1f, 2000f, 0.2f), + BrightnessLimitMapType.ADAPTIVE, + ImmutableMap.of(99f, 0.3f, 101f, 0.4f) + ), PowerManager.BRIGHTNESS_MAX}, + }; + } + + @Test + @Parameters(method = "brightnessData") + public void testReturnsCorrectMaxBrightness(float ambientLux, int autoBrightnessState, + Map<BrightnessLimitMapType, Map<Float, Float>> maxBrightnessConfig, + float expectedBrightness) { + setupController(ambientLux, autoBrightnessState, maxBrightnessConfig); + + assertEquals(expectedBrightness, mController.getCurrentBrightnessMax(), FLOAT_TOLERANCE); + } + + private void setupController(float ambientLux, int autoBrightnessState, + Map<BrightnessLimitMapType, Map<Float, Float>> maxBrightnessConfig) { + mController.onAmbientLuxChange(ambientLux); + mController.setAutoBrightnessState(autoBrightnessState); + mController.resetNbmData(maxBrightnessConfig); + } +} diff --git a/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java b/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java index 817b245a78bf..642f54c25a46 100644 --- a/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java @@ -60,6 +60,114 @@ public class PersistentDataStoreTest { } @Test + public void testLoadBrightness() { + final String uniqueDisplayId = "test:123"; + final DisplayDevice testDisplayDevice = new DisplayDevice( + null, null, uniqueDisplayId, null) { + @Override + public boolean hasStableUniqueId() { + return true; + } + + @Override + public DisplayDeviceInfo getDisplayDeviceInfoLocked() { + return null; + } + }; + + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <display-states>\n" + + " <display unique-id=\"test:123\">\n" + + " <brightness-value user-serial=\"1\">0.1</brightness-value>\n" + + " <brightness-value user-serial=\"2\">0.2</brightness-value>\n" + + " </display>\n" + + " </display-states>\n" + + "</display-manager-state>\n"; + + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + + float brightness = mDataStore.getBrightness(testDisplayDevice, 1); + assertEquals(0.1, brightness, 0.01); + + brightness = mDataStore.getBrightness(testDisplayDevice, 2); + assertEquals(0.2, brightness, 0.01); + } + + @Test + public void testSetBrightness_brightnessTagWithNoUserId_updatesToBrightnessTagWithUserId() { + final String uniqueDisplayId = "test:123"; + final DisplayDevice testDisplayDevice = + new DisplayDevice(null, null, uniqueDisplayId, null) { + @Override + public boolean hasStableUniqueId() { + return true; + } + + @Override + public DisplayDeviceInfo getDisplayDeviceInfoLocked() { + return null; + } + }; + + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <display-states>\n" + + " <color-mode>0</color-mode>\n" + + " <display unique-id=\"test:123\">\n" + + " <brightness-value>0.5</brightness-value>\n" + + " </display>\n" + + " </display-states>\n" + + "</display-manager-state>\n"; + + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + + float user1Brightness = mDataStore.getBrightness(testDisplayDevice, 1 /* userSerial */); + float user2Brightness = mDataStore.getBrightness(testDisplayDevice, 2 /* userSerial */); + assertEquals(0.5, user1Brightness, 0.01); + assertEquals(0.5, user2Brightness, 0.01); + + // Override the value for user 2. Default user must have been removed. + mDataStore.setBrightness(testDisplayDevice, 0.2f, 2 /* userSerial */ /* brightness*/); + + user1Brightness = mDataStore.getBrightness(testDisplayDevice, 1 /* userSerial */); + user2Brightness = mDataStore.getBrightness(testDisplayDevice, 2 /* userSerial */); + assertTrue(Float.isNaN(user1Brightness)); + assertEquals(0.2f, user2Brightness, 0.01); + + // Override the value for user 1. User-specific brightness values should co-exist. + mDataStore.setBrightness(testDisplayDevice, 0.1f, 1 /* userSerial */ /* brightness*/); + user1Brightness = mDataStore.getBrightness(testDisplayDevice, 1 /* userSerial */); + user2Brightness = mDataStore.getBrightness(testDisplayDevice, 2 /* userSerial */); + assertEquals(0.1f, user1Brightness, 0.01); + assertEquals(0.2f, user2Brightness, 0.01); + + // Validate saveIfNeeded writes user-specific brightnes. + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + mInjector.setWriteStream(baos); + mDataStore.saveIfNeeded(); + mTestLooper.dispatchAll(); + assertTrue(mInjector.wasWriteSuccessful()); + TestInjector newInjector = new TestInjector(); + PersistentDataStore newDataStore = new PersistentDataStore(newInjector); + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + newInjector.setReadStream(bais); + newDataStore.loadIfNeeded(); + + user1Brightness = newDataStore.getBrightness(testDisplayDevice, 1 /* userSerial */); + user2Brightness = newDataStore.getBrightness(testDisplayDevice, 2 /* userSerial */); + float unknownUserBrightness = + newDataStore.getBrightness(testDisplayDevice, 999 /* userSerial */); + assertEquals(0.1f, user1Brightness, 0.01); + assertEquals(0.2f, user2Brightness, 0.01); + assertTrue(Float.isNaN(unknownUserBrightness)); + } + + @Test public void testLoadingBrightnessConfigurations() { String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + "<display-manager-state>\n" @@ -374,7 +482,7 @@ public class PersistentDataStoreTest { ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); newInjector.setReadStream(bais); newDataStore.loadIfNeeded(); - assertTrue(Float.isNaN(mDataStore.getBrightness(testDisplayDevice))); + assertTrue(Float.isNaN(mDataStore.getBrightness(testDisplayDevice, 1 /* userSerial */))); } @Test diff --git a/services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java b/services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java index e6d3bbc53c83..c4f483810478 100644 --- a/services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java @@ -19,6 +19,7 @@ package com.android.server.display.brightness; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -247,6 +248,7 @@ public final class DisplayBrightnessControllerTest { 0.0f); verify(mBrightnessChangeExecutor).execute(mOnBrightnessChangeRunnable); verify(mBrightnessSetting).setBrightness(brightnessValue); + verify(mBrightnessSetting).setUserSerial(anyInt()); // Does nothing if the value is invalid mDisplayBrightnessController.updateScreenBrightnessSetting(Float.NaN); @@ -358,4 +360,28 @@ public final class DisplayBrightnessControllerTest { verify(mBrightnessSetting, never()).getBrightnessNitsForDefaultDisplay(); verify(mBrightnessSetting, never()).setBrightness(brightness); } + + @Test + public void testChangeBrightnessNitsWhenUserChanges() { + float brightnessValue1 = 0.3f; + float nits1 = 200f; + float brightnessValue2 = 0.5f; + float nits2 = 300f; + AutomaticBrightnessController automaticBrightnessController = + mock(AutomaticBrightnessController.class); + when(automaticBrightnessController.convertToNits(brightnessValue1)).thenReturn(nits1); + when(automaticBrightnessController.convertToNits(brightnessValue2)).thenReturn(nits2); + mDisplayBrightnessController.setAutomaticBrightnessController( + automaticBrightnessController); + + mDisplayBrightnessController.setBrightness(brightnessValue1, 1 /* user-serial */); + verify(mBrightnessSetting).setUserSerial(1); + verify(mBrightnessSetting).setBrightness(brightnessValue1); + verify(mBrightnessSetting).setBrightnessNitsForDefaultDisplay(nits1); + + mDisplayBrightnessController.setBrightness(brightnessValue2, 2 /* user-serial */); + verify(mBrightnessSetting).setUserSerial(2); + verify(mBrightnessSetting).setBrightness(brightnessValue2); + verify(mBrightnessSetting).setBrightnessNitsForDefaultDisplay(nits2); + } } diff --git a/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java b/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java index 851d8f94d2c0..f05fa65a43ea 100644 --- a/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java @@ -101,12 +101,6 @@ public class DreamOverlayServiceTest { mMonitor.onEndDream(); super.onEndDream(); } - - @Override - public void onWakeUp(@NonNull Runnable onCompleteCallback) { - mMonitor.onWakeUp(); - super.onWakeUp(onCompleteCallback); - } } /** diff --git a/services/tests/servicestests/src/com/android/server/input/AmbientKeyboardBacklightControllerTests.kt b/services/tests/servicestests/src/com/android/server/input/AmbientKeyboardBacklightControllerTests.kt new file mode 100644 index 000000000000..98b46286e977 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/input/AmbientKeyboardBacklightControllerTests.kt @@ -0,0 +1,355 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input + +import android.content.Context +import android.content.ContextWrapper +import android.content.res.Resources +import android.hardware.Sensor +import android.hardware.SensorEvent +import android.hardware.SensorEventListener +import android.hardware.SensorManager +import android.hardware.display.DisplayManagerInternal +import android.hardware.input.InputSensorInfo +import android.os.Handler +import android.os.test.TestLooper +import android.platform.test.annotations.Presubmit +import android.util.TypedValue +import android.view.Display +import android.view.DisplayInfo +import androidx.test.core.app.ApplicationProvider +import com.android.internal.R +import com.android.server.LocalServices +import com.android.server.input.AmbientKeyboardBacklightController.HYSTERESIS_THRESHOLD +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.anyBoolean +import org.mockito.Mockito.anyInt +import org.mockito.Mockito.eq +import org.mockito.Mockito.spy +import org.mockito.Mockito.`when` +import org.mockito.junit.MockitoJUnit + +/** + * Tests for {@link AmbientKeyboardBacklightController}. + * + * Build/Install/Run: + * atest FrameworksServicesTests:AmbientKeyboardBacklightControllerTests + */ +@Presubmit +class AmbientKeyboardBacklightControllerTests { + + companion object { + const val DEFAULT_DISPLAY_UNIQUE_ID = "uniqueId_1" + const val SENSOR_NAME = "test_sensor_name" + const val SENSOR_TYPE = "test_sensor_type" + } + + @get:Rule + val rule = MockitoJUnit.rule()!! + + private lateinit var context: Context + private lateinit var testLooper: TestLooper + private lateinit var ambientController: AmbientKeyboardBacklightController + + @Mock + private lateinit var resources: Resources + + @Mock + private lateinit var lightSensorInfo: InputSensorInfo + + @Mock + private lateinit var sensorManager: SensorManager + + @Mock + private lateinit var displayManagerInternal: DisplayManagerInternal + private lateinit var lightSensor: Sensor + + private var currentDisplayInfo = DisplayInfo() + private var lastBrightnessCallback: Int = 0 + private var listenerRegistered: Boolean = false + private var listenerRegistrationCount: Int = 0 + + @Before + fun setup() { + context = spy(ContextWrapper(ApplicationProvider.getApplicationContext())) + `when`(context.resources).thenReturn(resources) + setupBrightnessSteps() + setupSensor() + testLooper = TestLooper() + ambientController = AmbientKeyboardBacklightController(context, testLooper.looper) + ambientController.systemRunning() + testLooper.dispatchAll() + } + + private fun setupBrightnessSteps() { + val brightnessValues = intArrayOf(100, 200, 0) + val decreaseThresholds = intArrayOf(-1, 900, 1900) + val increaseThresholds = intArrayOf(1000, 2000, -1) + `when`(resources.getIntArray(R.array.config_autoKeyboardBacklightBrightnessValues)) + .thenReturn(brightnessValues) + `when`(resources.getIntArray(R.array.config_autoKeyboardBacklightDecreaseLuxThreshold)) + .thenReturn(decreaseThresholds) + `when`(resources.getIntArray(R.array.config_autoKeyboardBacklightIncreaseLuxThreshold)) + .thenReturn(increaseThresholds) + `when`( + resources.getValue( + eq(R.dimen.config_autoKeyboardBrightnessSmoothingConstant), + any(TypedValue::class.java), + anyBoolean() + ) + ).then { + val args = it.arguments + val outValue = args[1] as TypedValue + outValue.data = java.lang.Float.floatToRawIntBits(1.0f) + Unit + } + } + + private fun setupSensor() { + LocalServices.removeServiceForTest(DisplayManagerInternal::class.java) + LocalServices.addService(DisplayManagerInternal::class.java, displayManagerInternal) + currentDisplayInfo.uniqueId = DEFAULT_DISPLAY_UNIQUE_ID + `when`(displayManagerInternal.getDisplayInfo(Display.DEFAULT_DISPLAY)).thenReturn( + currentDisplayInfo + ) + val sensorData = DisplayManagerInternal.AmbientLightSensorData(SENSOR_NAME, SENSOR_TYPE) + `when`(displayManagerInternal.getAmbientLightSensorData(Display.DEFAULT_DISPLAY)) + .thenReturn(sensorData) + + `when`(lightSensorInfo.name).thenReturn(SENSOR_NAME) + `when`(lightSensorInfo.stringType).thenReturn(SENSOR_TYPE) + lightSensor = Sensor(lightSensorInfo) + `when`(context.getSystemService(eq(Context.SENSOR_SERVICE))).thenReturn(sensorManager) + `when`(sensorManager.getSensorList(anyInt())).thenReturn(listOf(lightSensor)) + `when`( + sensorManager.registerListener( + any(), + eq(lightSensor), + anyInt(), + any(Handler::class.java) + ) + ).then { + listenerRegistered = true + listenerRegistrationCount++ + true + } + `when`( + sensorManager.unregisterListener( + any(SensorEventListener::class.java), + eq(lightSensor) + ) + ).then { + listenerRegistered = false + Unit + } + } + + private fun setupSensorWithInitialLux(luxValue: Float) { + ambientController.registerAmbientBacklightListener { brightnessValue: Int -> + lastBrightnessCallback = brightnessValue + } + sendAmbientLuxValue(luxValue) + testLooper.dispatchAll() + } + + @Test + fun testInitialAmbientLux_sendsCallbackImmediately() { + setupSensorWithInitialLux(500F) + + assertEquals( + "Should receive immediate callback for first lux change", + 100, + lastBrightnessCallback + ) + } + + @Test + fun testBrightnessIncrease_afterInitialLuxChanges() { + setupSensorWithInitialLux(500F) + + // Current state: Step 1 [value = 100, increaseThreshold = 1000, decreaseThreshold = -1] + repeat(HYSTERESIS_THRESHOLD) { + sendAmbientLuxValue(1500F) + } + testLooper.dispatchAll() + + assertEquals( + "Should receive brightness change callback for increasing lux change", + 200, + lastBrightnessCallback + ) + } + + @Test + fun testBrightnessDecrease_afterInitialLuxChanges() { + setupSensorWithInitialLux(1500F) + + // Current state: Step 2 [value = 200, increaseThreshold = 2000, decreaseThreshold = 900] + repeat(HYSTERESIS_THRESHOLD) { + sendAmbientLuxValue(500F) + } + testLooper.dispatchAll() + + assertEquals( + "Should receive brightness change callback for decreasing lux change", + 100, + lastBrightnessCallback + ) + } + + @Test + fun testRegisterAmbientListener_throwsExceptionOnRegisteringDuplicate() { + val ambientListener = + AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener { } + ambientController.registerAmbientBacklightListener(ambientListener) + + assertThrows(IllegalStateException::class.java) { + ambientController.registerAmbientBacklightListener( + ambientListener + ) + } + } + + @Test + fun testUnregisterAmbientListener_throwsExceptionOnUnregisteringNonExistent() { + val ambientListener = + AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener { } + assertThrows(IllegalStateException::class.java) { + ambientController.unregisterAmbientBacklightListener( + ambientListener + ) + } + } + + @Test + fun testSensorListenerRegistered_onRegisterUnregisterAmbientListener() { + assertEquals( + "Should not have a sensor listener registered at init", + 0, + listenerRegistrationCount + ) + assertFalse("Should not have a sensor listener registered at init", listenerRegistered) + + val ambientListener1 = + AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener { } + ambientController.registerAmbientBacklightListener(ambientListener1) + assertEquals( + "Should register a new sensor listener", 1, listenerRegistrationCount + ) + assertTrue("Should have sensor listener registered", listenerRegistered) + + val ambientListener2 = + AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener { } + ambientController.registerAmbientBacklightListener(ambientListener2) + assertEquals( + "Should not register a new sensor listener when adding a second ambient listener", + 1, + listenerRegistrationCount + ) + assertTrue("Should have sensor listener registered", listenerRegistered) + + ambientController.unregisterAmbientBacklightListener(ambientListener1) + assertTrue("Should have sensor listener registered", listenerRegistered) + + ambientController.unregisterAmbientBacklightListener(ambientListener2) + assertFalse( + "Should not have sensor listener registered if there are no ambient listeners", + listenerRegistered + ) + } + + @Test + fun testDisplayChange_shouldNotReRegisterListener_ifUniqueIdSame() { + setupSensorWithInitialLux(0F) + + val count = listenerRegistrationCount + ambientController.onDisplayChanged(Display.DEFAULT_DISPLAY) + testLooper.dispatchAll() + + assertEquals( + "Should not re-register listener on display change if unique is same", + count, + listenerRegistrationCount + ) + } + + @Test + fun testDisplayChange_shouldReRegisterListener_ifUniqueIdChanges() { + setupSensorWithInitialLux(0F) + + val count = listenerRegistrationCount + currentDisplayInfo.uniqueId = "xyz" + ambientController.onDisplayChanged(Display.DEFAULT_DISPLAY) + testLooper.dispatchAll() + + assertEquals( + "Should re-register listener on display change if unique id changed", + count + 1, + listenerRegistrationCount + ) + } + + @Test + fun testBrightnessDoesntChange_betweenIncreaseAndDecreaseThresholds() { + setupSensorWithInitialLux(1001F) + + // Previous state: Step 1 [value = 100, increaseThreshold = 1000, decreaseThreshold = -1] + // Current state: Step 2 [value = 200, increaseThreshold = 2000, decreaseThreshold = 900] + lastBrightnessCallback = -1 + repeat(HYSTERESIS_THRESHOLD) { + sendAmbientLuxValue(999F) + } + testLooper.dispatchAll() + + assertEquals( + "Should not receive any callback for brightness change", + -1, + lastBrightnessCallback + ) + } + + @Test + fun testBrightnessDoesntChange_onChangeOccurringLessThanHysteresisThreshold() { + setupSensorWithInitialLux(1001F) + + // Previous state: Step 1 [value = 100, increaseThreshold = 1000, decreaseThreshold = -1] + // Current state: Step 2 [value = 200, increaseThreshold = 2000, decreaseThreshold = 900] + lastBrightnessCallback = -1 + repeat(HYSTERESIS_THRESHOLD - 1) { + sendAmbientLuxValue(2001F) + } + testLooper.dispatchAll() + + assertEquals( + "Should not receive any callback for brightness change", + -1, + lastBrightnessCallback + ) + } + + private fun sendAmbientLuxValue(luxValue: Float) { + ambientController.onSensorChanged(SensorEvent(lightSensor, 0, 0, floatArrayOf(luxValue))) + } +} diff --git a/services/tests/servicestests/src/com/android/server/input/BatteryControllerTests.kt b/services/tests/servicestests/src/com/android/server/input/BatteryControllerTests.kt index 416b1f49f5d9..c36122b7e788 100644 --- a/services/tests/servicestests/src/com/android/server/input/BatteryControllerTests.kt +++ b/services/tests/servicestests/src/com/android/server/input/BatteryControllerTests.kt @@ -40,8 +40,7 @@ import androidx.test.core.app.ApplicationProvider import com.android.server.input.BatteryController.BluetoothBatteryManager import com.android.server.input.BatteryController.BluetoothBatteryManager.BluetoothBatteryListener import com.android.server.input.BatteryController.POLLING_PERIOD_MILLIS -import com.android.server.input.BatteryController.UEventManager -import com.android.server.input.BatteryController.UEventManager.UEventBatteryListener +import com.android.server.input.BatteryController.UEventBatteryListener import com.android.server.input.BatteryController.USI_BATTERY_VALIDITY_DURATION_MILLIS import org.hamcrest.Description import org.hamcrest.Matcher diff --git a/services/tests/servicestests/src/com/android/server/input/InputManagerServiceTests.kt b/services/tests/servicestests/src/com/android/server/input/InputManagerServiceTests.kt index 677144c144a7..72066ea951e3 100644 --- a/services/tests/servicestests/src/com/android/server/input/InputManagerServiceTests.kt +++ b/services/tests/servicestests/src/com/android/server/input/InputManagerServiceTests.kt @@ -23,9 +23,12 @@ import android.hardware.display.DisplayViewport import android.os.IInputConstants import android.os.test.TestLooper import android.platform.test.annotations.Presubmit +import android.provider.Settings +import android.test.mock.MockContentResolver import android.view.Display import android.view.PointerIcon import androidx.test.InstrumentationRegistry +import com.android.internal.util.test.FakeSettingsProvider import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -33,6 +36,8 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.ArgumentMatchers.any +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.eq import org.mockito.Mock @@ -44,7 +49,9 @@ import org.mockito.Mockito.spy import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions +import org.mockito.Mockito.verifyZeroInteractions import org.mockito.junit.MockitoJUnit +import org.mockito.stubbing.OngoingStubbing import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -58,7 +65,10 @@ import java.util.concurrent.TimeUnit class InputManagerServiceTests { @get:Rule - val rule = MockitoJUnit.rule()!! + val mockitoRule = MockitoJUnit.rule()!! + + @get:Rule + val fakeSettingsProviderRule = FakeSettingsProvider.rule()!! @Mock private lateinit var native: NativeInputManagerService @@ -66,17 +76,25 @@ class InputManagerServiceTests { @Mock private lateinit var wmCallbacks: InputManagerService.WindowManagerCallbacks + @Mock + private lateinit var uEventManager: UEventManager + private lateinit var service: InputManagerService private lateinit var localService: InputManagerInternal private lateinit var context: Context private lateinit var testLooper: TestLooper + private lateinit var contentResolver: MockContentResolver @Before fun setup() { context = spy(ContextWrapper(InstrumentationRegistry.getContext())) + contentResolver = MockContentResolver(context) + contentResolver.addProvider(Settings.AUTHORITY, FakeSettingsProvider()) + whenever(context.contentResolver).thenReturn(contentResolver) testLooper = TestLooper() service = - InputManagerService(object : InputManagerService.Injector(context, testLooper.looper) { + InputManagerService(object : InputManagerService.Injector( + context, testLooper.looper, uEventManager) { override fun getNativeService( service: InputManagerService? ): NativeInputManagerService { @@ -92,9 +110,36 @@ class InputManagerServiceTests { } @Test + fun testStart() { + verifyZeroInteractions(native) + + service.start() + verify(native).start() + } + + @Test + fun testInputSettingsUpdatedOnSystemRunning() { + verifyZeroInteractions(native) + + service.systemRunning() + + verify(native).setPointerSpeed(anyInt()) + verify(native).setTouchpadPointerSpeed(anyInt()) + verify(native).setTouchpadNaturalScrollingEnabled(anyBoolean()) + verify(native).setTouchpadTapToClickEnabled(anyBoolean()) + verify(native).setTouchpadRightClickZoneEnabled(anyBoolean()) + verify(native).setShowTouches(anyBoolean()) + verify(native).reloadPointerIcons() + verify(native).notifyKeyGestureTimeoutsChanged() + verify(native).setMotionClassifierEnabled(anyBoolean()) + verify(native).setMaximumObscuringOpacityForTouch(anyFloat()) + verify(native).setStylusPointerIconEnabled(anyBoolean()) + } + + @Test fun testPointerDisplayUpdatesWhenDisplayViewportsChanged() { val displayId = 123 - `when`(wmCallbacks.pointerDisplayId).thenReturn(displayId) + whenever(wmCallbacks.pointerDisplayId).thenReturn(displayId) val viewports = listOf<DisplayViewport>() localService.setDisplayViewports(viewports) verify(native).setDisplayViewports(any(Array<DisplayViewport>::class.java)) @@ -337,3 +382,5 @@ class InputManagerServiceTests { thread.join(100 /*millis*/) } } + +private fun <T> whenever(methodCall: T): OngoingStubbing<T> = `when`(methodCall) diff --git a/services/tests/servicestests/src/com/android/server/input/KeyboardBacklightControllerTests.kt b/services/tests/servicestests/src/com/android/server/input/KeyboardBacklightControllerTests.kt index 64c05dc8ab84..3f4a4fba841e 100644 --- a/services/tests/servicestests/src/com/android/server/input/KeyboardBacklightControllerTests.kt +++ b/services/tests/servicestests/src/com/android/server/input/KeyboardBacklightControllerTests.kt @@ -16,6 +16,7 @@ package com.android.server.input +import android.animation.ValueAnimator import android.content.Context import android.content.ContextWrapper import android.graphics.Color @@ -29,11 +30,15 @@ import android.os.UEventObserver import android.os.test.TestLooper import android.platform.test.annotations.Presubmit import android.view.InputDevice +import androidx.test.annotation.UiThreadTest import androidx.test.core.app.ApplicationProvider -import com.android.server.input.KeyboardBacklightController.BRIGHTNESS_VALUE_FOR_LEVEL +import com.android.server.input.KeyboardBacklightController.DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL +import com.android.server.input.KeyboardBacklightController.MAX_BRIGHTNESS_CHANGE_STEPS import com.android.server.input.KeyboardBacklightController.USER_INACTIVITY_THRESHOLD_MILLIS import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Assert.assertTrue @@ -63,12 +68,20 @@ private fun createKeyboard(deviceId: Int): InputDevice = .build() private fun createLight(lightId: Int, lightType: Int): Light = + createLight( + lightId, + lightType, + null + ) + +private fun createLight(lightId: Int, lightType: Int, suggestedBrightnessLevels: IntArray?): Light = Light( lightId, "Light $lightId", 1, lightType, - Light.LIGHT_CAPABILITY_BRIGHTNESS + Light.LIGHT_CAPABILITY_BRIGHTNESS, + suggestedBrightnessLevels ) /** * Tests for {@link KeyboardBacklightController}. @@ -92,6 +105,8 @@ class KeyboardBacklightControllerTests { private lateinit var iInputManager: IInputManager @Mock private lateinit var native: NativeInputManagerService + @Mock + private lateinit var uEventManager: UEventManager private lateinit var keyboardBacklightController: KeyboardBacklightController private lateinit var context: Context private lateinit var dataStore: PersistentDataStore @@ -99,6 +114,7 @@ class KeyboardBacklightControllerTests { private var lightColorMap: HashMap<Int, Int> = HashMap() private var lastBacklightState: KeyboardBacklightState? = null private var sysfsNodeChanges = 0 + private var lastAnimationValues = IntArray(2) @Before fun setup() { @@ -115,8 +131,8 @@ class KeyboardBacklightControllerTests { override fun finishWrite(fos: FileOutputStream?, success: Boolean) {} }) testLooper = TestLooper() - keyboardBacklightController = - KeyboardBacklightController(context, native, dataStore, testLooper.looper) + keyboardBacklightController = KeyboardBacklightController(context, native, dataStore, + testLooper.looper, FakeAnimatorFactory(), uEventManager) InputManagerGlobal.resetInstance(iInputManager) val inputManager = InputManager(context) `when`(context.getSystemService(eq(Context.INPUT_SERVICE))).thenReturn(inputManager) @@ -125,6 +141,10 @@ class KeyboardBacklightControllerTests { val args = it.arguments lightColorMap.put(args[1] as Int, args[2] as Int) } + `when`(native.getLightColor(anyInt(), anyInt())).thenAnswer { + val args = it.arguments + lightColorMap.getOrDefault(args[1] as Int, 0) + } lightColorMap.clear() `when`(native.sysfsNodeChanged(any())).then { sysfsNodeChanges++ @@ -138,271 +158,257 @@ class KeyboardBacklightControllerTests { @Test fun testKeyboardBacklightIncrementDecrement() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - for (level in 1 until BRIGHTNESS_VALUE_FOR_LEVEL.size) { - incrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value for level $level mismatched", - Color.argb(BRIGHTNESS_VALUE_FOR_LEVEL[level], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - assertEquals( - "Light value for level $level must be correctly stored in the datastore", - BRIGHTNESS_VALUE_FOR_LEVEL[level], - dataStore.getKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID - ).asInt - ) + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) } - - // Increment above max level - incrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value for max level mismatched", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - assertEquals( - "Light value for max level must be correctly stored in the datastore", - MAX_BRIGHTNESS, - dataStore.getKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID - ).asInt - ) - - for (level in BRIGHTNESS_VALUE_FOR_LEVEL.size - 2 downTo 0) { - decrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value for level $level mismatched", - Color.argb(BRIGHTNESS_VALUE_FOR_LEVEL[level], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - assertEquals( - "Light value for level $level must be correctly stored in the datastore", - BRIGHTNESS_VALUE_FOR_LEVEL[level], - dataStore.getKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID - ).asInt - ) - } - - // Decrement below min level - decrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value for min level mismatched", - Color.argb(0, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - assertEquals( - "Light value for min level must be correctly stored in the datastore", - 0, - dataStore.getKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID - ).asInt - ) } @Test fun testKeyboardWithoutBacklight() { - val keyboardWithoutBacklight = createKeyboard(DEVICE_ID) - val keyboardInputLight = createLight(LIGHT_ID, Light.LIGHT_TYPE_INPUT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithoutBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardInputLight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - incrementKeyboardBacklight(DEVICE_ID) - assertTrue("Non Keyboard backlights should not change", lightColorMap.isEmpty()) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithoutBacklight = createKeyboard(DEVICE_ID) + val keyboardInputLight = createLight(LIGHT_ID, Light.LIGHT_TYPE_INPUT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithoutBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardInputLight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + incrementKeyboardBacklight(DEVICE_ID) + assertTrue("Non Keyboard backlights should not change", lightColorMap.isEmpty()) + } } @Test fun testKeyboardWithMultipleLight() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - val keyboardInputLight = createLight(SECOND_LIGHT_ID, Light.LIGHT_TYPE_INPUT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn( - listOf( - keyboardBacklight, - keyboardInputLight + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + val keyboardInputLight = createLight(SECOND_LIGHT_ID, Light.LIGHT_TYPE_INPUT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn( + listOf( + keyboardBacklight, + keyboardInputLight + ) ) - ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - incrementKeyboardBacklight(DEVICE_ID) - assertEquals("Only keyboard backlights should change", 1, lightColorMap.size) - assertNotNull("Keyboard backlight should change", lightColorMap[LIGHT_ID]) - assertNull("Input lights should not change", lightColorMap[SECOND_LIGHT_ID]) + incrementKeyboardBacklight(DEVICE_ID) + assertEquals("Only keyboard backlights should change", 1, lightColorMap.size) + assertNotNull("Keyboard backlight should change", lightColorMap[LIGHT_ID]) + assertNull("Input lights should not change", lightColorMap[SECOND_LIGHT_ID]) + } } @Test fun testRestoreBacklightOnInputDeviceAdded() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - - for (level in 1 until BRIGHTNESS_VALUE_FOR_LEVEL.size) { - dataStore.setKeyboardBacklightBrightness( + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + + for (level in 1 until DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size) { + dataStore.setKeyboardBacklightBrightness( keyboardWithBacklight.descriptor, LIGHT_ID, - BRIGHTNESS_VALUE_FOR_LEVEL[level] - 1 - ) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data " + - "store", - Color.argb(BRIGHTNESS_VALUE_FOR_LEVEL[level], 0, 0, 0), + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[level] - 1 + ) + + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchNext() + assertEquals( + "Keyboard backlight level should be restored to the level saved in the " + + "data store", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[level], 0, 0, 0), lightColorMap[LIGHT_ID] - ) - keyboardBacklightController.onInputDeviceRemoved(DEVICE_ID) + ) + keyboardBacklightController.onInputDeviceRemoved(DEVICE_ID) + } } } @Test fun testRestoreBacklightOnInputDeviceChanged() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + dataStore.setKeyboardBacklightBrightness( + keyboardWithBacklight.descriptor, + LIGHT_ID, + MAX_BRIGHTNESS + ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertTrue( - "Keyboard backlight should not be changed until its added", - lightColorMap.isEmpty() - ) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchNext() + assertTrue( + "Keyboard backlight should not be changed until its added", + lightColorMap.isEmpty() + ) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceChanged(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data store", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceChanged(DEVICE_ID) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchNext() + assertEquals( + "Keyboard backlight level should be restored to the level saved in the data store", + Color.argb(MAX_BRIGHTNESS, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + } } @Test fun testKeyboardBacklight_registerUnregisterListener() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + val maxLevel = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size - 1 + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - // Register backlight listener - val listener = KeyboardBacklightListener() - keyboardBacklightController.registerKeyboardBacklightListener(listener, 0) + // Register backlight listener + val listener = KeyboardBacklightListener() + keyboardBacklightController.registerKeyboardBacklightListener(listener, 0) - lastBacklightState = null - keyboardBacklightController.incrementKeyboardBacklight(DEVICE_ID) - testLooper.dispatchNext() + lastBacklightState = null + keyboardBacklightController.incrementKeyboardBacklight(DEVICE_ID) + testLooper.dispatchNext() - assertEquals( - "Backlight state device Id should be $DEVICE_ID", - DEVICE_ID, - lastBacklightState!!.deviceId - ) - assertEquals( - "Backlight state brightnessLevel should be " + 1, - 1, - lastBacklightState!!.brightnessLevel - ) - assertEquals( - "Backlight state maxBrightnessLevel should be " + (BRIGHTNESS_VALUE_FOR_LEVEL.size - 1), - (BRIGHTNESS_VALUE_FOR_LEVEL.size - 1), - lastBacklightState!!.maxBrightnessLevel - ) - assertEquals( - "Backlight state isTriggeredByKeyPress should be true", - true, - lastBacklightState!!.isTriggeredByKeyPress - ) + assertEquals( + "Backlight state device Id should be $DEVICE_ID", + DEVICE_ID, + lastBacklightState!!.deviceId + ) + assertEquals( + "Backlight state brightnessLevel should be 1", + 1, + lastBacklightState!!.brightnessLevel + ) + assertEquals( + "Backlight state maxBrightnessLevel should be $maxLevel", + maxLevel, + lastBacklightState!!.maxBrightnessLevel + ) + assertEquals( + "Backlight state isTriggeredByKeyPress should be true", + true, + lastBacklightState!!.isTriggeredByKeyPress + ) - // Unregister listener - keyboardBacklightController.unregisterKeyboardBacklightListener(listener, 0) + // Unregister listener + keyboardBacklightController.unregisterKeyboardBacklightListener(listener, 0) - lastBacklightState = null - incrementKeyboardBacklight(DEVICE_ID) + lastBacklightState = null + incrementKeyboardBacklight(DEVICE_ID) - assertNull("Listener should not receive any updates", lastBacklightState) + assertNull("Listener should not receive any updates", lastBacklightState) + } } @Test fun testKeyboardBacklight_userActivity() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + dataStore.setKeyboardBacklightBrightness( + keyboardWithBacklight.descriptor, + LIGHT_ID, + MAX_BRIGHTNESS + ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data store", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchNext() + assertEquals( + "Keyboard backlight level should be restored to the level saved in the data store", + Color.argb(MAX_BRIGHTNESS, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) - testLooper.moveTimeForward(USER_INACTIVITY_THRESHOLD_MILLIS + 1000) - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be turned off after inactivity", - 0, - lightColorMap[LIGHT_ID] - ) + testLooper.moveTimeForward(USER_INACTIVITY_THRESHOLD_MILLIS + 1000) + testLooper.dispatchNext() + assertEquals( + "Keyboard backlight level should be turned off after inactivity", + 0, + lightColorMap[LIGHT_ID] + ) + } } @Test fun testKeyboardBacklight_displayOnOff() { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) - `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + dataStore.setKeyboardBacklightBrightness( + keyboardWithBacklight.descriptor, + LIGHT_ID, + MAX_BRIGHTNESS + ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.handleInteractiveStateChange(true /* isDisplayOn */) - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data " + - "store when display turned on", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.handleInteractiveStateChange(true /* isDisplayOn */) + assertEquals( + "Keyboard backlight level should be restored to the level saved in the data " + + "store when display turned on", + Color.argb(MAX_BRIGHTNESS, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) - keyboardBacklightController.handleInteractiveStateChange(false /* isDisplayOn */) - assertEquals( - "Keyboard backlight level should be turned off after display is turned off", - 0, - lightColorMap[LIGHT_ID] - ) + keyboardBacklightController.handleInteractiveStateChange(false /* isDisplayOn */) + assertEquals( + "Keyboard backlight level should be turned off after display is turned off", + 0, + lightColorMap[LIGHT_ID] + ) + } } @Test @@ -463,6 +469,316 @@ class KeyboardBacklightControllerTests { ) } + @Test + @UiThreadTest + fun testKeyboardBacklightAnimation_onChangeLevels() { + KeyboardBacklightFlags( + animationEnabled = true, + customLevelsEnabled = false, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + incrementKeyboardBacklight(DEVICE_ID) + assertEquals( + "Should start animation from level 0", + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[0], + lastAnimationValues[0] + ) + assertEquals( + "Should start animation to level 1", + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], + lastAnimationValues[1] + ) + } + } + + @Test + fun testKeyboardBacklightPreferredLevels() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = true, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(0, 22, 63, 135, 196, 255) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + suggestedLevels) + } + } + + @Test + fun testKeyboardBacklightPreferredLevels_moreThanMax_shouldUseDefault() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = true, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = IntArray(MAX_BRIGHTNESS_CHANGE_STEPS + 1) { 10 * (it + 1) } + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) + } + } + + @Test + fun testKeyboardBacklightPreferredLevels_mustHaveZeroAndMaxBrightnessAsBounds() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = true, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(22, 63, 135, 196) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + // Framework will add the lowest and maximum levels if not provided via config + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + intArrayOf(0, 22, 63, 135, 196, 255)) + } + } + + @Test + fun testKeyboardBacklightPreferredLevels_dropsOutOfBoundsLevels() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = true, + ambientControlEnabled = false + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(22, 63, 135, 400, 196, 1000) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + // Framework will drop out of bound levels in the config + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + intArrayOf(0, 22, 63, 135, 196, 255)) + } + } + + @Test + fun testAmbientBacklightControl_doesntRestoreBacklightLevel() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = true + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + + dataStore.setKeyboardBacklightBrightness( + keyboardWithBacklight.descriptor, + LIGHT_ID, + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1] + ) + + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchNext() + assertNull( + "Keyboard backlight level should not be restored to the saved level", + lightColorMap[LIGHT_ID] + ) + } + } + + @Test + fun testAmbientBacklightControl_doesntBackupBacklightLevel() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = true + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) + assertFalse( + "Light value should not be backed up if ambient control is enabled", + dataStore.getKeyboardBacklightBrightness( + keyboardWithBacklight.descriptor, LIGHT_ID + ).isPresent + ) + } + } + + @Test + fun testAmbientBacklightControl_incrementLevel_afterAmbientChange() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = true + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + sendAmbientBacklightValue(1) + assertEquals( + "Light value should be changed to ambient provided value", + Color.argb(1, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + + incrementKeyboardBacklight(DEVICE_ID) + + assertEquals( + "Light value for level after increment post Ambient change is mismatched", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + } + } + + @Test + fun testAmbientBacklightControl_decrementLevel_afterAmbientChange() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = true + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + sendAmbientBacklightValue(254) + assertEquals( + "Light value should be changed to ambient provided value", + Color.argb(254, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + + decrementKeyboardBacklight(DEVICE_ID) + + val numLevels = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size + assertEquals( + "Light value for level after decrement post Ambient change is mismatched", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[numLevels - 2], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + } + } + + @Test + fun testAmbientBacklightControl_ambientChanges_afterManualChange() { + KeyboardBacklightFlags( + animationEnabled = false, + customLevelsEnabled = false, + ambientControlEnabled = true + ).use { + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(iInputManager.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) + assertEquals( + "Light value should be changed to the first level", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + + sendAmbientBacklightValue(100) + assertNotEquals( + "Light value should not change based on ambient changes after manual changes", + Color.argb(100, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) + } + } + + private fun assertIncrementDecrementForLevels( + device: InputDevice, + light: Light, + expectedLevels: IntArray + ) { + val deviceId = device.id + val lightId = light.id + for (level in 1 until expectedLevels.size) { + incrementKeyboardBacklight(deviceId) + assertEquals( + "Light value for level $level mismatched", + Color.argb(expectedLevels[level], 0, 0, 0), + lightColorMap[lightId] + ) + assertEquals( + "Light value for level $level must be correctly stored in the datastore", + expectedLevels[level], + dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt + ) + } + + // Increment above max level + incrementKeyboardBacklight(deviceId) + assertEquals( + "Light value for max level mismatched", + Color.argb(MAX_BRIGHTNESS, 0, 0, 0), + lightColorMap[lightId] + ) + assertEquals( + "Light value for max level must be correctly stored in the datastore", + MAX_BRIGHTNESS, + dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt + ) + + for (level in expectedLevels.size - 2 downTo 0) { + decrementKeyboardBacklight(deviceId) + assertEquals( + "Light value for level $level mismatched", + Color.argb(expectedLevels[level], 0, 0, 0), + lightColorMap[lightId] + ) + assertEquals( + "Light value for level $level must be correctly stored in the datastore", + expectedLevels[level], + dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt + ) + } + + // Decrement below min level + decrementKeyboardBacklight(deviceId) + assertEquals( + "Light value for min level mismatched", + Color.argb(0, 0, 0, 0), + lightColorMap[lightId] + ) + assertEquals( + "Light value for min level must be correctly stored in the datastore", + 0, + dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt + ) + } + inner class KeyboardBacklightListener : IKeyboardBacklightListener.Stub() { override fun onBrightnessChanged( deviceId: Int, @@ -490,10 +806,41 @@ class KeyboardBacklightControllerTests { testLooper.dispatchAll() } + private fun sendAmbientBacklightValue(brightnessValue: Int) { + keyboardBacklightController.handleAmbientLightValueChanged(brightnessValue) + keyboardBacklightController.notifyUserActivity() + testLooper.dispatchAll() + } + class KeyboardBacklightState( val deviceId: Int, val brightnessLevel: Int, val maxBrightnessLevel: Int, val isTriggeredByKeyPress: Boolean ) + + private inner class KeyboardBacklightFlags constructor( + animationEnabled: Boolean, + customLevelsEnabled: Boolean, + ambientControlEnabled: Boolean + ) : AutoCloseable { + init { + InputFeatureFlagProvider.setKeyboardBacklightAnimationEnabled(animationEnabled) + InputFeatureFlagProvider.setKeyboardBacklightCustomLevelsEnabled(customLevelsEnabled) + InputFeatureFlagProvider + .setAmbientKeyboardBacklightControlEnabled(ambientControlEnabled) + } + + override fun close() { + InputFeatureFlagProvider.clearOverrides() + } + } + + private inner class FakeAnimatorFactory : KeyboardBacklightController.AnimatorFactory { + override fun makeIntAnimator(from: Int, to: Int): ValueAnimator { + lastAnimationValues[0] = from + lastAnimationValues[1] = to + return ValueAnimator.ofInt(from, to) + } + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index cebc5409c795..eaf483869be4 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -83,6 +83,7 @@ import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.No import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags.SHOW_STICKY_HUN_FOR_DENIED_FSI; import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags.WAKE_LOCK_FOR_POSTING_NOTIFICATION; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; +import static com.android.server.notification.NotificationManagerService.DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_ADJUSTED; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_POSTED; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_UPDATED; @@ -705,6 +706,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @After public void assertAllTrackersFinishedOrCancelled() { + waitForIdle(); // Finish async work. // Verify that no trackers were left dangling. for (PostNotificationTracker tracker : mPostNotificationTrackerFactory.mCreatedTrackers) { assertThat(tracker.isOngoing()).isFalse(); @@ -11924,6 +11926,103 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertFalse(n.isUserInitiatedJob()); } + @Test + public void enqueue_updatesEnqueueRate() throws Exception { + Notification n = generateNotificationRecord(null).getNotification(); + + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + // Don't waitForIdle() here. We want to verify the "intermediate" state. + + verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats, never()).registerPostedByApp(any()); + + waitForIdle(); + } + + @Test + public void enqueue_withPost_updatesEnqueueRateAndPost() throws Exception { + Notification n = generateNotificationRecord(null).getNotification(); + + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + waitForIdle(); + + verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerPostedByApp(any()); + } + + @Test + public void enqueueNew_whenOverEnqueueRate_accepts() throws Exception { + Notification n = generateNotificationRecord(null).getNotification(); + when(mUsageStats.getAppEnqueueRate(eq(PKG))) + .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE + 1f); + + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, n, mUserId); + waitForIdle(); + + assertThat(mService.mNotificationsByKey).hasSize(1); + verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats).registerPostedByApp(any()); + } + + @Test + public void enqueueUpdate_whenBelowMaxEnqueueRate_accepts() throws Exception { + // Post the first version. + Notification original = generateNotificationRecord(null).getNotification(); + original.when = 111; + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, original, mUserId); + waitForIdle(); + assertThat(mService.mNotificationList).hasSize(1); + assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(111); + + reset(mUsageStats); + when(mUsageStats.getAppEnqueueRate(eq(PKG))) + .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE - 1f); + + // Post the update. + Notification update = generateNotificationRecord(null).getNotification(); + update.when = 222; + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, update, mUserId); + waitForIdle(); + + verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats).registerEnqueuedByAppAndAccepted(eq(PKG)); + verify(mUsageStats, never()).registerPostedByApp(any()); + verify(mUsageStats).registerUpdatedByApp(any(), any()); + assertThat(mService.mNotificationList).hasSize(1); + assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(222); + } + + @Test + public void enqueueUpdate_whenAboveMaxEnqueueRate_rejects() throws Exception { + // Post the first version. + Notification original = generateNotificationRecord(null).getNotification(); + original.when = 111; + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, original, mUserId); + waitForIdle(); + assertThat(mService.mNotificationList).hasSize(1); + assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(111); + + reset(mUsageStats); + when(mUsageStats.getAppEnqueueRate(eq(PKG))) + .thenReturn(DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE + 1f); + + // Post the update. + Notification update = generateNotificationRecord(null).getNotification(); + update.when = 222; + mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 0, update, mUserId); + waitForIdle(); + + verify(mUsageStats).registerEnqueuedByApp(eq(PKG)); + verify(mUsageStats, never()).registerEnqueuedByAppAndAccepted(any()); + verify(mUsageStats, never()).registerPostedByApp(any()); + verify(mUsageStats, never()).registerUpdatedByApp(any(), any()); + assertThat(mService.mNotificationList).hasSize(1); + assertThat(mService.mNotificationList.get(0).getNotification().when).isEqualTo(111); // old + } + private void setDpmAppOppsExemptFromDismissal(boolean isOn) { DeviceConfig.setProperty( DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER, diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java index beab107ec556..0b147c333dd2 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java @@ -18,6 +18,8 @@ package com.android.server.notification; import static android.app.Notification.FLAG_FOREGROUND_SERVICE; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; +import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_POSTED; +import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_UPDATED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,6 +35,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.server.UiServiceTestCase; +import com.android.internal.util.FrameworkStatsLog; import org.junit.Test; import org.junit.runner.RunWith; @@ -155,4 +158,54 @@ public class NotificationRecordLoggerTest extends UiServiceTestCase { // Then: should return false assertFalse(NotificationRecordLogger.isNonDismissible(p.r)); } + + @Test + public void testGetFsiState_stickyHunFlagDisabled_zero() { + final int fsiState = NotificationRecordLogger.getFsiState( + /* isStickyHunFlagEnabled= */ false, + /* hasFullScreenIntent= */ true, + /* hasFsiRequestedButDeniedFlag= */ true, + /* eventType= */ NOTIFICATION_POSTED); + assertEquals(0, fsiState); + } + + @Test + public void testGetFsiState_isUpdate_zero() { + final int fsiState = NotificationRecordLogger.getFsiState( + /* isStickyHunFlagEnabled= */ true, + /* hasFullScreenIntent= */ true, + /* hasFsiRequestedButDeniedFlag= */ true, + /* eventType= */ NOTIFICATION_UPDATED); + assertEquals(0, fsiState); + } + + @Test + public void testGetFsiState_hasFsi_allowedEnum() { + final int fsiState = NotificationRecordLogger.getFsiState( + /* isStickyHunFlagEnabled= */ true, + /* hasFullScreenIntent= */ true, + /* hasFsiRequestedButDeniedFlag= */ false, + /* eventType= */ NOTIFICATION_POSTED); + assertEquals(FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__FSI_ALLOWED, fsiState); + } + + @Test + public void testGetFsiState_fsiPermissionDenied_deniedEnum() { + final int fsiState = NotificationRecordLogger.getFsiState( + /* isStickyHunFlagEnabled= */ true, + /* hasFullScreenIntent= */ false, + /* hasFsiRequestedButDeniedFlag= */ true, + /* eventType= */ NOTIFICATION_POSTED); + assertEquals(FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__FSI_DENIED, fsiState); + } + + @Test + public void testGetFsiState_noFsi_noFsiEnum() { + final int fsiState = NotificationRecordLogger.getFsiState( + /* isStickyHunFlagEnabled= */ true, + /* hasFullScreenIntent= */ false, + /* hasFsiRequestedButDeniedFlag= */ false, + /* eventType= */ NOTIFICATION_POSTED); + assertEquals(FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__NO_FSI, fsiState); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java index 6668f8520820..a88ab1863671 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java @@ -115,11 +115,19 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { PREFERRED_CONSTRUCTORS = ImmutableMap.of( Notification.Builder.class, Notification.Builder.class.getConstructor(Context.class, String.class)); + + EXCLUDED_SETTERS_OVERLOADS = ImmutableMultimap.<Class<?>, Method>builder() + .put(RemoteViews.class, + // b/245950570: Tries to connect to service and will crash. + RemoteViews.class.getMethod("setRemoteAdapter", + int.class, Intent.class)) + .build(); } catch (NoSuchMethodException e) { throw new RuntimeException(e); } } + // Setters that shouldn't be called, for various reasons (but NOT because they are KNOWN_BAD). private static final Multimap<Class<?>, String> EXCLUDED_SETTERS = ImmutableMultimap.<Class<?>, String>builder() // Handled by testAllStyles(). @@ -134,6 +142,9 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { .put(RemoteViews.class, "mergeRemoteViews") .build(); + // Same as above, but specific overloads that should not be called. + private static final Multimap<Class<?>, Method> EXCLUDED_SETTERS_OVERLOADS; + private Context mContext; @Rule @@ -146,10 +157,12 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { @Test // This is a meta-test, checks that the generators are not broken. public void verifyTest() { - Generated<Notification> notification = buildNotification(mContext, /* styleClass= */ null, - /* extenderClass= */ null, /* actionExtenderClass= */ null, + Generated<Notification> notification = buildNotification(mContext, + /* styleClass= */ Notification.MessagingStyle.class, + /* extenderClass= */ Notification.WearableExtender.class, + /* actionExtenderClass= */ Notification.Action.WearableExtender.class, /* includeRemoteViews= */ true); - assertThat(notification.includedUris.size()).isAtLeast(20); + assertThat(notification.includedUris.size()).isAtLeast(730); } @Test @@ -479,6 +492,7 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { || method.getReturnType().equals(clazz)) && method.getParameterCount() >= 1 && !EXCLUDED_SETTERS.containsEntry(clazz, method.getName()) + && !EXCLUDED_SETTERS_OVERLOADS.containsEntry(clazz, method) && Arrays.stream(method.getParameterTypes()) .noneMatch(excludingParameterTypes::contains)) { methods.put(method.getName(), method); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java index 48ad86da1bc5..47340c1aef06 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java @@ -36,6 +36,9 @@ import static android.util.StatsLog.ANNOTATION_ID_IS_UID; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES; import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED; +import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED; import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.CHANNEL_ID_FIELD_NUMBER; import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.CHANNEL_NAME_FIELD_NUMBER; import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.IMPORTANCE_FIELD_NUMBER; @@ -48,7 +51,6 @@ import static com.android.server.notification.PreferencesHelper.DEFAULT_BUBBLE_P import static com.android.server.notification.PreferencesHelper.NOTIFICATION_CHANNEL_COUNT_LIMIT; import static com.android.server.notification.PreferencesHelper.NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT; import static com.android.server.notification.PreferencesHelper.UNKNOWN_UID; - import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertNull; @@ -102,6 +104,7 @@ import android.os.RemoteCallback; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.permission.PermissionManager; import android.provider.Settings; import android.provider.Settings.Global; import android.provider.Settings.Secure; @@ -185,6 +188,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Mock Context mContext; @Mock ZenModeHelper mMockZenModeHelper; @Mock AppOpsManager mAppOpsManager; + @Mock PermissionManager mPermissionManager; private NotificationManager.Policy mTestNotificationPolicy; @@ -218,6 +222,8 @@ public class PreferencesHelperTest extends UiServiceTestCase { InstrumentationRegistry.getContext().getResources()); when(mContext.getContentResolver()).thenReturn( InstrumentationRegistry.getContext().getContentResolver()); + when(mPm.getPermissionFlags(any(), any(), any())) + .thenReturn(PackageManager.FLAG_PERMISSION_USER_SET); when(mContext.getPackageManager()).thenReturn(mPm); when(mContext.getApplicationInfo()).thenReturn(legacy); // most tests assume badging is enabled @@ -303,7 +309,8 @@ public class PreferencesHelperTest extends UiServiceTestCase { mStatsEventBuilderFactory = new WrappedSysUiStatsEvent.WrappedBuilderFactory(); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, + mStatsEventBuilderFactory, false); resetZenModeHelper(); mAudioAttributes = new AudioAttributes.Builder() @@ -645,7 +652,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_oldXml_migrates() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); String xml = "<ranking version=\"2\">\n" + "<package name=\"" + PKG_N_MR1 + "\" uid=\"" + UID_N_MR1 @@ -711,7 +718,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_oldXml_backup_migratesWhenPkgInstalled() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); when(mPm.getPackageUidAsUser("pkg1", USER_SYSTEM)).thenReturn(UNKNOWN_UID); when(mPm.getPackageUidAsUser("pkg2", USER_SYSTEM)).thenReturn(UNKNOWN_UID); @@ -789,7 +796,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_newXml_noMigration_showPermissionNotification() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); String xml = "<ranking version=\"3\">\n" + "<package name=\"" + PKG_N_MR1 + "\" show_badge=\"true\">\n" @@ -846,7 +853,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_newXml_permissionNotificationOff() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); String xml = "<ranking version=\"3\">\n" + "<package name=\"" + PKG_N_MR1 + "\" show_badge=\"true\">\n" @@ -903,7 +910,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_newXml_noMigration_noPermissionNotification() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, true); String xml = "<ranking version=\"4\">\n" + "<package name=\"" + PKG_N_MR1 + "\" show_badge=\"true\">\n" @@ -959,7 +966,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_oldXml_migration_NoUid() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); when(mPm.getPackageUidAsUser("something", USER_SYSTEM)).thenReturn(UNKNOWN_UID); String xml = "<ranking version=\"2\">\n" @@ -992,7 +999,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testReadXml_newXml_noMigration_NoUid() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); when(mPm.getPackageUidAsUser("something", USER_SYSTEM)).thenReturn(UNKNOWN_UID); String xml = "<ranking version=\"3\">\n" @@ -1024,7 +1031,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testChannelXmlForNonBackup_postMigration() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); ArrayMap<Pair<Integer, String>, Pair<Boolean, Boolean>> appPermissions = new ArrayMap<>(); appPermissions.put(new Pair<>(1, "first"), new Pair<>(true, false)); @@ -1110,7 +1117,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testChannelXmlForBackup_postMigration() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); ArrayMap<Pair<Integer, String>, Pair<Boolean, Boolean>> appPermissions = new ArrayMap<>(); appPermissions.put(new Pair<>(1, "first"), new Pair<>(true, false)); @@ -1202,7 +1209,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testChannelXmlForBackup_postMigration_noExternal() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); ArrayMap<Pair<Integer, String>, Pair<Boolean, Boolean>> appPermissions = new ArrayMap<>(); appPermissions.put(new Pair<>(UID_P, PKG_P), new Pair<>(true, false)); @@ -1287,7 +1294,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testChannelXmlForBackup_postMigration_noLocalSettings() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); ArrayMap<Pair<Integer, String>, Pair<Boolean, Boolean>> appPermissions = new ArrayMap<>(); appPermissions.put(new Pair<>(1, "first"), new Pair<>(true, false)); @@ -1498,7 +1505,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { new FileNotFoundException("")).thenReturn(resId); mHelper = new PreferencesHelper(mContext, mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); NotificationChannel channel = new NotificationChannel("id", "name", IMPORTANCE_LOW); @@ -2443,7 +2450,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { NotificationManager.Policy.STATE_CHANNELS_BYPASSING_DND, 0); when(mMockZenModeHelper.getNotificationPolicy()).thenReturn(mTestNotificationPolicy); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); @@ -2474,7 +2481,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { NotificationManager.Policy.STATE_CHANNELS_BYPASSING_DND, 0); when(mMockZenModeHelper.getNotificationPolicy()).thenReturn(mTestNotificationPolicy); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); // create notification channel that can bypass dnd, but app is blocked @@ -2498,7 +2505,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { NotificationManager.Policy.STATE_CHANNELS_BYPASSING_DND, 0); when(mMockZenModeHelper.getNotificationPolicy()).thenReturn(mTestNotificationPolicy); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); // create notification channel that can bypass dnd, but app is blocked @@ -2552,7 +2559,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { NotificationManager.Policy.STATE_CHANNELS_BYPASSING_DND, 0); when(mMockZenModeHelper.getNotificationPolicy()).thenReturn(mTestNotificationPolicy); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); assertFalse(mHelper.areChannelsBypassingDnd()); verify(mMockZenModeHelper, times(1)).setNotificationPolicy(any(), anyInt(), anyBoolean()); @@ -2565,7 +2572,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { mTestNotificationPolicy = new NotificationManager.Policy(0, 0, 0, 0, 0, 0); when(mMockZenModeHelper.getNotificationPolicy()).thenReturn(mTestNotificationPolicy); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); assertFalse(mHelper.areChannelsBypassingDnd()); verify(mMockZenModeHelper, never()).setNotificationPolicy(any(), anyInt(), anyBoolean()); @@ -3668,7 +3675,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { + "</package>\n" + "</ranking>\n"; mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadByteArrayXml(preQXml.getBytes(), true, USER_SYSTEM); @@ -3682,7 +3689,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3752,7 +3759,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3765,7 +3772,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3779,7 +3786,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3795,7 +3802,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3851,7 +3858,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -3889,7 +3896,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); loadStreamXml(baos, false, UserHandle.USER_ALL); @@ -4547,7 +4554,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testPlaceholderConversationId_shortcutRequired() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); final String xml = "<ranking version=\"1\">\n" @@ -4567,7 +4574,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testNormalConversationId_shortcutRequired() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); final String xml = "<ranking version=\"1\">\n" @@ -4587,7 +4594,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testNoConversationId_shortcutRequired() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); final String xml = "<ranking version=\"1\">\n" @@ -4607,7 +4614,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testDeleted_noTime() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); final String xml = "<ranking version=\"1\">\n" @@ -4627,7 +4634,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testDeleted_twice() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); mHelper.createNotificationChannel( @@ -4642,7 +4649,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testDeleted_recentTime() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); mHelper.createNotificationChannel( @@ -4661,7 +4668,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { null); parser.nextTag(); mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); mHelper.readXml(parser, true, USER_SYSTEM); @@ -4673,7 +4680,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testUnDelete_time() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); mHelper.createNotificationChannel( @@ -4695,7 +4702,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { @Test public void testDeleted_longTime() throws Exception { mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper, - mPermissionHelper, mLogger, + mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mStatsEventBuilderFactory, false); long time = System.currentTimeMillis() - (DateUtils.DAY_IN_MILLIS * 30); @@ -5464,4 +5471,93 @@ public class PreferencesHelperTest extends UiServiceTestCase { verifyZeroInteractions(mHandler); } + + @Test + public void testGetFsiState_flagDisabled_zero() { + final int fsiState = mHelper.getFsiState("pkg", /* uid= */ 0, + /* requestedFsiPermission */ true, /* isFlagEnabled= */ false); + + assertEquals(0, fsiState); + } + + @Test + public void testGetFsiState_appDidNotRequest_enumNotRequested() { + final int fsiState = mHelper.getFsiState("pkg", /* uid= */ 0, + /* requestedFsiPermission */ false, /* isFlagEnabled= */ true); + + assertEquals(PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED, fsiState); + } + + @Test + public void testGetFsiState_permissionGranted_enumGranted() { + when(mPermissionManager.checkPermissionForPreflight(any(), any())) + .thenReturn(PermissionManager.PERMISSION_GRANTED); + + final int fsiState = mHelper.getFsiState("pkg", /* uid= */ 0, + /* requestedFsiPermission= */ true, /* isFlagEnabled= */ true); + + assertEquals(PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED, fsiState); + } + + @Test + public void testGetFsiState_permissionSoftDenied_enumDenied() { + when(mPermissionManager.checkPermissionForPreflight(any(), any())) + .thenReturn(PermissionManager.PERMISSION_SOFT_DENIED); + + final int fsiState = mHelper.getFsiState("pkg", /* uid= */ 0, + /* requestedFsiPermission = */ true, /* isFlagEnabled= */ true); + + assertEquals(PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED, fsiState); + } + + @Test + public void testGetFsiState_permissionHardDenied_enumDenied() { + when(mPermissionManager.checkPermissionForPreflight(any(), any())) + .thenReturn(PermissionManager.PERMISSION_HARD_DENIED); + + final int fsiState = mHelper.getFsiState("pkg", /* uid= */ 0, + /* requestedFsiPermission = */ true, /* isFlagEnabled= */ true); + + assertEquals(PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED, fsiState); + } + + @Test + public void testIsFsiPermissionUserSet_appDidNotRequest_false() { + final boolean isUserSet = mHelper.isFsiPermissionUserSet("pkg", /* uid= */ 0, + /* fsiState = */ PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED, + /* currentPermissionFlags= */ PackageManager.FLAG_PERMISSION_USER_SET, + /* isStickyHunFlagEnabled= */ true); + + assertFalse(isUserSet); + } + + @Test + public void testIsFsiPermissionUserSet_flagDisabled_false() { + final boolean isUserSet = mHelper.isFsiPermissionUserSet("pkg", /* uid= */ 0, + /* fsiState = */ PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED, + /* currentPermissionFlags= */ PackageManager.FLAG_PERMISSION_USER_SET, + /* isStickyHunFlagEnabled= */ false); + + assertFalse(isUserSet); + } + + @Test + public void testIsFsiPermissionUserSet_userSet_true() { + final boolean isUserSet = mHelper.isFsiPermissionUserSet("pkg", /* uid= */ 0, + /* fsiState = */ PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED, + /* currentPermissionFlags= */ PackageManager.FLAG_PERMISSION_USER_SET, + /* isStickyHunFlagEnabled= */ true); + + assertTrue(isUserSet); + } + + @Test + public void testIsFsiPermissionUserSet_notUserSet_false() { + final boolean isUserSet = mHelper.isFsiPermissionUserSet("pkg", /* uid= */ 0, + /* fsiState = */ PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED, + /* currentPermissionFlags= */ ~PackageManager.FLAG_PERMISSION_USER_SET, + /* isStickyHunFlagEnabled= */ true); + + assertFalse(isUserSet); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java index 68aa1dc1bf3b..131aaa0d4ea7 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java @@ -15,8 +15,9 @@ */ package com.android.server.notification; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static com.google.common.truth.Truth.assertThat; + +import static java.util.concurrent.TimeUnit.HOURS; import android.test.suitebuilder.annotation.SmallTest; @@ -42,110 +43,120 @@ public class RateEstimatorTest extends UiServiceTestCase { @Test public void testRunningTimeBackwardDoesntExplodeUpdate() throws Exception { - assertUpdateTime(mTestStartTime); - assertUpdateTime(mTestStartTime - 1000L); + updateAndVerifyRate(mTestStartTime); + updateAndVerifyRate(mTestStartTime - 1000L); } @Test public void testRunningTimeBackwardDoesntExplodeGet() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); final float rate = mEstimator.getRate(mTestStartTime - 1000L); - assertFalse(Float.isInfinite(rate)); - assertFalse(Float.isNaN(rate)); + assertThat(rate).isFinite(); } @Test public void testInstantaneousEventsDontExplodeUpdate() throws Exception { - assertUpdateTime(mTestStartTime); - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); + updateAndVerifyRate(mTestStartTime); } @Test public void testInstantaneousEventsDontExplodeGet() throws Exception { - assertUpdateTime(mTestStartTime); - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); + updateAndVerifyRate(mTestStartTime); final float rate = mEstimator.getRate(mTestStartTime); - assertFalse(Float.isInfinite(rate)); - assertFalse(Float.isNaN(rate)); + assertThat(rate).isFinite(); } @Test public void testInstantaneousBurstIsEstimatedUnderTwoPercent() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization long nextEventTime = postEvents(eventStart, 0, 5); // five events at \inf final float rate = mEstimator.getRate(nextEventTime); - assertLessThan("Rate", rate, 20f); + assertThat(rate).isLessThan(20f); } @Test public void testCompactBurstIsEstimatedUnderTwoPercent() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization long nextEventTime = postEvents(eventStart, 1, 5); // five events at 1000Hz final float rate = mEstimator.getRate(nextEventTime); - assertLessThan("Rate", rate, 20f); + assertThat(rate).isLessThan(20f); } @Test public void testSustained1000HzBurstIsEstimatedOverNinetyPercent() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization long nextEventTime = postEvents(eventStart, 1, 100); // one hundred events at 1000Hz final float rate = mEstimator.getRate(nextEventTime); - assertGreaterThan("Rate", rate, 900f); + assertThat(rate).isGreaterThan(900f); } @Test public void testSustained100HzBurstIsEstimatedOverNinetyPercent() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization long nextEventTime = postEvents(eventStart, 10, 100); // one hundred events at 100Hz final float rate = mEstimator.getRate(nextEventTime); - assertGreaterThan("Rate", rate, 90f); + assertThat(rate).isGreaterThan(90f); } @Test public void testRecoverQuicklyAfterSustainedBurst() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization - long nextEventTime = postEvents(eventStart, 10, 1000); // one hundred events at 100Hz - final float rate = mEstimator.getRate(nextEventTime + 5000L); // two seconds later - assertLessThan("Rate", rate, 2f); + long nextEventTime = postEvents(eventStart, 10, 1000); // one thousand events at 100Hz + final float rate = mEstimator.getRate(nextEventTime + 5000L); // five seconds later + assertThat(rate).isLessThan(2f); } @Test public void testEstimateShouldNotOvershoot() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); long eventStart = mTestStartTime + 1000; // start event a long time after initialization - long nextEventTime = postEvents(eventStart, 1, 1000); // one thousand events at 1000Hz + long nextEventTime = postEvents(eventStart, 1, 5000); // five thousand events at 1000Hz final float rate = mEstimator.getRate(nextEventTime); - assertLessThan("Rate", rate, 1000f); + assertThat(rate).isAtMost(1000f); } @Test public void testGetRateWithoutUpdate() throws Exception { final float rate = mEstimator.getRate(mTestStartTime); - assertLessThan("Rate", rate, 0.1f); + assertThat(rate).isLessThan(0.1f); } @Test public void testGetRateWithOneUpdate() throws Exception { - assertUpdateTime(mTestStartTime); + updateAndVerifyRate(mTestStartTime); final float rate = mEstimator.getRate(mTestStartTime+1); - assertLessThan("Rate", rate, 1f); + assertThat(rate).isLessThan(1f); } - private void assertLessThan(String label, float a, float b) { - assertTrue(String.format("%s was %f, but should be less than %f", label, a, b), a <= b); - } + @Test + public void testEstimateCatchesUpQuickly() { + long nextEventTime = postEvents(mTestStartTime, 100, 30); // 30 events at 10Hz + + final float firstBurstRate = mEstimator.getRate(nextEventTime); + assertThat(firstBurstRate).isWithin(2f).of(10); + + nextEventTime += HOURS.toMillis(3); // 3 hours later... + nextEventTime = postEvents(nextEventTime, 100, 30); // same burst of 30 events at 10Hz + + // Catching up. Rate is not yet 10, since we had a long period of inactivity... + float secondBurstRate = mEstimator.getRate(nextEventTime); + assertThat(secondBurstRate).isWithin(1f).of(6); - private void assertGreaterThan(String label, float a, float b) { - assertTrue(String.format("%s was %f, but should be more than %f", label, a, b), a >= b); + // ... but after a few more events, we are there. + nextEventTime = postEvents(nextEventTime, 100, 10); // 10 more events at 10Hz + secondBurstRate = mEstimator.getRate(nextEventTime); + assertThat(secondBurstRate).isWithin(1f).of(10); } - /** @returns the next event time. */ + /** @return the next event time. */ private long postEvents(long start, long dt, int num) { long time = start; for (int i = 0; i < num; i++) { @@ -155,9 +166,8 @@ public class RateEstimatorTest extends UiServiceTestCase { return time; } - private void assertUpdateTime(long time) { - final float rate = mEstimator.update(time); - assertFalse(Float.isInfinite(rate)); - assertFalse(Float.isNaN(rate)); + private void updateAndVerifyRate(long time) { + mEstimator.update(time); + assertThat(mEstimator.getRate(time)).isFinite(); } -} +}
\ No newline at end of file diff --git a/services/tests/wmtests/src/com/android/server/policy/PowerKeyGestureTests.java b/services/tests/wmtests/src/com/android/server/policy/PowerKeyGestureTests.java index 5863e9d9243a..6a9f283c9c4c 100644 --- a/services/tests/wmtests/src/com/android/server/policy/PowerKeyGestureTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/PowerKeyGestureTests.java @@ -58,9 +58,20 @@ public class PowerKeyGestureTests extends ShortcutKeyTestBase { mPhoneWindowManager.overrideCanStartDreaming(true); sendKey(KEYCODE_POWER); mPhoneWindowManager.assertDreamRequest(); + mPhoneWindowManager.overrideIsDreaming(true); mPhoneWindowManager.assertLockedAfterAppTransitionFinished(); } + @Test + public void testAppTransitionFinishedCalledAfterDreamStoppedWillNotLockAgain() { + mPhoneWindowManager.overrideShortPressOnPower(SHORT_PRESS_POWER_DREAM_OR_SLEEP); + mPhoneWindowManager.overrideCanStartDreaming(true); + sendKey(KEYCODE_POWER); + mPhoneWindowManager.assertDreamRequest(); + mPhoneWindowManager.overrideIsDreaming(false); + mPhoneWindowManager.assertDidNotLockAfterAppTransitionFinished(); + } + /** * Power double-press to launch camera does not lock device when the single press behavior is to * dream. @@ -72,7 +83,7 @@ public class PowerKeyGestureTests extends ShortcutKeyTestBase { sendKey(KEYCODE_POWER); sendKey(KEYCODE_POWER); mPhoneWindowManager.assertCameraLaunch(); - mPhoneWindowManager.assertWillNotLockAfterAppTransitionFinished(); + mPhoneWindowManager.assertDidNotLockAfterAppTransitionFinished(); } /** diff --git a/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java b/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java index 676bfb00c60c..2015ae9b8081 100644 --- a/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java +++ b/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java @@ -39,6 +39,7 @@ import static android.view.KeyEvent.META_SHIFT_RIGHT_ON; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy; import static com.android.server.policy.WindowManagerPolicy.ACTION_PASS_TO_USER; import static java.util.Collections.unmodifiableMap; @@ -59,7 +60,7 @@ import java.util.Map; class ShortcutKeyTestBase { TestPhoneWindowManager mPhoneWindowManager; - final Context mContext = getInstrumentation().getTargetContext(); + final Context mContext = spy(getInstrumentation().getTargetContext()); /** Modifier key to meta state */ private static final Map<Integer, Integer> MODIFIER; diff --git a/services/tests/wmtests/src/com/android/server/policy/StemKeyGestureTests.java b/services/tests/wmtests/src/com/android/server/policy/StemKeyGestureTests.java new file mode 100644 index 000000000000..fe8017e5f513 --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/policy/StemKeyGestureTests.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.policy; + +import static android.view.KeyEvent.KEYCODE_STEM_PRIMARY; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; +import static com.android.server.policy.PhoneWindowManager.SHORT_PRESS_PRIMARY_LAUNCH_ALL_APPS; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; + +import android.content.Context; +import android.content.res.Resources; + +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; + +/** + * Test class for stem key gesture. + * + * Build/Install/Run: + * atest WmTests:StemKeyGestureTests + */ +public class StemKeyGestureTests extends ShortcutKeyTestBase { + @Mock private Resources mResources; + + /** + * Stem single key should not launch behavior during set up. + */ + @Test + public void stemSingleKey_duringSetup_doNothing() { + stemKeySetup( + () -> overrideBehavior( + com.android.internal.R.integer.config_shortPressOnStemPrimaryBehavior, + SHORT_PRESS_PRIMARY_LAUNCH_ALL_APPS)); + mPhoneWindowManager.setKeyguardServiceDelegateIsShowing(false); + mPhoneWindowManager.overrideIsUserSetupComplete(false); + + sendKey(KEYCODE_STEM_PRIMARY); + + mPhoneWindowManager.assertNotOpenAllAppView(); + } + + /** + * Stem single key should launch all app after set up. + */ + @Test + public void stemSingleKey_AfterSetup_openAllApp() { + stemKeySetup( + () -> overrideBehavior( + com.android.internal.R.integer.config_shortPressOnStemPrimaryBehavior, + SHORT_PRESS_PRIMARY_LAUNCH_ALL_APPS)); + mPhoneWindowManager.setKeyguardServiceDelegateIsShowing(false); + mPhoneWindowManager.overrideIsUserSetupComplete(true); + + sendKey(KEYCODE_STEM_PRIMARY); + + mPhoneWindowManager.assertOpenAllAppView(); + } + + private void stemKeySetup(Runnable behaviorOverrideRunnable) { + super.tearDown(); + setupResourcesMock(); + behaviorOverrideRunnable.run(); + super.setUp(); + } + + private void setupResourcesMock() { + Resources realResources = mContext.getResources(); + + mResources = Mockito.mock(Resources.class); + doReturn(mResources).when(mContext).getResources(); + + doAnswer(invocation -> realResources.getXml((Integer) invocation.getArguments()[0])) + .when(mResources).getXml(anyInt()); + doAnswer(invocation -> realResources.getString((Integer) invocation.getArguments()[0])) + .when(mResources).getString(anyInt()); + doAnswer(invocation -> realResources.getBoolean((Integer) invocation.getArguments()[0])) + .when(mResources).getBoolean(anyInt()); + } + + private void overrideBehavior(int resId, int expectedBehavior) { + doReturn(expectedBehavior).when(mResources).getInteger(eq(resId)); + } +} diff --git a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java index d38302429c02..766a88f6476c 100644 --- a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java +++ b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java @@ -16,6 +16,7 @@ package com.android.server.policy; +import static android.os.Build.HW_TIMEOUT_MULTIPLIER; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.STATE_ON; @@ -43,8 +44,11 @@ import static com.android.server.policy.PhoneWindowManager.LONG_PRESS_POWER_SHUT import static com.android.server.policy.PhoneWindowManager.POWER_VOLUME_UP_BEHAVIOR_MUTE; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.CALLS_REAL_METHODS; +import static org.mockito.Mockito.after; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mockingDetails; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.withSettings; @@ -61,9 +65,11 @@ import android.hardware.display.DisplayManagerInternal; import android.media.AudioManagerInternal; import android.os.Handler; import android.os.HandlerThread; +import android.os.IBinder; import android.os.PowerManager; import android.os.PowerManagerInternal; import android.os.RemoteException; +import android.os.UserHandle; import android.os.Vibrator; import android.service.dreams.DreamManagerInternal; import android.telecom.TelecomManager; @@ -79,6 +85,7 @@ import com.android.server.LocalServices; import com.android.server.input.InputManagerInternal; import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.pm.UserManagerInternal; +import com.android.server.policy.keyguard.KeyguardServiceDelegate; import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.vr.VrManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; @@ -100,6 +107,8 @@ import java.util.function.Supplier; class TestPhoneWindowManager { private static final long SHORTCUT_KEY_DELAY_MILLIS = 150; + private static final long TEST_SINGLE_KEY_DELAY_MILLIS + = SingleKeyGestureDetector.MULTI_PRESS_TIMEOUT + 1000L * HW_TIMEOUT_MULTIPLIER; private PhoneWindowManager mPhoneWindowManager; private Context mContext; @@ -134,6 +143,8 @@ class TestPhoneWindowManager { @Mock private StatusBarManagerInternal mStatusBarManagerInternal; + @Mock private KeyguardServiceDelegate mKeyguardServiceDelegate; + private StaticMockitoSession mMockitoSession; private HandlerThread mHandlerThread; private Handler mHandler; @@ -151,6 +162,10 @@ class TestPhoneWindowManager { Supplier<GlobalActions> getGlobalActionsFactory() { return () -> mGlobalActions; } + + KeyguardServiceDelegate getKeyguardServiceDelegate() { + return mKeyguardServiceDelegate; + } } TestPhoneWindowManager(Context context) { @@ -158,12 +173,12 @@ class TestPhoneWindowManager { mHandlerThread = new HandlerThread("fake window manager"); mHandlerThread.start(); mHandler = new Handler(mHandlerThread.getLooper()); - mHandler.runWithScissors(()-> setUp(context), 0 /* timeout */); + mContext = mockingDetails(context).isSpy() ? context : spy(context); + mHandler.runWithScissors(this::setUp, 0 /* timeout */); } - private void setUp(Context context) { + private void setUp() { mPhoneWindowManager = spy(new PhoneWindowManager()); - mContext = spy(context); // Use stubOnly() to reduce memory usage if it doesn't need verification. final MockSettings spyStubOnly = withSettings().stubOnly() @@ -251,6 +266,7 @@ class TestPhoneWindowManager { overrideLaunchAccessibility(); doReturn(false).when(mPhoneWindowManager).keyguardOn(); doNothing().when(mContext).startActivityAsUser(any(), any()); + doNothing().when(mContext).startActivityAsUser(any(), any(), any()); Mockito.reset(mContext); } @@ -329,6 +345,10 @@ class TestPhoneWindowManager { doReturn(canDream).when(mDreamManagerInternal).canStartDreaming(anyBoolean()); } + void overrideIsDreaming(boolean isDreaming) { + doReturn(isDreaming).when(mDreamManagerInternal).isDreaming(); + } + void overrideDisplayState(int state) { doReturn(state).when(mDisplay).getState(); doReturn(state == STATE_ON).when(mDisplayPolicy).isAwake(); @@ -381,6 +401,14 @@ class TestPhoneWindowManager { doNothing().when(mPhoneWindowManager).launchHomeFromHotKey(anyInt()); } + void overrideIsUserSetupComplete(boolean isCompleted) { + doReturn(isCompleted).when(mPhoneWindowManager).isUserSetupComplete(); + } + + void setKeyguardServiceDelegateIsShowing(boolean isShowing) { + doReturn(isShowing).when(mKeyguardServiceDelegate).isShowing(); + } + /** * Below functions will check the policy behavior could be invoked. */ @@ -497,21 +525,42 @@ class TestPhoneWindowManager { verify(mInputManagerInternal).toggleCapsLock(anyInt()); } - void assertWillNotLockAfterAppTransitionFinished() { - Assert.assertFalse(mPhoneWindowManager.mLockAfterAppTransitionFinished); - } - void assertLockedAfterAppTransitionFinished() { ArgumentCaptor<AppTransitionListener> transitionCaptor = ArgumentCaptor.forClass(AppTransitionListener.class); verify(mWindowManagerInternal).registerAppTransitionListener( transitionCaptor.capture()); - transitionCaptor.getValue().onAppTransitionFinishedLocked(any()); + final IBinder token = mock(IBinder.class); + transitionCaptor.getValue().onAppTransitionFinishedLocked(token); verify(mPhoneWindowManager).lockNow(null); } + void assertDidNotLockAfterAppTransitionFinished() { + ArgumentCaptor<AppTransitionListener> transitionCaptor = + ArgumentCaptor.forClass(AppTransitionListener.class); + verify(mWindowManagerInternal).registerAppTransitionListener( + transitionCaptor.capture()); + final IBinder token = mock(IBinder.class); + transitionCaptor.getValue().onAppTransitionFinishedLocked(token); + verify(mPhoneWindowManager, never()).lockNow(null); + } + void assertGoToHomescreen() { waitForIdle(); verify(mPhoneWindowManager).launchHomeFromHotKey(anyInt()); } + + void assertOpenAllAppView() { + waitForIdle(); + ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mContext, timeout(TEST_SINGLE_KEY_DELAY_MILLIS)) + .startActivityAsUser(intentCaptor.capture(), isNull(), any(UserHandle.class)); + Assert.assertEquals(Intent.ACTION_ALL_APPS, intentCaptor.getValue().getAction()); + } + + void assertNotOpenAllAppView() { + waitForIdle(); + verify(mContext, after(TEST_SINGLE_KEY_DELAY_MILLIS).never()) + .startActivityAsUser(any(Intent.class), any(), any(UserHandle.class)); + } } 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 3ff433e546d8..41fcd6935567 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -3330,7 +3330,7 @@ public class ActivityRecordTests extends WindowTestsBase { // app1 requests IME visible. app1.setRequestedVisibleTypes(ime(), ime()); - mDisplayContent.getInsetsStateController().onInsetsModified(app1); + mDisplayContent.getInsetsStateController().onRequestedVisibleTypesChanged(app1); // Verify app1's IME insets is visible and app2's IME insets frozen flag set. assertTrue(app1.getInsetsState().peekSource(ID_IME).isVisible()); @@ -3399,7 +3399,7 @@ public class ActivityRecordTests extends WindowTestsBase { assertFalse(activity2.mImeInsetsFrozenUntilStartInput); app1.setRequestedVisibleTypes(ime()); - controller.onInsetsModified(app1); + controller.onRequestedVisibleTypesChanged(app1); // Expect all activities in split-screen will get IME insets visible state assertTrue(app1.getInsetsState().peekSource(ID_IME).isVisible()); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 2b589bf59682..d179338bf947 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -1702,6 +1702,9 @@ public class ActivityStarterTests extends WindowTestsBase { @Test public void testRecordActivityMovementBeforeDeliverToTop() { + // Mock recents as task is only marked to be in recents + mAtm.mTaskSupervisor.setRecentTasks(mock(RecentTasks.class)); + final Task task = new TaskBuilder(mAtm.mTaskSupervisor).build(); final ActivityRecord activityBot = new ActivityBuilder(mAtm).setTask(task).build(); final ActivityRecord activityTop = new ActivityBuilder(mAtm).setTask(task).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java index 3a456fb9366c..dc4e47dfea30 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.util.DisplayMetrics.DENSITY_DEFAULT; @@ -80,13 +81,27 @@ public class DesktopModeLaunchParamsModifierTests extends WindowTestsBase { } @Test - public void testReturnsSkipIfTaskNotUsingActivityTypeStandard() { + public void testReturnsSkipIfTaskNotUsingActivityTypeStandardOrUndefined() { final Task task = new TaskBuilder(mSupervisor).setActivityType( ACTIVITY_TYPE_ASSISTANT).build(); assertEquals(RESULT_SKIP, new CalculateRequestBuilder().setTask(task).calculate()); } @Test + public void testReturnsDoneIfTaskUsingActivityTypeStandard() { + final Task task = new TaskBuilder(mSupervisor).setActivityType( + ACTIVITY_TYPE_STANDARD).build(); + assertEquals(RESULT_DONE, new CalculateRequestBuilder().setTask(task).calculate()); + } + + @Test + public void testReturnsDoneIfTaskUsingActivityTypeUndefined() { + final Task task = new TaskBuilder(mSupervisor).setActivityType( + ACTIVITY_TYPE_UNDEFINED).build(); + assertEquals(RESULT_DONE, new CalculateRequestBuilder().setTask(task).calculate()); + } + + @Test public void testReturnsSkipIfCurrentParamsHasBounds() { final Task task = new TaskBuilder(mSupervisor).setActivityType( ACTIVITY_TYPE_STANDARD).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java index b0609ddfddfd..dd90e0450280 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java @@ -182,6 +182,44 @@ public class DisplayPolicyTests extends WindowTestsBase { dimmingNonImTarget, imeNonDrawNavBar, NAV_BAR_BOTTOM)); } + @Test + public void testChooseNavigationBackgroundWindow() { + final WindowState drawBarWin = createOpaqueFullscreen(false); + final WindowState nonDrawBarWin = createDimmingDialogWindow(true); + + final WindowState visibleIme = createInputMethodWindow(true, true, false); + final WindowState invisibleIme = createInputMethodWindow(false, true, false); + final WindowState nonDrawBarIme = createInputMethodWindow(true, false, false); + + assertEquals(drawBarWin, DisplayPolicy.chooseNavigationBackgroundWindow( + drawBarWin, null, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + null, null, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + nonDrawBarWin, null, NAV_BAR_BOTTOM)); + + assertEquals(visibleIme, DisplayPolicy.chooseNavigationBackgroundWindow( + drawBarWin, visibleIme, NAV_BAR_BOTTOM)); + assertEquals(visibleIme, DisplayPolicy.chooseNavigationBackgroundWindow( + null, visibleIme, NAV_BAR_BOTTOM)); + assertEquals(visibleIme, DisplayPolicy.chooseNavigationBackgroundWindow( + nonDrawBarWin, visibleIme, NAV_BAR_BOTTOM)); + + assertEquals(drawBarWin, DisplayPolicy.chooseNavigationBackgroundWindow( + drawBarWin, invisibleIme, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + null, invisibleIme, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + nonDrawBarWin, invisibleIme, NAV_BAR_BOTTOM)); + + assertEquals(drawBarWin, DisplayPolicy.chooseNavigationBackgroundWindow( + drawBarWin, nonDrawBarIme, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + null, nonDrawBarIme, NAV_BAR_BOTTOM)); + assertNull(DisplayPolicy.chooseNavigationBackgroundWindow( + nonDrawBarWin, nonDrawBarIme, NAV_BAR_BOTTOM)); + } + @SetupWindows(addWindows = W_NAVIGATION_BAR) @Test public void testUpdateLightNavigationBarLw() { diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java index a8fc25fc4477..204cbf79dba9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java @@ -370,7 +370,7 @@ public class InsetsPolicyTest extends WindowTestsBase { mAppWindow.setRequestedVisibleTypes( navigationBars() | statusBars(), navigationBars() | statusBars()); - policy.onInsetsModified(mAppWindow); + policy.onRequestedVisibleTypesChanged(mAppWindow); waitUntilWindowAnimatorIdle(); controls = mDisplayContent.getInsetsStateController().getControlsForDispatch(mAppWindow); diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java index d7e736df064b..114796d17ef1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java @@ -192,17 +192,16 @@ public class InsetsStateControllerTest extends WindowTestsBase { // This can be the IME z-order target while app cannot be the IME z-order target. // This is also the only IME control target in this test, so IME won't be invisible caused // by the control-target change. - mDisplayContent.updateImeInputAndControlTarget( - createWindow(null, TYPE_APPLICATION, "base")); + final WindowState base = createWindow(null, TYPE_APPLICATION, "base"); + mDisplayContent.updateImeInputAndControlTarget(base); // Make IME and stay visible during the test. mImeWindow.setHasSurface(true); getController().getOrCreateSourceProvider(ID_IME, ime()) .setWindowContainer(mImeWindow, null, null); - getController().onImeControlTargetChanged( - mDisplayContent.getImeInputTarget().getWindowState()); - mDisplayContent.getImeInputTarget().getWindowState().setRequestedVisibleTypes(ime(), ime()); - getController().onInsetsModified(mDisplayContent.getImeInputTarget().getWindowState()); + getController().onImeControlTargetChanged(base); + base.setRequestedVisibleTypes(ime(), ime()); + getController().onRequestedVisibleTypesChanged(base); // Send our spy window (app) into the system so that we can detect the invocation. final WindowState win = createWindow(null, TYPE_APPLICATION, "app"); @@ -485,7 +484,7 @@ public class InsetsStateControllerTest extends WindowTestsBase { mDisplayContent.updateImeInputAndControlTarget(app); app.setRequestedVisibleTypes(ime(), ime()); - getController().onInsetsModified(app); + getController().onRequestedVisibleTypesChanged(app); assertTrue(ime.getControllableInsetProvider().getSource().isVisible()); getController().updateAboveInsetsState(true /* notifyInsetsChange */); diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java index 7d507e9150e8..34a13bfa855c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java @@ -38,6 +38,7 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCA import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; +import static android.view.InsetsSource.FLAG_INSETS_ROUNDED_CORNER; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE; @@ -461,7 +462,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { public void testGetCropBoundsIfNeeded_handleCropForTransparentActivityBasedOnOpaqueBounds() { final InsetsSource taskbar = new InsetsSource(/*id=*/ 0, WindowInsets.Type.navigationBars()); - taskbar.setInsetsRoundedCornerFrame(true); + taskbar.setFlags(FLAG_INSETS_ROUNDED_CORNER, FLAG_INSETS_ROUNDED_CORNER); final WindowState mainWindow = mockForGetCropBoundsAndRoundedCorners(taskbar); final Rect opaqueBounds = new Rect(0, 0, 500, 300); doReturn(opaqueBounds).when(mActivity).getBounds(); @@ -505,7 +506,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { public void testGetCropBoundsIfNeeded_appliesCrop() { final InsetsSource taskbar = new InsetsSource(/*id=*/ 0, WindowInsets.Type.navigationBars()); - taskbar.setInsetsRoundedCornerFrame(true); + taskbar.setFlags(FLAG_INSETS_ROUNDED_CORNER, FLAG_INSETS_ROUNDED_CORNER); final WindowState mainWindow = mockForGetCropBoundsAndRoundedCorners(taskbar); // Apply crop if taskbar is expanded @@ -528,7 +529,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { public void testGetCropBoundsIfNeeded_appliesCropWithSizeCompatScaling() { final InsetsSource taskbar = new InsetsSource(/*id=*/ 0, WindowInsets.Type.navigationBars()); - taskbar.setInsetsRoundedCornerFrame(true); + taskbar.setFlags(FLAG_INSETS_ROUNDED_CORNER, FLAG_INSETS_ROUNDED_CORNER); final WindowState mainWindow = mockForGetCropBoundsAndRoundedCorners(taskbar); final float scaling = 2.0f; diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index 0ccb0d0b2ef5..b02b774da86a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -49,10 +49,12 @@ import static org.junit.Assert.fail; 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.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import static java.lang.Integer.MAX_VALUE; @@ -1139,6 +1141,40 @@ public class RecentTasksTest extends WindowTestsBase { } @Test + public void addTask_taskAlreadyInRecentsMovedToTop_callsTaskNotificationController() { + final Task firstTask = createTaskBuilder(".Task").build(); + final Task secondTask = createTaskBuilder(".Task2").build(); + + mRecentTasks.add(firstTask); + mRecentTasks.add(secondTask); + + TaskChangeNotificationController controller = + mAtm.getTaskChangeNotificationController(); + clearInvocations(controller); + + // Add firstTask back to top + mRecentTasks.add(firstTask); + verify(controller).notifyTaskListUpdated(); + } + + @Test + public void addTask_taskAlreadyInRecentsOnTop_doesNotNotify() { + final Task firstTask = createTaskBuilder(".Task").build(); + final Task secondTask = createTaskBuilder(".Task2").build(); + + mRecentTasks.add(firstTask); + mRecentTasks.add(secondTask); + + TaskChangeNotificationController controller = + mAtm.getTaskChangeNotificationController(); + clearInvocations(controller); + + // Add secondTask to top again + mRecentTasks.add(secondTask); + verifyZeroInteractions(controller); + } + + @Test public void removeTask_callsTaskNotificationController() { final Task task = createTaskBuilder(".Task").build(); 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 082122e33175..27e6e31ec152 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -30,6 +30,7 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.provider.DeviceConfig.NAMESPACE_CONSTRAIN_DISPLAY_APIS; +import static android.view.InsetsSource.FLAG_INSETS_ROUNDED_CORNER; import static android.view.Surface.ROTATION_0; import static android.view.Surface.ROTATION_180; import static android.view.Surface.ROTATION_270; @@ -3482,7 +3483,7 @@ public class SizeCompatTests extends WindowTestsBase { final InsetsSource navSource = new InsetsSource( InsetsSource.createId(null, 0, navigationBars()), navigationBars()); - navSource.setInsetsRoundedCornerFrame(true); + navSource.setFlags(FLAG_INSETS_ROUNDED_CORNER, FLAG_INSETS_ROUNDED_CORNER); navSource.setFrame(new Rect(0, screenHeight - taskbarHeight, screenWidth, screenHeight)); mActivity.mWmService.mLetterboxConfiguration.setLetterboxActivityCornersRadius(15); @@ -3530,7 +3531,7 @@ public class SizeCompatTests extends WindowTestsBase { final InsetsSource navSource = new InsetsSource( InsetsSource.createId(null, 0, navigationBars()), navigationBars()); - navSource.setInsetsRoundedCornerFrame(true); + navSource.setFlags(FLAG_INSETS_ROUNDED_CORNER, FLAG_INSETS_ROUNDED_CORNER); // Immersive activity has transient navbar navSource.setVisible(!immersive); navSource.setFrame(new Rect(0, screenHeight - taskbarHeight, screenWidth, screenHeight)); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index d3f68185a269..197ee92aa7eb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -52,6 +52,7 @@ 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.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -99,6 +100,7 @@ import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; import com.android.compatibility.common.util.AdoptShellPermissionsRule; +import com.android.internal.os.IResultReceiver; import org.junit.Rule; import org.junit.Test; @@ -905,6 +907,56 @@ public class WindowManagerServiceTests extends WindowTestsBase { argThat(h -> (h.inputConfig & InputConfig.SPY) == InputConfig.SPY)); } + @Test + public void testRequestKeyboardShortcuts_noWindow() { + doNothing().when(mWm.mContext).enforceCallingOrSelfPermission(anyString(), anyString()); + doReturn(null).when(mWm).getFocusedWindowLocked(); + doReturn(null).when(mWm.mRoot).getCurrentInputMethodWindow(); + + TestResultReceiver receiver = new TestResultReceiver(); + mWm.requestAppKeyboardShortcuts(receiver, 0); + assertNotNull(receiver.resultData); + assertTrue(receiver.resultData.isEmpty()); + + receiver = new TestResultReceiver(); + mWm.requestImeKeyboardShortcuts(receiver, 0); + assertNotNull(receiver.resultData); + assertTrue(receiver.resultData.isEmpty()); + } + + @Test + public void testRequestKeyboardShortcuts() throws RemoteException { + final IWindow window = mock(IWindow.class); + final IBinder binder = mock(IBinder.class); + doReturn(binder).when(window).asBinder(); + final WindowState windowState = + createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "appWin", window); + doNothing().when(mWm.mContext).enforceCallingOrSelfPermission(anyString(), anyString()); + doReturn(windowState).when(mWm).getFocusedWindowLocked(); + doReturn(windowState).when(mWm.mRoot).getCurrentInputMethodWindow(); + + TestResultReceiver receiver = new TestResultReceiver(); + mWm.requestAppKeyboardShortcuts(receiver, 0); + mWm.requestImeKeyboardShortcuts(receiver, 0); + verify(window, times(2)).requestAppKeyboardShortcuts(receiver, 0); + } + + class TestResultReceiver implements IResultReceiver { + public android.os.Bundle resultData; + private final IBinder mBinder = mock(IBinder.class); + + @Override + public void send(int resultCode, android.os.Bundle resultData) + throws android.os.RemoteException { + this.resultData = resultData; + } + + @Override + public android.os.IBinder asBinder() { + return mBinder; + } + } + private void setupActivityWithLaunchCookie(IBinder launchCookie, WindowContainerToken wct) { final WindowContainer.RemoteToken remoteToken = mock(WindowContainer.RemoteToken.class); when(remoteToken.toWindowContainerToken()).thenReturn(wct); diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp index 4ba538ed9d45..a996fa100da9 100644 --- a/tests/FlickerTests/Android.bp +++ b/tests/FlickerTests/Android.bp @@ -23,14 +23,49 @@ package { default_applicable_licenses: ["frameworks_base_license"], } -android_test { - name: "FlickerTests", +filegroup { + name: "FlickerTestsBase-src", + srcs: ["src/com/android/server/wm/flicker/*.kt"], +} + +filegroup { + name: "FlickerTestsAppClose-src", + srcs: ["src/**/close/*.kt"], +} + +filegroup { + name: "FlickerTestsActivityEmbedding-src", srcs: [ - "src/**/*.java", - "src/**/*.kt", + "src/**/activityembedding/*.kt", + "src/**/activityembedding/close/*.kt", + "src/**/activityembedding/rotation/*.kt", ], - manifest: "AndroidManifest.xml", - test_config: "AndroidTest.xml", +} + +filegroup { + name: "FlickerTestsIme-src", + srcs: ["src/**/ime/*.kt"], +} + +filegroup { + name: "FlickerTestsAppLaunch-src", + srcs: ["src/**/launch/*.kt"], +} + +filegroup { + name: "FlickerTestsQuickswitch-src", + srcs: ["src/**/quickswitch/*.kt"], +} + +filegroup { + name: "FlickerTestsRotation-src", + srcs: ["src/**/rotation/*.kt"], +} + +java_defaults { + name: "FlickerTestsDefault", + manifest: "manifests/AndroidManifest.xml", + test_config_template: "AndroidTestTemplate.xml", platform_apis: true, certificate: "platform", optimize: { @@ -42,16 +77,98 @@ android_test { "androidx.test.ext.junit", "flickertestapplib", "flickerlib", - "flickerlib-apphelpers", "flickerlib-helpers", - "truth-prebuilt", - "launcher-helper-lib", - "launcher-aosp-tapl", "platform-test-annotations", - "wm-flicker-window-extensions", + "wm-flicker-common-app-helpers", ], data: [ ":FlickerTestApp", + "trace_config/*", + ], +} + +android_test { + name: "FlickerTestsOther", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestOther.xml"], + package_name: "com.android.server.wm.flicker", + instrumentation_target_package: "com.android.server.wm.flicker", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + exclude_srcs: [ + ":FlickerTestsAppClose-src", + ":FlickerTestsIme-src", + ":FlickerTestsAppLaunch-src", + ":FlickerTestsQuickswitch-src", + ":FlickerTestsRotation-src", + ], +} + +android_test { + name: "FlickerTestsAppClose", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestAppClose.xml"], + package_name: "com.android.server.wm.flicker.close", + instrumentation_target_package: "com.android.server.wm.flicker.close", + srcs: [ + ":FlickerTestsBase-src", + ":FlickerTestsAppClose-src", + ], + exclude_srcs: [ + ":FlickerTestsActivityEmbedding-src", + ], +} + +android_test { + name: "FlickerTestsIme", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestIme.xml"], + package_name: "com.android.server.wm.flicker.ime", + instrumentation_target_package: "com.android.server.wm.flicker.ime", + srcs: [ + ":FlickerTestsBase-src", + ":FlickerTestsIme-src", + ], +} + +android_test { + name: "FlickerTestsAppLaunch", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestAppLaunch.xml"], + package_name: "com.android.server.wm.flicker.launch", + instrumentation_target_package: "com.android.server.wm.flicker.launch", + srcs: [ + ":FlickerTestsBase-src", + ":FlickerTestsAppLaunch-src", + ], +} + +android_test { + name: "FlickerTestsQuickswitch", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestQuickswitch.xml"], + package_name: "com.android.server.wm.flicker.quickswitch", + instrumentation_target_package: "com.android.server.wm.flicker.quickswitch", + srcs: [ + ":FlickerTestsBase-src", + ":FlickerTestsQuickswitch-src", + ], +} + +android_test { + name: "FlickerTestsRotation", + defaults: ["FlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestRotation.xml"], + package_name: "com.android.server.wm.flicker.rotation", + instrumentation_target_package: "com.android.server.wm.flicker.rotation", + srcs: [ + ":FlickerTestsBase-src", + ":FlickerTestsRotation-src", + ], + exclude_srcs: [ + ":FlickerTestsActivityEmbedding-src", ], } diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml deleted file mode 100644 index 32ff243921ec..000000000000 --- a/tests/FlickerTests/AndroidTest.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright 2018 Google Inc. All Rights Reserved. - --> -<configuration description="Runs WindowManager Flicker Tests"> - <option name="test-tag" value="FlickerTests" /> - <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> - <!-- keeps the screen on during tests --> - <option name="screen-always-on" value="on" /> - <!-- prevents the phone from restarting --> - <option name="force-skip-system-props" value="true" /> - <!-- set WM tracing verbose level to all --> - <option name="run-command" value="cmd window tracing level all" /> - <!-- set WM tracing to frame (avoid incomplete states) --> - <option name="run-command" value="cmd window tracing frame" /> - <!-- ensure lock screen mode is swipe --> - <option name="run-command" value="locksettings set-disabled false" /> - <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests --> - <option name="run-command" value="pm disable com.google.android.internal.betterbug" /> - <!-- restart launcher to activate TAPL --> - <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" /> - <!-- Ensure output directory is empty at the start --> - <option name="run-command" value="rm -rf /sdcard/flicker" /> - <!-- Increase trace size: 20mb for WM and 80mb for SF --> - <option name="run-command" value="cmd window tracing size 20480" /> - <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920" /> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1" /> - <option name="run-command" value="settings put system show_touches 1" /> - <option name="run-command" value="settings put system pointer_location 1" /> - <option name="teardown-command" value="settings delete secure show_ime_with_hard_keyboard" /> - <option name="teardown-command" value="settings delete system show_touches" /> - <option name="teardown-command" value="settings delete system pointer_location" /> - <option name="teardown-command" value="cmd overlay enable com.android.internal.systemui.navbar.gestural" /> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> - <option name="cleanup-apks" value="true"/> - <option name="test-file-name" value="FlickerTests.apk"/> - <option name="test-file-name" value="FlickerTestApp.apk" /> - </target_preparer> - <test class="com.android.tradefed.testtype.AndroidJUnitTest"> - <option name="package" value="com.android.server.wm.flicker"/> - <option name="shell-timeout" value="6600s" /> - <option name="test-timeout" value="6600s" /> - <option name="hidden-api-checks" value="false" /> - </test> - <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> - <option name="directory-keys" value="/sdcard/flicker" /> - <option name="collect-on-run-ended-only" value="true" /> - <option name="clean-up" value="true" /> - </metrics_collector> -</configuration> diff --git a/tests/FlickerTests/AndroidTestTemplate.xml b/tests/FlickerTests/AndroidTestTemplate.xml new file mode 100644 index 000000000000..1ede943a9fa2 --- /dev/null +++ b/tests/FlickerTests/AndroidTestTemplate.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright 2018 Google Inc. All Rights Reserved. + --> +<configuration description="Runs WindowManager {MODULE}"> + <option name="test-tag" value="FlickerTests"/> + <!-- Needed for storing the perfetto trace files in the sdcard/test_results--> + <option name="isolated-storage" value="false"/> + + <target_preparer class="com.android.tradefed.targetprep.DeviceSetup"> + <!-- keeps the screen on during tests --> + <option name="screen-always-on" value="on"/> + <!-- prevents the phone from restarting --> + <option name="force-skip-system-props" value="true"/> + <!-- set WM tracing verbose level to all --> + <option name="run-command" value="cmd window tracing level all"/> + <!-- set WM tracing to frame (avoid incomplete states) --> + <option name="run-command" value="cmd window tracing frame"/> + <!-- ensure lock screen mode is swipe --> + <option name="run-command" value="locksettings set-disabled false"/> + <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests --> + <option name="run-command" value="pm disable com.google.android.internal.betterbug"/> + <!-- restart launcher to activate TAPL --> + <option name="run-command" + value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher"/> + <!-- Increase trace size: 20mb for WM and 80mb for SF --> + <option name="run-command" value="cmd window tracing size 20480"/> + <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920"/> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="test-user-token" value="%TEST_USER%"/> + <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/> + <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/> + <option name="run-command" value="settings put system show_touches 1"/> + <option name="run-command" value="settings put system pointer_location 1"/> + <option name="teardown-command" + value="settings delete secure show_ime_with_hard_keyboard"/> + <option name="teardown-command" value="settings delete system show_touches"/> + <option name="teardown-command" value="settings delete system pointer_location"/> + <option name="teardown-command" + value="cmd overlay enable com.android.internal.systemui.navbar.gestural"/> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true"/> + <option name="test-file-name" value="{MODULE}.apk"/> + <option name="test-file-name" value="FlickerTestApp.apk"/> + </target_preparer> + <!-- Needed for pushing the trace config file --> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="push-file" + key="trace_config.textproto" + value="/data/misc/perfetto-traces/trace_config.textproto" + /> + <!--Install the content provider automatically when we push some file in sdcard folder.--> + <!--Needed to avoid the installation during the test suite.--> + <option name="push-file" key="trace_config.textproto" value="/sdcard/sample.textproto"/> + </target_preparer> + <test class="com.android.tradefed.testtype.AndroidJUnitTest"> + <option name="package" value="{PACKAGE}"/> + <option name="shell-timeout" value="6600s"/> + <option name="test-timeout" value="6600s"/> + <option name="hidden-api-checks" value="false"/> + <option name="device-listeners" value="android.device.collectors.PerfettoListener"/> + <!-- PerfettoListener related arguments --> + <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true"/> + <option name="instrumentation-arg" + key="perfetto_config_file" + value="trace_config.textproto" + /> + <option name="instrumentation-arg" key="per_run" value="true"/> + </test> + <!-- Needed for pulling the collected trace config on to the host --> + <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> + <option name="pull-pattern-keys" value="perfetto_file_path"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.close/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.ime/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.launch/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.quickswitch/files"/> + <option name="directory-keys" + value="/data/user/0/com.android.server.wm.flicker.rotation/files"/> + <option name="collect-on-run-ended-only" value="true"/> + <option name="clean-up" value="true"/> + </metrics_collector> +</configuration> diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/manifests/AndroidManifest.xml index 462f91bc081c..de8a3c680768 100644 --- a/tests/FlickerTests/AndroidManifest.xml +++ b/tests/FlickerTests/manifests/AndroidManifest.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- 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. ---> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.server.wm.flicker"> @@ -47,9 +48,4 @@ <uses-library android:name="android.test.runner"/> <uses-library android:name="androidx.window.extensions" android:required="false"/> </application> - - <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" - android:targetPackage="com.android.server.wm.flicker" - android:label="WindowManager Flicker Tests"> - </instrumentation> </manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestAppClose.xml b/tests/FlickerTests/manifests/AndroidManifestAppClose.xml new file mode 100644 index 000000000000..4cdcb903b498 --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestAppClose.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker.close"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker.close" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestAppLaunch.xml b/tests/FlickerTests/manifests/AndroidManifestAppLaunch.xml new file mode 100644 index 000000000000..659a745ba480 --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestAppLaunch.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker.launch"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker.launch" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestIme.xml b/tests/FlickerTests/manifests/AndroidManifestIme.xml new file mode 100644 index 000000000000..abd03af4888a --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestIme.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker.ime"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker.ime" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestOther.xml b/tests/FlickerTests/manifests/AndroidManifestOther.xml new file mode 100644 index 000000000000..47749b8133b1 --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestOther.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestQuickswitch.xml b/tests/FlickerTests/manifests/AndroidManifestQuickswitch.xml new file mode 100644 index 000000000000..203035d30584 --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestQuickswitch.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker.quickswitch"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker.quickswitch" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/manifests/AndroidManifestRotation.xml b/tests/FlickerTests/manifests/AndroidManifestRotation.xml new file mode 100644 index 000000000000..2852cf23a35b --- /dev/null +++ b/tests/FlickerTests/manifests/AndroidManifestRotation.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.server.wm.flicker.rotation"> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.server.wm.flicker.rotation" + android:label="WindowManager Flicker Tests"> + </instrumentation> +</manifest> diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/close/CloseSecondaryActivityInSplitTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/close/CloseSecondaryActivityInSplitTest.kt new file mode 100644 index 000000000000..c0c738b16c2a --- /dev/null +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/close/CloseSecondaryActivityInSplitTest.kt @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm.flicker.activityembedding + +import android.platform.test.annotations.Presubmit +import android.tools.common.datatypes.Rect +import android.tools.common.traces.component.ComponentNameMatcher +import android.tools.device.flicker.junit.FlickerParametersRunnerFactory +import android.tools.device.flicker.legacy.FlickerBuilder +import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Test closing a secondary activity in a split. + * + * Setup: Launch A|B in split with B being the secondary activity. + * Transitions: Finish B and expect A to become fullscreen. + * + * To run this test: `atest FlickerTests:CloseSecondaryActivityInSplitTest` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +class CloseSecondaryActivityInSplitTest(flicker: FlickerTest) : + ActivityEmbeddingTestBase(flicker) { + + override val transition: FlickerBuilder.() -> Unit = { + setup { + tapl.setExpectedRotationCheckEnabled(false) + // Launches fullscreen A. + testApp.launchViaIntent(wmHelper) + // Launches a split A|B and waits for both activities to show. + testApp.launchSecondaryActivity(wmHelper) + // Get fullscreen bounds + startDisplayBounds = + wmHelper.currentState.layerState.physicalDisplayBounds ?: + error("Can't get display bounds") + } + transitions { + // Finish secondary activity B. + testApp.finishSecondaryActivity(wmHelper) + // Expect the main activity A to expand into fullscreen. + wmHelper.StateSyncBuilder().withFullScreenApp(testApp).waitForAndVerify() + } + teardown { + tapl.goHome() + testApp.exit(wmHelper) + } + } + + /** Main activity is always visible and becomes fullscreen in the end. */ + @Presubmit + @Test + fun mainActivityWindowBecomesFullScreen() { + flicker.assertWm { isAppWindowVisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) } + flicker.assertWmEnd { + this.visibleRegion(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + .coversExactly(startDisplayBounds) + } + } + + /** Main activity surface is animated from split to fullscreen. */ + @Presubmit + @Test + fun mainActivityLayerIsAlwaysVisible() { + flicker.assertLayers { + isVisible( + ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT.or( + ComponentNameMatcher.TRANSITION_SNAPSHOT + ) + ) + } + flicker.assertLayersEnd { + isVisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + .isInvisible(ComponentNameMatcher.TRANSITION_SNAPSHOT) + } + } + + /** Secondary activity should destroy and become invisible. */ + @Presubmit + @Test + fun secondaryActivityWindowFinishes() { + flicker.assertWm { + contains(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + .then() + .notContains(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + } + } + + @Presubmit + @Test + fun secondaryActivityLayerFinishes() { + flicker.assertLayers { + isVisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + .then() + .isInvisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + } + } + + companion object { + /** {@inheritDoc} */ + private var startDisplayBounds = Rect.EMPTY + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.nonRotationTests() + } + } + }
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/MainActivityStartsSecondaryWithAlwaysExpandTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/MainActivityStartsSecondaryWithAlwaysExpandTest.kt new file mode 100644 index 000000000000..00316ea249b7 --- /dev/null +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/MainActivityStartsSecondaryWithAlwaysExpandTest.kt @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm.flicker.activityembedding + +import android.platform.test.annotations.Presubmit +import android.tools.device.flicker.junit.FlickerParametersRunnerFactory +import android.tools.device.flicker.legacy.FlickerBuilder +import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized +import android.tools.common.datatypes.Rect + +/** + * Test launching an activity with AlwaysExpand rule. + * + * Setup: Launch A|B in split with B being the secondary activity. + * Transitions: + * A start C with alwaysExpand=true, expect C to launch in fullscreen and cover split A|B. + * + * To run this test: `atest FlickerTests:MainActivityStartsSecondaryWithAlwaysExpandTest` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: FlickerTest) : + ActivityEmbeddingTestBase(flicker) { + + /** {@inheritDoc} */ + override val transition: FlickerBuilder.() -> Unit = { + setup { + tapl.setExpectedRotationCheckEnabled(false) + // Launch a split + testApp.launchViaIntent(wmHelper) + testApp.launchSecondaryActivity(wmHelper) + startDisplayBounds = + wmHelper.currentState.layerState.physicalDisplayBounds ?: error("Display not found") + } + transitions { + // Launch C with alwaysExpand + testApp.launchAlwaysExpandActivity(wmHelper) + } + teardown { + tapl.goHome() + testApp.exit(wmHelper) + } + } + + /** Transition begins with a split. */ + @Presubmit + @Test + fun startsWithSplit() { + flicker.assertWmStart { + this.isAppWindowVisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + } + flicker.assertWmStart { + this.isAppWindowVisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + } + } + + + /** Main activity should become invisible after being covered by always expand activity. */ + @Presubmit + @Test + fun mainActivityLayerBecomesInvisible() { + flicker.assertLayers { + isVisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + .then() + .isInvisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + } + } + + /** Secondary activity should become invisible after being covered by always expand activity. */ + @Presubmit + @Test + fun secondaryActivityLayerBecomesInvisible() { + flicker.assertLayers { + isVisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + .then() + .isInvisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + } + } + + /** At the end of transition always expand activity is in fullscreen. */ + @Presubmit + @Test + fun endsWithAlwaysExpandActivityCoveringFullScreen() { + flicker.assertWmEnd { + this.visibleRegion(ActivityEmbeddingAppHelper.ALWAYS_EXPAND_ACTIVITY_COMPONENT) + .coversExactly(startDisplayBounds) + } + } + + /** Always expand activity is on top of the split. */ + @Presubmit + @Test + fun endsWithAlwaysExpandActivityOnTop() { + flicker.assertWmEnd { + this.isAppWindowOnTop( + ActivityEmbeddingAppHelper.ALWAYS_EXPAND_ACTIVITY_COMPONENT) + } + } + + companion object { + /** {@inheritDoc} */ + private var startDisplayBounds = Rect.EMPTY + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.nonRotationTests() + } + } +} + diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplitTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingPlaceholderSplitTest.kt index ed17059e79e7..ed17059e79e7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplitTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingPlaceholderSplitTest.kt diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingSecondaryToSplitTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingSecondaryToSplitTest.kt index 863828881d36..863828881d36 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingSecondaryToSplitTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingSecondaryToSplitTest.kt diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt new file mode 100644 index 000000000000..39ae8e2d9799 --- /dev/null +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm.flicker.activityembedding + +import android.platform.test.annotations.Presubmit +import android.tools.common.traces.component.ComponentNameMatcher +import com.android.server.wm.flicker.rotation.RotationTransition +import android.tools.device.flicker.junit.FlickerParametersRunnerFactory +import android.tools.device.flicker.legacy.FlickerBuilder +import android.tools.device.flicker.legacy.FlickerTest +import android.tools.device.flicker.legacy.FlickerTestFactory +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Tests rotating two activities in an Activity Embedding split. + * + * Setup: Launch A|B in split with B being the secondary activity. + * Transitions: Rotate display, and expect A and B to split evenly in new rotation. + * + * To run this test: `atest FlickerTests:RotateSplitNoChangeTest` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +open class RotateSplitNoChangeTest(flicker: FlickerTest) : RotationTransition(flicker) { + + override val testApp = ActivityEmbeddingAppHelper(instrumentation) + override val transition: FlickerBuilder.() -> Unit + get() = { + super.transition(this) + setup { + testApp.launchViaIntent(wmHelper) + testApp.launchSecondaryActivity(wmHelper) + } + } + + /** + * Checks that the [ComponentNameMatcher.ROTATION] layer appears during the transition, doesn't + * flicker, and disappears before the transition is complete + */ + @Presubmit + @Test + fun rotationLayerAppearsAndVanishes() { + flicker.assertLayers { + this.isVisible(testApp) + .then() + .isVisible(ComponentNameMatcher.ROTATION) + .then() + .isVisible(testApp) + .isInvisible(ComponentNameMatcher.ROTATION) + } + } + + /** + * Overrides inherited assertion because in AE Split, the main and secondary activity are separate + * layers, each covering up exactly half of the display. + */ + @Presubmit + @Test + override fun appLayerRotates_StartingPos() { + flicker.assertLayersStart { + this.entry.displays.map { display -> + val leftLayerRegion = this.visibleRegion(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + val rightLayerRegion = + this.visibleRegion(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + // Compare dimensions of two splits, given we're using default split attributes, + // both activities take up the same visible size on the display. + check{"height"}.that(leftLayerRegion.region.height).isEqual(rightLayerRegion.region.height) + check{"width"}.that(leftLayerRegion.region.width).isEqual(rightLayerRegion.region.width) + leftLayerRegion.notOverlaps(rightLayerRegion.region) + // Layers of two activities sum to be fullscreen size on display. + leftLayerRegion.plus(rightLayerRegion.region).coversExactly(display.layerStackSpace) + } + } + } + + /** + * Verifies dimensions of both split activities hold their invariance after transition too. + */ + @Presubmit + @Test + override fun appLayerRotates_EndingPos() { + flicker.assertLayersEnd { + this.entry.displays.map { display -> + val leftLayerRegion = this.visibleRegion(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + val rightLayerRegion = + this.visibleRegion(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + check{"height"}.that(leftLayerRegion.region.height).isEqual(rightLayerRegion.region.height) + check{"width"}.that(leftLayerRegion.region.width).isEqual(rightLayerRegion.region.width) + leftLayerRegion.notOverlaps(rightLayerRegion.region) + leftLayerRegion.plus(rightLayerRegion.region).coversExactly(display.layerStackSpace) + } + } + } + + /** Both activities in split should remain visible during rotation. */ + @Presubmit + @Test + fun bothActivitiesAreAlwaysVisible() { + flicker.assertWm { + isAppWindowVisible(ActivityEmbeddingAppHelper.MAIN_ACTIVITY_COMPONENT) + } + flicker.assertWm { + isAppWindowVisible(ActivityEmbeddingAppHelper.SECONDARY_ACTIVITY_COMPONENT) + } + } + + companion object { + /** + * Creates the test configurations. + * + * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and + * navigation modes. + */ + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTest> { + return FlickerTestFactory.rotationTests() + } + } +}
\ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt index daecfe7e4c4d..a21965e0d7d5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ActivityEmbeddingAppHelper.kt @@ -60,6 +60,47 @@ constructor( } /** + * Clicks the button to finishes the secondary activity launched through + * [launchSecondaryActivity], waits for the main activity to resume. + */ + fun finishSecondaryActivity(wmHelper: WindowManagerStateHelper) { + val finishButton = + uiDevice.wait( + Until.findObject(By.res(getPackage(), "finish_secondary_activity_button")), + FIND_TIMEOUT + ) + require(finishButton != null) { "Can't find finish secondary activity button on screen." } + finishButton.click() + wmHelper + .StateSyncBuilder() + .withActivityRemoved(SECONDARY_ACTIVITY_COMPONENT) + .waitForAndVerify() + } + + /** + * Clicks the button to launch a secondary activity with alwaysExpand enabled, which will launch + * a fullscreen window on top of the visible region. + */ + fun launchAlwaysExpandActivity(wmHelper: WindowManagerStateHelper) { + val launchButton = + uiDevice.wait( + Until.findObject( + By.res(getPackage(), + "launch_always_expand_activity_button")), + FIND_TIMEOUT + ) + require(launchButton != null) { + "Can't find launch always expand activity button on screen." + } + launchButton.click() + wmHelper + .StateSyncBuilder() + .withActivityState(ALWAYS_EXPAND_ACTIVITY_COMPONENT, PlatformConsts.STATE_RESUMED) + .withActivityState(MAIN_ACTIVITY_COMPONENT, PlatformConsts.STATE_PAUSED) + .waitForAndVerify() + } + + /** * Clicks the button to launch the placeholder primary activity, which should launch the * placeholder secondary activity based on the placeholder rule. */ @@ -87,6 +128,9 @@ constructor( val SECONDARY_ACTIVITY_COMPONENT = ActivityOptions.ActivityEmbedding.SecondaryActivity.COMPONENT.toFlickerComponent() + val ALWAYS_EXPAND_ACTIVITY_COMPONENT = + ActivityOptions.ActivityEmbedding.AlwaysExpandActivity.COMPONENT.toFlickerComponent() + val PLACEHOLDER_PRIMARY_COMPONENT = ActivityOptions.ActivityEmbedding.PlaceholderPrimaryActivity.COMPONENT .toFlickerComponent() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java index a8f1b3de564e..eeee7b4dfc6b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/GestureHelper.java @@ -62,6 +62,33 @@ public class GestureHelper { } /** + * Injects a series of {@link MotionEvent}s to simulate tapping. + * + * @param point coordinates of pointer to tap + * @param times the number of times to tap + */ + public boolean tap(@NonNull Tuple point, int times) throws InterruptedException { + PointerProperties ptrProp = getPointerProp(0, MotionEvent.TOOL_TYPE_FINGER); + PointerCoords ptrCoord = getPointerCoord(point.x, point.y, 1, 1); + + for (int i = 0; i <= times; i++) { + // If already tapped, inject delay in between movements + if (times > 0) { + SystemClock.sleep(50L); + } + if (!primaryPointerDown(ptrProp, ptrCoord, SystemClock.uptimeMillis())) { + return false; + } + // Delay before releasing tap + SystemClock.sleep(100L); + if (!primaryPointerUp(ptrProp, ptrCoord, SystemClock.uptimeMillis())) { + return false; + } + } + return true; + } + + /** * Injects a series of {@link MotionEvent}s to simulate a drag gesture without pointer release. * * Simulates a drag gesture without releasing the primary pointer. The primary pointer info diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/LetterboxAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/LetterboxAppHelper.kt index a670d68cabd9..34581bbb4516 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/LetterboxAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/LetterboxAppHelper.kt @@ -17,6 +17,8 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation +import android.tools.common.datatypes.Region +import android.tools.common.datatypes.Rect import android.tools.common.traces.component.ComponentNameMatcher import android.tools.device.apphelpers.StandardAppHelper import android.tools.device.helpers.FIND_TIMEOUT @@ -36,6 +38,8 @@ constructor( ActivityOptions.NonResizeablePortraitActivity.COMPONENT.toFlickerComponent() ) : StandardAppHelper(instr, launcherName, component) { + private val gestureHelper: GestureHelper = GestureHelper(mInstrumentation) + fun clickRestart(wmHelper: WindowManagerStateHelper) { val restartButton = uiDevice.wait( @@ -56,4 +60,64 @@ constructor( ?: error("Restart dialog button not found") wmHelper.StateSyncBuilder().withAppTransitionIdle().waitForAndVerify() } + + fun repositionHorizontally(displayBounds: Rect, right: Boolean) { + val x = if (right) displayBounds.right - BOUNDS_OFFSET else BOUNDS_OFFSET + reposition(x.toFloat(), displayBounds.centerY().toFloat()) + } + + fun repositionVertically(displayBounds: Rect, bottom: Boolean) { + val y = if (bottom) displayBounds.bottom - BOUNDS_OFFSET else BOUNDS_OFFSET + reposition(displayBounds.centerX().toFloat(), y.toFloat()) + } + + private fun reposition(x: Float, y: Float) { + val coords = GestureHelper.Tuple(x, y) + require(gestureHelper.tap(coords, 2)) { "Failed to reposition letterbox app" } + } + + fun waitForAppToMoveHorizontallyTo( + wmHelper: WindowManagerStateHelper, + displayBounds: Rect, + right: Boolean + ) { + wmHelper.StateSyncBuilder().add("letterboxAppRepositioned") { + val letterboxAppWindow = getWindowRegion(wmHelper) + val appRegionBounds = letterboxAppWindow.bounds + val appWidth = appRegionBounds.width + return@add if (right) appRegionBounds.left == displayBounds.right - appWidth && + appRegionBounds.right == displayBounds.right + else appRegionBounds.left == displayBounds.left && + appRegionBounds.right == displayBounds.left + appWidth + }.waitForAndVerify() + } + + fun waitForAppToMoveVerticallyTo( + wmHelper: WindowManagerStateHelper, + displayBounds: Rect, + navBarHeight: Int, + bottom: Boolean + ) { + wmHelper.StateSyncBuilder().add("letterboxAppRepositioned") { + val letterboxAppWindow = getWindowRegion(wmHelper) + val appRegionBounds = letterboxAppWindow.bounds + val appHeight = appRegionBounds.height + return@add if (bottom) appRegionBounds.bottom == displayBounds.bottom && + appRegionBounds.top == (displayBounds.bottom - appHeight + navBarHeight) + else appRegionBounds.top == displayBounds.top && + appRegionBounds.bottom == displayBounds.top + appHeight + }.waitForAndVerify() + } + + private fun getWindowRegion(wmHelper: WindowManagerStateHelper): Region { + val windowRegion = wmHelper.getWindowRegion(this) + require(!windowRegion.isEmpty) { + "Unable to find letterbox app window in the current state" + } + return windowRegion + } + + companion object { + private const val BOUNDS_OFFSET: Int = 100 + } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTest.kt index e6594c969373..a87fae857509 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTest.kt @@ -57,7 +57,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class ActivitiesTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { +open class ActivityTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { private val testApp: TwoActivitiesAppHelper = TwoActivitiesAppHelper(instrumentation) /** {@inheritDoc} */ diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTestCfArm.kt index ac05c7687311..85344a156d7a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTestCfArm.kt @@ -27,7 +27,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppAfterCameraTestCfArm(flicker: FlickerTest) : OpenAppAfterCameraTest(flicker) { +class ActivityTransitionTestCfArm(flicker: FlickerTest) : ActivityTransitionTest(flicker) { companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTest.kt index 3a80c6649833..575206591e59 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTest.kt @@ -55,7 +55,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { +open class OpenAppFromIconColdTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit get() = { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTestCfArm.kt index d33a2724ca44..d453c1ae908a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTestCfArm.kt @@ -32,7 +32,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppColdFromIconCfArm(flicker: FlickerTest) : OpenAppColdFromIcon(flicker) { +class OpenAppFromIconColdTestCfArm(flicker: FlickerTest) : OpenAppFromIconColdTest(flicker) { @Test @FlakyTest override fun visibleLayersShownMoreThanOneConsecutiveEntry() { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdAfterCameraTest.kt index 549183f407e2..e74731555642 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdAfterCameraTest.kt @@ -38,7 +38,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppAfterCameraTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { +open class OpenAppFromIntentColdAfterCameraTest(flicker: FlickerTest) : + OpenAppFromLauncherTransition(flicker) { private val cameraApp = CameraAppHelper(instrumentation) /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdAfterCameraTestCfArm.kt index 8b89a8b4c40d..177ad7dc09d1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdAfterCameraTestCfArm.kt @@ -27,7 +27,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class ActivitiesTransitionTestCfArm(flicker: FlickerTest) : ActivitiesTransitionTest(flicker) { +class OpenAppFromIntentColdAfterCameraTestCfArm(flicker: FlickerTest) : + OpenAppFromIntentColdAfterCameraTest(flicker) { companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdTest.kt index 26f88d23cda0..f45f728664cf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdTest.kt @@ -58,7 +58,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppColdTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { +open class OpenAppFromIntentColdTest(flicker: FlickerTest) : + OpenAppFromLauncherTransition(flicker) { /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit get() = { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdTestCfArm.kt index d9a99dadbd3d..0d695f306c00 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdTestCfArm.kt @@ -31,7 +31,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppColdTestCfArm(flicker: FlickerTest) : OpenAppColdTest(flicker) { +class OpenAppFromIntentColdTestCfArm(flicker: FlickerTest) : OpenAppFromIntentColdTest(flicker) { @FlakyTest(bugId = 273696733) @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentWarmTest.kt index 3385830ee77f..a42bff5bf170 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentWarmTest.kt @@ -58,7 +58,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppWarmTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { +open class OpenAppFromIntentWarmTest(flicker: FlickerTest) : + OpenAppFromLauncherTransition(flicker) { /** Defines the transition used to run the test */ override val transition: FlickerBuilder.() -> Unit get() = { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentWarmTestCfArm.kt index d8b38b30cf13..b6ffcb3df9f3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTestCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentWarmTestCfArm.kt @@ -29,7 +29,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppWarmTestCfArm(flicker: FlickerTest) : OpenAppWarmTest(flicker) { +class OpenAppFromIntentWarmTestCfArm(flicker: FlickerTest) : OpenAppFromIntentWarmTest(flicker) { companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationColdTest.kt index b21777b30b21..fd4272600d55 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationColdTest.kt @@ -44,8 +44,8 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @Postsubmit -open class OpenAppFromLockNotificationCold(flicker: FlickerTest) : - OpenAppFromNotificationCold(flicker) { +open class OpenAppFromLockscreenNotificationColdTest(flicker: FlickerTest) : + OpenAppFromNotificationColdTest(flicker) { override val openingNotificationsFromLockScreen = true diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationWarmTest.kt index ec92ca65f80a..fd051d50d032 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationWarmTest.kt @@ -46,7 +46,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppFromLockNotificationWarm(flicker: FlickerTest) : OpenAppFromNotificationWarm(flicker) { +class OpenAppFromLockscreenNotificationWarmTest(flicker: FlickerTest) : + OpenAppFromNotificationWarmTest(flicker) { override val openingNotificationsFromLockScreen = true diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationWithOverlayAppTest.kt index 009d61797fe0..37afa8d0caba 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationWithOverlayAppTest.kt @@ -37,6 +37,8 @@ import org.junit.runners.Parameterized * Test cold launching an app from a notification from the lock screen when there is an app overlaid * on the lock screen. * + * This test assumes the device doesn't have AOD enabled + * * To run this test: `atest FlickerTests:OpenAppFromLockNotificationWithLockOverlayApp` */ @RequiresDevice @@ -44,8 +46,8 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @Postsubmit -class OpenAppFromLockNotificationWithLockOverlayApp(flicker: FlickerTest) : - OpenAppFromLockNotificationCold(flicker) { +class OpenAppFromLockscreenNotificationWithOverlayAppTest(flicker: FlickerTest) : + OpenAppFromLockscreenNotificationColdTest(flicker) { private val showWhenLockedApp = ShowWhenLockedAppHelper(instrumentation) // Although we are technically still locked here, the overlay app means we should open the diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenTransition.kt index eae9ca10c711..30c3ec205bb1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenTransition.kt @@ -28,7 +28,7 @@ import org.junit.Ignore import org.junit.Test /** Base class for app launch tests from lock screen */ -abstract class OpenAppFromLockTransition(flicker: FlickerTest) : OpenAppTransition(flicker) { +abstract class OpenAppFromLockscreenTransition(flicker: FlickerTest) : OpenAppTransition(flicker) { /** Defines the transition used to run the test */ override val transition: FlickerBuilder.() -> Unit = { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt index 1383ae39f760..924d03f6d302 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt @@ -63,7 +63,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppNonResizeableTest(flicker: FlickerTest) : OpenAppFromLockTransition(flicker) { +open class OpenAppFromLockscreenViaIntentTest(flicker: FlickerTest) : + OpenAppFromLockscreenTransition(flicker) { override val testApp = NonResizeableAppHelper(instrumentation) /** diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdTest.kt index 7bcb91070ecf..d873ec5e83e2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdTest.kt @@ -35,8 +35,6 @@ import org.junit.runners.Parameterized /** * Test cold launching an app from a notification. * - * This test assumes the device doesn't have AOD enabled - * * To run this test: `atest FlickerTests:OpenAppFromNotificationCold` */ @RequiresDevice @@ -44,8 +42,8 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @Postsubmit -open class OpenAppFromNotificationCold(flicker: FlickerTest) : - OpenAppFromNotificationWarm(flicker) { +open class OpenAppFromNotificationColdTest(flicker: FlickerTest) : + OpenAppFromNotificationWarmTest(flicker) { /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit get() = { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdTestCfArm.kt index 8b4a613305c0..fb2a48c2ad7f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationColdTestCfArm.kt @@ -29,8 +29,8 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @Postsubmit -class OpenAppFromNotificationColdCfArm(flicker: FlickerTest) : - OpenAppFromNotificationCold(flicker) { +class OpenAppFromNotificationColdTestCfArm(flicker: FlickerTest) : + OpenAppFromNotificationColdTest(flicker) { companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmTest.kt index 425e674dec3a..99668ecd0b68 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmTest.kt @@ -47,15 +47,13 @@ import org.junit.runners.Parameterized /** * Test cold launching an app from a notification. * - * This test assumes the device doesn't have AOD enabled - * * To run this test: `atest FlickerTests:OpenAppFromNotificationWarm` */ @RequiresDevice @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -open class OpenAppFromNotificationWarm(flicker: FlickerTest) : OpenAppTransition(flicker) { +open class OpenAppFromNotificationWarmTest(flicker: FlickerTest) : OpenAppTransition(flicker) { override val testApp: NotificationAppHelper = NotificationAppHelper(instrumentation) open val openingNotificationsFromLockScreen = false diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmCfArm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmTestCfArm.kt index 43d28fa60e51..2a2597e1ebe8 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmCfArm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarmTestCfArm.kt @@ -27,8 +27,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppFromNotificationWarmCfArm(flicker: FlickerTest) : - OpenAppFromNotificationWarm(flicker) { +class OpenAppFromNotificationWarmTestCfArm(flicker: FlickerTest) : + OpenAppFromNotificationWarmTest(flicker) { companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraFromHomeOnDoubleClickPowerButtonTest.kt index ae9ca8007dc8..6ee8ae69924a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraFromHomeOnDoubleClickPowerButtonTest.kt @@ -60,7 +60,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) : +class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { private val cameraApp = CameraAppHelper(instrumentation) override val testApp: StandardAppHelper diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml index 1ec9ec9b0eda..dc9ff3b01822 100644 --- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml +++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml @@ -198,6 +198,13 @@ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" android:exported="false"/> <activity + android:name=".ActivityEmbeddingAlwaysExpandActivity" + android:label="ActivityEmbedding AlwaysExpand" + android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding" + android:theme="@style/CutoutShortEdges" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" + android:exported="false"/> + <activity android:name=".ActivityEmbeddingPlaceholderPrimaryActivity" android:label="ActivityEmbedding Placeholder Primary" android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding" diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_base_layout.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_base_layout.xml index 3a02cadc90dd..f0dfdfce035f 100644 --- a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_base_layout.xml +++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_base_layout.xml @@ -20,5 +20,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - </LinearLayout> diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_main_layout.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_main_layout.xml index d78b9a836a37..f5241cae8fa8 100644 --- a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_main_layout.xml +++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_main_layout.xml @@ -37,4 +37,12 @@ android:onClick="launchPlaceholderSplit" android:text="Launch Placeholder Split" /> + <Button + android:id="@+id/launch_always_expand_activity_button" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:layout_centerHorizontal="true" + android:onClick="launchAlwaysExpandActivity" + android:text="Launch Always Expand Activity" /> + </LinearLayout> diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_secondary_activity_layout.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_secondary_activity_layout.xml new file mode 100644 index 000000000000..239aba59f4a7 --- /dev/null +++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_embedding_secondary_activity_layout.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/secondary_activity_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <Button + android:id="@+id/finish_secondary_activity_button" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:text="Finish" /> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingAlwaysExpandActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingAlwaysExpandActivity.java new file mode 100644 index 000000000000..d9b24ed23424 --- /dev/null +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingAlwaysExpandActivity.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.wm.flicker.testapp; + +import android.app.Activity; +import android.graphics.Color; +import android.os.Bundle; + +/** + * Activity with alwaysExpand=true (launched via R.id.launch_always_expand_activity_button) + */ +public class ActivityEmbeddingAlwaysExpandActivity extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_embedding_base_layout); + findViewById(R.id.root_activity_layout).setBackgroundColor(Color.GREEN); + } + +} diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingMainActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingMainActivity.java index 6a7a2ccd3378..61202545f407 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingMainActivity.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingMainActivity.java @@ -23,6 +23,9 @@ import android.util.ArraySet; import android.util.Log; import android.view.View; +import androidx.window.embedding.ActivityFilter; +import androidx.window.embedding.ActivityRule; +import androidx.window.embedding.RuleController; import androidx.window.extensions.embedding.ActivityEmbeddingComponent; import androidx.window.extensions.embedding.EmbeddingRule; import androidx.window.extensions.embedding.SplitPairRule; @@ -30,6 +33,7 @@ import androidx.window.extensions.embedding.SplitPlaceholderRule; import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper; +import java.util.HashSet; import java.util.Set; /** Main activity of the ActivityEmbedding test app to launch other embedding activities. */ @@ -50,6 +54,23 @@ public class ActivityEmbeddingMainActivity extends Activity { ActivityOptions.ActivityEmbedding.SecondaryActivity.COMPONENT)); } + /** R.id.launch_always_expand_activity_button onClick */ + public void launchAlwaysExpandActivity(View view) { + final Set<ActivityFilter> activityFilters = new HashSet<>(); + activityFilters.add( + new ActivityFilter(ActivityOptions.ActivityEmbedding.AlwaysExpandActivity.COMPONENT, + null)); + final ActivityRule activityRule = new ActivityRule.Builder(activityFilters) + .setAlwaysExpand(true) + .build(); + + RuleController rc = RuleController.getInstance(this); + + rc.addRule(activityRule); + startActivity(new Intent().setComponent( + ActivityOptions.ActivityEmbedding.AlwaysExpandActivity.COMPONENT)); + } + /** R.id.launch_placeholder_split_button onClick */ public void launchPlaceholderSplit(View view) { initializeSplitRules(createSplitPlaceholderRules()); diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingSecondaryActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingSecondaryActivity.java index 00f4c2576eb1..6e78750cdeee 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingSecondaryActivity.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityEmbeddingSecondaryActivity.java @@ -16,15 +16,28 @@ package com.android.server.wm.flicker.testapp; +import android.app.Activity; import android.graphics.Color; +import android.os.Bundle; +import android.view.View; /** * Activity to be used as the secondary activity to split with * {@link ActivityEmbeddingMainActivity}. */ -public class ActivityEmbeddingSecondaryActivity extends ActivityEmbeddingBaseActivity { +public class ActivityEmbeddingSecondaryActivity extends Activity { + @Override - int getBackgroundColor() { - return Color.YELLOW; + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_embedding_secondary_activity_layout); + findViewById(R.id.secondary_activity_layout).setBackgroundColor(Color.YELLOW); + findViewById(R.id.finish_secondary_activity_button).setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java index 9c3226b5292c..0f5c003f12fd 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java @@ -99,6 +99,12 @@ public class ActivityOptions { FLICKER_APP_PACKAGE + ".ActivityEmbeddingSecondaryActivity"); } + public static class AlwaysExpandActivity { + public static final String LABEL = "ActivityEmbeddingAlwaysExpandActivity"; + public static final ComponentName COMPONENT = new ComponentName(FLICKER_APP_PACKAGE, + FLICKER_APP_PACKAGE + ".ActivityEmbeddingAlwaysExpandActivity"); + } + public static class PlaceholderPrimaryActivity { public static final String LABEL = "ActivityEmbeddingPlaceholderPrimaryActivity"; public static final ComponentName COMPONENT = new ComponentName(FLICKER_APP_PACKAGE, diff --git a/tests/FlickerTests/trace_config/trace_config.textproto b/tests/FlickerTests/trace_config/trace_config.textproto new file mode 100644 index 000000000000..c9a35aca9085 --- /dev/null +++ b/tests/FlickerTests/trace_config/trace_config.textproto @@ -0,0 +1,77 @@ +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# proto-message: TraceConfig + +# Enable periodic flushing of the trace buffer into the output file. +write_into_file: true + +# Writes the userspace buffer into the file every 1s. +file_write_period_ms: 2500 + +# See b/126487238 - we need to guarantee ordering of events. +flush_period_ms: 30000 + +# The trace buffers needs to be big enough to hold |file_write_period_ms| of +# trace data. The trace buffer sizing depends on the number of trace categories +# enabled and the device activity. + +# RSS events +buffers: { + size_kb: 63488 + fill_policy: RING_BUFFER +} + +data_sources { + config { + name: "linux.process_stats" + target_buffer: 0 + # polled per-process memory counters and process/thread names. + # If you don't want the polled counters, remove the "process_stats_config" + # section, but keep the data source itself as it still provides on-demand + # thread/process naming for ftrace data below. + process_stats_config { + scan_all_processes_on_start: true + } + } +} + +data_sources: { + config { + name: "linux.ftrace" + ftrace_config { + ftrace_events: "ftrace/print" + ftrace_events: "task/task_newtask" + ftrace_events: "task/task_rename" + atrace_categories: "ss" + atrace_categories: "wm" + atrace_categories: "am" + atrace_categories: "aidl" + atrace_categories: "input" + atrace_categories: "binder_driver" + atrace_categories: "sched_process_exit" + atrace_apps: "com.android.server.wm.flicker" + atrace_apps: "com.android.server.wm.flicker.other" + atrace_apps: "com.android.server.wm.flicker.close" + atrace_apps: "com.android.server.wm.flicker.ime" + atrace_apps: "com.android.server.wm.flicker.launch" + atrace_apps: "com.android.server.wm.flicker.quickswitch" + atrace_apps: "com.android.server.wm.flicker.rotation" + atrace_apps: "com.android.server.wm.flicker.testapp" + atrace_apps: "com.android.systemui" + atrace_apps: "com.google.android.apps.nexuslauncher" + } + } +} + diff --git a/tools/protologtool/Android.bp b/tools/protologtool/Android.bp index 039bb4e2788c..46745e995f64 100644 --- a/tools/protologtool/Android.bp +++ b/tools/protologtool/Android.bp @@ -11,7 +11,7 @@ java_library_host { name: "protologtool-lib", srcs: [ "src/com/android/protolog/tool/**/*.kt", - ":protolog-common-src", + ":protolog-common-no-android-src", ], static_libs: [ "javaparser", |