diff options
67 files changed, 1331 insertions, 159 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 4851279eea97..d0d76a4c8285 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -454,12 +454,11 @@ public class Dialog implements DialogInterface, Window.Callback, */ protected void onStart() { if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(true); - if (mContext != null + if (allowsRegisterDefaultOnBackInvokedCallback() && mContext != null && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { // Add onBackPressed as default back behavior. mDefaultBackCallback = this::onBackPressed; getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback); - mDefaultBackCallback = null; } } @@ -470,9 +469,18 @@ public class Dialog implements DialogInterface, Window.Callback, if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(false); if (mDefaultBackCallback != null) { getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mDefaultBackCallback); + mDefaultBackCallback = null; } } + /** + * Whether this dialog allows to register the default onBackInvokedCallback. + * @hide + */ + protected boolean allowsRegisterDefaultOnBackInvokedCallback() { + return true; + } + private static final String DIALOG_SHOWING_TAG = "android:dialogShowing"; private static final String DIALOG_HIERARCHY_TAG = "android:dialogHierarchy"; @@ -697,7 +705,8 @@ public class Dialog implements DialogInterface, Window.Callback, if (event.isTracking() && !event.isCanceled()) { switch (keyCode) { case KeyEvent.KEYCODE_BACK: - if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { + if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext) + || !allowsRegisterDefaultOnBackInvokedCallback()) { onBackPressed(); return true; } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 795eb4a737ef..8f653b3808c1 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -576,6 +576,12 @@ public class InputMethodService extends AbstractInputMethodService { @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final long DISALLOW_INPUT_METHOD_INTERFACE_OVERRIDE = 148086656L; + /** + * Enable the logic to allow hiding the IME caption bar ("fake" IME navigation bar). + * @hide + */ + public static final boolean ENABLE_HIDE_IME_CAPTION_BAR = true; + LayoutInflater mInflater; TypedArray mThemeAttrs; @UnsupportedAppUsage diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java index 78388efe98c7..c01664e55744 100644 --- a/core/java/android/inputmethodservice/NavigationBarController.java +++ b/core/java/android/inputmethodservice/NavigationBarController.java @@ -16,6 +16,8 @@ package android.inputmethodservice; +import static android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR; +import static android.view.WindowInsets.Type.captionBar; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS; import android.animation.ValueAnimator; @@ -230,6 +232,16 @@ final class NavigationBarController { setIconTintInternal(calculateTargetDarkIntensity(mAppearance, mDrawLegacyNavigationBarBackground)); + + if (ENABLE_HIDE_IME_CAPTION_BAR) { + mNavigationBarFrame.setOnApplyWindowInsetsListener((view, insets) -> { + if (mNavigationBarFrame != null) { + boolean visible = insets.isVisible(captionBar()); + mNavigationBarFrame.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); + } + return view.onApplyWindowInsets(insets); + }); + } } private void uninstallNavigationBarFrameIfNecessary() { @@ -240,6 +252,9 @@ final class NavigationBarController { if (parent instanceof ViewGroup) { ((ViewGroup) parent).removeView(mNavigationBarFrame); } + if (ENABLE_HIDE_IME_CAPTION_BAR) { + mNavigationBarFrame.setOnApplyWindowInsetsListener(null); + } mNavigationBarFrame = null; } @@ -414,7 +429,9 @@ final class NavigationBarController { decor.bringChildToFront(mNavigationBarFrame); } } - mNavigationBarFrame.setVisibility(View.VISIBLE); + if (!ENABLE_HIDE_IME_CAPTION_BAR) { + mNavigationBarFrame.setVisibility(View.VISIBLE); + } } } @@ -435,6 +452,11 @@ final class NavigationBarController { mShouldShowImeSwitcherWhenImeIsShown; mShouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherWhenImeIsShown; + if (ENABLE_HIDE_IME_CAPTION_BAR) { + mService.mWindow.getWindow().getDecorView().getWindowInsetsController() + .setImeCaptionBarInsetsHeight(getImeCaptionBarHeight()); + } + if (imeDrawsImeNavBar) { installNavigationBarFrameIfNecessary(); if (mNavigationBarFrame == null) { @@ -528,6 +550,16 @@ final class NavigationBarController { return drawLegacyNavigationBarBackground; } + /** + * Returns the height of the IME caption bar if this should be shown, or {@code 0} instead. + */ + private int getImeCaptionBarHeight() { + return mImeDrawsImeNavBar + ? mService.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_frame_height) + : 0; + } + @Override public String toDebugString() { return "{mImeDrawsImeNavBar=" + mImeDrawsImeNavBar diff --git a/core/java/android/inputmethodservice/SoftInputWindow.java b/core/java/android/inputmethodservice/SoftInputWindow.java index 5704dac7a327..e4a09a651ae1 100644 --- a/core/java/android/inputmethodservice/SoftInputWindow.java +++ b/core/java/android/inputmethodservice/SoftInputWindow.java @@ -79,6 +79,13 @@ final class SoftInputWindow extends Dialog { @WindowState private int mWindowState = WindowState.TOKEN_PENDING; + @Override + protected boolean allowsRegisterDefaultOnBackInvokedCallback() { + // Do not register OnBackInvokedCallback from Dialog#onStart, InputMethodService will + // register CompatOnBackInvokedCallback for input method window. + return false; + } + /** * Set {@link IBinder} window token to the window. * diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fc13f37fa3a6..99b080095afb 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11121,6 +11121,19 @@ public final class Settings { "navigation_mode"; /** + * The value is from another(source) device's {@link #NAVIGATION_MODE} during restore. + * It's supposed to be written only by + * {@link com.android.providers.settings.SettingsHelper}. + * This setting should not be added into backup array. + * <p>Value: -1 = Can't get value from restore(default), + * 0 = 3 button, + * 1 = 2 button, + * 2 = fully gestural. + * @hide + */ + public static final String NAVIGATION_MODE_RESTORE = "navigation_mode_restore"; + + /** * Scale factor for the back gesture inset size on the left side of the screen. * @hide */ diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index 4ecfc4044b1d..c6d8bd18bc28 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -16,10 +16,12 @@ package android.view; +import static android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR; import static android.os.Trace.TRACE_TAG_VIEW; import static android.view.InsetsControllerProto.CONTROL; import static android.view.InsetsControllerProto.STATE; import static android.view.InsetsSource.ID_IME; +import static android.view.InsetsSource.ID_IME_CAPTION_BAR; import static android.view.ViewRootImpl.CAPTION_ON_SHELL; import static android.view.WindowInsets.Type.FIRST; import static android.view.WindowInsets.Type.LAST; @@ -40,6 +42,7 @@ import android.app.ActivityThread; import android.content.Context; import android.content.res.CompatibilityInfo; import android.graphics.Insets; +import android.graphics.Point; import android.graphics.Rect; import android.os.CancellationSignal; import android.os.Handler; @@ -652,6 +655,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private int mLastWindowingMode; private boolean mStartingAnimation; private int mCaptionInsetsHeight = 0; + private int mImeCaptionBarInsetsHeight = 0; private boolean mAnimationsDisabled; private boolean mCompatSysUiVisibilityStaled; @@ -693,6 +697,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation if (!CAPTION_ON_SHELL && source1.getType() == captionBar()) { return; } + if (source1.getId() == ID_IME_CAPTION_BAR) { + return; + } // Don't change the indexes of the sources while traversing. Remove it later. mPendingRemoveIndexes.add(index1); @@ -823,6 +830,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation if (mFrame.equals(frame)) { return; } + if (mImeCaptionBarInsetsHeight != 0) { + setImeCaptionBarInsetsHeight(mImeCaptionBarInsetsHeight); + } mHost.notifyInsetsChanged(); mFrame.set(frame); } @@ -1007,6 +1017,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation // Ensure to update all existing source consumers for (int i = mSourceConsumers.size() - 1; i >= 0; i--) { final InsetsSourceConsumer consumer = mSourceConsumers.valueAt(i); + if (consumer.getId() == ID_IME_CAPTION_BAR) { + // The inset control for the IME caption bar will never be dispatched + // by the server. + continue; + } + final InsetsSourceControl control = mTmpControlArray.get(consumer.getId()); if (control != null) { controllableTypes |= control.getType(); @@ -1499,7 +1515,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation continue; } final InsetsSourceControl control = consumer.getControl(); - if (control != null && control.getLeash() != null) { + if (control != null + && (control.getLeash() != null || control.getId() == ID_IME_CAPTION_BAR)) { controls.put(control.getId(), new InsetsSourceControl(control)); typesReady |= consumer.getType(); } @@ -1885,6 +1902,35 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation } @Override + public void setImeCaptionBarInsetsHeight(int height) { + if (!ENABLE_HIDE_IME_CAPTION_BAR) { + return; + } + Rect newFrame = new Rect(mFrame.left, mFrame.bottom - height, mFrame.right, mFrame.bottom); + InsetsSource source = mState.peekSource(ID_IME_CAPTION_BAR); + if (mImeCaptionBarInsetsHeight != height + || (source != null && !newFrame.equals(source.getFrame()))) { + mImeCaptionBarInsetsHeight = height; + if (mImeCaptionBarInsetsHeight != 0) { + mState.getOrCreateSource(ID_IME_CAPTION_BAR, captionBar()) + .setFrame(newFrame); + getSourceConsumer(ID_IME_CAPTION_BAR, captionBar()).setControl( + new InsetsSourceControl(ID_IME_CAPTION_BAR, captionBar(), + null /* leash */, false /* initialVisible */, + new Point(), Insets.NONE), + new int[1], new int[1]); + } else { + mState.removeSource(ID_IME_CAPTION_BAR); + InsetsSourceConsumer sourceConsumer = mSourceConsumers.get(ID_IME_CAPTION_BAR); + if (sourceConsumer != null) { + sourceConsumer.setControl(null, new int[1], new int[1]); + } + } + mHost.notifyInsetsChanged(); + } + } + + @Override public void setSystemBarsBehavior(@Behavior int behavior) { mHost.setSystemBarsBehavior(behavior); } diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java index 64411866f020..ff009ed09329 100644 --- a/core/java/android/view/InsetsSource.java +++ b/core/java/android/view/InsetsSource.java @@ -20,6 +20,7 @@ import static android.view.InsetsSourceProto.FRAME; import static android.view.InsetsSourceProto.TYPE; import static android.view.InsetsSourceProto.VISIBLE; import static android.view.InsetsSourceProto.VISIBLE_FRAME; +import static android.view.WindowInsets.Type.captionBar; import static android.view.WindowInsets.Type.ime; import android.annotation.IntDef; @@ -47,6 +48,9 @@ public class InsetsSource implements Parcelable { /** The insets source ID of IME */ public static final int ID_IME = createId(null, 0, ime()); + /** The insets source ID of the IME caption bar ("fake" IME navigation bar). */ + static final int ID_IME_CAPTION_BAR = + InsetsSource.createId(null /* owner */, 1 /* index */, captionBar()); /** * Controls whether this source suppresses the scrim. If the scrim is ignored, the system won't @@ -215,8 +219,12 @@ public class InsetsSource implements Parcelable { // During drag-move and drag-resizing, the caption insets position may not get updated // before the app frame get updated. To layout the app content correctly during drag events, // we always return the insets with the corresponding height covering the top. + // However, with the "fake" IME navigation bar treated as a caption bar, we return the + // insets with the corresponding height the bottom. if (getType() == WindowInsets.Type.captionBar()) { - return Insets.of(0, frame.height(), 0, 0); + return getId() == ID_IME_CAPTION_BAR + ? Insets.of(0, 0, 0, frame.height()) + : Insets.of(0, frame.height(), 0, 0); } // Checks for whether there is shared edge with insets for 0-width/height window. final boolean hasIntersection = relativeFrame.isEmpty() diff --git a/core/java/android/view/PendingInsetsController.java b/core/java/android/view/PendingInsetsController.java index e8f62fc0963f..a4cbc52416b3 100644 --- a/core/java/android/view/PendingInsetsController.java +++ b/core/java/android/view/PendingInsetsController.java @@ -44,6 +44,7 @@ public class PendingInsetsController implements WindowInsetsController { private ArrayList<OnControllableInsetsChangedListener> mControllableInsetsChangedListeners = new ArrayList<>(); private int mCaptionInsetsHeight = 0; + private int mImeCaptionBarInsetsHeight = 0; private WindowInsetsAnimationControlListener mLoggingListener; private @InsetsType int mRequestedVisibleTypes = WindowInsets.Type.defaultVisible(); @@ -91,6 +92,11 @@ public class PendingInsetsController implements WindowInsetsController { } @Override + public void setImeCaptionBarInsetsHeight(int height) { + mImeCaptionBarInsetsHeight = height; + } + + @Override public void setSystemBarsBehavior(int behavior) { if (mReplayedInsetsController != null) { mReplayedInsetsController.setSystemBarsBehavior(behavior); @@ -168,6 +174,9 @@ public class PendingInsetsController implements WindowInsetsController { if (mCaptionInsetsHeight != 0) { controller.setCaptionInsetsHeight(mCaptionInsetsHeight); } + if (mImeCaptionBarInsetsHeight != 0) { + controller.setImeCaptionBarInsetsHeight(mImeCaptionBarInsetsHeight); + } if (mAnimationsDisabled) { controller.setAnimationsDisabled(true); } diff --git a/core/java/android/view/WindowInsetsController.java b/core/java/android/view/WindowInsetsController.java index bc0bab7b5e95..cc2cd7982841 100644 --- a/core/java/android/view/WindowInsetsController.java +++ b/core/java/android/view/WindowInsetsController.java @@ -250,6 +250,16 @@ public interface WindowInsetsController { void setCaptionInsetsHeight(int height); /** + * Sets the insets height for the IME caption bar, which corresponds to the + * "fake" IME navigation bar. + * + * @param height the insets height of the IME caption bar. + * @hide + */ + default void setImeCaptionBarInsetsHeight(int height) { + } + + /** * Controls the behavior of system bars. * * @param behavior Determines how the bars behave when being hidden by the application. diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 9195509312e8..a00e7974fcb4 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -3839,6 +3839,7 @@ public interface WindowManager extends ViewManager { * @see #ROTATION_ANIMATION_ROTATE * @see #ROTATION_ANIMATION_CROSSFADE * @see #ROTATION_ANIMATION_JUMPCUT + * @see #ROTATION_ANIMATION_SEAMLESS */ public int rotationAnimation = ROTATION_ANIMATION_ROTATE; diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index fea3b78f27b4..7903dd644afb 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -6945,6 +6945,7 @@ public class RemoteViews implements Parcelable, Filter { // something is going to start. opts.setPendingIntentBackgroundActivityStartMode( ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + opts.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true); return Pair.create(intent, opts); } } diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 6f7bc53e891c..735e5906cced 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2465,7 +2465,7 @@ duration of the vector animation automatically. --> <attr name="windowSplashScreenAnimationDuration" format="integer"/> - <!-- Place an drawable image in the bottom of the starting window, it can be used to + <!-- Place a drawable image in the bottom of the starting window. The image can be used to represent the branding of the application. --> <attr name="windowSplashScreenBrandingImage" format="reference"/> <!-- Set a background behind the splash screen icon. This is useful if there is not enough @@ -3245,7 +3245,7 @@ <!-- Specifies the id of a view for which this view serves as a label for accessibility purposes. For example, a TextView before an EditText in - the UI usually specifies what infomation is contained in the EditText. + the UI usually specifies what information is contained in the EditText. Hence, the TextView is a label for the EditText. --> <attr name="labelFor" format="reference" /> @@ -6787,7 +6787,7 @@ edges of a bitmap when rotated. Default value is false. --> <attr name="antialias" format="boolean" /> <!-- Enables or disables bitmap filtering. Filtering is used when the bitmap is - shrunk or stretched to smooth its apperance. Default value is true. --> + shrunk or stretched to smooth its appearance. Default value is true. --> <attr name="filter" format="boolean" /> <!-- Enables or disables dithering of the bitmap if the bitmap does not have the same pixel configuration as the screen (for instance: a ARGB 8888 bitmap with diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index b7d088bd3d82..95f14931c6ef 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -634,7 +634,7 @@ able to return to it. --> <attr name="noHistory" format="boolean" /> - <!-- Specify whether an acitivty's task state should always be maintained + <!-- Specify whether an activity's task state should always be maintained by the system, or if it is allowed to reset the task to its initial state in certain situations. @@ -731,15 +731,17 @@ This is equivalent to calling {@link android.app.Activity#setVrModeEnabled} with the the given component name within the Activity that this attribute is set for. Declaring this will prevent the system from leaving VR mode during an Activity - transtion from one VR activity to another. --> + transition from one VR activity to another. --> <attr name="enableVrMode" format="string" /> - <!-- Flag allowing the activity to specify which screen rotation animation - it desires. Valid values are "rotate", "crossfade", and "jumpcut" - as described in {@link android.view.WindowManager.LayoutParams#rotationAnimation}. - Specifying your Rotation animation in the WindowManager.LayoutParams - may be racy with app startup and updattransitions occuring during application startup and thusly - the manifest attribute is preferred. + <!-- Flag that specifies the activity's preferred screen rotation animation. + Valid values are "rotate", "crossfade", "jumpcut", and "seamless" as + described in + {@link android.view.WindowManager.LayoutParams#rotationAnimation}. + Specifying your rotation animation in + <code>WindowManager.LayoutParams</code> may be racy with app startup + and update transitions that occur during application startup; and so, + specify the animation in the manifest attribute. --> <attr name="rotationAnimation"> <flag name="rotate" value= "0" /> @@ -830,7 +832,7 @@ <enum name="singleInstance" value="3" /> <!-- The activity can only be running as the root activity of the task, the first activity that created the task, and therefore there will only be one instance of this activity - in a task. In constrast to the {@code singleTask} launch mode, this activity can be + in a task. In contrast to the {@code singleTask} launch mode, this activity can be started in multiple instances in different tasks if the {@code FLAG_ACTIVITY_MULTIPLE_TASK} or {@code FLAG_ACTIVITY_NEW_DOCUMENT} is set.--> <enum name="singleInstancePerTask" value="4" /> @@ -1328,7 +1330,7 @@ <p>Such a document is any kind of item for which an application may want to maintain multiple simultaneous instances. Examples might be text files, web pages, spreadsheets, or emails. Each such document will be in a separate - task in the recent taskss list. + task in the recent tasks list. <p>This attribute is equivalent to adding the flag {@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} to every Intent used to launch @@ -1771,7 +1773,7 @@ </attr> <!-- Enable hardware memory tagging (ARM MTE) in this process. - When enabled, heap memory bugs like use-after-free and buffer overlow + When enabled, heap memory bugs like use-after-free and buffer overflow are detected and result in an immediate ("sync" mode) or delayed ("async" mode) crash instead of a silent memory corruption. Sync mode, while slower, provides enhanced bug reports including stack traces at the time of allocation diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 33c18c29dc74..9c018c30f9e3 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1889,22 +1889,22 @@ <!-- Content description which should be used for the fingerprint icon. --> <string name="fingerprint_icon_content_description">Fingerprint icon</string> + <!-- Notification name shown when the system requires the user to set up device unlock. [CHAR LIMIT=NONE] --> + <string name="device_unlock_notification_name">Device unlock</string> + <!-- Notification title shown when the system suggests the user to set up another way to unlock. [CHAR LIMIT=NONE] --> + <string name="alternative_unlock_setup_notification_title">Try another way to unlock</string> + <!-- Notification content shown when the system suggests the user to enroll their face. [CHAR LIMIT=NONE] --> + <string name="alternative_face_setup_notification_content">Use Face Unlock when your fingerprint isn\'t recognized, like when your fingers are wet</string> + <!-- Notification content shown when the system suggests the user to enroll their fingerprint. [CHAR LIMIT=NONE] --> + <string name="alternative_fp_setup_notification_content">Use Fingerprint Unlock when your face isn\'t recognized, like when there\'s not enough light</string> <!-- Notification name shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] --> <string name="face_recalibrate_notification_name">Face Unlock</string> <!-- Notification title shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] --> <string name="face_recalibrate_notification_title">Issue with Face Unlock</string> <!-- Notification content shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] --> <string name="face_recalibrate_notification_content">Tap to delete your face model, then add your face again</string> - <!-- Title of a notification that directs the user to set up Face Unlock by enrolling their face. [CHAR LIMIT=NONE] --> - <string name="face_setup_notification_title">Set up Face Unlock</string> - <!-- Contents of a notification that directs the user to set up face unlock by enrolling their face. [CHAR LIMIT=NONE] --> - <string name="face_setup_notification_content">Unlock your phone by looking at it</string> <!-- Error message indicating that the camera privacy sensor has been turned on [CHAR LIMIT=NONE] --> <string name="face_sensor_privacy_enabled">To use Face Unlock, turn on <b>Camera access</b> in Settings > Privacy</string> - <!-- Title of a notification that directs the user to enroll a fingerprint. [CHAR LIMIT=NONE] --> - <string name="fingerprint_setup_notification_title">Set up more ways to unlock</string> - <!-- Contents of a notification that directs the user to enroll a fingerprint. [CHAR LIMIT=NONE] --> - <string name="fingerprint_setup_notification_content">Tap to add a fingerprint</string> <!-- Notification name shown when the system requires the user to re-calibrate their fingerprint. [CHAR LIMIT=NONE] --> <string name="fingerprint_recalibrate_notification_name">Fingerprint Unlock</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index cfcabf3d9a72..b94ede94b001 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2584,6 +2584,12 @@ <!-- Biometric FRR config --> <java-symbol type="fraction" name="config_biometricNotificationFrrThreshold" /> + <!-- Biometric FRR notification messages --> + <java-symbol type="string" name="device_unlock_notification_name" /> + <java-symbol type="string" name="alternative_unlock_setup_notification_title" /> + <java-symbol type="string" name="alternative_face_setup_notification_content" /> + <java-symbol type="string" name="alternative_fp_setup_notification_content" /> + <!-- Device credential strings for BiometricManager --> <java-symbol type="string" name="screen_lock_app_setting_name" /> <java-symbol type="string" name="screen_lock_dialog_default_subtitle" /> @@ -2624,8 +2630,6 @@ <java-symbol type="string" name="fingerprint_recalibrate_notification_name" /> <java-symbol type="string" name="fingerprint_recalibrate_notification_title" /> <java-symbol type="string" name="fingerprint_recalibrate_notification_content" /> - <java-symbol type="string" name="fingerprint_setup_notification_title" /> - <java-symbol type="string" name="fingerprint_setup_notification_content" /> <java-symbol type="string" name="fingerprint_error_power_pressed" /> <!-- Fingerprint config --> @@ -2693,7 +2697,6 @@ <java-symbol type="string" name="face_authenticated_no_confirmation_required" /> <java-symbol type="string" name="face_authenticated_confirmation_required" /> <java-symbol type="string" name="face_error_security_update_required" /> - <java-symbol type="string" name="face_setup_notification_title" /> <java-symbol type="string" name="config_biometric_prompt_ui_package" /> <java-symbol type="array" name="config_biometric_sensors" /> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithm.java index f9332e4bdb2e..2d3403599484 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithm.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithm.java @@ -40,6 +40,7 @@ public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithmInterfac "persist.wm.debug.enable_pip_keep_clear_algorithm_gravity", false); protected int mKeepClearAreasPadding; + private int mImeOffset; public PhonePipKeepClearAlgorithm(Context context) { reloadResources(context); @@ -48,6 +49,7 @@ public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithmInterfac private void reloadResources(Context context) { final Resources res = context.getResources(); mKeepClearAreasPadding = res.getDimensionPixelSize(R.dimen.pip_keep_clear_areas_padding); + mImeOffset = res.getDimensionPixelSize(R.dimen.pip_ime_offset); } /** @@ -61,7 +63,7 @@ public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithmInterfac Rect insets = new Rect(); pipBoundsAlgorithm.getInsetBounds(insets); if (pipBoundsState.isImeShowing()) { - insets.bottom -= pipBoundsState.getImeHeight(); + insets.bottom -= (pipBoundsState.getImeHeight() + mImeOffset); } // if PiP is stashed we only adjust the vertical position if it's outside of insets and // ignore all keep clear areas, since it's already on the side diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index f6c2f6918739..e5f7f889138e 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -259,6 +259,8 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.NAV_BAR_KIDS_MODE, BOOLEAN_VALIDATOR); VALIDATORS.put( Secure.NAVIGATION_MODE, new DiscreteValueValidator(new String[] {"0", "1", "2"})); + VALIDATORS.put(Secure.NAVIGATION_MODE_RESTORE, + new DiscreteValueValidator(new String[] {"-1", "0", "1", "2"})); VALIDATORS.put(Secure.BACK_GESTURE_INSET_SCALE_LEFT, new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE)); VALIDATORS.put(Secure.BACK_GESTURE_INSET_SCALE_RIGHT, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 11154d165109..056be2ed6451 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -813,7 +813,11 @@ public class SettingsBackupAgent extends BackupAgentHelper { continue; } - if (settingsToPreserve.contains(getQualifiedKeyForSetting(key, contentUri))) { + // Filter out Settings.Secure.NAVIGATION_MODE from modified preserve settings. + // Let it take part in restore process. See also b/244532342. + boolean isSettingPreserved = settingsToPreserve.contains( + getQualifiedKeyForSetting(key, contentUri)); + if (isSettingPreserved && !Settings.Secure.NAVIGATION_MODE.equals(key)) { Log.i(TAG, "Skipping restore for setting " + key + " as it is marked as " + "preserved"); continue; @@ -874,6 +878,23 @@ public class SettingsBackupAgent extends BackupAgentHelper { } else { destination = contentUri; } + + // Value is written to NAVIGATION_MODE_RESTORE to mark navigation mode + // has been set before on source device. + // See also: b/244532342. + if (Settings.Secure.NAVIGATION_MODE.equals(key)) { + contentValues.clear(); + contentValues.put(Settings.NameValueTable.NAME, + Settings.Secure.NAVIGATION_MODE_RESTORE); + contentValues.put(Settings.NameValueTable.VALUE, value); + cr.insert(destination, contentValues); + // Avoid restore original setting if it has been preserved. + if (isSettingPreserved) { + Log.i(TAG, "Skipping restore for setting navigation_mode " + + "as it is marked as preserved"); + continue; + } + } settingsHelper.restoreValue(this, cr, contentValues, destination, key, value, mRestoredFromSdkInt); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index b8707b7ed16f..91c72b543cc4 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -849,7 +849,8 @@ public class SettingsBackupTest { Settings.Secure.ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT, Settings.Secure.UI_TRANSLATION_ENABLED, Settings.Secure.CREDENTIAL_SERVICE, - Settings.Secure.CREDENTIAL_SERVICE_PRIMARY); + Settings.Secure.CREDENTIAL_SERVICE_PRIMARY, + Settings.Secure.NAVIGATION_MODE_RESTORE); @Test public void systemSettingsBackedUpOrDenied() { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index 889c026a0568..dd71dfa0b008 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -48,6 +48,7 @@ fun SceneScope.Notifications( Column( modifier = modifier + .element(key = Notifications.Elements.Notifications) .fillMaxWidth() .defaultMinSize(minHeight = 300.dp) .clip(RoundedCornerShape(32.dp)) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToQuickSettingsTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToQuickSettingsTransition.kt index 38712b01ae44..291617f8edde 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToQuickSettingsTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToQuickSettingsTransition.kt @@ -1,11 +1,12 @@ package com.android.systemui.scene.ui.composable.transitions import androidx.compose.animation.core.tween +import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.scene.ui.composable.QuickSettings fun TransitionBuilder.goneToQuickSettingsTransition() { spec = tween(durationMillis = 500) - fade(QuickSettings.rootElementKey) + translate(QuickSettings.rootElementKey, Edge.Top, true) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt index 1d57c1a377e5..45df2b1bb20c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt @@ -1,11 +1,12 @@ package com.android.systemui.scene.ui.composable.transitions import androidx.compose.animation.core.tween +import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.scene.ui.composable.Shade fun TransitionBuilder.goneToShadeTransition() { spec = tween(durationMillis = 500) - fade(Shade.rootElementKey) + translate(Shade.rootElementKey, Edge.Top, true) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToQuickSettingsTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToQuickSettingsTransition.kt index 9a8a3e2048d1..e63bc4e458eb 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToQuickSettingsTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToQuickSettingsTransition.kt @@ -1,11 +1,12 @@ package com.android.systemui.scene.ui.composable.transitions import androidx.compose.animation.core.tween +import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.scene.ui.composable.QuickSettings fun TransitionBuilder.lockscreenToQuickSettingsTransition() { spec = tween(durationMillis = 500) - fade(QuickSettings.rootElementKey) + translate(QuickSettings.rootElementKey, Edge.Top, true) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt index 6c7964b30989..21a10b1bc936 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt @@ -10,6 +10,5 @@ fun TransitionBuilder.shadeToQuickSettingsTransition() { spec = tween(durationMillis = 500) translate(Notifications.Elements.Notifications, Edge.Bottom) - fade(Notifications.Elements.Notifications) timestampRange(endMillis = 83) { fade(QuickSettings.Elements.FooterActions) } } diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index e539c955a3c6..e7a53e5baaf4 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt @@ -62,6 +62,7 @@ class DefaultClockController( private val burmeseLineSpacing = resources.getFloat(R.dimen.keyguard_clock_line_spacing_scale_burmese) private val defaultLineSpacing = resources.getFloat(R.dimen.keyguard_clock_line_spacing_scale) + protected var onSecondaryDisplay: Boolean = false override val events: DefaultClockEvents override val config = ClockConfig() @@ -142,6 +143,11 @@ class DefaultClockController( view.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSizePx) recomputePadding(targetRegion) } + + override fun onSecondaryDisplayChanged(onSecondaryDisplay: Boolean) { + this@DefaultClockController.onSecondaryDisplay = onSecondaryDisplay + recomputePadding(null) + } } open fun recomputePadding(targetRegion: Rect?) {} @@ -182,13 +188,19 @@ class DefaultClockController( override fun recomputePadding(targetRegion: Rect?) { // We center the view within the targetRegion instead of within the parent // view by computing the difference and adding that to the padding. - val parent = view.parent - val yDiff = - if (targetRegion != null && parent is View && parent.isLaidOut()) - targetRegion.centerY() - parent.height / 2f - else 0f val lp = view.getLayoutParams() as FrameLayout.LayoutParams - lp.topMargin = (-0.5f * view.bottom + yDiff).toInt() + lp.topMargin = + if (onSecondaryDisplay) { + // On the secondary display we don't want any additional top/bottom margin. + 0 + } else { + val parent = view.parent + val yDiff = + if (targetRegion != null && parent is View && parent.isLaidOut()) + targetRegion.centerY() - parent.height / 2f + else 0f + (-0.5f * view.bottom + yDiff).toInt() + } view.setLayoutParams(lp) } diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt index d962732ba884..527f80072222 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt @@ -177,6 +177,9 @@ interface ClockFaceEvents { * targetRegion is relative to the parent view. */ fun onTargetRegionChanged(targetRegion: Rect?) + + /** Called to notify the clock about its display. */ + fun onSecondaryDisplayChanged(onSecondaryDisplay: Boolean) } /** Tick rates for clocks */ diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_presentation.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_presentation.xml new file mode 100644 index 000000000000..593f507f3c88 --- /dev/null +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_presentation.xml @@ -0,0 +1,37 @@ +<?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. +*/ +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/presentation" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.keyguard.KeyguardStatusView + android:id="@+id/clock" + android:layout_width="410dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical"> + + <include + android:id="@+id/keyguard_clock_container" + layout="@layout/keyguard_clock_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </com.android.keyguard.KeyguardStatusView> + +</FrameLayout> diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml index 12f13e9a2138..3a15ae4f17ff 100644 --- a/packages/SystemUI/res/layout/combined_qs_header.xml +++ b/packages/SystemUI/res/layout/combined_qs_header.xml @@ -127,6 +127,8 @@ frame when animating QS <-> QQS transition android:gravity="center_vertical" android:paddingStart="@dimen/shade_header_system_icons_padding_start" android:paddingEnd="@dimen/shade_header_system_icons_padding_end" + android:paddingTop="@dimen/shade_header_system_icons_padding_top" + android:paddingBottom="@dimen/shade_header_system_icons_padding_bottom" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/privacy_container" app:layout_constraintTop_toTopOf="@id/clock"> diff --git a/packages/SystemUI/res/layout/screen_share_dialog.xml b/packages/SystemUI/res/layout/screen_share_dialog.xml index 9af46c5b739c..37964158a4aa 100644 --- a/packages/SystemUI/res/layout/screen_share_dialog.xml +++ b/packages/SystemUI/res/layout/screen_share_dialog.xml @@ -64,8 +64,7 @@ android:layout_height="wrap_content" android:text="@string/screenrecord_permission_dialog_warning_entire_screen" style="@style/TextAppearance.Dialog.Body.Message" - android:gravity="start" - android:lineHeight="@dimen/screenrecord_warning_line_height"/> + android:gravity="start"/> <!-- Buttons --> <LinearLayout diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index d85e0122f2b4..915dcdb9755f 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -82,6 +82,8 @@ <!-- start padding is smaller to account for status icon margins coming from drawable itself --> <dimen name="shade_header_system_icons_padding_start">3dp</dimen> <dimen name="shade_header_system_icons_padding_end">4dp</dimen> + <dimen name="shade_header_system_icons_padding_top">2dp</dimen> + <dimen name="shade_header_system_icons_padding_bottom">2dp</dimen> <!-- Lockscreen shade transition values --> <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 55978e65e85b..3ada7c2341ae 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -496,9 +496,10 @@ <dimen name="large_screen_shade_header_min_height">@dimen/qs_header_row_min_height</dimen> <dimen name="large_screen_shade_header_left_padding">@dimen/qs_horizontal_margin</dimen> <dimen name="shade_header_system_icons_height">@dimen/large_screen_shade_header_min_height</dimen> - <dimen name="shade_header_system_icons_height_large_screen">32dp</dimen> <dimen name="shade_header_system_icons_padding_start">0dp</dimen> <dimen name="shade_header_system_icons_padding_end">0dp</dimen> + <dimen name="shade_header_system_icons_padding_top">0dp</dimen> + <dimen name="shade_header_system_icons_padding_bottom">0dp</dimen> <!-- The top margin of the panel that holds the list of notifications. On phones it's always 0dp but it's overridden in Car UI diff --git a/packages/SystemUI/res/xml/large_screen_shade_header.xml b/packages/SystemUI/res/xml/large_screen_shade_header.xml index 2ec6180513bf..fe61c46e341d 100644 --- a/packages/SystemUI/res/xml/large_screen_shade_header.xml +++ b/packages/SystemUI/res/xml/large_screen_shade_header.xml @@ -56,7 +56,7 @@ <Constraint android:id="@+id/shade_header_system_icons"> <Layout android:layout_width="wrap_content" - android:layout_height="@dimen/shade_header_system_icons_height_large_screen" + android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/privacy_container" app:layout_constraintTop_toTopOf="parent" diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java index c844db7b770d..77f6d03a03fb 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java @@ -28,8 +28,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; public final class InteractionJankMonitorWrapper { - private static final String TAG = "JankMonitorWrapper"; - // Launcher journeys. public static final int CUJ_APP_LAUNCH_FROM_RECENTS = InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS; @@ -37,6 +35,8 @@ public final class InteractionJankMonitorWrapper { InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON; public static final int CUJ_APP_CLOSE_TO_HOME = InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_HOME; + public static final int CUJ_APP_CLOSE_TO_HOME_FALLBACK = + InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK; public static final int CUJ_APP_CLOSE_TO_PIP = InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_PIP; public static final int CUJ_QUICK_SWITCH = @@ -68,6 +68,7 @@ public final class InteractionJankMonitorWrapper { CUJ_APP_LAUNCH_FROM_RECENTS, CUJ_APP_LAUNCH_FROM_ICON, CUJ_APP_CLOSE_TO_HOME, + CUJ_APP_CLOSE_TO_HOME_FALLBACK, CUJ_APP_CLOSE_TO_PIP, CUJ_QUICK_SWITCH, CUJ_APP_LAUNCH_FROM_WIDGET, diff --git a/packages/SystemUI/src/com/android/keyguard/ConnectedDisplayKeyguardPresentation.kt b/packages/SystemUI/src/com/android/keyguard/ConnectedDisplayKeyguardPresentation.kt new file mode 100644 index 000000000000..899cad89a0be --- /dev/null +++ b/packages/SystemUI/src/com/android/keyguard/ConnectedDisplayKeyguardPresentation.kt @@ -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.keyguard + +import android.app.Presentation +import android.content.Context +import android.graphics.Color +import android.os.Bundle +import android.view.Display +import android.view.LayoutInflater +import android.view.View +import android.view.WindowManager +import com.android.keyguard.dagger.KeyguardStatusViewComponent +import com.android.systemui.R +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +/** [Presentation] shown in connected displays while on keyguard. */ +class ConnectedDisplayKeyguardPresentation +@AssistedInject +constructor( + @Assisted display: Display, + context: Context, + private val keyguardStatusViewComponentFactory: KeyguardStatusViewComponent.Factory, +) : + Presentation( + context, + display, + R.style.Theme_SystemUI_KeyguardPresentation, + WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG + ) { + + private lateinit var keyguardStatusViewController: KeyguardStatusViewController + private lateinit var clock: KeyguardStatusView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setContentView( + LayoutInflater.from(context) + .inflate(R.layout.keyguard_clock_presentation, /* root= */ null) + ) + val window = window ?: error("no window available.") + + // Logic to make the lock screen fullscreen + window.decorView.systemUiVisibility = + (View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or + View.SYSTEM_UI_FLAG_LAYOUT_STABLE) + window.attributes.fitInsetsTypes = 0 + window.isNavigationBarContrastEnforced = false + window.navigationBarColor = Color.TRANSPARENT + + clock = findViewById(R.id.clock) + keyguardStatusViewController = + keyguardStatusViewComponentFactory.build(clock).keyguardStatusViewController.apply { + setDisplayedOnSecondaryDisplay() + init() + } + } + + /** [ConnectedDisplayKeyguardPresentation] factory. */ + @AssistedFactory + interface Factory { + /** Creates a new [Presentation] for the given [display]. */ + fun create( + display: Display, + ): ConnectedDisplayKeyguardPresentation + } +} diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index b4f195654780..5915b22c9a5f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -1,10 +1,5 @@ package com.android.keyguard; -import static android.view.View.ALPHA; -import static android.view.View.SCALE_X; -import static android.view.View.SCALE_Y; -import static android.view.View.TRANSLATION_Y; - import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_X_CLOCK_DESIGN; import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_Y_CLOCK_DESIGN; import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_Y_CLOCK_SIZE; @@ -145,6 +140,13 @@ public class KeyguardClockSwitch extends RelativeLayout { updateStatusArea(/* animate= */false); } + /** Sets whether the large clock is being shown on a connected display. */ + public void setLargeClockOnSecondaryDisplay(boolean onSecondaryDisplay) { + if (mClock != null) { + mClock.getLargeClock().getEvents().onSecondaryDisplayChanged(onSecondaryDisplay); + } + } + /** * Enable or disable split shade specific positioning */ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 21d8c0af5685..81080760822b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -104,6 +104,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController; + private boolean mShownOnSecondaryDisplay = false; private boolean mOnlyClock = false; private boolean mIsActiveDreamLockscreenHosted = false; private FeatureFlags mFeatureFlags; @@ -185,8 +186,18 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } /** + * When set, limits the information shown in an external display. + */ + public void setShownOnSecondaryDisplay(boolean shownOnSecondaryDisplay) { + mShownOnSecondaryDisplay = shownOnSecondaryDisplay; + } + + /** * Mostly used for alternate displays, limit the information shown + * + * @deprecated use {@link KeyguardClockSwitchController#setShownOnSecondaryDisplay} */ + @Deprecated public void setOnlyClock(boolean onlyClock) { mOnlyClock = onlyClock; } @@ -221,6 +232,15 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } } + private void hideSliceViewAndNotificationIconContainer() { + View ksv = mView.findViewById(R.id.keyguard_slice_view); + ksv.setVisibility(View.GONE); + + View nic = mView.findViewById( + R.id.left_aligned_notification_icon_container); + nic.setVisibility(View.GONE); + } + @Override protected void onViewAttached() { mClockRegistry.registerClockChangeListener(mClockChangedListener); @@ -233,13 +253,15 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mKeyguardDateWeatherViewInvisibility = mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility); - if (mOnlyClock) { - View ksv = mView.findViewById(R.id.keyguard_slice_view); - ksv.setVisibility(View.GONE); + if (mShownOnSecondaryDisplay) { + mView.setLargeClockOnSecondaryDisplay(true); + displayClock(LARGE, /* animate= */ false); + hideSliceViewAndNotificationIconContainer(); + return; + } - View nic = mView.findViewById( - R.id.left_aligned_notification_icon_container); - nic.setVisibility(View.GONE); + if (mOnlyClock) { + hideSliceViewAndNotificationIconContainer(); return; } updateAodIcons(); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java index 9f21a31bd2c0..1c5a5758c2a4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java @@ -43,16 +43,19 @@ import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.UiBackground; +import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.policy.KeyguardStateController; +import dagger.Lazy; + import java.util.concurrent.Executor; import javax.inject.Inject; -import dagger.Lazy; @SysUISingleton public class KeyguardDisplayManager { @@ -64,6 +67,9 @@ public class KeyguardDisplayManager { private final DisplayTracker mDisplayTracker; private final Lazy<NavigationBarController> mNavigationBarControllerLazy; private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory; + private final ConnectedDisplayKeyguardPresentation.Factory + mConnectedDisplayKeyguardPresentationFactory; + private final FeatureFlags mFeatureFlags; private final Context mContext; private boolean mShowing; @@ -105,7 +111,10 @@ public class KeyguardDisplayManager { @Main Executor mainExecutor, @UiBackground Executor uiBgExecutor, DeviceStateHelper deviceStateHelper, - KeyguardStateController keyguardStateController) { + KeyguardStateController keyguardStateController, + ConnectedDisplayKeyguardPresentation.Factory + connectedDisplayKeyguardPresentationFactory, + FeatureFlags featureFlags) { mContext = context; mNavigationBarControllerLazy = navigationBarControllerLazy; mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory; @@ -115,6 +124,8 @@ public class KeyguardDisplayManager { mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor); mDeviceStateHelper = deviceStateHelper; mKeyguardStateController = keyguardStateController; + mConnectedDisplayKeyguardPresentationFactory = connectedDisplayKeyguardPresentationFactory; + mFeatureFlags = featureFlags; } private boolean isKeyguardShowable(Display display) { @@ -185,8 +196,12 @@ public class KeyguardDisplayManager { return false; } - KeyguardPresentation createPresentation(Display display) { - return new KeyguardPresentation(mContext, display, mKeyguardStatusViewComponentFactory); + Presentation createPresentation(Display display) { + if (mFeatureFlags.isEnabled(Flags.ENABLE_CLOCK_KEYGUARD_PRESENTATION)) { + return mConnectedDisplayKeyguardPresentationFactory.create(display); + } else { + return new KeyguardPresentation(mContext, display, mKeyguardStatusViewComponentFactory); + } } /** diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java index 757022dd153b..c314586e4a21 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java @@ -187,6 +187,11 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV mConfigurationController.removeCallback(mConfigurationListener); } + /** Sets the StatusView as shown on an external display. */ + public void setDisplayedOnSecondaryDisplay() { + mKeyguardClockSwitchController.setShownOnSecondaryDisplay(true); + } + /** * Called in notificationPanelViewController to avoid leak */ diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinator.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinator.kt index 8029ba844850..534832c0992d 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinator.kt @@ -54,9 +54,10 @@ interface ControlActionCoordinator { /** * When a ToggleRange control is interacting with, a drag event is sent. * + * @param cvh [ControlViewHolder] for the control * @param isEdge did the drag event reach a control edge */ - fun drag(isEdge: Boolean) + fun drag(cvh: ControlViewHolder, isEdge: Boolean) /** * Send a request to update the value of a device using the [FloatAction]. diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt index a7e9efd8ab03..00d95c02c172 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt @@ -37,6 +37,8 @@ import com.android.systemui.controls.ControlsMetricsLogger import com.android.systemui.controls.settings.ControlsSettingsRepository 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.ONE_WAY_HAPTICS_API_MIGRATION import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.KeyguardStateController @@ -57,6 +59,7 @@ class ControlActionCoordinatorImpl @Inject constructor( private val controlsMetricsLogger: ControlsMetricsLogger, private val vibrator: VibratorHelper, private val controlsSettingsRepository: ControlsSettingsRepository, + private val featureFlags: FeatureFlags, ) : ControlActionCoordinator { private var dialog: Dialog? = null private var pendingAction: Action? = null @@ -119,11 +122,17 @@ class ControlActionCoordinatorImpl @Inject constructor( ) } - override fun drag(isEdge: Boolean) { - if (isEdge) { - vibrate(Vibrations.rangeEdgeEffect) + override fun drag(cvh: ControlViewHolder, isEdge: Boolean) { + if (featureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) { + val constant = + if (isEdge) + HapticFeedbackConstants.SEGMENT_TICK + else + HapticFeedbackConstants.SEGMENT_FREQUENT_TICK + vibrator.performHapticFeedback(cvh.layout, constant) } else { - vibrate(Vibrations.rangeMiddleEffect) + val effect = if (isEdge) Vibrations.rangeEdgeEffect else Vibrations.rangeMiddleEffect + vibrate(effect) } } diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt index b2c95a63ad72..0d570d2dcc73 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt @@ -235,7 +235,7 @@ class ToggleRangeBehavior : Behavior { if (isDragging) { val isEdge = newLevel == MIN_LEVEL || newLevel == MAX_LEVEL if (clipLayer.level != newLevel) { - cvh.controlActionCoordinator.drag(isEdge) + cvh.controlActionCoordinator.drag(cvh, isEdge) clipLayer.level = newLevel } } else if (newLevel != clipLayer.level) { diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index b92bf6b61669..93bdac249bef 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -115,7 +115,7 @@ object Flags { // TODO(b/292213543): Tracking Bug @JvmField val NOTIFICATION_GROUP_EXPANSION_CHANGE = - unreleasedFlag("notification_group_expansion_change", teamfood = false) + unreleasedFlag("notification_group_expansion_change", teamfood = true) // 200 - keyguard/lockscreen // ** Flag retired ** @@ -769,6 +769,10 @@ object Flags { @JvmField val ONE_WAY_HAPTICS_API_MIGRATION = unreleasedFlag("oneway_haptics_api_migration") + /** TODO(b/296223317): Enables the new keyguard presentation containing a clock. */ + @JvmField + val ENABLE_CLOCK_KEYGUARD_PRESENTATION = unreleasedFlag("enable_clock_keyguard_presentation") + /** Enable the Compose implementation of the PeopleSpaceActivity. */ @JvmField val COMPOSE_PEOPLE_SPACE = unreleasedFlag("compose_people_space") diff --git a/packages/SystemUI/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractor.kt new file mode 100644 index 000000000000..3f2f67dbba37 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractor.kt @@ -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.systemui.keyevent.domain.interactor + +import android.view.KeyEvent +import com.android.systemui.back.domain.interactor.BackActionInteractor +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.KeyguardKeyEventInteractor +import javax.inject.Inject + +/** + * Sends key events to the appropriate interactors and then acts upon key events that haven't + * already been handled but should be handled by SystemUI. + */ +@SysUISingleton +class KeyEventInteractor +@Inject +constructor( + private val backActionInteractor: BackActionInteractor, + private val keyguardKeyEventInteractor: KeyguardKeyEventInteractor, +) { + fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (keyguardKeyEventInteractor.dispatchKeyEvent(event)) { + return true + } + + when (event.keyCode) { + KeyEvent.KEYCODE_BACK -> { + if (event.handleAction()) { + backActionInteractor.onBackRequested() + } + return true + } + } + return false + } + + fun interceptMediaKey(event: KeyEvent): Boolean { + return keyguardKeyEventInteractor.interceptMediaKey(event) + } + + fun dispatchKeyEventPreIme(event: KeyEvent): Boolean { + return keyguardKeyEventInteractor.dispatchKeyEventPreIme(event) + } + + companion object { + // Most actions shouldn't be handled on the down event and instead handled on subsequent + // key events like ACTION_UP. + fun KeyEvent.handleAction(): Boolean { + return action != KeyEvent.ACTION_DOWN + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt new file mode 100644 index 000000000000..635961b0ea01 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt @@ -0,0 +1,117 @@ +/* + * 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 android.content.Context +import android.media.AudioManager +import android.view.KeyEvent +import com.android.systemui.back.domain.interactor.BackActionInteractor +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyevent.domain.interactor.KeyEventInteractor.Companion.handleAction +import com.android.systemui.media.controls.util.MediaSessionLegacyHelperWrapper +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.shade.ShadeController +import com.android.systemui.statusbar.StatusBarState +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager +import javax.inject.Inject + +/** Handles key events arriving when the keyguard is showing or device is dozing. */ +@SysUISingleton +class KeyguardKeyEventInteractor +@Inject +constructor( + private val context: Context, + private val statusBarStateController: StatusBarStateController, + private val keyguardInteractor: KeyguardInteractor, + private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager, + private val shadeController: ShadeController, + private val mediaSessionLegacyHelperWrapper: MediaSessionLegacyHelperWrapper, + private val backActionInteractor: BackActionInteractor, +) { + + fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (statusBarStateController.isDozing) { + when (event.keyCode) { + KeyEvent.KEYCODE_VOLUME_DOWN, + KeyEvent.KEYCODE_VOLUME_UP -> return dispatchVolumeKeyEvent(event) + } + } + + if (event.handleAction()) { + when (event.keyCode) { + KeyEvent.KEYCODE_MENU -> return dispatchMenuKeyEvent() + KeyEvent.KEYCODE_SPACE -> return dispatchSpaceEvent() + } + } + return false + } + + /** + * While IME is active and a BACK event is detected, check with {@link + * StatusBarKeyguardViewManager#dispatchBackKeyEventPreIme()} to see if the event should be + * handled before routing to IME, in order to prevent the user from having to hit back twice to + * exit bouncer. + */ + fun dispatchKeyEventPreIme(event: KeyEvent): Boolean { + when (event.keyCode) { + KeyEvent.KEYCODE_BACK -> + if ( + statusBarStateController.state == StatusBarState.KEYGUARD && + statusBarKeyguardViewManager.dispatchBackKeyEventPreIme() + ) { + return backActionInteractor.onBackRequested() + } + } + return false + } + + fun interceptMediaKey(event: KeyEvent): Boolean { + return statusBarStateController.state == StatusBarState.KEYGUARD && + statusBarKeyguardViewManager.interceptMediaKey(event) + } + + private fun dispatchMenuKeyEvent(): Boolean { + val shouldUnlockOnMenuPressed = + isDeviceInteractive() && + (statusBarStateController.state != StatusBarState.SHADE) && + statusBarKeyguardViewManager.shouldDismissOnMenuPressed() + if (shouldUnlockOnMenuPressed) { + shadeController.animateCollapseShadeForced() + return true + } + return false + } + + private fun dispatchSpaceEvent(): Boolean { + if (isDeviceInteractive() && statusBarStateController.state != StatusBarState.SHADE) { + shadeController.animateCollapseShadeForced() + return true + } + return false + } + + private fun dispatchVolumeKeyEvent(event: KeyEvent): Boolean { + mediaSessionLegacyHelperWrapper + .getHelper(context) + .sendVolumeKeyEvent(event, AudioManager.USE_DEFAULT_STREAM_TYPE, true) + return true + } + + private fun isDeviceInteractive(): Boolean { + return keyguardInteractor.wakefulnessModel.value.isDeviceInteractive() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaSessionLegacyHelperWrapper.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaSessionLegacyHelperWrapper.kt new file mode 100644 index 000000000000..99243696a4e0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaSessionLegacyHelperWrapper.kt @@ -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.systemui.media.controls.util + +import android.content.Context +import android.media.session.MediaSessionLegacyHelper +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +/** Injectable wrapper around `MediaSessionLegacyHelper` functions */ +@SysUISingleton +class MediaSessionLegacyHelperWrapper @Inject constructor() { + fun getHelper(context: Context): MediaSessionLegacyHelper { + return MediaSessionLegacyHelper.getHelper(context) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index e134f7c10b9b..ae0ab8423a99 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -25,6 +25,7 @@ import static android.app.StatusBarManager.WindowType; import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.windowStateToString; import static android.app.WindowConfiguration.ROTATION_UNDEFINED; +import static android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR; import static android.view.InsetsSource.FLAG_SUPPRESS_SCRIM; import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; @@ -1714,10 +1715,12 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private InsetsFrameProvider[] getInsetsFrameProvider(int insetsHeight, Context userContext) { final InsetsFrameProvider navBarProvider = - new InsetsFrameProvider(mInsetsSourceOwner, 0, WindowInsets.Type.navigationBars()) - .setInsetsSizeOverrides(new InsetsFrameProvider.InsetsSizeOverride[] { - new InsetsFrameProvider.InsetsSizeOverride( - TYPE_INPUT_METHOD, null)}); + new InsetsFrameProvider(mInsetsSourceOwner, 0, WindowInsets.Type.navigationBars()); + if (!ENABLE_HIDE_IME_CAPTION_BAR) { + navBarProvider.setInsetsSizeOverrides(new InsetsFrameProvider.InsetsSizeOverride[] { + new InsetsFrameProvider.InsetsSizeOverride(TYPE_INPUT_METHOD, null) + }); + } if (insetsHeight != -1 && !mEdgeBackGestureHandler.isButtonForcedVisible()) { navBarProvider.setInsetsSize(Insets.of(0, 0, 0, insetsHeight)); } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 132cd6115bc7..cabbeb1075f9 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -3198,6 +3198,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } } + @Override + public void performHapticFeedback(int constant) { + mVibratorHelper.performHapticFeedback(mView, constant); + } + private class ShadeHeadsUpTrackerImpl implements ShadeHeadsUpTracker { @Override public void addTrackingHeadsUpListener(Consumer<ExpandableNotificationRow> listener) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt index bea12de5ab49..656411874de5 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt @@ -263,9 +263,11 @@ constructor( resources.getDimensionPixelSize( R.dimen.shade_header_system_icons_padding_start ), - systemIcons.paddingTop, + resources.getDimensionPixelSize(R.dimen.shade_header_system_icons_padding_top), resources.getDimensionPixelSize(R.dimen.shade_header_system_icons_padding_end), - systemIcons.paddingBottom + resources.getDimensionPixelSize( + R.dimen.shade_header_system_icons_padding_bottom + ) ) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index d5b5c87ec781..182a676c9841 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -248,6 +248,16 @@ interface ShadeViewController { /** Starts tracking a shade expansion gesture that originated from the status bar. */ fun startTrackingExpansionFromStatusBar() + /** + * Performs haptic feedback from a view with a haptic feedback constant. + * + * The implementation of this method should use the [android.view.View.performHapticFeedback] + * method with the provided constant. + * + * @param[constant] One of [android.view.HapticFeedbackConstants] + */ + fun performHapticFeedback(constant: Int) + // ******* End Keyguard Section ********* /** Returns the ShadeHeadsUpTracker. */ diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt index 287ac528385f..09b74b213ebf 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt @@ -86,6 +86,8 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : ShadeViewController { return false } override fun startTrackingExpansionFromStatusBar() {} + override fun performHapticFeedback(constant: Int) {} + override val shadeHeadsUpTracker = ShadeHeadsUpTrackerEmptyImpl() override val shadeFoldAnimator = ShadeFoldAnimatorEmptyImpl() } 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 6431ef958239..2bc7b996ffb3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.phone; +import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING; @@ -33,12 +34,15 @@ import android.os.VibrationEffect; import android.os.Vibrator; import android.util.Log; import android.util.Slog; +import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.WindowInsets; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.LetterboxDetails; @@ -49,6 +53,7 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.camera.CameraIntents; import com.android.systemui.dagger.qualifiers.DisplayId; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.qs.QSHost; @@ -107,6 +112,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba private final Lazy<CameraLauncher> mCameraLauncherLazy; private final QuickSettingsController mQsController; private final QSHost mQSHost; + private final FeatureFlags mFeatureFlags; private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES = VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK); @@ -144,7 +150,8 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba Lazy<CameraLauncher> cameraLauncherLazy, UserTracker userTracker, QSHost qsHost, - ActivityStarter activityStarter) { + ActivityStarter activityStarter, + FeatureFlags featureFlags) { mCentralSurfaces = centralSurfaces; mQsController = quickSettingsController; mContext = context; @@ -171,6 +178,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba mCameraLauncherLazy = cameraLauncherLazy; mUserTracker = userTracker; mQSHost = qsHost; + mFeatureFlags = featureFlags; mVibrateOnOpening = resources.getBoolean(R.bool.config_vibrateOnIconAnimation); mCameraLaunchGestureVibrationEffect = getCameraGestureVibrationEffect( @@ -314,7 +322,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba mMetricsLogger.action(MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_DOWN); if (mShadeViewController.isFullyCollapsed()) { if (mVibrateOnOpening) { - mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK); + vibrateOnNavigationKeyDown(); } mShadeViewController.expand(true /* animate */); mNotificationStackScrollLayoutController.setWillExpand(true); @@ -587,4 +595,15 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba } return VibrationEffect.createWaveform(timings, /* repeat= */ -1); } + + @VisibleForTesting + void vibrateOnNavigationKeyDown() { + if (mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) { + mShadeViewController.performHapticFeedback( + HapticFeedbackConstants.GESTURE_START + ); + } else { + mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK); + } + } } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java index b3496967f525..438f0f43acb6 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java @@ -18,6 +18,8 @@ package com.android.keyguard; import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; +import static com.android.systemui.flags.Flags.ENABLE_CLOCK_KEYGUARD_PRESENTATION; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -37,6 +39,7 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.dagger.KeyguardStatusViewComponent; import com.android.systemui.SysuiTestCase; +import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -59,8 +62,13 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Mock private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory; @Mock + private ConnectedDisplayKeyguardPresentation.Factory + mConnectedDisplayKeyguardPresentationFactory; + @Mock private KeyguardDisplayManager.KeyguardPresentation mKeyguardPresentation; @Mock + private ConnectedDisplayKeyguardPresentation mConnectedDisplayKeyguardPresentation; + @Mock private KeyguardDisplayManager.DeviceStateHelper mDeviceStateHelper; @Mock private KeyguardStateController mKeyguardStateController; @@ -69,7 +77,7 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { private Executor mBackgroundExecutor = Runnable::run; private KeyguardDisplayManager mManager; private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); - + private FakeFeatureFlags mFakeFeatureFlags = new FakeFeatureFlags(); // The default and secondary displays are both in the default group private Display mDefaultDisplay; private Display mSecondaryDisplay; @@ -80,10 +88,14 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); + mFakeFeatureFlags.set(ENABLE_CLOCK_KEYGUARD_PRESENTATION, false); mManager = spy(new KeyguardDisplayManager(mContext, () -> mNavigationBarController, mKeyguardStatusViewComponentFactory, mDisplayTracker, mMainExecutor, - mBackgroundExecutor, mDeviceStateHelper, mKeyguardStateController)); + mBackgroundExecutor, mDeviceStateHelper, mKeyguardStateController, + mConnectedDisplayKeyguardPresentationFactory, mFakeFeatureFlags)); doReturn(mKeyguardPresentation).when(mManager).createPresentation(any()); + doReturn(mConnectedDisplayKeyguardPresentation).when( + mConnectedDisplayKeyguardPresentationFactory).create(any()); mDefaultDisplay = new Display(DisplayManagerGlobal.getInstance(), Display.DEFAULT_DISPLAY, new DisplayInfo(), DEFAULT_DISPLAY_ADJUSTMENTS); @@ -138,4 +150,15 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { when(mKeyguardStateController.isOccluded()).thenReturn(true); verify(mManager, never()).createPresentation(eq(mSecondaryDisplay)); } + + @Test + public void testShow_withClockPresentationFlagEnabled_presentationCreated() { + when(mManager.createPresentation(any())).thenCallRealMethod(); + mFakeFeatureFlags.set(ENABLE_CLOCK_KEYGUARD_PRESENTATION, true); + mDisplayTracker.setAllDisplays(new Display[]{mDefaultDisplay, mSecondaryDisplay}); + + mManager.show(); + + verify(mConnectedDisplayKeyguardPresentationFactory).create(eq(mSecondaryDisplay)); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt index 692d794f21f0..8416c46a3f38 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt @@ -18,12 +18,14 @@ package com.android.systemui.controls.ui import android.test.suitebuilder.annotation.SmallTest import android.testing.AndroidTestingRunner +import android.view.HapticFeedbackConstants import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.controls.ControlsMetricsLogger import com.android.systemui.controls.settings.ControlsSettingsDialogManager import com.android.systemui.controls.settings.FakeControlsSettingsRepository -import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.KeyguardStateController @@ -33,6 +35,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Answers +import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.anyBoolean @@ -68,8 +71,6 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { @Mock private lateinit var metricsLogger: ControlsMetricsLogger @Mock - private lateinit var featureFlags: FeatureFlags - @Mock private lateinit var controlsSettingsDialogManager: ControlsSettingsDialogManager companion object { @@ -82,6 +83,8 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { private lateinit var action: ControlActionCoordinatorImpl.Action private lateinit var controlsSettingsRepository: FakeControlsSettingsRepository + private val featureFlags = FakeFeatureFlags() + @Before fun setUp() { MockitoAnnotations.initMocks(this) @@ -101,6 +104,7 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { metricsLogger, vibratorHelper, controlsSettingsRepository, + featureFlags )) coordinator.activityContext = mContext @@ -194,4 +198,50 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { verify(coordinator).bouncerOrRun(action) verify(action, never()).invoke() } + + @Test + fun drag_isEdge_oneWayHapticsDisabled_usesVibrate() { + featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false) + + coordinator.drag(cvh, true) + + verify(vibratorHelper).vibrate( + Vibrations.rangeEdgeEffect + ) + } + + @Test + fun drag_isNotEdge_oneWayHapticsDisabled_usesVibrate() { + featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false) + + coordinator.drag(cvh, false) + + verify(vibratorHelper).vibrate( + Vibrations.rangeMiddleEffect + ) + } + + @Test + fun drag_isEdge_oneWayHapticsEnabled_usesPerformHapticFeedback() { + featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true) + + coordinator.drag(cvh, true) + + verify(vibratorHelper).performHapticFeedback( + any(), + eq(HapticFeedbackConstants.SEGMENT_TICK) + ) + } + + @Test + fun drag_isNotEdge_oneWayHapticsEnabled_usesPerformHapticFeedback() { + featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true) + + coordinator.drag(cvh, false) + + verify(vibratorHelper).performHapticFeedback( + any(), + eq(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK) + ) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractorTest.kt new file mode 100644 index 000000000000..632d149c9520 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyevent/domain/interactor/KeyEventInteractorTest.kt @@ -0,0 +1,147 @@ +/* + * 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.keyevent.domain.interactor + +import android.view.KeyEvent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.back.domain.interactor.BackActionInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory +import com.android.systemui.keyguard.domain.interactor.KeyguardKeyEventInteractor +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +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.Mockito.verify +import org.mockito.junit.MockitoJUnit + +@SmallTest +@RunWith(AndroidJUnit4::class) +class KeyEventInteractorTest : SysuiTestCase() { + @JvmField @Rule var mockitoRule = MockitoJUnit.rule() + + private lateinit var keyguardInteractorWithDependencies: + KeyguardInteractorFactory.WithDependencies + @Mock private lateinit var keyguardKeyEventInteractor: KeyguardKeyEventInteractor + @Mock private lateinit var backActionInteractor: BackActionInteractor + + private lateinit var underTest: KeyEventInteractor + + @Before + fun setup() { + keyguardInteractorWithDependencies = KeyguardInteractorFactory.create() + underTest = + KeyEventInteractor( + backActionInteractor, + keyguardKeyEventInteractor, + ) + } + + @Test + fun dispatchBackKey_notHandledByKeyguardKeyEventInteractor_handledByBackActionInteractor() { + val backKeyEventActionDown = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK) + val backKeyEventActionUp = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK) + + // GIVEN back key ACTION_DOWN and ACTION_UP aren't handled by the keyguardKeyEventInteractor + whenever(keyguardKeyEventInteractor.dispatchKeyEvent(backKeyEventActionDown)) + .thenReturn(false) + whenever(keyguardKeyEventInteractor.dispatchKeyEvent(backKeyEventActionUp)) + .thenReturn(false) + + // WHEN back key event ACTION_DOWN, the event is handled even though back isn't requested + assertThat(underTest.dispatchKeyEvent(backKeyEventActionDown)).isTrue() + // THEN back event isn't handled on ACTION_DOWN + verify(backActionInteractor, never()).onBackRequested() + + // WHEN back key event ACTION_UP + assertThat(underTest.dispatchKeyEvent(backKeyEventActionUp)).isTrue() + // THEN back event is handled on ACTION_UP + verify(backActionInteractor).onBackRequested() + } + + @Test + fun dispatchKeyEvent_isNotHandledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.dispatchKeyEvent(eq(keyEvent))).thenReturn(false) + assertThat(underTest.dispatchKeyEvent(keyEvent)).isFalse() + } + + @Test + fun dispatchKeyEvent_handledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.dispatchKeyEvent(eq(keyEvent))).thenReturn(true) + assertThat(underTest.dispatchKeyEvent(keyEvent)).isTrue() + } + + @Test + fun interceptMediaKey_isNotHandledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.interceptMediaKey(eq(keyEvent))).thenReturn(false) + assertThat(underTest.interceptMediaKey(keyEvent)).isFalse() + } + + @Test + fun interceptMediaKey_handledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.interceptMediaKey(eq(keyEvent))).thenReturn(true) + assertThat(underTest.interceptMediaKey(keyEvent)).isTrue() + } + + @Test + fun dispatchKeyEventPreIme_isNotHandledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.dispatchKeyEventPreIme(eq(keyEvent))).thenReturn(false) + assertThat(underTest.dispatchKeyEventPreIme(keyEvent)).isFalse() + } + + @Test + fun dispatchKeyEventPreIme_handledByKeyguardKeyEventInteractor() { + val keyEvent = + KeyEvent( + KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_SPACE, + ) + whenever(keyguardKeyEventInteractor.dispatchKeyEventPreIme(eq(keyEvent))).thenReturn(true) + assertThat(underTest.dispatchKeyEventPreIme(keyEvent)).isTrue() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt new file mode 100644 index 000000000000..a3f7fc5fc8cf --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt @@ -0,0 +1,255 @@ +/* + * 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 android.media.AudioManager +import android.media.session.MediaSessionLegacyHelper +import android.view.KeyEvent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.back.domain.interactor.BackActionInteractor +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.media.controls.util.MediaSessionLegacyHelperWrapper +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.shade.ShadeController +import com.android.systemui.statusbar.StatusBarState +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mock +import org.mockito.Mockito.clearInvocations +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.junit.MockitoJUnit + +@SmallTest +@RunWith(AndroidJUnit4::class) +class KeyguardKeyEventInteractorTest : SysuiTestCase() { + @JvmField @Rule var mockitoRule = MockitoJUnit.rule() + + private val actionDownVolumeDownKeyEvent = + KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_VOLUME_DOWN) + private val actionDownVolumeUpKeyEvent = + KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_VOLUME_UP) + private val backKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK) + private val awakeWakefulnessMode = + WakefulnessModel(WakefulnessState.AWAKE, WakeSleepReason.OTHER, WakeSleepReason.OTHER) + private val asleepWakefulnessMode = + WakefulnessModel(WakefulnessState.ASLEEP, WakeSleepReason.OTHER, WakeSleepReason.OTHER) + + private lateinit var keyguardInteractorWithDependencies: + KeyguardInteractorFactory.WithDependencies + @Mock private lateinit var statusBarStateController: StatusBarStateController + @Mock private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager + @Mock private lateinit var shadeController: ShadeController + @Mock private lateinit var mediaSessionLegacyHelperWrapper: MediaSessionLegacyHelperWrapper + @Mock private lateinit var mediaSessionLegacyHelper: MediaSessionLegacyHelper + @Mock private lateinit var backActionInteractor: BackActionInteractor + + private lateinit var underTest: KeyguardKeyEventInteractor + + @Before + fun setup() { + whenever(mediaSessionLegacyHelperWrapper.getHelper(any())) + .thenReturn(mediaSessionLegacyHelper) + keyguardInteractorWithDependencies = KeyguardInteractorFactory.create() + underTest = + KeyguardKeyEventInteractor( + context, + statusBarStateController, + keyguardInteractorWithDependencies.keyguardInteractor, + statusBarKeyguardViewManager, + shadeController, + mediaSessionLegacyHelperWrapper, + backActionInteractor, + ) + } + + @Test + fun dispatchKeyEvent_volumeKey_dozing_handlesEvents() { + whenever(statusBarStateController.isDozing).thenReturn(true) + + assertThat(underTest.dispatchKeyEvent(actionDownVolumeDownKeyEvent)).isTrue() + verify(mediaSessionLegacyHelper) + .sendVolumeKeyEvent( + eq(actionDownVolumeDownKeyEvent), + eq(AudioManager.USE_DEFAULT_STREAM_TYPE), + eq(true) + ) + + assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isTrue() + verify(mediaSessionLegacyHelper) + .sendVolumeKeyEvent( + eq(actionDownVolumeUpKeyEvent), + eq(AudioManager.USE_DEFAULT_STREAM_TYPE), + eq(true) + ) + } + + @Test + fun dispatchKeyEvent_volumeKey_notDozing_doesNotHandleEvents() { + whenever(statusBarStateController.isDozing).thenReturn(false) + + assertThat(underTest.dispatchKeyEvent(actionDownVolumeDownKeyEvent)).isFalse() + verify(mediaSessionLegacyHelper, never()) + .sendVolumeKeyEvent( + eq(actionDownVolumeDownKeyEvent), + eq(AudioManager.USE_DEFAULT_STREAM_TYPE), + eq(true) + ) + + assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isFalse() + verify(mediaSessionLegacyHelper, never()) + .sendVolumeKeyEvent( + eq(actionDownVolumeUpKeyEvent), + eq(AudioManager.USE_DEFAULT_STREAM_TYPE), + eq(true) + ) + } + + @Test + fun dispatchKeyEvent_menuActionUp_interactiveKeyguard_collapsesShade() { + keyguardInteractorWithDependencies.repository.setWakefulnessModel(awakeWakefulnessMode) + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true) + + val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU) + assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isTrue() + verify(shadeController).animateCollapseShadeForced() + } + + @Test + fun dispatchKeyEvent_menuActionUp_interactiveShadeLocked_collapsesShade() { + keyguardInteractorWithDependencies.repository.setWakefulnessModel(awakeWakefulnessMode) + whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED) + whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true) + + // action down: does NOT collapse the shade + val actionDownMenuKeyEvent = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU) + assertThat(underTest.dispatchKeyEvent(actionDownMenuKeyEvent)).isFalse() + verify(shadeController, never()).animateCollapseShadeForced() + + // action up: collapses the shade + val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU) + assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isTrue() + verify(shadeController).animateCollapseShadeForced() + } + + @Test + fun dispatchKeyEvent_menuActionUp_nonInteractiveKeyguard_neverCollapsesShade() { + keyguardInteractorWithDependencies.repository.setWakefulnessModel(asleepWakefulnessMode) + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true) + + val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU) + assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isFalse() + verify(shadeController, never()).animateCollapseShadeForced() + } + + @Test + fun dispatchKeyEvent_spaceActionUp_interactiveKeyguard_collapsesShade() { + keyguardInteractorWithDependencies.repository.setWakefulnessModel(awakeWakefulnessMode) + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + + // action down: does NOT collapse the shade + val actionDownMenuKeyEvent = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SPACE) + assertThat(underTest.dispatchKeyEvent(actionDownMenuKeyEvent)).isFalse() + verify(shadeController, never()).animateCollapseShadeForced() + + // action up: collapses the shade + val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_SPACE) + assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isTrue() + verify(shadeController).animateCollapseShadeForced() + } + + @Test + fun dispatchKeyEventPreIme_back_keyguard_onBackRequested() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.dispatchBackKeyEventPreIme()).thenReturn(true) + + whenever(backActionInteractor.onBackRequested()).thenReturn(false) + assertThat(underTest.dispatchKeyEventPreIme(backKeyEvent)).isFalse() + verify(backActionInteractor).onBackRequested() + clearInvocations(backActionInteractor) + + whenever(backActionInteractor.onBackRequested()).thenReturn(true) + assertThat(underTest.dispatchKeyEventPreIme(backKeyEvent)).isTrue() + verify(backActionInteractor).onBackRequested() + } + + @Test + fun dispatchKeyEventPreIme_back_keyguard_SBKVMdoesNotHandle_neverOnBackRequested() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.dispatchBackKeyEventPreIme()).thenReturn(false) + whenever(backActionInteractor.onBackRequested()).thenReturn(true) + + assertThat(underTest.dispatchKeyEventPreIme(backKeyEvent)).isFalse() + verify(backActionInteractor, never()).onBackRequested() + } + + @Test + fun dispatchKeyEventPreIme_back_shade_neverOnBackRequested() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE) + whenever(statusBarKeyguardViewManager.dispatchBackKeyEventPreIme()).thenReturn(true) + whenever(backActionInteractor.onBackRequested()).thenReturn(true) + + assertThat(underTest.dispatchKeyEventPreIme(backKeyEvent)).isFalse() + verify(backActionInteractor, never()).onBackRequested() + } + + @Test + fun interceptMediaKey_keyguard_SBKVMdoesNotHandle_doesNotHandleMediaKey() { + val keyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_VOLUME_UP) + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.interceptMediaKey(eq(keyEvent))).thenReturn(false) + + assertThat(underTest.interceptMediaKey(keyEvent)).isFalse() + verify(statusBarKeyguardViewManager).interceptMediaKey(eq(keyEvent)) + } + + @Test + fun interceptMediaKey_keyguard_handleMediaKey() { + val keyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_VOLUME_UP) + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(statusBarKeyguardViewManager.interceptMediaKey(eq(keyEvent))).thenReturn(true) + + assertThat(underTest.interceptMediaKey(keyEvent)).isTrue() + verify(statusBarKeyguardViewManager).interceptMediaKey(eq(keyEvent)) + } + + @Test + fun interceptMediaKey_shade_doesNotHandleMediaKey() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE) + + assertThat( + underTest.interceptMediaKey( + KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_VOLUME_UP) + ) + ) + .isFalse() + verify(statusBarKeyguardViewManager, never()).interceptMediaKey(any()) + } +} 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 8545b894ad41..3ad3c15f158a 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,6 +18,8 @@ package com.android.systemui.statusbar.phone; import static android.view.Display.DEFAULT_DISPLAY; +import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -29,8 +31,10 @@ import android.app.ActivityManager; import android.app.StatusBarManager; import android.os.PowerManager; import android.os.UserHandle; +import android.os.VibrationEffect; import android.os.Vibrator; import android.testing.AndroidTestingRunner; +import android.view.HapticFeedbackConstants; import android.view.WindowInsets; import androidx.test.filters.SmallTest; @@ -42,6 +46,7 @@ import com.android.internal.view.AppearanceRegion; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; import com.android.systemui.assist.AssistManager; +import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.qs.QSHost; @@ -98,6 +103,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { @Mock private UserTracker mUserTracker; @Mock private QSHost mQSHost; @Mock private ActivityStarter mActivityStarter; + private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); CentralSurfacesCommandQueueCallbacks mSbcqCallbacks; @@ -134,7 +140,8 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { mCameraLauncherLazy, mUserTracker, mQSHost, - mActivityStarter); + mActivityStarter, + mFeatureFlags); when(mUserTracker.getUserHandle()).thenReturn( UserHandle.of(ActivityManager.getCurrentUser())); @@ -241,4 +248,24 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { verifyZeroInteractions(mSystemBarAttributesListener); } + + @Test + public void vibrateOnNavigationKeyDown_oneWayHapticsDisabled_usesVibrate() { + mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false); + + mSbcqCallbacks.vibrateOnNavigationKeyDown(); + + verify(mVibratorHelper).vibrate(VibrationEffect.EFFECT_TICK); + } + + @Test + public void vibrateOnNavigationKeyDown_oneWayHapticsEnabled_usesPerformHapticFeedback() { + mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true); + + mSbcqCallbacks.vibrateOnNavigationKeyDown(); + + verify(mShadeViewController).performHapticFeedback( + HapticFeedbackConstants.GESTURE_START + ); + } } diff --git a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java index c9fb78546c42..97e5c6fbd8c3 100644 --- a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java +++ b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java @@ -57,7 +57,8 @@ public class AuthenticationStatsCollector { @NonNull private final Map<Integer, AuthenticationStats> mUserAuthenticationStatsMap; - @NonNull private AuthenticationStatsPersister mAuthenticationStatsPersister; + // TODO(b/295582896): Find a way to make this NonNull + @Nullable private AuthenticationStatsPersister mAuthenticationStatsPersister; @NonNull private BiometricNotification mBiometricNotification; private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @@ -92,8 +93,9 @@ public class AuthenticationStatsCollector { /** Update total authentication and rejected attempts. */ public void authenticate(int userId, boolean authenticated) { - // Initialize mUserAuthenticationStatsMap when authenticate to ensure SharedPreferences - // are ready for application use and avoid ramdump issue. + // SharedPreference is not ready when starting system server, initialize + // mUserAuthenticationStatsMap in authentication to ensure SharedPreference + // is ready for application use. if (mUserAuthenticationStatsMap.isEmpty()) { initializeUserAuthenticationStatsMap(); } @@ -164,6 +166,9 @@ public class AuthenticationStatsCollector { } private void onUserRemoved(final int userId) { + if (mAuthenticationStatsPersister == null) { + initializeUserAuthenticationStatsMap(); + } mUserAuthenticationStatsMap.remove(userId); mAuthenticationStatsPersister.removeFrrStats(userId); } diff --git a/services/core/java/com/android/server/biometrics/AuthenticationStatsPersister.java b/services/core/java/com/android/server/biometrics/AuthenticationStatsPersister.java index 7217956c61a5..21e93a8bc024 100644 --- a/services/core/java/com/android/server/biometrics/AuthenticationStatsPersister.java +++ b/services/core/java/com/android/server/biometrics/AuthenticationStatsPersister.java @@ -98,7 +98,7 @@ public class AuthenticationStatsPersister { */ public void removeFrrStats(int userId) { try { - // Copy into a new HashSet to avoid iterator exception. + // Copy into a new HashSet to allow modification. Set<String> frrStatsSet = new HashSet<>(readFrrStats()); // Remove the old authentication stat for the user if it exists. @@ -122,7 +122,7 @@ public class AuthenticationStatsPersister { public void persistFrrStats(int userId, int totalAttempts, int rejectedAttempts, int enrollmentNotifications, int modality) { try { - // Copy into a new HashSet to avoid iterator exception. + // Copy into a new HashSet to allow modification. Set<String> frrStatsSet = new HashSet<>(readFrrStats()); // Remove the old authentication stat for the user if it exists. diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java b/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java index 230ba63fe5e1..2ff695d7b85d 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java +++ b/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java @@ -87,11 +87,11 @@ public class BiometricNotificationUtils { public static void showFaceEnrollNotification(@NonNull Context context) { final String name = - context.getString(R.string.face_recalibrate_notification_name); + context.getString(R.string.device_unlock_notification_name); final String title = - context.getString(R.string.fingerprint_setup_notification_title); + context.getString(R.string.alternative_unlock_setup_notification_title); final String content = - context.getString(R.string.face_setup_notification_title); + context.getString(R.string.alternative_face_setup_notification_content); final Intent intent = new Intent(FACE_ENROLL_ACTION); intent.setPackage(SETTINGS_PACKAGE); @@ -112,11 +112,11 @@ public class BiometricNotificationUtils { public static void showFingerprintEnrollNotification(@NonNull Context context) { final String name = - context.getString(R.string.fingerprint_recalibrate_notification_name); + context.getString(R.string.device_unlock_notification_name); final String title = - context.getString(R.string.fingerprint_setup_notification_title); + context.getString(R.string.alternative_unlock_setup_notification_title); final String content = - context.getString(R.string.fingerprint_setup_notification_content); + context.getString(R.string.alternative_fp_setup_notification_content); final Intent intent = new Intent(FINGERPRINT_ENROLL_ACTION); intent.setPackage(SETTINGS_PACKAGE); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 2a617c529f38..6509126dcc60 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -6132,6 +6132,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mVisibilityStateComputer.dump(pw); p.println(" mInFullscreenMode=" + mInFullscreenMode); p.println(" mSystemReady=" + mSystemReady + " mInteractive=" + mIsInteractive); + p.println(" ENABLE_HIDE_IME_CAPTION_BAR=" + + InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR); p.println(" mSettingsObserver=" + mSettingsObserver); p.println(" mStylusIds=" + (mStylusIds != null ? Arrays.toString(mStylusIds.toArray()) : "")); diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index b2d3fca16112..100c63863f7f 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -25,8 +25,6 @@ import static android.service.notification.NotificationListenerService.Ranking.U import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_POSITIVE; import android.annotation.Nullable; -import android.app.ActivityManager; -import android.app.IActivityManager; import android.app.KeyguardManager; import android.app.Notification; import android.app.NotificationChannel; @@ -48,6 +46,7 @@ import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.PowerManager; +import android.os.Trace; import android.os.UserHandle; import android.os.VibrationEffect; import android.provider.Settings; @@ -98,8 +97,7 @@ public final class NotificationRecord { // the period after which a notification is updated where it can make sound private static final int MAX_SOUND_DELAY_MS = 2000; private final StatusBarNotification sbn; - IActivityManager mAm; - UriGrantsManagerInternal mUgmInternal; + private final UriGrantsManagerInternal mUgmInternal; final int mTargetSdkVersion; final int mOriginalFlags; private final Context mContext; @@ -223,7 +221,6 @@ public final class NotificationRecord { this.sbn = sbn; mTargetSdkVersion = LocalServices.getService(PackageManagerInternal.class) .getPackageTargetSdkVersion(sbn.getPackageName()); - mAm = ActivityManager.getService(); mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class); mOriginalFlags = sbn.getNotification().flags; mRankingTimeMs = calculateRankingTimeMs(0L); @@ -1387,18 +1384,27 @@ public final class NotificationRecord { * Collect all {@link Uri} that should have permission granted to whoever * will be rendering it. */ - protected void calculateGrantableUris() { - final Notification notification = getNotification(); - notification.visitUris((uri) -> { - visitGrantableUri(uri, false, false); - }); - - if (notification.getChannelId() != null) { - NotificationChannel channel = getChannel(); - if (channel != null) { - visitGrantableUri(channel.getSound(), (channel.getUserLockedFields() - & NotificationChannel.USER_LOCKED_SOUND) != 0, true); + private void calculateGrantableUris() { + Trace.beginSection("NotificationRecord.calculateGrantableUris"); + try { + // We can't grant URI permissions from system. + final int sourceUid = getSbn().getUid(); + if (sourceUid == android.os.Process.SYSTEM_UID) return; + + final Notification notification = getNotification(); + notification.visitUris((uri) -> { + visitGrantableUri(uri, false, false); + }); + + if (notification.getChannelId() != null) { + NotificationChannel channel = getChannel(); + if (channel != null) { + visitGrantableUri(channel.getSound(), (channel.getUserLockedFields() + & NotificationChannel.USER_LOCKED_SOUND) != 0, true); + } } + } finally { + Trace.endSection(); } } @@ -1413,13 +1419,14 @@ public final class NotificationRecord { private void visitGrantableUri(Uri uri, boolean userOverriddenUri, boolean isSound) { if (uri == null || !ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) return; - // We can't grant Uri permissions from system - final int sourceUid = getSbn().getUid(); - if (sourceUid == android.os.Process.SYSTEM_UID) return; + if (mGrantableUris != null && mGrantableUris.contains(uri)) { + return; // already verified this URI + } + final int sourceUid = getSbn().getUid(); final long ident = Binder.clearCallingIdentity(); try { - // This will throw SecurityException if caller can't grant + // This will throw a SecurityException if the caller can't grant. mUgmInternal.checkGrantUriPermission(sourceUid, null, ContentProvider.getUriWithoutUserId(uri), Intent.FLAG_GRANT_READ_URI_PERMISSION, diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5a6851ea196c..d0f86c0a9239 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -224,6 +224,9 @@ import static com.android.server.wm.IdentifierProto.TITLE; import static com.android.server.wm.IdentifierProto.USER_ID; import static com.android.server.wm.LetterboxConfiguration.DEFAULT_LETTERBOX_ASPECT_RATIO_FOR_MULTI_WINDOW; import static com.android.server.wm.LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO; +import static com.android.server.wm.StartingData.AFTER_TRANSACTION_COPY_TO_CLIENT; +import static com.android.server.wm.StartingData.AFTER_TRANSACTION_IDLE; +import static com.android.server.wm.StartingData.AFTER_TRANSACTION_REMOVE_DIRECTLY; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_PREDICT_BACK; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS; @@ -2684,6 +2687,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (isTransferringSplashScreen()) { return true; } + // Only do transfer after transaction has done when starting window exist. + if (mStartingData != null && mStartingData.mWaitForSyncTransactionCommit) { + mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_COPY_TO_CLIENT; + return true; + } requestCopySplashScreen(); return isTransferringSplashScreen(); } @@ -2844,11 +2852,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mStartingData == null) { return; } - mStartingData.mWaitForSyncTransactionCommit = false; - if (mStartingData.mRemoveAfterTransaction) { - mStartingData.mRemoveAfterTransaction = false; - removeStartingWindowAnimation(mStartingData.mPrepareRemoveAnimation); + final StartingData lastData = mStartingData; + lastData.mWaitForSyncTransactionCommit = false; + if (lastData.mRemoveAfterTransaction == AFTER_TRANSACTION_REMOVE_DIRECTLY) { + removeStartingWindowAnimation(lastData.mPrepareRemoveAnimation); + } else if (lastData.mRemoveAfterTransaction == AFTER_TRANSACTION_COPY_TO_CLIENT) { + removeStartingWindow(); } + lastData.mRemoveAfterTransaction = AFTER_TRANSACTION_IDLE; } void removeStartingWindowAnimation(boolean prepareAnimation) { @@ -2875,7 +2886,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mStartingData != null) { if (mStartingData.mWaitForSyncTransactionCommit || mTransitionController.inCollectingTransition(startingWindow)) { - mStartingData.mRemoveAfterTransaction = true; + mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY; mStartingData.mPrepareRemoveAnimation = prepareAnimation; return; } diff --git a/services/core/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java index 34806bd023a0..a23547ef1d5b 100644 --- a/services/core/java/com/android/server/wm/StartingData.java +++ b/services/core/java/com/android/server/wm/StartingData.java @@ -16,6 +16,8 @@ package com.android.server.wm; +import android.annotation.IntDef; + import com.android.server.wm.StartingSurfaceController.StartingSurface; /** @@ -23,6 +25,20 @@ import com.android.server.wm.StartingSurfaceController.StartingSurface; */ public abstract class StartingData { + /** Nothing need to do after transaction */ + static final int AFTER_TRANSACTION_IDLE = 0; + /** Remove the starting window directly after transaction done. */ + static final int AFTER_TRANSACTION_REMOVE_DIRECTLY = 1; + /** Do copy splash screen to client after transaction done. */ + static final int AFTER_TRANSACTION_COPY_TO_CLIENT = 2; + + @IntDef(prefix = { "AFTER_TRANSACTION" }, value = { + AFTER_TRANSACTION_IDLE, + AFTER_TRANSACTION_REMOVE_DIRECTLY, + AFTER_TRANSACTION_COPY_TO_CLIENT, + }) + @interface AfterTransaction {} + protected final WindowManagerService mService; protected final int mTypeParams; @@ -60,7 +76,7 @@ public abstract class StartingData { * This starting window should be removed after applying the start transaction of transition, * which ensures the app window has shown. */ - boolean mRemoveAfterTransaction; + @AfterTransaction int mRemoveAfterTransaction; /** Whether to prepare the removal animation. */ boolean mPrepareRemoveAnimation; diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java index 285a20c0f9cb..746fb53c7254 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java @@ -36,6 +36,9 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.server.biometrics.sensors.BiometricNotification; @@ -47,6 +50,8 @@ import org.mockito.MockitoAnnotations; import java.io.File; +@Presubmit +@SmallTest public class AuthenticationStatsCollectorTest { private AuthenticationStatsCollector mAuthenticationStatsCollector; diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsPersisterTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsPersisterTest.java index 66a8ff31018a..dde2a3c2cfd7 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsPersisterTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsPersisterTest.java @@ -29,6 +29,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.SharedPreferences; import android.hardware.biometrics.BiometricsProtoEnums; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; import org.json.JSONException; import org.json.JSONObject; @@ -45,6 +48,8 @@ import java.io.File; import java.util.List; import java.util.Set; +@Presubmit +@SmallTest public class AuthenticationStatsPersisterTest { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java index fae92d9ac738..f83a1df358bd 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java @@ -36,7 +36,7 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.fail; +import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -44,7 +44,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import android.app.IActivityManager; import android.app.Notification; import android.app.Notification.Builder; import android.app.NotificationChannel; @@ -76,6 +75,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.R; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.server.LocalServices; import com.android.server.UiServiceTestCase; import com.android.server.uri.UriGrantsManagerInternal; @@ -850,84 +850,78 @@ public class NotificationRecordTest extends UiServiceTestCase { @Test public void testCalculateGrantableUris_PappProvided() { - IActivityManager am = mock(IActivityManager.class); UriGrantsManagerInternal ugm = mock(UriGrantsManagerInternal.class); when(ugm.checkGrantUriPermission(anyInt(), eq(null), any(Uri.class), anyInt(), anyInt())).thenThrow(new SecurityException()); + LocalServices.removeServiceForTest(UriGrantsManagerInternal.class); + LocalServices.addService(UriGrantsManagerInternal.class, ugm); + channel.setSound(null, null); Notification n = new Notification.Builder(mContext, channel.getId()) .setSmallIcon(Icon.createWithContentUri(Uri.parse("content://something"))) .build(); StatusBarNotification sbn = new StatusBarNotification(PKG_P, PKG_P, id1, tag1, uid, uid, n, mUser, null, uid); - NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); - record.mAm = am; - record.mUgmInternal = ugm; - - try { - record.calculateGrantableUris(); - fail("App provided uri for p targeting app should throw exception"); - } catch (SecurityException e) { - // expected - } + + assertThrows("App provided uri for p targeting app should throw exception", + SecurityException.class, + () -> new NotificationRecord(mMockContext, sbn, channel)); } @Test public void testCalculateGrantableUris_PappProvided_invalidSound() { - IActivityManager am = mock(IActivityManager.class); UriGrantsManagerInternal ugm = mock(UriGrantsManagerInternal.class); when(ugm.checkGrantUriPermission(anyInt(), eq(null), any(Uri.class), anyInt(), anyInt())).thenThrow(new SecurityException()); + LocalServices.removeServiceForTest(UriGrantsManagerInternal.class); + LocalServices.addService(UriGrantsManagerInternal.class, ugm); + channel.setSound(Uri.parse("content://something"), mock(AudioAttributes.class)); Notification n = mock(Notification.class); when(n.getChannelId()).thenReturn(channel.getId()); StatusBarNotification sbn = new StatusBarNotification(PKG_P, PKG_P, id1, tag1, uid, uid, n, mUser, null, uid); - NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); - record.mAm = am; - record.mUgmInternal = ugm; - record.calculateGrantableUris(); + NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); assertEquals(Settings.System.DEFAULT_NOTIFICATION_URI, record.getSound()); } @Test public void testCalculateGrantableUris_PuserOverridden() { - IActivityManager am = mock(IActivityManager.class); UriGrantsManagerInternal ugm = mock(UriGrantsManagerInternal.class); when(ugm.checkGrantUriPermission(anyInt(), eq(null), any(Uri.class), anyInt(), anyInt())).thenThrow(new SecurityException()); + LocalServices.removeServiceForTest(UriGrantsManagerInternal.class); + LocalServices.addService(UriGrantsManagerInternal.class, ugm); + channel.lockFields(NotificationChannel.USER_LOCKED_SOUND); Notification n = mock(Notification.class); when(n.getChannelId()).thenReturn(channel.getId()); StatusBarNotification sbn = new StatusBarNotification(PKG_P, PKG_P, id1, tag1, uid, uid, n, mUser, null, uid); - NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); - record.mAm = am; - record.calculateGrantableUris(); + new NotificationRecord(mMockContext, sbn, channel); // should not throw } @Test public void testCalculateGrantableUris_prePappProvided() { - IActivityManager am = mock(IActivityManager.class); UriGrantsManagerInternal ugm = mock(UriGrantsManagerInternal.class); when(ugm.checkGrantUriPermission(anyInt(), eq(null), any(Uri.class), anyInt(), anyInt())).thenThrow(new SecurityException()); + LocalServices.removeServiceForTest(UriGrantsManagerInternal.class); + LocalServices.addService(UriGrantsManagerInternal.class, ugm); + Notification n = mock(Notification.class); when(n.getChannelId()).thenReturn(channel.getId()); StatusBarNotification sbn = new StatusBarNotification(PKG_O, PKG_O, id1, tag1, uid, uid, n, mUser, null, uid); - NotificationRecord record = new NotificationRecord(mMockContext, sbn, channel); - record.mAm = am; - record.calculateGrantableUris(); - // should not throw + new NotificationRecord(mMockContext, sbn, channel); // should not throw } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java b/services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java index 7b4392b5e15d..56c3ec0ffe2d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java @@ -317,7 +317,8 @@ public class AssistDataRequesterTest { assertEquals("Expected " + numPendingScreenshots + " pending screenshots, got " + mDataRequester.getPendingScreenshotCount(), numPendingScreenshots, mDataRequester.getPendingScreenshotCount()); - assertFalse("Expected request NOT completed", mCallbacks.mRequestCompleted); + assertEquals("Expected request NOT completed, unless no pending data", + numPendingData == 0 && numPendingScreenshots == 0, mCallbacks.mRequestCompleted); mGate.countDown(); waitForIdle(mHandler); assertEquals("Expected " + numReceivedData + " data, received " @@ -376,14 +377,7 @@ public class AssistDataRequesterTest { @Override public void onAssistRequestCompleted() { - mHandler.post(() -> { - try { - mGate.await(10, TimeUnit.SECONDS); - mRequestCompleted = true; - } catch (InterruptedException e) { - Log.e(TAG, "Failed to wait", e); - } - }); + mRequestCompleted = true; } } } |