diff options
344 files changed, 8083 insertions, 1493 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index c231b30503fa..c477a75d68ec 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -249,6 +249,14 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "android.app.usage.flags-aconfig-java-host", + aconfig_declarations: "android.app.usage.flags-aconfig", + host_supported: true, + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + + // OS aconfig_declarations { name: "android.os.flags-aconfig", diff --git a/core/api/current.txt b/core/api/current.txt index 95af71cfa074..5abb92b1c2e4 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12368,6 +12368,7 @@ package android.content.pm { public final class ModuleInfo implements android.os.Parcelable { method public int describeContents(); + method @FlaggedApi("android.content.pm.provide_info_of_apk_in_apex") @NonNull public java.util.Collection<java.lang.String> getApkInApexPackageNames(); method @Nullable public CharSequence getName(); method @Nullable public String getPackageName(); method public boolean isHidden(); @@ -12378,6 +12379,7 @@ package android.content.pm { public class PackageInfo implements android.os.Parcelable { ctor public PackageInfo(); method public int describeContents(); + method @FlaggedApi("android.content.pm.provide_info_of_apk_in_apex") @Nullable public String getApexPackageName(); method @FlaggedApi("android.content.pm.archiving") public long getArchiveTimeMillis(); method public long getLongVersionCode(); method public void setLongVersionCode(long); @@ -53956,8 +53958,10 @@ package android.view { field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH"; field public static final String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE"; field public static final String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE"; + field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"; field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE"; field public static final String PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE"; + field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES = "android.window.PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES"; field public static final String PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS = "android.window.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_BOUNDS_APIS"; field public static final String PROPERTY_COMPAT_ENABLE_FAKE_FOCUS = "android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS"; field public static final String PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION = "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ad8b6852a6f4..572be192fb3e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1010,6 +1010,7 @@ package android.content.pm { field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH = 264304459L; // 0xfc0f74bL field public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = 264301586L; // 0xfc0ec12L field public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L; // 0xfb1048bL + field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = 273509367L; // 0x104d6bf7L field public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION = 254631730L; // 0xf2d5f32L field public static final long OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE = 266124927L; // 0xfdcbe7fL field public static final long OVERRIDE_MIN_ASPECT_RATIO = 174042980L; // 0xa5faf64L diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 12da66515c07..30871e938e68 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -16,6 +16,7 @@ package android.content.pm; +import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.IntDef; import android.annotation.NonNull; @@ -42,6 +43,7 @@ import android.util.Printer; import android.window.OnBackInvokedCallback; import com.android.internal.util.Parcelling; +import com.android.window.flags.Flags; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -1099,6 +1101,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { @ChangeId @Overridable @Disabled + @TestApi + @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API) public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = 273509367L; // buganizer id diff --git a/core/java/android/content/pm/ModuleInfo.java b/core/java/android/content/pm/ModuleInfo.java index a7306a311ad8..a1c874725d4b 100644 --- a/core/java/android/content/pm/ModuleInfo.java +++ b/core/java/android/content/pm/ModuleInfo.java @@ -16,10 +16,15 @@ package android.content.pm; +import android.annotation.FlaggedApi; +import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Parcel; import android.os.Parcelable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.Objects; /** @@ -46,6 +51,13 @@ public final class ModuleInfo implements Parcelable { /** Whether or not this module is hidden from the user. */ private boolean mHidden; + /** + * The list of the package names of all APK-in-APEX apps in the module, or + * null if there are none. + */ + @Nullable + private List<String> mApkInApexPackageNames; + // TODO: Decide whether we need an additional metadata bundle to support out of band // updates to ModuleInfo. // @@ -61,6 +73,9 @@ public final class ModuleInfo implements Parcelable { mPackageName = orig.mPackageName; mHidden = orig.mHidden; mApexModuleName = orig.mApexModuleName; + if (orig.mApkInApexPackageNames != null) { + mApkInApexPackageNames = List.copyOf(orig.mApkInApexPackageNames); + } } /** @hide Sets the public name of this module. */ @@ -107,6 +122,25 @@ public final class ModuleInfo implements Parcelable { return mApexModuleName; } + /** @hide Sets the list of the package name of APK-in-APEX apps in this module. */ + public ModuleInfo setApkInApexPackageNames(@NonNull Collection<String> apkInApexPackageNames) { + Objects.requireNonNull(apkInApexPackageNames); + mApkInApexPackageNames = List.copyOf(apkInApexPackageNames); + return this; + } + + /** + * Gets the list of the package name of all APK-in-APEX apps in the module. + */ + @NonNull + @FlaggedApi(android.content.pm.Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX) + public Collection<String> getApkInApexPackageNames() { + if (mApkInApexPackageNames == null) { + return Collections.emptyList(); + } + return mApkInApexPackageNames; + } + /** Returns a string representation of this object. */ public String toString() { return "ModuleInfo{" @@ -125,6 +159,7 @@ public final class ModuleInfo implements Parcelable { hashCode = 31 * hashCode + Objects.hashCode(mName); hashCode = 31 * hashCode + Objects.hashCode(mPackageName); hashCode = 31 * hashCode + Objects.hashCode(mApexModuleName); + hashCode = 31 * hashCode + Objects.hashCode(mApkInApexPackageNames); hashCode = 31 * hashCode + Boolean.hashCode(mHidden); return hashCode; } @@ -138,6 +173,7 @@ public final class ModuleInfo implements Parcelable { return Objects.equals(mName, other.mName) && Objects.equals(mPackageName, other.mPackageName) && Objects.equals(mApexModuleName, other.mApexModuleName) + && Objects.equals(mApkInApexPackageNames, other.mApkInApexPackageNames) && mHidden == other.mHidden; } @@ -147,6 +183,8 @@ public final class ModuleInfo implements Parcelable { dest.writeString(mPackageName); dest.writeBoolean(mHidden); dest.writeString(mApexModuleName); + // Parcel#writeStringList handles null case, we can use it directly + dest.writeStringList(mApkInApexPackageNames); } private ModuleInfo(Parcel source) { @@ -154,6 +192,7 @@ public final class ModuleInfo implements Parcelable { mPackageName = source.readString(); mHidden = source.readBoolean(); mApexModuleName = source.readString(); + mApkInApexPackageNames = source.createStringArrayList(); } public static final @android.annotation.NonNull Parcelable.Creator<ModuleInfo> CREATOR = diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index 4f61613b9c6e..c1c9928e0571 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -499,6 +499,16 @@ public class PackageInfo implements Parcelable { */ public boolean isActiveApex; + /** + * If the package is an APEX package (i.e. the value of {@link #isApex} + * is true), this field is the package name of the APEX. If the package + * is one APK-in-APEX app, this field is the package name of the parent + * APEX that contains the app. If the package is not one of the above + * two cases, this field is {@code null}. + */ + @Nullable + private String mApexPackageName; + public PackageInfo() { } @@ -535,6 +545,26 @@ public class PackageInfo implements Parcelable { mArchiveTimeMillis = value; } + /** + * If the package is an APEX package (i.e. the value of {@link #isApex} + * is true), returns the package name of the APEX. If the package + * is one APK-in-APEX app, returns the package name of the parent + * APEX that contains the app. If the package is not one of the above + * two cases, returns {@code null}. + */ + @Nullable + @FlaggedApi(android.content.pm.Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX) + public String getApexPackageName() { + return mApexPackageName; + } + + /** + * @hide + */ + public void setApexPackageName(@Nullable String apexPackageName) { + mApexPackageName = apexPackageName; + } + @Override public String toString() { return "PackageInfo{" @@ -603,6 +633,12 @@ public class PackageInfo implements Parcelable { dest.writeBoolean(isApex); dest.writeBoolean(isActiveApex); dest.writeLong(mArchiveTimeMillis); + if (mApexPackageName != null) { + dest.writeInt(1); + dest.writeString8(mApexPackageName); + } else { + dest.writeInt(0); + } dest.restoreAllowSquashing(prevAllowSquashing); } @@ -669,5 +705,9 @@ public class PackageInfo implements Parcelable { isApex = source.readBoolean(); isActiveApex = source.readBoolean(); mArchiveTimeMillis = source.readLong(); + int hasApexPackageName = source.readInt(); + if (hasApexPackageName != 0) { + mApexPackageName = source.readString8(); + } } } diff --git a/core/java/android/content/rollback/OWNERS b/core/java/android/content/rollback/OWNERS index 3093fd686a21..8e5a0d8af550 100644 --- a/core/java/android/content/rollback/OWNERS +++ b/core/java/android/content/rollback/OWNERS @@ -1,5 +1,5 @@ -# Bug component: 557916 +# Bug component: 819107 -narayan@google.com -nandana@google.com -olilan@google.com +ancr@google.com +harshitmahajan@google.com +robertogil@google.com diff --git a/core/java/android/credentials/ui/Constants.java b/core/java/android/credentials/ui/Constants.java index 7092f291eea5..37f850bc46c5 100644 --- a/core/java/android/credentials/ui/Constants.java +++ b/core/java/android/credentials/ui/Constants.java @@ -29,6 +29,13 @@ public class Constants { public static final String EXTRA_RESULT_RECEIVER = "android.credentials.ui.extra.RESULT_RECEIVER"; + /** + * The intent extra key for indicating whether the bottom sheet should be started directly + * on the 'All Options' screen. + */ + public static final String EXTRA_REQ_FOR_ALL_OPTIONS = + "android.credentials.ui.extra.REQ_FOR_ALL_OPTIONS"; + /** The intent action for when the enabled Credential Manager providers has been updated. */ public static final String CREDMAN_ENABLED_PROVIDERS_UPDATED = "android.credentials.ui.action.CREDMAN_ENABLED_PROVIDERS_UPDATED"; diff --git a/core/java/android/credentials/ui/IntentFactory.java b/core/java/android/credentials/ui/IntentFactory.java index 5e8372d68eb2..49321d514128 100644 --- a/core/java/android/credentials/ui/IntentFactory.java +++ b/core/java/android/credentials/ui/IntentFactory.java @@ -35,6 +35,31 @@ import java.util.ArrayList; */ @TestApi public class IntentFactory { + + /** + * Generate a new launch intent to the Credential Selector UI. + * + * @hide + */ + @NonNull + public static Intent createCredentialSelectorIntent( + @NonNull RequestInfo requestInfo, + @SuppressLint("ConcreteCollection") // Concrete collection needed for marshalling. + @NonNull + ArrayList<ProviderData> enabledProviderDataList, + @SuppressLint("ConcreteCollection") // Concrete collection needed for marshalling. + @NonNull + ArrayList<DisabledProviderData> disabledProviderDataList, + @NonNull ResultReceiver resultReceiver, + boolean isRequestForAllOptions) { + + Intent intent = createCredentialSelectorIntent(requestInfo, enabledProviderDataList, + disabledProviderDataList, resultReceiver); + intent.putExtra(Constants.EXTRA_REQ_FOR_ALL_OPTIONS, isRequestForAllOptions); + + return intent; + } + /** Generate a new launch intent to the Credential Selector UI. */ @NonNull public static Intent createCredentialSelectorIntent( diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl index 6626baffd134..7bea9aeeb86b 100644 --- a/core/java/android/hardware/input/IInputManager.aidl +++ b/core/java/android/hardware/input/IInputManager.aidl @@ -25,6 +25,7 @@ import android.hardware.input.IInputDeviceBatteryListener; import android.hardware.input.IInputDeviceBatteryState; import android.hardware.input.IKeyboardBacklightListener; import android.hardware.input.IKeyboardBacklightState; +import android.hardware.input.IStickyModifierStateListener; import android.hardware.input.ITabletModeChangedListener; import android.hardware.input.TouchCalibration; import android.os.CombinedVibration; @@ -241,4 +242,14 @@ interface IInputManager { void unregisterKeyboardBacklightListener(IKeyboardBacklightListener listener); HostUsiVersion getHostUsiVersionFromDisplayConfig(int displayId); + + @EnforcePermission("MONITOR_STICKY_MODIFIER_STATE") + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + + "android.Manifest.permission.MONITOR_STICKY_MODIFIER_STATE)") + void registerStickyModifierStateListener(IStickyModifierStateListener listener); + + @EnforcePermission("MONITOR_STICKY_MODIFIER_STATE") + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + + "android.Manifest.permission.MONITOR_STICKY_MODIFIER_STATE)") + void unregisterStickyModifierStateListener(IStickyModifierStateListener listener); } diff --git a/core/java/android/hardware/input/IStickyModifierStateListener.aidl b/core/java/android/hardware/input/IStickyModifierStateListener.aidl new file mode 100644 index 000000000000..bd139ab75698 --- /dev/null +++ b/core/java/android/hardware/input/IStickyModifierStateListener.aidl @@ -0,0 +1,26 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.input; + +/** @hide */ +oneway interface IStickyModifierStateListener { + + /** + * Called when the sticky modifier state is changed when A11y Sticky keys feature is enabled + */ + void onStickyModifierStateChanged(int modifierState, int lockedModifierState); +} diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index f941ad87bac5..4ebbde732747 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -1297,6 +1297,42 @@ public final class InputManager { } /** + * Registers a Sticky modifier state change listener to be notified about {@link + * StickyModifierState} changes. + * + * @param executor an executor on which the callback will be called + * @param listener the {@link StickyModifierStateListener} + * @throws IllegalArgumentException if {@code listener} has already been registered previously. + * @throws NullPointerException if {@code listener} or {@code executor} is null. + * @hide + * @see #unregisterStickyModifierStateListener(StickyModifierStateListener) + */ + @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + public void registerStickyModifierStateListener(@NonNull Executor executor, + @NonNull StickyModifierStateListener listener) throws IllegalArgumentException { + if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) { + return; + } + mGlobal.registerStickyModifierStateListener(executor, listener); + } + + /** + * Unregisters a previously added Sticky modifier state change listener. + * + * @param listener the {@link StickyModifierStateListener} + * @hide + * @see #registerStickyModifierStateListener(Executor, StickyModifierStateListener) + */ + @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + public void unregisterStickyModifierStateListener( + @NonNull StickyModifierStateListener listener) { + if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) { + return; + } + mGlobal.unregisterStickyModifierStateListener(listener); + } + + /** * A callback used to be notified about battery state changes for an input device. The * {@link #onBatteryStateChanged(int, long, BatteryState)} method will be called once after the * listener is successfully registered to provide the initial battery state of the device. @@ -1378,4 +1414,23 @@ public final class InputManager { void onKeyboardBacklightChanged( int deviceId, @NonNull KeyboardBacklightState state, boolean isTriggeredByKeyPress); } + + /** + * A callback used to be notified about sticky modifier state changes when A11y Sticky keys + * feature is enabled. + * + * @see #registerStickyModifierStateListener(Executor, StickyModifierStateListener) + * @see #unregisterStickyModifierStateListener(StickyModifierStateListener) + * @hide + */ + public interface StickyModifierStateListener { + /** + * Called when the sticky modifier state changes. + * This method will be called once after the listener is successfully registered to provide + * the initial modifier state. + * + * @param state the new sticky modifier state, never null. + */ + void onStickyModifierStateChanged(@NonNull StickyModifierState state); + } } diff --git a/core/java/android/hardware/input/InputManagerGlobal.java b/core/java/android/hardware/input/InputManagerGlobal.java index 24a69116e77e..7c104a0ca946 100644 --- a/core/java/android/hardware/input/InputManagerGlobal.java +++ b/core/java/android/hardware/input/InputManagerGlobal.java @@ -27,6 +27,7 @@ import android.hardware.input.InputManager.InputDeviceBatteryListener; import android.hardware.input.InputManager.InputDeviceListener; import android.hardware.input.InputManager.KeyboardBacklightListener; import android.hardware.input.InputManager.OnTabletModeChangedListener; +import android.hardware.input.InputManager.StickyModifierStateListener; import android.hardware.lights.Light; import android.hardware.lights.LightState; import android.hardware.lights.LightsManager; @@ -52,6 +53,7 @@ import android.view.InputDevice; import android.view.InputEvent; import android.view.InputMonitor; import android.view.KeyCharacterMap; +import android.view.KeyEvent; import android.view.PointerIcon; import com.android.internal.annotations.GuardedBy; @@ -100,6 +102,14 @@ public final class InputManagerGlobal { @GuardedBy("mKeyboardBacklightListenerLock") @Nullable private IKeyboardBacklightListener mKeyboardBacklightListener; + private final Object mStickyModifierStateListenerLock = new Object(); + @GuardedBy("mStickyModifierStateListenerLock") + @Nullable + private ArrayList<StickyModifierStateListenerDelegate> mStickyModifierStateListeners; + @GuardedBy("mStickyModifierStateListenerLock") + @Nullable + private IStickyModifierStateListener mStickyModifierStateListener; + // InputDeviceSensorManager gets notified synchronously from the binder thread when input // devices change, so it must be synchronized with the input device listeners. @GuardedBy("mInputDeviceListeners") @@ -905,6 +915,158 @@ public final class InputManagerGlobal { } } + private static final class StickyModifierStateListenerDelegate { + final InputManager.StickyModifierStateListener mListener; + final Executor mExecutor; + + StickyModifierStateListenerDelegate(StickyModifierStateListener listener, + Executor executor) { + mListener = listener; + mExecutor = executor; + } + + void notifyStickyModifierStateChange(int modifierState, int lockedModifierState) { + mExecutor.execute(() -> + mListener.onStickyModifierStateChanged( + new LocalStickyModifierState(modifierState, lockedModifierState))); + } + } + + private class LocalStickyModifierStateListener extends IStickyModifierStateListener.Stub { + + @Override + public void onStickyModifierStateChanged(int modifierState, int lockedModifierState) { + synchronized (mStickyModifierStateListenerLock) { + if (mStickyModifierStateListeners == null) return; + final int numListeners = mStickyModifierStateListeners.size(); + for (int i = 0; i < numListeners; i++) { + mStickyModifierStateListeners.get(i) + .notifyStickyModifierStateChange(modifierState, lockedModifierState); + } + } + } + } + + // Implementation of the android.hardware.input.StickyModifierState interface used to report + // the sticky modifier state via the StickyModifierStateListener interfaces. + private static final class LocalStickyModifierState extends StickyModifierState { + + private final int mModifierState; + private final int mLockedModifierState; + + LocalStickyModifierState(int modifierState, int lockedModifierState) { + mModifierState = modifierState; + mLockedModifierState = lockedModifierState; + } + + @Override + public boolean isShiftModifierOn() { + return (mModifierState & KeyEvent.META_SHIFT_ON) != 0; + } + + @Override + public boolean isShiftModifierLocked() { + return (mLockedModifierState & KeyEvent.META_SHIFT_ON) != 0; + } + + @Override + public boolean isCtrlModifierOn() { + return (mModifierState & KeyEvent.META_CTRL_ON) != 0; + } + + @Override + public boolean isCtrlModifierLocked() { + return (mLockedModifierState & KeyEvent.META_CTRL_ON) != 0; + } + + @Override + public boolean isMetaModifierOn() { + return (mModifierState & KeyEvent.META_META_ON) != 0; + } + + @Override + public boolean isMetaModifierLocked() { + return (mLockedModifierState & KeyEvent.META_META_ON) != 0; + } + + @Override + public boolean isAltModifierOn() { + return (mModifierState & KeyEvent.META_ALT_LEFT_ON) != 0; + } + + @Override + public boolean isAltModifierLocked() { + return (mLockedModifierState & KeyEvent.META_ALT_LEFT_ON) != 0; + } + + @Override + public boolean isAltGrModifierOn() { + return (mModifierState & KeyEvent.META_ALT_RIGHT_ON) != 0; + } + + @Override + public boolean isAltGrModifierLocked() { + return (mLockedModifierState & KeyEvent.META_ALT_RIGHT_ON) != 0; + } + } + + /** + * @see InputManager#registerStickyModifierStateListener(Executor, StickyModifierStateListener) + */ + @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + void registerStickyModifierStateListener(@NonNull Executor executor, + @NonNull StickyModifierStateListener listener) throws IllegalArgumentException { + Objects.requireNonNull(executor, "executor should not be null"); + Objects.requireNonNull(listener, "listener should not be null"); + + synchronized (mStickyModifierStateListenerLock) { + if (mStickyModifierStateListener == null) { + mStickyModifierStateListeners = new ArrayList<>(); + mStickyModifierStateListener = new LocalStickyModifierStateListener(); + + try { + mIm.registerStickyModifierStateListener(mStickyModifierStateListener); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + final int numListeners = mStickyModifierStateListeners.size(); + for (int i = 0; i < numListeners; i++) { + if (mStickyModifierStateListeners.get(i).mListener == listener) { + throw new IllegalArgumentException("Listener has already been registered!"); + } + } + StickyModifierStateListenerDelegate delegate = + new StickyModifierStateListenerDelegate(listener, executor); + mStickyModifierStateListeners.add(delegate); + } + } + + /** + * @see InputManager#unregisterStickyModifierStateListener(StickyModifierStateListener) + */ + @RequiresPermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + void unregisterStickyModifierStateListener( + @NonNull StickyModifierStateListener listener) { + Objects.requireNonNull(listener, "listener should not be null"); + + synchronized (mStickyModifierStateListenerLock) { + if (mStickyModifierStateListeners == null) { + return; + } + mStickyModifierStateListeners.removeIf((delegate) -> delegate.mListener == listener); + if (mStickyModifierStateListeners.isEmpty()) { + try { + mIm.unregisterStickyModifierStateListener(mStickyModifierStateListener); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + mStickyModifierStateListeners = null; + mStickyModifierStateListener = null; + } + } + } + /** * @see InputManager#getKeyboardLayoutsForInputDevice(InputDeviceIdentifier) */ diff --git a/core/java/android/hardware/input/StickyModifierState.java b/core/java/android/hardware/input/StickyModifierState.java new file mode 100644 index 000000000000..a3f7a0ab542e --- /dev/null +++ b/core/java/android/hardware/input/StickyModifierState.java @@ -0,0 +1,127 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.input; + +/** + * The StickyModifierState class is a representation of a modifier state when A11y Sticky keys + * feature is enabled + * + * @hide + */ +public abstract class StickyModifierState { + + /** + * Represents whether current sticky modifier state includes 'Shift' modifier. + * <p> If {@code true} the next {@link android.view.KeyEvent} will contain 'Shift' modifier in + * its metaState. + * + * @return whether Shift modifier key is on. + */ + public abstract boolean isShiftModifierOn(); + + /** + * Represents whether current sticky modifier state includes 'Shift' modifier, and it is + * locked. + * <p> If {@code true} any subsequent {@link android.view.KeyEvent} will contain 'Shift' + * modifier in its metaState and this state will remain sticky (will not be cleared), until + * user presses 'Shift' key again to clear the locked state. + * + * @return whether Shift modifier key is locked. + */ + public abstract boolean isShiftModifierLocked(); + + /** + * Represents whether current sticky modifier state includes 'Ctrl' modifier. + * <p> If {@code true} the next {@link android.view.KeyEvent} will contain 'Ctrl' modifier in + * its metaState. + * + * @return whether Ctrl modifier key is on. + */ + public abstract boolean isCtrlModifierOn(); + + /** + * Represents whether current sticky modifier state includes 'Ctrl' modifier, and it is + * locked. + * <p> If {@code true} any subsequent {@link android.view.KeyEvent} will contain 'Ctrl' + * modifier in its metaState and this state will remain sticky (will not be cleared), until + * user presses 'Ctrl' key again to clear the locked state. + * + * @return whether Ctrl modifier key is locked. + */ + public abstract boolean isCtrlModifierLocked(); + + /** + * Represents whether current sticky modifier state includes 'Meta' modifier. + * <p> If {@code true} the next {@link android.view.KeyEvent} will contain 'Meta' modifier in + * its metaState. + * + * @return whether Meta modifier key is on. + */ + public abstract boolean isMetaModifierOn(); + + /** + * Represents whether current sticky modifier state includes 'Meta' modifier, and it is + * locked. + * <p> If {@code true} any subsequent {@link android.view.KeyEvent} will contain 'Meta' + * modifier in its metaState and this state will remain sticky (will not be cleared), until + * user presses 'Meta' key again to clear the locked state. + * + * @return whether Meta modifier key is locked. + */ + public abstract boolean isMetaModifierLocked(); + + /** + * Represents whether current sticky modifier state includes 'Alt' modifier. + * <p> If {@code true} the next {@link android.view.KeyEvent} will contain 'Alt' modifier in + * its metaState. + * + * @return whether Alt modifier key is on. + */ + public abstract boolean isAltModifierOn(); + + /** + * Represents whether current sticky modifier state includes 'Alt' modifier, and it is + * locked. + * <p> If {@code true} any subsequent {@link android.view.KeyEvent} will contain 'Alt' + * modifier in its metaState and this state will remain sticky (will not be cleared), until + * user presses 'Alt' key again to clear the locked state. + * + * @return whether Alt modifier key is locked. + */ + public abstract boolean isAltModifierLocked(); + + /** + * Represents whether current sticky modifier state includes 'AltGr' modifier. + * <p> If {@code true} the next {@link android.view.KeyEvent} will contain 'AltGr' modifier in + * its metaState. + * + * @return whether AltGr modifier key is on. + */ + public abstract boolean isAltGrModifierOn(); + + /** + * Represents whether current sticky modifier state includes 'AltGr' modifier, and it is + * locked. + * <p> If {@code true} any subsequent {@link android.view.KeyEvent} will contain 'AltGr' + * modifier in its metaState and this state will remain sticky (will not be cleared), until + * user presses 'AltGr' key again to clear the locked state. + * + * @return whether AltGr modifier key is locked. + */ + public abstract boolean isAltGrModifierLocked(); +} + diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 18d3e5e02fbe..71698e4f4469 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -127,6 +127,7 @@ import android.view.inputmethod.CursorAnchorInfo; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; +import android.view.inputmethod.Flags; import android.view.inputmethod.ImeTracker; import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InlineSuggestionsResponse; @@ -388,6 +389,9 @@ public class InputMethodService extends AbstractInputMethodService { private long mStylusHwSessionsTimeout = STYLUS_HANDWRITING_IDLE_TIMEOUT_MS; private Runnable mStylusWindowIdleTimeoutRunnable; private long mStylusWindowIdleTimeoutForTest; + /** Tracks last {@link MotionEvent#getToolType(int)} used for {@link MotionEvent#ACTION_DOWN}. + **/ + private int mLastUsedToolType; /** * Returns whether {@link InputMethodService} is responsible for rendering the back button and @@ -1005,7 +1009,7 @@ public class InputMethodService extends AbstractInputMethodService { */ @Override public void updateEditorToolType(@ToolType int toolType) { - onUpdateEditorToolType(toolType); + updateEditorToolTypeInternal(toolType); } /** @@ -1249,6 +1253,14 @@ public class InputMethodService extends AbstractInputMethodService { rootView.setSystemGestureExclusionRects(exclusionRects); } + private void updateEditorToolTypeInternal(int toolType) { + if (Flags.useHandwritingListenerForTooltype()) { + mLastUsedToolType = toolType; + mInputEditorInfo.setInitialToolType(toolType); + } + onUpdateEditorToolType(toolType); + } + /** * Concrete implementation of * {@link AbstractInputMethodService.AbstractInputMethodSessionImpl} that provides @@ -3110,6 +3122,9 @@ public class InputMethodService extends AbstractInputMethodService { null /* icProto */); mInputStarted = true; mStartedInputConnection = ic; + if (Flags.useHandwritingListenerForTooltype()) { + editorInfo.setInitialToolType(mLastUsedToolType); + } mInputEditorInfo = editorInfo; initialize(); mInlineSuggestionSessionController.notifyOnStartInput( @@ -3354,6 +3369,10 @@ public class InputMethodService extends AbstractInputMethodService { * had not seen the event at all. */ public boolean onKeyDown(int keyCode, KeyEvent event) { + if (Flags.useHandwritingListenerForTooltype()) { + // any KeyEvent keyDown should reset last toolType. + updateEditorToolTypeInternal(MotionEvent.TOOL_TYPE_UNKNOWN); + } if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { final ExtractEditText eet = getExtractEditTextIfVisible(); if (eet != null && eet.handleBackInTextActionModeIfNeeded(event)) { diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 8fcff78fb025..3149de4c39e7 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -673,6 +673,7 @@ public class GraphicsEnvironment { if (anglePkg.isEmpty()) { return; } + intent.setPackage(anglePkg); context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() { @Override diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index e32a8f32ce95..8c8af0ead227 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2373,13 +2373,29 @@ public final class StrictMode { /** Assume locked until we hear otherwise */ private static volatile boolean sCeStorageUnlocked = false; + /** + * Avoid (potentially) costly and repeated lookups to the same mount service. + * Note that we don't use the Singleton wrapper as lookup may fail early during boot. + */ + private static volatile IStorageManager sStorageManager; + private static boolean isCeStorageUnlocked(int userId) { - final IStorageManager storage = IStorageManager.Stub + IStorageManager storage = sStorageManager; + if (storage == null) { + storage = IStorageManager.Stub .asInterface(ServiceManager.getService("mount")); + // As the queried handle may be null early during boot, only stash valid handles, + // avoiding races with concurrent service queries. + if (storage != null) { + sStorageManager = storage; + } + } if (storage != null) { try { return storage.isCeStorageUnlocked(userId); } catch (RemoteException ignored) { + // Conservatively clear the ref, allowing refresh if the remote process restarts. + sStorageManager = null; } } return false; diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 54116a2749e0..692dad49ec89 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -26,6 +26,8 @@ import static android.graphics.Matrix.MSKEW_Y; import static android.view.View.SYSTEM_UI_FLAG_VISIBLE; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; +import static com.android.window.flags.Flags.noConsecutiveVisibilityEvents; + import android.animation.AnimationHandler; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -1431,27 +1433,36 @@ public abstract class WallpaperService extends Service { } if (didSurface && !mReportedVisible) { - // This wallpaper is currently invisible, but its - // surface has changed. At this point let's tell it - // again that it is invisible in case the report about - // the surface caused it to start running. We really - // don't want wallpapers running when not visible. if (mIsCreating) { - // Some wallpapers will ignore this call if they - // had previously been told they were invisble, - // so if we are creating a new surface then toggle - // the state to get them to notice. - if (DEBUG) Log.v(TAG, "onVisibilityChanged(true) at surface: " - + this); - Trace.beginSection("WPMS.Engine.onVisibilityChanged-true"); - onVisibilityChanged(true); + // The surface has been created, but the wallpaper isn't visible. + // Trigger onVisibilityChanged(true) then onVisibilityChanged(false) + // to make sure the wallpaper is stopped even after the events + // onSurfaceCreated() and onSurfaceChanged(). + if (noConsecutiveVisibilityEvents()) { + if (DEBUG) Log.v(TAG, "toggling doVisibilityChanged"); + Trace.beginSection("WPMS.Engine.doVisibilityChanged-true"); + doVisibilityChanged(true); + Trace.endSection(); + Trace.beginSection("WPMS.Engine.doVisibilityChanged-false"); + doVisibilityChanged(false); + Trace.endSection(); + } else { + if (DEBUG) { + Log.v(TAG, "onVisibilityChanged(true) at surface: " + this); + } + Trace.beginSection("WPMS.Engine.onVisibilityChanged-true"); + onVisibilityChanged(true); + Trace.endSection(); + } + } + if (!noConsecutiveVisibilityEvents()) { + if (DEBUG) { + Log.v(TAG, "onVisibilityChanged(false) at surface: " + this); + } + Trace.beginSection("WPMS.Engine.onVisibilityChanged-false"); + onVisibilityChanged(false); Trace.endSection(); } - if (DEBUG) Log.v(TAG, "onVisibilityChanged(false) at surface: " - + this); - Trace.beginSection("WPMS.Engine.onVisibilityChanged-false"); - onVisibilityChanged(false); - Trace.endSection(); } } finally { mIsCreating = false; diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index 19e6836ed261..9c430cd4acb4 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -54,6 +54,7 @@ public abstract class InputEventReceiver { InputChannel inputChannel, MessageQueue messageQueue); private static native void nativeDispose(long receiverPtr); private static native void nativeFinishInputEvent(long receiverPtr, int seq, boolean handled); + private static native boolean nativeProbablyHasInput(long receiverPtr); private static native void nativeReportTimeline(long receiverPtr, int inputEventId, long gpuCompletedTime, long presentTime); private static native boolean nativeConsumeBatchedInputEvents(long receiverPtr, @@ -92,6 +93,17 @@ public abstract class InputEventReceiver { } /** + * Checks the receiver for input availability. + * May return false negatives. + */ + public boolean probablyHasInput() { + if (mReceiverPtr == 0) { + return false; + } + return nativeProbablyHasInput(mReceiverPtr); + } + + /** * Disposes the receiver. * Must be called on the same Looper thread to which the receiver is attached. */ diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index ad0bf7c95c70..785055441d59 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -274,7 +274,8 @@ public class Surface implements Parcelable { @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = {"FRAME_RATE_CATEGORY_"}, value = {FRAME_RATE_CATEGORY_DEFAULT, FRAME_RATE_CATEGORY_NO_PREFERENCE, - FRAME_RATE_CATEGORY_LOW, FRAME_RATE_CATEGORY_NORMAL, FRAME_RATE_CATEGORY_HIGH}) + FRAME_RATE_CATEGORY_LOW, FRAME_RATE_CATEGORY_NORMAL, + FRAME_RATE_CATEGORY_HIGH_HINT, FRAME_RATE_CATEGORY_HIGH}) public @interface FrameRateCategory {} // From native_window.h or window.h. Keep these in sync. @@ -308,11 +309,21 @@ public class Surface implements Parcelable { public static final int FRAME_RATE_CATEGORY_NORMAL = 3; /** + * Hints that, as a result of a user interaction, an animation is likely to start. + * This category is a signal that a user interaction heuristic determined the need of a + * high refresh rate, and is not an explicit request from the app. + * As opposed to {@link #FRAME_RATE_CATEGORY_HIGH}, this vote may be ignored in favor of + * more explicit votes. + * @hide + */ + public static final int FRAME_RATE_CATEGORY_HIGH_HINT = 4; + + /** * Indicates a frame rate suitable for animations that require a high frame rate, which may * increase smoothness but may also increase power usage. * @hide */ - public static final int FRAME_RATE_CATEGORY_HIGH = 4; + public static final int FRAME_RATE_CATEGORY_HIGH = 5; /** * Create an empty surface, which will later be filled in by readFromParcel(). diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 442ea661585c..2b99e1e9f79b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -32,6 +32,7 @@ import static android.view.displayhash.DisplayHashResultCallback.EXTRA_DISPLAY_H import static android.view.displayhash.DisplayHashResultCallback.EXTRA_DISPLAY_HASH_ERROR_CODE; import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY; import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API; +import static android.view.flags.Flags.enableUseMeasureCacheDuringForceLayout; import static android.view.flags.Flags.toolkitMetricsForFrameRateDecision; import static android.view.flags.Flags.toolkitSetFrameRateReadOnly; import static android.view.flags.Flags.viewVelocityApi; @@ -955,6 +956,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private static boolean sAlwaysRemeasureExactly = false; /** + * When true makes it possible to use onMeasure caches also when the force layout flag is + * enabled. This helps avoiding multiple measures in the same frame with the same dimensions. + */ + private static boolean sUseMeasureCacheDuringForceLayoutFlagValue; + + /** * Allow setForeground/setBackground to be called (and ignored) on a textureview, * without throwing */ @@ -2396,6 +2403,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, sToolkitSetFrameRateReadOnlyFlagValue = toolkitSetFrameRateReadOnly(); sToolkitMetricsForFrameRateDecisionFlagValue = toolkitMetricsForFrameRateDecision(); + sUseMeasureCacheDuringForceLayoutFlagValue = enableUseMeasureCacheDuringForceLayout(); } /** @@ -22848,6 +22856,36 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** + * Determines whether an unprocessed input event is available on the window. + * + * This is only a performance hint (a.k.a. the Input Hint) and may return false negative + * results. Callers should not rely on availability of the input event based on the return + * value of this method. + * + * The Input Hint functionality is experimental, and can be removed in the future OS releases. + * + * This method only returns nontrivial results on a View that is attached to a Window. Such View + * can be acquired using `Activity.getWindow().getDecorView()`, and only after the view + * hierarchy is attached (via {@link android.app.Activity#setContentView(android.view.View)}). + * + * In multi-window mode the View can provide the Input Hint only for the window it is attached + * to. Therefore, checking input availability for the whole application would require asking + * for the hint from more than one View. + * + * The initial implementation does not return false positives, but callers should not rely on + * it: false positives may occur in future OS releases. + * + * @hide + */ + public boolean probablyHasInput() { + ViewRootImpl viewRootImpl = getViewRootImpl(); + if (viewRootImpl == null) { + return false; + } + return viewRootImpl.probablyHasInput(); + } + + /** * Destroys all hardware rendering resources. This method is invoked * when the system needs to reclaim resources. Upon execution of this * method, you should free any OpenGL resources created by the view. @@ -27417,7 +27455,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, resolveRtlPropertiesIfNeeded(); - int cacheIndex = forceLayout ? -1 : mMeasureCache.indexOfKey(key); + int cacheIndex; + if (sUseMeasureCacheDuringForceLayoutFlagValue) { + cacheIndex = mMeasureCache.indexOfKey(key); + } else { + cacheIndex = forceLayout ? -1 : mMeasureCache.indexOfKey(key); + } + if (cacheIndex < 0 || sIgnoreMeasureCache) { if (isTraversalTracingEnabled()) { Trace.beginSection(mTracingStrings.onMeasure); diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 287c7b29813f..fbefbf31a9f0 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -49,6 +49,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.os.SystemClock; +import android.service.autofill.Flags; import android.util.AttributeSet; import android.util.IntArray; import android.util.Log; @@ -3752,7 +3753,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager && !child.isActivityDeniedForAutofillForUnimportantView()) || (shouldIncludeAllChildrenViewWithAutofillTypeNotNone(afm) && child.getAutofillType() != AUTOFILL_TYPE_NONE) - || shouldIncludeAllChildrenViews(afm)){ + || shouldIncludeAllChildrenViews(afm) + || (Flags.includeInvisibleViewGroupInAssistStructure() + && child instanceof ViewGroup && child.getVisibility() != View.VISIBLE)) { + // If the child is a ViewGroup object and its visibility is not visible, include + // it as part of the assist structure. The children of these invisible ViewGroup + // objects are parsed and included in the assist structure. When the Autofill + // Provider determines the visibility of these children, it looks at their + // visibility as well as their parent's visibility. Omitting invisible parents + // will lead to the Autofill Provider incorrectly assuming that these children + // of invisible parents are actually visible. list.add(child); } else if (child instanceof ViewGroup) { ((ViewGroup) child).populateChildrenForAutofill(list, flags); diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 32afe065857d..8529b4e044fa 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -10554,6 +10554,18 @@ public final class ViewRootImpl implements ViewParent, } /** + * Checks the input event receiver for input availability. + * May return false negatives. + * @hide + */ + public boolean probablyHasInput() { + if (mInputEventReceiver == null) { + return false; + } + return mInputEventReceiver.probablyHasInput(); + } + + /** * Adds a scroll capture callback to this window. * * @param callback the callback to add diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index f76822f14189..61cf1266177a 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -972,10 +972,8 @@ public interface WindowManager extends ViewManager { * android:value="false"/> * </application> * </pre> - * - * @hide */ - // TODO(b/274924641): Make this public API. + @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API) String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"; @@ -1309,9 +1307,8 @@ public interface WindowManager extends ViewManager { * android:value="true|false"/> * </application> * </pre> - * @hide */ - // TODO(b/280052089): Make this public API. + @FlaggedApi(Flags.FLAG_APP_COMPAT_PROPERTIES_API) String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES = "android.window.PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES"; diff --git a/core/java/android/view/flags/view_flags.aconfig b/core/java/android/view/flags/view_flags.aconfig new file mode 100644 index 000000000000..a74b06a491e8 --- /dev/null +++ b/core/java/android/view/flags/view_flags.aconfig @@ -0,0 +1,10 @@ +package: "android.view.flags" + +flag { + name: "enable_use_measure_cache_during_force_layout" + namespace: "toolkit" + description: "Enables using the measure cache during a view force layout from the second " + "onMeasure call onwards during the same traversal." + bug: "316170253" + is_fixed_read_only: true +} diff --git a/core/java/android/view/inputmethod/flags.aconfig b/core/java/android/view/inputmethod/flags.aconfig index dc6aa6cdc048..bb7677d6a571 100644 --- a/core/java/android/view/inputmethod/flags.aconfig +++ b/core/java/android/view/inputmethod/flags.aconfig @@ -38,3 +38,12 @@ flag { description: "Feature flag for supporting stylus handwriting delegation from RemoteViews on the home screen" bug: "279959705" } + +flag { + name: "use_handwriting_listener_for_tooltype" + namespace: "input_method" + description: "Feature flag for using handwriting spy for determining pointer toolType." + bug: "309554999" + is_fixed_read_only: true +} + diff --git a/core/java/android/window/flags/wallpaper_manager.aconfig b/core/java/android/window/flags/wallpaper_manager.aconfig index f03c993a9c66..ea9da96496c7 100644 --- a/core/java/android/window/flags/wallpaper_manager.aconfig +++ b/core/java/android/window/flags/wallpaper_manager.aconfig @@ -13,3 +13,10 @@ flag { description: "Support storing different wallpaper crops for different display dimensions. Only effective after rebooting." bug: "281648899" } + +flag { + name: "no_consecutive_visibility_events" + namespace: "systemui" + description: "Prevent the system from sending consecutive onVisibilityChanged(false) events." + bug: "285631818" +}
\ No newline at end of file diff --git a/core/java/com/android/internal/util/function/pooled/PooledLambda.java b/core/java/com/android/internal/util/function/pooled/PooledLambda.java index bdc8a668a7f7..1d6d69cee967 100755 --- a/core/java/com/android/internal/util/function/pooled/PooledLambda.java +++ b/core/java/com/android/internal/util/function/pooled/PooledLambda.java @@ -1009,7 +1009,7 @@ public interface PooledLambda { K arg11, L arg12) { synchronized (Message.sPoolSync) { PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool, - function, 11, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, arg7, + function, 12, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); return Message.obtain().setCallback(callback.recycleOnUse()); } diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index 5b68e8ed1ad8..f7d815283885 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -82,6 +82,7 @@ public: status_t initialize(); void dispose(); status_t finishInputEvent(uint32_t seq, bool handled); + bool probablyHasInput(); status_t reportTimeline(int32_t inputEventId, nsecs_t gpuCompletedTime, nsecs_t presentTime); status_t consumeEvents(JNIEnv* env, bool consumeBatches, nsecs_t frameTime, bool* outConsumedBatch); @@ -165,6 +166,10 @@ status_t NativeInputEventReceiver::finishInputEvent(uint32_t seq, bool handled) return processOutboundEvents(); } +bool NativeInputEventReceiver::probablyHasInput() { + return mInputConsumer.probablyHasInput(); +} + status_t NativeInputEventReceiver::reportTimeline(int32_t inputEventId, nsecs_t gpuCompletedTime, nsecs_t presentTime) { if (kDebugDispatchCycle) { @@ -547,6 +552,12 @@ static void nativeFinishInputEvent(JNIEnv* env, jclass clazz, jlong receiverPtr, } } +static bool nativeProbablyHasInput(JNIEnv* env, jclass clazz, jlong receiverPtr) { + sp<NativeInputEventReceiver> receiver = + reinterpret_cast<NativeInputEventReceiver*>(receiverPtr); + return receiver->probablyHasInput(); +} + static void nativeReportTimeline(JNIEnv* env, jclass clazz, jlong receiverPtr, jint inputEventId, jlong gpuCompletedTime, jlong presentTime) { if (IdGenerator::getSource(inputEventId) != IdGenerator::Source::INPUT_READER) { @@ -597,6 +608,7 @@ static const JNINativeMethod gMethods[] = { (void*)nativeInit}, {"nativeDispose", "(J)V", (void*)nativeDispose}, {"nativeFinishInputEvent", "(JIZ)V", (void*)nativeFinishInputEvent}, + {"nativeProbablyHasInput", "(J)Z", (void*)nativeProbablyHasInput}, {"nativeReportTimeline", "(JIJJ)V", (void*)nativeReportTimeline}, {"nativeConsumeBatchedInputEvents", "(JJ)Z", (void*)nativeConsumeBatchedInputEvents}, {"nativeDump", "(JLjava/lang/String;)Ljava/lang/String;", (void*)nativeDump}, diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 2a0feee25e86..52e0124cc681 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -395,6 +395,8 @@ message ActivityRecordProto { optional bool should_refresh_activity_for_camera_compat = 40; optional bool should_refresh_activity_via_pause_for_camera_compat = 41; optional bool should_override_min_aspect_ratio = 42; + optional bool should_ignore_orientation_request_loop = 43; + optional bool should_override_force_resize_app = 44; } /* represents WindowToken */ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 232a36fb6cb3..e65bfab06052 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -7692,6 +7692,13 @@ <permission android:name="android.permission.MONITOR_KEYBOARD_BACKLIGHT" android:protectionLevel="signature" /> + <!-- Allows low-level access to monitor sticky modifier state changes when A11Y Sticky keys + feature is enabled. + <p>Not for use by third-party applications. + @hide --> + <permission android:name="android.permission.MONITOR_STICKY_MODIFIER_STATE" + android:protectionLevel="signature" /> + <uses-permission android:name="android.permission.HANDLE_QUERY_PACKAGE_RESTART" /> <!-- Allows financed device kiosk apps to perform actions on the Device Lock service diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 70f0c932b88e..0cc49a57dd1f 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -2316,7 +2316,7 @@ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7089318886628390827">"إزالة الحظر"</string> <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"الخصوصية في جهاز الاستشعار"</string> <string name="splash_screen_view_icon_description" msgid="180638751260598187">"رمز التطبيق"</string> - <string name="splash_screen_view_branding_description" msgid="7911129347402728216">"الصورة الذهنية للعلامة التجارية للتطبيق"</string> + <string name="splash_screen_view_branding_description" msgid="7911129347402728216">"هوية العلامة التجارية للتطبيق"</string> <string name="view_and_control_notification_title" msgid="4300765399209912240">"التحقّق من إعدادات الوصول"</string> <string name="view_and_control_notification_content" msgid="8003766498562604034">"يمكن لخدمة <xliff:g id="SERVICE_NAME">%s</xliff:g> الاطّلاع على شاشتك والتحكّم فيها. انقر لمراجعة الإعدادات."</string> <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> (مُترجَم)."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index a4b01e8c822f..ec14677965a7 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -2340,9 +2340,9 @@ <string name="permdesc_startForegroundServicesFromBackground" msgid="4071826571656001537">"Permet que una aplicació complementària iniciï serveis en primer pla des d\'un segon pla."</string> <string name="mic_access_on_toast" msgid="2666925317663845156">"El micròfon està disponible"</string> <string name="mic_access_off_toast" msgid="8111040892954242437">"El micròfon està bloquejat"</string> - <string name="connected_display_unavailable_notification_title" msgid="5265409360902073556">"No es pot projectar a la pantalla"</string> + <string name="connected_display_unavailable_notification_title" msgid="5265409360902073556">"No es pot duplicar a la pantalla"</string> <string name="connected_display_unavailable_notification_content" msgid="3845903313751217516">"Utilitza un altre cable i torna-ho a provar"</string> - <string name="connected_display_thermally_unavailable_notification_content" msgid="9205758199439955949">"El dispositiu està massa calent i no pot projectar a la pantalla fins que es refredi"</string> + <string name="connected_display_thermally_unavailable_notification_content" msgid="9205758199439955949">"El dispositiu està massa calent i no pot duplicar a la pantalla fins que es refredi"</string> <string name="concurrent_display_notification_name" msgid="1526911253558311131">"Pantalla dual"</string> <string name="concurrent_display_notification_active_title" msgid="4892473462327943673">"La pantalla dual està activada"</string> <string name="concurrent_display_notification_active_content" msgid="5889355473710601270">"<xliff:g id="APP_NAME">%1$s</xliff:g> està utilitzant les dues pantalles per mostrar contingut"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 7119131048a4..d3f8550b58c7 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -2050,7 +2050,7 @@ <string name="autofill_save_type_password" msgid="5624528786144539944">"adgangskode"</string> <string name="autofill_save_type_address" msgid="3111006395818252885">"adresse"</string> <string name="autofill_save_type_credit_card" msgid="3583795235862046693">"kreditkort"</string> - <string name="autofill_save_type_debit_card" msgid="3169397504133097468">"betalingskort"</string> + <string name="autofill_save_type_debit_card" msgid="3169397504133097468">"debetkort"</string> <string name="autofill_save_type_payment_card" msgid="6555012156728690856">"betalingskort"</string> <string name="autofill_save_type_generic_card" msgid="1019367283921448608">"kort"</string> <string name="autofill_save_type_username" msgid="1018816929884640882">"brugernavn"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index c0e12c3d0a03..514d6955e629 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -355,7 +355,7 @@ <string name="permlab_fullScreenIntent" msgid="4310888199502509104">"Benachrichtigungen auf einem gesperrten Gerät als Vollbildaktivitäten anzeigen"</string> <string name="permdesc_fullScreenIntent" msgid="1100721419406643997">"Ermöglicht der App, Benachrichtigungen auf einem gesperrten Gerät als Vollbildaktivitäten anzuzeigen"</string> <string name="permlab_install_shortcut" msgid="7451554307502256221">"Verknüpfungen installieren"</string> - <string name="permdesc_install_shortcut" msgid="4476328467240212503">"ohne Zutun des Nutzers Verknüpfungen zum Startbildschirm hinzufügen."</string> + <string name="permdesc_install_shortcut" msgid="4476328467240212503">"Ermöglicht einer App, dem Startbildschirm ohne Zutun des Nutzers Verknüpfungen hinzuzufügen."</string> <string name="permlab_uninstall_shortcut" msgid="295263654781900390">"Verknüpfungen deinstallieren"</string> <string name="permdesc_uninstall_shortcut" msgid="1924735350988629188">"Ermöglicht einer App das Entfernen von Verknüpfungen vom Startbildschirm ohne Eingriff des Nutzers"</string> <string name="permlab_processOutgoingCalls" msgid="4075056020714266558">"Ausgehende Anrufe umleiten"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index cf18eb907e1c..2b9c5550d9a4 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -2331,7 +2331,7 @@ <string name="default_card_name" msgid="9198284935962911468">"<xliff:g id="CARDNUMBER">%d</xliff:g> TXARTELA"</string> <string name="permlab_companionProfileWatch" msgid="2457738382085872542">"Aplikazio osagarrien erloju-profilaren baimena erlojuak kudeatzeko"</string> <string name="permdesc_companionProfileWatch" msgid="5655698581110449397">"Erlojuak kudeatzeko baimena ematen die aplikazio osagarriei."</string> - <string name="permlab_observeCompanionDevicePresence" msgid="9008994909653990465">"Begiratu gailu osagarrien presentzia"</string> + <string name="permlab_observeCompanionDevicePresence" msgid="9008994909653990465">"Begiratu gailu osagarrien presentziari"</string> <string name="permdesc_observeCompanionDevicePresence" msgid="3011699826788697852">"Gailu osagarrien presentzia begiratzeko baimena ematen die aplikazio osagarriei gailuak inguruan edo urrun daudenean."</string> <string name="permlab_deliverCompanionMessages" msgid="3931552294842980887">"Entregatu aplikazio osagarrien mezuak"</string> <string name="permdesc_deliverCompanionMessages" msgid="2170847384281412850">"Beste gailuetan mezuak entregatzeko baimena ematen die aplikazio osagarriei."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d435c62b9b49..3b242309e9b7 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1724,7 +1724,7 @@ <string name="color_inversion_feature_name" msgid="2672824491933264951">"Inversion des couleurs"</string> <string name="color_correction_feature_name" msgid="7975133554160979214">"Correction des couleurs"</string> <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Mode une main"</string> - <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Encore moins lumineux"</string> + <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Luminosité ultra-réduite"</string> <string name="hearing_aids_feature_name" msgid="1125892105105852542">"Appareils auditifs"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Touches de volume appuyées de manière prolongée. Service <xliff:g id="SERVICE_NAME">%1$s</xliff:g> activé."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Touches de volume appuyées de manière prolongée. Service <xliff:g id="SERVICE_NAME">%1$s</xliff:g> désactivé."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 2ff302df7a21..9a063fb65b0f 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -575,7 +575,7 @@ <string name="permdesc_changeWimaxState" product="tablet" msgid="4011097664859480108">"Inaruhusu programu kuunganisha kompyuta kibao, na kukata kompyuta kibao kutoka mitandao ya WiMAX."</string> <string name="permdesc_changeWimaxState" product="tv" msgid="5373274458799425276">"Huruhusu programu iunganishe na kutenganisha kifaa chako cha Android TV na mitandao ya WiMAX."</string> <string name="permdesc_changeWimaxState" product="default" msgid="1551666203780202101">"Inaruhusu programu kuunganisha simu kwenye, na kukata simu kutoka mitandao ya WiMAX."</string> - <string name="permlab_bluetooth" msgid="586333280736937209">"oanisha na vifaa vya Bluetooth"</string> + <string name="permlab_bluetooth" msgid="586333280736937209">"unganisha na vifaa vya Bluetooth"</string> <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Huruhusu programu kuona usanidi wa Bluetooth kwenye kompyuta kibao, na kutuma na kukubali miunganisho kwa vifaa vilivyooanishwa."</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Huruhusu programu iangalie mipangilio iliyowekwa ya Bluetooth kwenye kifaa chako cha Android TV na kufanya na kukubali miunganisho na vifaa vilivyooanishwa."</string> <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Huruhusu programu kuona usanidi wa Bluetooth kwenye simu, na kutuma na kukubali miunganisho kwa vifaa vilivyooanishwa."</string> diff --git a/core/tests/coretests/src/android/content/pm/ModuleInfoTest.java b/core/tests/coretests/src/android/content/pm/ModuleInfoTest.java new file mode 100644 index 000000000000..4366e02cdf23 --- /dev/null +++ b/core/tests/coretests/src/android/content/pm/ModuleInfoTest.java @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.content.pm; + +import static com.google.common.truth.Truth.assertThat; + +import android.os.Parcel; +import android.platform.test.annotations.AppModeFull; +import android.text.TextUtils; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.List; + +@RunWith(AndroidJUnit4.class) +@AppModeFull +public class ModuleInfoTest { + + private static final String APEX_MODULE_NAME = "apexModuleName"; + private static final String APK_IN_APEX_PACKAGE_NAME = "apkInApexPackageName"; + private static final String MODULE_PACKAGE_NAME = "modulePackageName"; + private static final String MODULE_NAME = "moduleName"; + + @Test + public void testSimple() { + ModuleInfo info = new ModuleInfo(); + assertThat(info.toString()).isNotNull(); + } + + @Test + public void testDefaultCopy() { + ModuleInfo oldInfo = new ModuleInfo(); + ModuleInfo newInfo = new ModuleInfo(oldInfo); + assertThat(newInfo).isEqualTo(oldInfo); + } + + @Test + public void testCopy() { + boolean isHidden = false; + ModuleInfo info = new ModuleInfo(); + info.setHidden(isHidden); + info.setApexModuleName(APEX_MODULE_NAME); + info.setPackageName(MODULE_PACKAGE_NAME); + info.setName(MODULE_NAME); + info.setApkInApexPackageNames(List.of(APK_IN_APEX_PACKAGE_NAME)); + + ModuleInfo newInfo = new ModuleInfo(info); + assertThat(newInfo).isEqualTo(info); + } + + @Test + public void testGetApkInApexPackageNamesReturnEmptyListInDefault() { + ModuleInfo info = new ModuleInfo(); + assertThat(info.getApkInApexPackageNames()).isNotNull(); + assertThat(info.getApkInApexPackageNames()).isEmpty(); + } + + @Test + public void testModuleInfoParcelizeDeparcelize() { + boolean isHidden = false; + ModuleInfo info = new ModuleInfo(); + info.setHidden(isHidden); + info.setApexModuleName(APEX_MODULE_NAME); + info.setPackageName(MODULE_PACKAGE_NAME); + info.setName(MODULE_NAME); + info.setApkInApexPackageNames(List.of(APK_IN_APEX_PACKAGE_NAME)); + + final Parcel p = Parcel.obtain(); + info.writeToParcel(p, 0); + p.setDataPosition(0); + + final ModuleInfo targetInfo = ModuleInfo.CREATOR.createFromParcel(p); + p.recycle(); + + assertThat(info.isHidden()).isEqualTo(targetInfo.isHidden()); + assertThat(info.getApexModuleName()).isEqualTo(targetInfo.getApexModuleName()); + assertThat(info.getPackageName()).isEqualTo(targetInfo.getPackageName()); + assertThat(TextUtils.equals(info.getName(), targetInfo.getName())).isTrue(); + assertThat(info.getApkInApexPackageNames().toArray()).isEqualTo( + targetInfo.getApkInApexPackageNames().toArray()); + } +} diff --git a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml index cec7ee233236..ef7478c04dda 100644 --- a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml +++ b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml @@ -18,13 +18,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/desktop_mode_caption" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal"> <ImageButton android:id="@+id/caption_handle" - android:layout_width="128dp" + android:layout_width="@dimen/desktop_mode_fullscreen_decor_caption_width" android:layout_height="@dimen/desktop_mode_fullscreen_decor_caption_height" android:paddingVertical="16dp" android:contentDescription="@string/handle_text" diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 0a40cea3134d..28e709845e88 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -413,6 +413,9 @@ <!-- Height of desktop mode caption for fullscreen tasks. --> <dimen name="desktop_mode_fullscreen_decor_caption_height">36dp</dimen> + <!-- Width of desktop mode caption for fullscreen tasks. --> + <dimen name="desktop_mode_fullscreen_decor_caption_width">128dp</dimen> + <!-- Required empty space to be visible for partially offscreen tasks. --> <dimen name="freeform_required_visible_empty_space_in_header">48dp</dimen> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index 48a0a46dccc1..3b0e7c139bed 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -19,6 +19,7 @@ package com.android.wm.shell.pip2.phone; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_PIP; +import static android.view.WindowManager.TRANSIT_TO_FRONT; import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP; @@ -54,6 +55,8 @@ public class PipTransition extends PipTransitionController { @Nullable private WindowContainerToken mPipTaskToken; @Nullable + private IBinder mEnterTransition; + @Nullable private IBinder mAutoEnterButtonNavTransition; @Nullable private IBinder mExitViaExpandTransition; @@ -98,11 +101,8 @@ public class PipTransition extends PipTransitionController { @Override public WindowContainerTransaction handleRequest(@NonNull IBinder transition, @NonNull TransitionRequestInfo request) { - if (isAutoEnterInButtonNavigation(request)) { - mAutoEnterButtonNavTransition = transition; - return getEnterPipTransaction(transition, request); - } else if (isLegacyEnter(request)) { - mLegacyEnterTransition = transition; + if (isAutoEnterInButtonNavigation(request) || isEnterPictureInPictureModeRequest(request)) { + mEnterTransition = transition; return getEnterPipTransaction(transition, request); } return null; @@ -111,12 +111,9 @@ public class PipTransition extends PipTransitionController { @Override public void augmentRequest(@NonNull IBinder transition, @NonNull TransitionRequestInfo request, @NonNull WindowContainerTransaction outWct) { - if (isAutoEnterInButtonNavigation(request)) { + if (isAutoEnterInButtonNavigation(request) || isEnterPictureInPictureModeRequest(request)) { outWct.merge(getEnterPipTransaction(transition, request), true /* transfer */); - mAutoEnterButtonNavTransition = transition; - } else if (isLegacyEnter(request)) { - outWct.merge(getEnterPipTransaction(transition, request), true /* transfer */); - mLegacyEnterTransition = transition; + mEnterTransition = transition; } } @@ -162,7 +159,7 @@ public class PipTransition extends PipTransitionController { && pipTask.pictureInPictureParams.isAutoEnterEnabled(); } - private boolean isLegacyEnter(@NonNull TransitionRequestInfo requestInfo) { + private boolean isEnterPictureInPictureModeRequest(@NonNull TransitionRequestInfo requestInfo) { return requestInfo.getType() == TRANSIT_PIP; } @@ -172,13 +169,15 @@ public class PipTransition extends PipTransitionController { @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback) { - if (transition == mAutoEnterButtonNavTransition) { - mAutoEnterButtonNavTransition = null; - return startAutoEnterButtonNavAnimation(info, startTransaction, finishTransaction, - finishCallback); - } else if (transition == mLegacyEnterTransition) { - mLegacyEnterTransition = null; - return startLegacyEnterAnimation(info, startTransaction, finishTransaction, + if (transition == mEnterTransition) { + mEnterTransition = null; + if (isLegacyEnter(info)) { + // If this is a legacy-enter-pip (auto-enter is off and PiP activity went to pause), + // then we should run an ALPHA type (cross-fade) animation. + return startAlphaTypeEnterAnimation(info, startTransaction, finishTransaction, + finishCallback); + } + return startBoundsTypeEnterAnimation(info, startTransaction, finishTransaction, finishCallback); } else if (transition == mExitViaExpandTransition) { mExitViaExpandTransition = null; @@ -187,7 +186,15 @@ public class PipTransition extends PipTransitionController { return false; } - private boolean startAutoEnterButtonNavAnimation(@NonNull TransitionInfo info, + private boolean isLegacyEnter(@NonNull TransitionInfo info) { + TransitionInfo.Change pipChange = getPipChange(info); + // If the only change in the changes list is a TO_FRONT mode PiP task, + // then this is legacy-enter PiP. + return pipChange != null && pipChange.getMode() == TRANSIT_TO_FRONT + && info.getChanges().size() == 1; + } + + private boolean startBoundsTypeEnterAnimation(@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback) { @@ -205,7 +212,7 @@ public class PipTransition extends PipTransitionController { return true; } - private boolean startLegacyEnterAnimation(@NonNull TransitionInfo info, + private boolean startAlphaTypeEnterAnimation(@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index 4fd362591151..61a8e9b5dd59 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -726,7 +726,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private void handleEventOutsideFocusedCaption(MotionEvent ev, DesktopModeWindowDecoration relevantDecor) { // Returns if event occurs within caption - if (relevantDecor == null || relevantDecor.checkTouchEventInCaption(ev)) { + if (relevantDecor == null || relevantDecor.checkTouchEventInCaptionHandle(ev)) { return; } @@ -761,7 +761,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { || windowingMode == WINDOWING_MODE_MULTI_WINDOW; } - if (dragFromStatusBarAllowed && relevantDecor.checkTouchEventInHandle(ev)) { + if (dragFromStatusBarAllowed + && relevantDecor.checkTouchEventInCaptionHandle(ev)) { mTransitionDragActive = true; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 0c8e93b48d02..d08b655e43f8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -317,6 +317,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin relayoutParams.mLayoutResId = getDesktopModeWindowDecorLayoutId(taskInfo.getWindowingMode()); relayoutParams.mCaptionHeightId = getCaptionHeightIdStatic(taskInfo.getWindowingMode()); + relayoutParams.mCaptionWidthId = getCaptionWidthId(relayoutParams.mLayoutResId); if (DesktopModeStatus.useWindowShadow(/* isFocusedWindow= */ taskInfo.isFocused)) { relayoutParams.mShadowRadiusId = taskInfo.isFocused ? R.dimen.freeform_decor_shadow_focused_thickness @@ -345,6 +346,17 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } } + /** + * If task has focused window decor, return the caption id of the fullscreen caption size + * resource. Otherwise, return ID_NULL and caption width be set to task width. + */ + private static int getCaptionWidthId(int layoutResId) { + if (layoutResId == R.layout.desktop_mode_focused_window_decor) { + return R.dimen.desktop_mode_fullscreen_decor_caption_width; + } + return Resources.ID_NULL; + } + private PointF calculateMaximizeMenuPosition() { final PointF position = new PointF(); @@ -558,7 +570,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin .setOnClickListener(mOnCaptionButtonClickListener) .setOnTouchListener(mOnCaptionTouchListener) .setLayoutId(mRelayoutParams.mLayoutResId) - .setCaptionPosition(mRelayoutParams.mCaptionX, mRelayoutParams.mCaptionY) .setWindowingButtonsVisible(DesktopModeStatus.isEnabled()) .setCaptionHeight(mResult.mCaptionHeight) .build(); @@ -635,35 +646,25 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mTaskOrganizer.getRunningTaskInfo(mTaskInfo.taskId); if (taskInfo == null) return result; final Point positionInParent = taskInfo.positionInParent; - result.offset(-mRelayoutParams.mCaptionX, -mRelayoutParams.mCaptionY); result.offset(-positionInParent.x, -positionInParent.y); return result; } /** - * Determine if a passed MotionEvent is in a view in caption + * Checks if motion event occurs in the caption handle area. This should be used in cases where + * onTouchListener will not work (i.e. when caption is in status bar area). * * @param ev the {@link MotionEvent} to check - * @param layoutId the id of the view * @return {@code true} if event is inside the specified view, {@code false} if not */ - private boolean checkEventInCaptionView(MotionEvent ev, int layoutId) { - if (mResult.mRootView == null) return false; + boolean checkTouchEventInCaptionHandle(MotionEvent ev) { + if (isHandleMenuActive() || !(mWindowDecorViewHolder + instanceof DesktopModeFocusedWindowDecorationViewHolder)) { + return false; + } final PointF inputPoint = offsetCaptionLocation(ev); - final View view = mResult.mRootView.findViewById(layoutId); - return view != null && pointInView(view, inputPoint.x, inputPoint.y); - } - - boolean checkTouchEventInHandle(MotionEvent ev) { - if (isHandleMenuActive()) return false; - return checkEventInCaptionView(ev, R.id.caption_handle); - } - - /** - * Returns true if motion event is within the caption's root view's bounds. - */ - boolean checkTouchEventInCaption(MotionEvent ev) { - return checkEventInCaptionView(ev, getCaptionViewId()); + return ((DesktopModeFocusedWindowDecorationViewHolder) mWindowDecorViewHolder) + .pointInCaption(inputPoint, mResult.mCaptionX); } /** @@ -676,24 +677,19 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin void checkClickEvent(MotionEvent ev) { if (mResult.mRootView == null) return; if (!isHandleMenuActive()) { + // Click if point in caption handle view final View caption = mResult.mRootView.findViewById(R.id.desktop_mode_caption); final View handle = caption.findViewById(R.id.caption_handle); - clickIfPointInView(new PointF(ev.getX(), ev.getY()), handle); + if (checkTouchEventInCaptionHandle(ev)) { + mOnCaptionButtonClickListener.onClick(handle); + } } else { mHandleMenu.checkClickEvent(ev); closeHandleMenuIfNeeded(ev); } } - private boolean clickIfPointInView(PointF inputPoint, View v) { - if (pointInView(v, inputPoint.x, inputPoint.y)) { - mOnCaptionButtonClickListener.onClick(v); - return true; - } - return false; - } - - boolean pointInView(View v, float x, float y) { + private boolean pointInView(View v, float x, float y) { return v != null && v.getLeft() <= x && v.getRight() >= x && v.getTop() <= y && v.getBottom() >= y; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java index 652a2ed39c67..b37dd0d6fd2d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java @@ -64,8 +64,6 @@ class HandleMenu { private final View.OnTouchListener mOnTouchListener; private final RunningTaskInfo mTaskInfo; private final int mLayoutResId; - private final int mCaptionX; - private final int mCaptionY; private int mMarginMenuTop; private int mMarginMenuStart; private int mMenuHeight; @@ -74,16 +72,13 @@ class HandleMenu { private HandleMenuAnimator mHandleMenuAnimator; - HandleMenu(WindowDecoration parentDecor, int layoutResId, int captionX, int captionY, - View.OnClickListener onClickListener, View.OnTouchListener onTouchListener, - Bitmap appIcon, CharSequence appName, boolean shouldShowWindowingPill, - int captionHeight) { + HandleMenu(WindowDecoration parentDecor, int layoutResId, View.OnClickListener onClickListener, + View.OnTouchListener onTouchListener, Bitmap appIcon, CharSequence appName, + boolean shouldShowWindowingPill, int captionHeight) { mParentDecor = parentDecor; mContext = mParentDecor.mDecorWindowContext; mTaskInfo = mParentDecor.mTaskInfo; mLayoutResId = layoutResId; - mCaptionX = captionX; - mCaptionY = captionY; mOnClickListener = onClickListener; mOnTouchListener = onTouchListener; mAppIconBitmap = appIcon; @@ -225,12 +220,12 @@ class HandleMenu { if (mLayoutResId == R.layout.desktop_mode_app_controls_window_decor) { // Align the handle menu to the left of the caption. - menuX = mCaptionX + mMarginMenuStart; - menuY = mCaptionY + mMarginMenuTop; + menuX = mMarginMenuStart; + menuY = mMarginMenuTop; } else { // Position the handle menu at the center of the caption. - menuX = mCaptionX + (captionWidth / 2) - (mMenuWidth / 2); - menuY = mCaptionY + mMarginMenuStart; + menuX = (captionWidth / 2) - (mMenuWidth / 2); + menuY = mMarginMenuStart; } // Handle Menu position setup. @@ -346,8 +341,6 @@ class HandleMenu { private View.OnClickListener mOnClickListener; private View.OnTouchListener mOnTouchListener; private int mLayoutId; - private int mCaptionX; - private int mCaptionY; private boolean mShowWindowingPill; private int mCaptionHeight; @@ -381,12 +374,6 @@ class HandleMenu { return this; } - Builder setCaptionPosition(int captionX, int captionY) { - mCaptionX = captionX; - mCaptionY = captionY; - return this; - } - Builder setWindowingButtonsVisible(boolean windowingButtonsVisible) { mShowWindowingPill = windowingButtonsVisible; return this; @@ -398,8 +385,8 @@ class HandleMenu { } HandleMenu build() { - return new HandleMenu(mParent, mLayoutId, mCaptionX, mCaptionY, mOnClickListener, - mOnTouchListener, mAppIcon, mName, mShowWindowingPill, mCaptionHeight); + return new HandleMenu(mParent, mLayoutId, mOnClickListener, mOnTouchListener, + mAppIcon, mName, mShowWindowingPill, mCaptionHeight); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index b5373c67c602..6a9258c68acf 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -279,9 +279,12 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } outResult.mCaptionHeight = loadDimensionPixelSize(resources, params.mCaptionHeightId); - final int captionWidth = taskBounds.width(); + final int captionWidth = params.mCaptionWidthId != Resources.ID_NULL + ? loadDimensionPixelSize(resources, params.mCaptionWidthId) : taskBounds.width(); + outResult.mCaptionX = (outResult.mWidth - captionWidth) / 2; startT.setWindowCrop(mCaptionContainerSurface, captionWidth, outResult.mCaptionHeight) + .setPosition(mCaptionContainerSurface, outResult.mCaptionX, 0 /* y */) .setLayer(mCaptionContainerSurface, CAPTION_LAYER_Z_ORDER) .show(mCaptionContainerSurface); @@ -292,7 +295,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCaptionInsetsRect.set(taskBounds); if (mIsCaptionVisible) { mCaptionInsetsRect.bottom = - mCaptionInsetsRect.top + outResult.mCaptionHeight + params.mCaptionY; + mCaptionInsetsRect.top + outResult.mCaptionHeight; wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect); wct.addInsetsSource(mTaskInfo.token, @@ -554,9 +557,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> int mCornerRadius; - int mCaptionX; - int mCaptionY; - Configuration mWindowDecorConfig; boolean mApplyStartTransactionOnDraw; @@ -570,9 +570,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCornerRadius = 0; - mCaptionX = 0; - mCaptionY = 0; - mApplyStartTransactionOnDraw = false; mSetTaskPositionAndCrop = false; mWindowDecorConfig = null; @@ -581,6 +578,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> static class RelayoutResult<T extends View & TaskFocusStateConsumer> { int mCaptionHeight; + int mCaptionX; int mWidth; int mHeight; T mRootView; @@ -589,6 +587,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mWidth = 0; mHeight = 0; mCaptionHeight = 0; + mCaptionX = 0; mRootView = null; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt index 4930cb721336..5f77022a577d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt @@ -5,6 +5,7 @@ import android.app.ActivityManager.RunningTaskInfo import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.content.res.ColorStateList import android.graphics.Color +import android.graphics.PointF import android.view.View import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS import android.widget.ImageButton @@ -35,9 +36,6 @@ internal class DesktopModeFocusedWindowDecorationViewHolder( } override fun bindData(taskInfo: RunningTaskInfo) { - taskInfo.taskDescription?.statusBarColor?.let { captionColor -> - captionView.setBackgroundColor(captionColor) - } captionHandle.imageTintList = ColorStateList.valueOf(getCaptionHandleBarColor(taskInfo)) } @@ -49,6 +47,17 @@ internal class DesktopModeFocusedWindowDecorationViewHolder( animateCaptionHandleAlpha(startValue = 0f, endValue = 1f) } + /** + * Returns true if input point is in the caption's view. + * @param inputPoint the input point relative to the task in full "focus" (i.e. fullscreen). + */ + fun pointInCaption(inputPoint: PointF, captionX: Int): Boolean { + return inputPoint.x >= captionX && + inputPoint.x <= captionX + captionView.width && + inputPoint.y >= 0 && + inputPoint.y <= captionView.height + } + private fun getCaptionHandleBarColor(taskInfo: RunningTaskInfo): Int { return if (shouldUseLightCaptionColors(taskInfo)) { context.getColor(R.color.desktop_mode_caption_handle_bar_light) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt index 690b4e4be122..81bc34c876b6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt @@ -17,9 +17,9 @@ internal abstract class DesktopModeWindowDecorationViewHolder(rootView: View) { */ abstract fun bindData(taskInfo: RunningTaskInfo) - /** Callback when the handle menu is opened. */ - abstract fun onHandleMenuOpened() + /** Callback when the handle menu is opened. */ + abstract fun onHandleMenuOpened() - /** Callback when the handle menu is closed. */ - abstract fun onHandleMenuClosed() + /** Callback when the handle menu is closed. */ + abstract fun onHandleMenuClosed() } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt index 32f12592135d..143f7a726ed3 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt @@ -69,7 +69,7 @@ open class NetflixEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransit setup { standardAppHelper.launchViaIntent( wmHelper, - NetflixAppHelper.getNetflixWatchVideoIntent("70184207"), + NetflixAppHelper.getNetflixWatchVideoIntent("81605060"), ComponentNameMatcher(NetflixAppHelper.PACKAGE_NAME, NetflixAppHelper.WATCH_ACTIVITY) ) standardAppHelper.waitForVideoPlaying() diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 32a91461e40f..7b53f70a771c 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -772,15 +772,13 @@ public class WindowDecorationTests extends ShellTestCase { private WindowDecoration.AdditionalWindow addTestWindow() { final Resources resources = mDecorWindowContext.getResources(); - int x = mRelayoutParams.mCaptionX; - int y = mRelayoutParams.mCaptionY; int width = loadDimensionPixelSize(resources, mCaptionMenuWidthId); int height = loadDimensionPixelSize(resources, mRelayoutParams.mCaptionHeightId); String name = "Test Window"; WindowDecoration.AdditionalWindow additionalWindow = addWindow(R.layout.desktop_mode_window_decor_handle_menu, name, - mMockSurfaceControlAddWindowT, mMockSurfaceSyncGroup, x, y, - width, height); + mMockSurfaceControlAddWindowT, mMockSurfaceSyncGroup, 0 /* x */, + 0 /* y */, width, height); return additionalWindow; } } diff --git a/libs/hwui/utils/ForceDark.h b/libs/hwui/utils/ForceDark.h index 28538c4b7a7b..ecfe41f39ecb 100644 --- a/libs/hwui/utils/ForceDark.h +++ b/libs/hwui/utils/ForceDark.h @@ -17,6 +17,8 @@ #ifndef FORCEDARKUTILS_H #define FORCEDARKUTILS_H +#include <stdint.h> + namespace android { namespace uirenderer { @@ -26,9 +28,9 @@ namespace uirenderer { * This should stay in sync with the java @IntDef in * frameworks/base/graphics/java/android/graphics/ForceDarkType.java */ -enum class ForceDarkType : __uint8_t { NONE = 0, FORCE_DARK = 1, FORCE_INVERT_COLOR_DARK = 2 }; +enum class ForceDarkType : uint8_t { NONE = 0, FORCE_DARK = 1, FORCE_INVERT_COLOR_DARK = 2 }; } /* namespace uirenderer */ } /* namespace android */ -#endif // FORCEDARKUTILS_H
\ No newline at end of file +#endif // FORCEDARKUTILS_H diff --git a/packages/CompanionDeviceManager/res/values-ar/strings.xml b/packages/CompanionDeviceManager/res/values-ar/strings.xml index 5b893b0e1b37..6ddd5d3a5240 100644 --- a/packages/CompanionDeviceManager/res/values-ar/strings.xml +++ b/packages/CompanionDeviceManager/res/values-ar/strings.xml @@ -56,28 +56,18 @@ <string name="permission_nearby_devices" msgid="7530973297737123481">"الأجهزة المجاورة"</string> <string name="permission_media_routing_control" msgid="5498639511586715253">"تغيير جهاز إخراج الوسائط"</string> <string name="permission_storage" msgid="6831099350839392343">"الصور والوسائط"</string> - <!-- no translation found for permission_notifications (4099418516590632909) --> - <skip /> + <string name="permission_notifications" msgid="4099418516590632909">"الإشعارات"</string> <string name="permission_app_streaming" msgid="6009695219091526422">"التطبيقات"</string> <string name="permission_nearby_device_streaming" msgid="1023325519477349499">"البثّ"</string> - <!-- no translation found for permission_phone_summary (8246321093970051702) --> - <skip /> - <!-- no translation found for permission_call_logs_summary (7545243592757693321) --> - <skip /> - <!-- no translation found for permission_sms_summary (8499509535410068616) --> - <skip /> - <!-- no translation found for permission_contacts_summary (2840800622763086808) --> - <skip /> - <!-- no translation found for permission_calendar_summary (8430353935747336165) --> - <skip /> - <!-- no translation found for permission_microphone_summary (4862628553869973259) --> - <skip /> - <!-- no translation found for permission_nearby_devices_summary (1306752848196464817) --> - <skip /> - <!-- no translation found for permission_notification_listener_access_summary (7856071768185367749) --> - <skip /> - <!-- no translation found for permission_notifications_summary (2272810466047367030) --> - <skip /> + <string name="permission_phone_summary" msgid="8246321093970051702">"إجراء المكالمات الهاتفية وإدارتها"</string> + <string name="permission_call_logs_summary" msgid="7545243592757693321">"قراءة سجلّ المكالمات الهاتفية والكتابة إليه"</string> + <string name="permission_sms_summary" msgid="8499509535410068616">"إرسال الرسائل القصيرة وعرضها"</string> + <string name="permission_contacts_summary" msgid="2840800622763086808">"الوصول إلى جهات اتصالك"</string> + <string name="permission_calendar_summary" msgid="8430353935747336165">"الوصول إلى تقويمك"</string> + <string name="permission_microphone_summary" msgid="4862628553869973259">"تسجيل الصوت"</string> + <string name="permission_nearby_devices_summary" msgid="1306752848196464817">"يمكن العثور على الموضع النسبي للأجهزة المجاورة والربط بها وتحديدها."</string> + <string name="permission_notification_listener_access_summary" msgid="7856071768185367749">"يمكن لهذا الملف الشخصي قراءة جميع الإشعارات، بما في ذلك المعلومات، مثل جهات الاتصال والرسائل والصور."</string> + <string name="permission_notifications_summary" msgid="2272810466047367030">"• قراءة كل الإشعارات بما فيها المعلومات، مثل جهات الاتصال والرسائل والصور<br/>• إرسال الإشعارات<br/><br/>يمكنك إدارة الإذن الممنوح لهذا التطبيق بقراءة الإشعارات وإرسالها في أي وقت من خلال الإعدادات > الإشعارات."</string> <string name="permission_app_streaming_summary" msgid="606923325679670624">"بث تطبيقات هاتفك"</string> <string name="permission_storage_summary" msgid="3918240895519506417"></string> <string name="permission_nearby_device_streaming_summary" msgid="8280824871197081246">"بثّ التطبيقات وميزات النظام الأخرى من هاتفك"</string> diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt index a78509d897aa..c0d71494e020 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt @@ -53,6 +53,7 @@ class CredentialManagerRepo( isNewActivity: Boolean, ) { val requestInfo: RequestInfo? + var isReqForAllOptions: Boolean = false private val providerEnabledList: List<ProviderData> private val providerDisabledList: List<DisabledProviderData>? val resultReceiver: ResultReceiver? @@ -102,6 +103,11 @@ class CredentialManagerRepo( ResultReceiver::class.java ) + isReqForAllOptions = intent.getBooleanExtra( + Constants.EXTRA_REQ_FOR_ALL_OPTIONS, + /*defaultValue=*/ false + ) + val cancellationRequest = getCancelUiRequest(intent) val cancelUiRequestState = cancellationRequest?.let { CancelUiRequestState(getAppLabel(context.getPackageManager(), it.appPackageName)) @@ -141,7 +147,8 @@ class CredentialManagerRepo( ) } RequestInfo.TYPE_GET -> { - val getCredentialInitialUiState = getCredentialInitialUiState(originName)!! + val getCredentialInitialUiState = getCredentialInitialUiState(originName, + isReqForAllOptions)!! val autoSelectEntry = findAutoSelectEntry(getCredentialInitialUiState.providerDisplayInfo) UiState( @@ -216,14 +223,18 @@ class CredentialManagerRepo( } // IMPORTANT: new invocation should be mindful that this method can throw. - private fun getCredentialInitialUiState(originName: String?): GetCredentialUiState? { + private fun getCredentialInitialUiState( + originName: String?, + isReqForAllOptions: Boolean + ): GetCredentialUiState? { val providerEnabledList = GetFlowUtils.toProviderList( providerEnabledList as List<GetCredentialProviderData>, context ) val requestDisplayInfo = GetFlowUtils.toRequestDisplayInfo(requestInfo, context, originName) return GetCredentialUiState( - providerEnabledList, - requestDisplayInfo ?: return null, + isReqForAllOptions, + providerEnabledList, + requestDisplayInfo ?: return null ) } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt index 46bebc4073ab..a291f59021f0 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt @@ -26,10 +26,12 @@ import com.android.credentialmanager.model.get.RemoteEntryInfo import com.android.internal.util.Preconditions data class GetCredentialUiState( + val isRequestForAllOptions: Boolean, val providerInfoList: List<ProviderInfo>, val requestDisplayInfo: RequestDisplayInfo, val providerDisplayInfo: ProviderDisplayInfo = toProviderDisplayInfo(providerInfoList), - val currentScreenState: GetScreenState = toGetScreenState(providerDisplayInfo), + val currentScreenState: GetScreenState = toGetScreenState( + providerDisplayInfo, isRequestForAllOptions), val activeEntry: EntryInfo? = toActiveEntry(providerDisplayInfo), val isNoAccount: Boolean = false, ) @@ -184,7 +186,8 @@ private fun toActiveEntry( } private fun toGetScreenState( - providerDisplayInfo: ProviderDisplayInfo + providerDisplayInfo: ProviderDisplayInfo, + isRequestForAllOptions: Boolean ): GetScreenState { return if (providerDisplayInfo.sortedUserNameToCredentialEntryList.isEmpty() && providerDisplayInfo.remoteEntry == null && @@ -194,6 +197,8 @@ private fun toGetScreenState( providerDisplayInfo.authenticationEntryList.isEmpty() && providerDisplayInfo.remoteEntry != null) GetScreenState.REMOTE_ONLY + else if (isRequestForAllOptions) + GetScreenState.ALL_SIGN_IN_OPTIONS else GetScreenState.PRIMARY_SELECTION } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorViewModel.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorViewModel.kt index 2a7e9e16a10e..59e6142f3687 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorViewModel.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorViewModel.kt @@ -21,11 +21,14 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.android.credentialmanager.model.Request import com.android.credentialmanager.client.CredentialManagerClient +import com.android.credentialmanager.model.get.ActionEntryInfo +import com.android.credentialmanager.model.get.CredentialEntryInfo import com.android.credentialmanager.ui.mappers.toGet import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import javax.inject.Inject @@ -33,15 +36,15 @@ import javax.inject.Inject class CredentialSelectorViewModel @Inject constructor( private val credentialManagerClient: CredentialManagerClient, ) : ViewModel() { - + private val isPrimaryScreen = MutableStateFlow(false) val uiState: StateFlow<CredentialSelectorUiState> = credentialManagerClient.requests - .map { request -> + .combine(isPrimaryScreen) { request, isPrimary -> when (request) { null -> CredentialSelectorUiState.Idle is Request.Cancel -> CredentialSelectorUiState.Cancel(request.appName) is Request.Close -> CredentialSelectorUiState.Close is Request.Create -> CredentialSelectorUiState.Create - is Request.Get -> request.toGet() + is Request.Get -> request.toGet(isPrimary) } } .stateIn( @@ -57,9 +60,18 @@ class CredentialSelectorViewModel @Inject constructor( sealed class CredentialSelectorUiState { data object Idle : CredentialSelectorUiState() - sealed class Get : CredentialSelectorUiState() { - data object SingleProviderSinglePasskey : Get() - data object SingleProviderSinglePassword : Get() + sealed class Get() : CredentialSelectorUiState() { + data class SingleEntry(val entry: CredentialEntryInfo) : Get() + data class SingleEntryPerAccount(val sortedEntries: List<CredentialEntryInfo>) : Get() + data class MultipleEntry( + val accounts: List<PerUserNameEntries>, + val actionEntryList: List<ActionEntryInfo>, + ) : Get() { + data class PerUserNameEntries( + val userName: String, + val sortedCredentialEntryList: List<CredentialEntryInfo>, + ) + } // TODO: b/301206470 add the remaining states } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt index 7e0ea3077559..790f5b1f27f3 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/WearApp.kt @@ -26,6 +26,7 @@ import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState import androidx.wear.compose.navigation.rememberSwipeDismissableNavController import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState import com.android.credentialmanager.CredentialSelectorUiState +import com.android.credentialmanager.CredentialSelectorUiState.Get.SingleEntry import com.android.credentialmanager.CredentialSelectorViewModel import com.android.credentialmanager.ui.screens.LoadingScreen import com.android.credentialmanager.ui.screens.single.password.SinglePasswordScreen @@ -57,6 +58,7 @@ fun WearApp( scrollable(Screen.SinglePasswordScreen.route) { SinglePasswordScreen( + state = viewModel.uiState.value as SingleEntry, columnState = it.columnState, onCloseApp = onCloseApp, ) @@ -100,7 +102,7 @@ private fun handleGetNavigation( onCloseApp: () -> Unit, ) { when (state) { - is CredentialSelectorUiState.Get.SingleProviderSinglePassword -> { + is SingleEntry -> { navController.navigateToSinglePasswordScreen() } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt index 14b992a0d0e9..44a838d51a04 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/mappers/CredentialSelectorUiStateGetMapper.kt @@ -18,18 +18,45 @@ package com.android.credentialmanager.ui.mappers import com.android.credentialmanager.model.Request import com.android.credentialmanager.CredentialSelectorUiState +import com.android.credentialmanager.CredentialSelectorUiState.Get.MultipleEntry.PerUserNameEntries +import com.android.credentialmanager.model.CredentialType +import com.android.credentialmanager.model.get.CredentialEntryInfo -fun Request.Get.toGet(): CredentialSelectorUiState.Get { +fun Request.Get.toGet(isPrimary: Boolean): CredentialSelectorUiState.Get { // TODO: b/301206470 returning a hard coded state for MVP - if (true) return CredentialSelectorUiState.Get.SingleProviderSinglePassword - - return if (providerInfos.size == 1) { - if (providerInfos.first().credentialEntryList.size == 1) { - CredentialSelectorUiState.Get.SingleProviderSinglePassword + if (true) return CredentialSelectorUiState.Get.SingleEntry( + providerInfos + .flatMap { it.credentialEntryList } + .first { it.credentialType == CredentialType.PASSWORD } + ) + val accounts = providerInfos + .flatMap { it.credentialEntryList } + .groupBy { it.userName} + .entries + .toList() + return if (isPrimary) { + if (accounts.size == 1) { + CredentialSelectorUiState.Get.SingleEntry( + accounts[0].value.minWith(comparator) + ) } else { - TODO() // b/301206470 - Implement other get flows + CredentialSelectorUiState.Get.SingleEntryPerAccount( + accounts.map { it.value.minWith(comparator) }.sortedWith(comparator) + ) } } else { - TODO() // b/301206470 - Implement other get flows + CredentialSelectorUiState.Get.MultipleEntry( + accounts = accounts.map { PerUserNameEntries( + it.key, + it.value.sortedWith(comparator) + ) + }, + actionEntryList = providerInfos.flatMap { it.actionEntryList }, + ) } } +val comparator = compareBy<CredentialEntryInfo> { entryInfo -> + // Passkey type always go first + entryInfo.credentialType.let{ if (it == CredentialType.PASSKEY) 0 else 1 } +} + .thenByDescending{ it.lastUsedTimeMillis } diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt index b64f58192d23..9f971ae1e327 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.android.credentialmanager.CredentialSelectorUiState.Get.SingleEntry import com.android.credentialmanager.R import com.android.credentialmanager.TAG import com.android.credentialmanager.activity.StartBalIntentSenderForResultContract @@ -44,12 +45,13 @@ import com.google.android.horologist.compose.tools.WearPreview @Composable fun SinglePasswordScreen( + state: SingleEntry, columnState: ScalingLazyColumnState, onCloseApp: () -> Unit, modifier: Modifier = Modifier, viewModel: SinglePasswordScreenViewModel = hiltViewModel(), ) { - viewModel.initialize() + viewModel.initialize(state.entry) val uiState by viewModel.uiState.collectAsStateWithLifecycle() diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreenViewModel.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreenViewModel.kt index 26bee1f8d191..4f9fc46e0fce 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreenViewModel.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreenViewModel.kt @@ -19,12 +19,9 @@ package com.android.credentialmanager.ui.screens.single.password import android.content.Intent import android.credentials.ui.ProviderPendingIntentResponse import android.credentials.ui.UserSelectionDialogResult -import android.util.Log import androidx.activity.result.IntentSenderRequest import androidx.annotation.MainThread import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.android.credentialmanager.TAG import com.android.credentialmanager.ktx.getIntentSenderRequest import com.android.credentialmanager.model.Request import com.android.credentialmanager.client.CredentialManagerClient @@ -33,7 +30,6 @@ import com.android.credentialmanager.ui.model.PasswordUiModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel @@ -51,32 +47,14 @@ class SinglePasswordScreenViewModel @Inject constructor( val uiState: StateFlow<SinglePasswordScreenUiState> = _uiState @MainThread - fun initialize() { + fun initialize(entryInfo: CredentialEntryInfo) { if (initializeCalled) return initializeCalled = true - - viewModelScope.launch { - val request = credentialManagerClient.requests.value - Log.d(TAG, "request: $request, client instance: $credentialManagerClient") - - if (request !is Request.Get) { - _uiState.value = SinglePasswordScreenUiState.Error - } else { - requestGet = request - - if (requestGet.providerInfos.all { it.credentialEntryList.isEmpty() }) { - Log.d(TAG, "Empty passwordEntries") - _uiState.value = SinglePasswordScreenUiState.Error - } else { - entryInfo = requestGet.providerInfos.first().credentialEntryList.first() - _uiState.value = SinglePasswordScreenUiState.Loaded( - PasswordUiModel( - email = entryInfo.userName, - ) - ) - } - } - } + _uiState.value = SinglePasswordScreenUiState.Loaded( + PasswordUiModel( + email = entryInfo.userName, + ) + ) } fun onCancelClick() { diff --git a/packages/InputDevices/res/values-uk/strings.xml b/packages/InputDevices/res/values-uk/strings.xml index 5368f2c64828..71b3496c929f 100644 --- a/packages/InputDevices/res/values-uk/strings.xml +++ b/packages/InputDevices/res/values-uk/strings.xml @@ -3,49 +3,49 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="8016145283189546017">"Пристрої вводу"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Клавіатура Android"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"англійська (Велика Британія)"</string> - <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"англійська (США)"</string> - <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"англійська (США), міжнародна"</string> - <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"англійська (США), розкладка Colemak"</string> - <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"англійська (США), розкладка Дворака"</string> - <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"англійська (США), розкладка Workman"</string> - <string name="keyboard_layout_german_label" msgid="8451565865467909999">"німецька"</string> - <string name="keyboard_layout_french_label" msgid="813450119589383723">"французька"</string> - <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"французька (Канада)"</string> - <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"російська"</string> - <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"російська, розкладка Mac"</string> - <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"іспанська"</string> - <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"французька (Швейцарія)"</string> - <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"німецька (Швейцарія)"</string> - <string name="keyboard_layout_belgian" msgid="2011984572838651558">"бельгійська"</string> - <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"болгарська"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Англійська (Велика Британія)"</string> + <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Англійська (США)"</string> + <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Англійська (США), міжнародна"</string> + <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Англійська (США), розкладка Colemak"</string> + <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"Англійська (США), розкладка Дворака"</string> + <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"Англійська (США), розкладка Workman"</string> + <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Німецька"</string> + <string name="keyboard_layout_french_label" msgid="813450119589383723">"Французька"</string> + <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Французька (Канада)"</string> + <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Російська"</string> + <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Російська, розкладка Mac"</string> + <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Іспанська"</string> + <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Французька (Швейцарія)"</string> + <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Німецька (Швейцарія)"</string> + <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Бельгійська"</string> + <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Болгарська"</string> <string name="keyboard_layout_bulgarian_phonetic" msgid="7568914730360106653">"Болгарська (фонетична)"</string> - <string name="keyboard_layout_italian" msgid="6497079660449781213">"італійська"</string> - <string name="keyboard_layout_danish" msgid="8036432066627127851">"данська"</string> - <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"норвезька"</string> - <string name="keyboard_layout_swedish" msgid="732959109088479351">"шведська"</string> - <string name="keyboard_layout_finnish" msgid="5585659438924315466">"фінська"</string> - <string name="keyboard_layout_croatian" msgid="4172229471079281138">"хорватська"</string> - <string name="keyboard_layout_czech" msgid="1349256901452975343">"чеська"</string> + <string name="keyboard_layout_italian" msgid="6497079660449781213">"Італійська"</string> + <string name="keyboard_layout_danish" msgid="8036432066627127851">"Данська"</string> + <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Норвезька"</string> + <string name="keyboard_layout_swedish" msgid="732959109088479351">"Шведська"</string> + <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Фінська"</string> + <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Хорватська"</string> + <string name="keyboard_layout_czech" msgid="1349256901452975343">"Чеська"</string> <string name="keyboard_layout_czech_qwerty" msgid="3331402534128515501">"Чеська (QWERTY)"</string> - <string name="keyboard_layout_estonian" msgid="8775830985185665274">"естонська"</string> - <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"угорська"</string> - <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"ісландська"</string> - <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"бразильська"</string> - <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"португальська"</string> - <string name="keyboard_layout_slovak" msgid="2469379934672837296">"словацька"</string> - <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"словенська"</string> - <string name="keyboard_layout_turkish" msgid="7736163250907964898">"турецька"</string> + <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Естонська"</string> + <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Угорська"</string> + <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Ісландська"</string> + <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Бразильська"</string> + <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Португальська"</string> + <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Словацька"</string> + <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Словенська"</string> + <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Турецька"</string> <string name="keyboard_layout_turkish_f" msgid="9130320856010776018">"Турецька-F"</string> - <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"українська"</string> - <string name="keyboard_layout_arabic" msgid="5671970465174968712">"арабська"</string> + <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Українська"</string> + <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Арабська"</string> <string name="keyboard_layout_greek" msgid="7289253560162386040">"Грецька"</string> <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Іврит"</string> <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Литовська"</string> <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Іспанська (латиниця)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латвійська"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Перська"</string> - <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"азербайджанська"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Азербайджанська"</string> <string name="keyboard_layout_polish" msgid="1121588624094925325">"Польська"</string> <string name="keyboard_layout_belarusian" msgid="7619281752698687588">"Білоруська"</string> <string name="keyboard_layout_mongolian" msgid="7678483495823936626">"Монгольська"</string> diff --git a/packages/PackageInstaller/res/values-ar/strings.xml b/packages/PackageInstaller/res/values-ar/strings.xml index e4da5b736d70..224c6dc90903 100644 --- a/packages/PackageInstaller/res/values-ar/strings.xml +++ b/packages/PackageInstaller/res/values-ar/strings.xml @@ -44,8 +44,7 @@ <string name="unknown_apps_user_restriction_dlg_text" msgid="151020786933988344">"يتعذر على هذا المستخدم تثبيت التطبيقات غير المعروفة"</string> <string name="install_apps_user_restriction_dlg_text" msgid="2154119597001074022">"غير مسموح لهذا المستخدم بتثبيت التطبيقات"</string> <string name="ok" msgid="7871959885003339302">"حسنًا"</string> - <!-- no translation found for archive (4447791830199354721) --> - <skip /> + <string name="archive" msgid="4447791830199354721">"أرشفة"</string> <string name="update_anyway" msgid="8792432341346261969">"التحديث على أي حال"</string> <string name="manage_applications" msgid="5400164782453975580">"إدارة التطبيقات"</string> <string name="out_of_space_dlg_title" msgid="4156690013884649502">"نفدت مساحة التخزين"</string> @@ -60,16 +59,11 @@ <string name="uninstall_update_title" msgid="824411791011583031">"إزالة التحديث"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> هو جزء من التطبيق التالي:"</string> <string name="uninstall_application_text" msgid="3816830743706143980">"هل تريد إزالة هذا التطبيق؟"</string> - <!-- no translation found for archive_application_text (8482325710714386348) --> - <skip /> - <!-- no translation found for archive_application_text_all_users (3151229641681672580) --> - <skip /> - <!-- no translation found for archive_application_text_current_user_work_profile (1450487362134779752) --> - <skip /> - <!-- no translation found for archive_application_text_user (2586558895535581451) --> - <skip /> - <!-- no translation found for archive_application_text_current_user_private_profile (1958423158655599132) --> - <skip /> + <string name="archive_application_text" msgid="8482325710714386348">"سيتم حفظ بياناتك الشخصية."</string> + <string name="archive_application_text_all_users" msgid="3151229641681672580">"هل تريد أرشفة هذا التطبيق لجميع المستخدمين؟ سيتم حفظ بياناتك الشخصية."</string> + <string name="archive_application_text_current_user_work_profile" msgid="1450487362134779752">"هل تريد أرشفة هذا التطبيق في ملف العمل؟ سيتم حفظ بياناتك الشخصية."</string> + <string name="archive_application_text_user" msgid="2586558895535581451">"هل تريد أرشفة هذا التطبيق لـ \"<xliff:g id="USERNAME">%1$s</xliff:g>\"؟ سيتم حفظ بياناتك الشخصية."</string> + <string name="archive_application_text_current_user_private_profile" msgid="1958423158655599132">"هل تريد أرشفة هذا التطبيق المحفوظ في المساحة الخاصّة؟ سيتم حفظ بياناتك الشخصية."</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"هل تريد إزالة هذا التطبيق "<b>"لكل"</b>" المستخدمين؟ ستتم إزالة التطبيق وبياناته من "<b>"كل"</b>" المستخدمين على هذا الجهاز."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"هل تريد إزالة هذا التطبيق للمستخدم <xliff:g id="USERNAME">%1$s</xliff:g>؟"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"هل تريد إزالة تثبيت هذا التطبيق من ملفك الشخصي للعمل؟"</string> @@ -108,8 +102,7 @@ <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"يعتبر الجهاز اللوحي والبيانات الشخصية أكثر عرضة لهجوم التطبيقات غير المعروفة. من خلال تثبيت هذا التطبيق، توافق على تحمل مسؤولية أي ضرر يحدث للجهاز اللوحي أو فقدان البيانات الذي قد ينتج عن استخدامه."</string> <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"يعتبر جهاز التلفزيون والبيانات الشخصية أكثر عرضة لهجوم التطبيقات غير المعروفة. من خلال تثبيت هذا التطبيق، توافق على تحمل مسؤولية أي ضرر يحدث لجهاز التلفزيون أو فقدان البيانات الذي قد ينتج عن استخدامه."</string> <string name="cloned_app_label" msgid="7503612829833756160">"نسخة طبق الأصل من \"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>\""</string> - <!-- no translation found for archiving_app_label (1127085259724124725) --> - <skip /> + <string name="archiving_app_label" msgid="1127085259724124725">"هل تريد أرشفة <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>؟"</string> <string name="anonymous_source_continue" msgid="4375745439457209366">"متابعة"</string> <string name="external_sources_settings" msgid="4046964413071713807">"الإعدادات"</string> <string name="wear_app_channel" msgid="1960809674709107850">"تثبيت / إلغاء تثبيت تطبيقات Android Wear"</string> diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java index 5ca02eae5167..dbe32cc42d1a 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java @@ -60,20 +60,29 @@ public class InstallConfirmationFragment extends DialogFragment { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { View dialogView = getLayoutInflater().inflate(R.layout.install_content_view, null); + int positiveBtnTextRes; + if (mDialogData.isAppUpdating()) { + if (mDialogData.getDialogMessage() != null) { + positiveBtnTextRes = R.string.update_anyway; + } else { + positiveBtnTextRes = R.string.update; + } + } else { + positiveBtnTextRes = R.string.install; + } + mDialog = new AlertDialog.Builder(requireContext()) .setIcon(mDialogData.getAppIcon()) .setTitle(mDialogData.getAppLabel()) .setView(dialogView) - .setPositiveButton(mDialogData.isAppUpdating() ? R.string.update : R.string.install, + .setPositiveButton(positiveBtnTextRes, (dialogInt, which) -> mInstallActionListener.onPositiveResponse( InstallUserActionRequired.USER_ACTION_REASON_INSTALL_CONFIRMATION)) .setNegativeButton(R.string.cancel, (dialogInt, which) -> mInstallActionListener.onNegativeResponse( mDialogData.getStageCode())) - .create(); - // TODO: Dynamically change positive button text to update anyway TextView viewToEnable; if (mDialogData.isAppUpdating()) { viewToEnable = dialogView.requireViewById(R.id.install_confirm_question_update); diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 1cdb69c6634b..a94c313ee817 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -140,8 +140,8 @@ <string name="bluetooth_hid_profile_summary_use_for" msgid="4289460627406490952">"Tumia kwa kuingiza"</string> <string name="bluetooth_hearing_aid_profile_summary_use_for" msgid="3374057355721486932">"Tumia kwa visaidizi vya kusikia"</string> <string name="bluetooth_le_audio_profile_summary_use_for" msgid="2778318636027348572">"Tumia kwa ajili ya LE_AUDIO"</string> - <string name="bluetooth_pairing_accept" msgid="2054232610815498004">"Oanisha"</string> - <string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"OANISHA"</string> + <string name="bluetooth_pairing_accept" msgid="2054232610815498004">"Unganisha"</string> + <string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"UNGANISHA"</string> <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Ghairi"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Kuoanisha hutoa ruhusa ya kufikiwa kwa unaowasiliana nao na rekodi ya simu zilizopigwa unapounganishwa."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Haikuwezakulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> @@ -237,10 +237,10 @@ <string name="adb_wireless_error" msgid="721958772149779856">"Hitilafu"</string> <string name="adb_wireless_settings" msgid="2295017847215680229">"Utatuzi usiotumia waya"</string> <string name="adb_wireless_list_empty_off" msgid="1713707973837255490">"Ili kuangalia na kutumia vifaa vinavyopatikana, washa utatuzi usiotumia waya"</string> - <string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"Oanisha kifaa ukitumia msimbo wa QR"</string> - <string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"Oanisha vifaa vipya ukitumia kichanganuzi cha Msimbo wa QR"</string> - <string name="adb_pair_method_code_title" msgid="1122590300445142904">"Oanisha kifaa ukitumia msimbo wa kuoanisha"</string> - <string name="adb_pair_method_code_summary" msgid="6370414511333685185">"Oanisha vifaa vipya ukitumia msimbo wa tarakimu sita"</string> + <string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"Unganisha kifaa ukitumia msimbo wa QR"</string> + <string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"Unganisha vifaa vipya ukitumia kichanganuzi cha Msimbo wa QR"</string> + <string name="adb_pair_method_code_title" msgid="1122590300445142904">"Unganisha kifaa ukitumia msimbo wa kuunganisha"</string> + <string name="adb_pair_method_code_summary" msgid="6370414511333685185">"Unganisha vifaa vipya ukitumia msimbo wa tarakimu sita"</string> <string name="adb_paired_devices_title" msgid="5268997341526217362">"Vifaa vilivyooanishwa"</string> <string name="adb_wireless_device_connected_summary" msgid="3039660790249148713">"Vilivyounganishwa kwa sasa"</string> <string name="adb_wireless_device_details_title" msgid="7129369670526565786">"Maelezo ya kifaa"</string> @@ -248,16 +248,16 @@ <string name="adb_device_fingerprint_title_format" msgid="291504822917843701">"Alama bainifu ya kifaa: <xliff:g id="FINGERPRINT_PARAM">%1$s</xliff:g>"</string> <string name="adb_wireless_connection_failed_title" msgid="664211177427438438">"Imeshindwa kuunganisha"</string> <string name="adb_wireless_connection_failed_message" msgid="9213896700171602073">"Hakikisha kuwa <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kimeunganishwa kwenye mtandao sahihi"</string> - <string name="adb_pairing_device_dialog_title" msgid="7141739231018530210">"Oanisha na kifaa"</string> + <string name="adb_pairing_device_dialog_title" msgid="7141739231018530210">"Unganisha na kifaa"</string> <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Msimbo wa kuoanisha wa Wi-Fi"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Imeshindwa kuoanisha"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Hakikisha kuwa kifaa kimeunganishwa kwenye mtandao mmoja."</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Oanisha kifaa kupitia Wi-Fi kwa kuchanganua msimbo wa QR"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Unganisha kifaa kupitia Wi-Fi kwa kuchanganua msimbo wa QR"</string> <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Inaoanisha kifaa…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Imeshindwa kuoanisha kifaa. Huenda msimbo wa QR haukuwa sahihi au kifaa hakijaunganishwa kwenye mtandao mmoja."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"Anwani ya IP na Mlango"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Changanua msimbo wa QR"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Oanisha kifaa kupitia Wi-Fi kwa kuchanganua msimbo wa QR"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Unganisha kifaa kupitia Wi-Fi kwa kuchanganua msimbo wa QR"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Tafadhali unganisha kwenye mtandao wa Wi-Fi"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, tatua, dev"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"Njia ya mkato ya kuripoti hitilafu"</string> diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp index 7f16ca52d949..03f9d74a4a34 100644 --- a/packages/SystemUI/aconfig/Android.bp +++ b/packages/SystemUI/aconfig/Android.bp @@ -25,6 +25,7 @@ package { "//frameworks/base/packages/SystemUI:__subpackages__", "//frameworks/libs/systemui/tracinglib:__subpackages__", "//platform_testing:__subpackages__", + "//cts:__subpackages__", ], } diff --git a/packages/SystemUI/compose/core/src/com/android/compose/ui/platform/DensityAwareComposeView.kt b/packages/SystemUI/compose/core/src/com/android/compose/ui/platform/DensityAwareComposeView.kt new file mode 100644 index 000000000000..dff8753fd880 --- /dev/null +++ b/packages/SystemUI/compose/core/src/com/android/compose/ui/platform/DensityAwareComposeView.kt @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.compose.ui.platform + +import android.content.Context +import android.content.res.Configuration +import android.util.AttributeSet +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.platform.AbstractComposeView + +/** + * A ComposeView that recreates its composition if the display size or font scale was changed. + * + * TODO(b/317317814): Remove this workaround. + */ +class DensityAwareComposeView(context: Context) : OpenComposeView(context) { + private var lastDensityDpi: Int = -1 + private var lastFontScale: Float = -1f + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + + val configuration = context.resources.configuration + lastDensityDpi = configuration.densityDpi + lastFontScale = configuration.fontScale + } + + override fun dispatchConfigurationChanged(newConfig: Configuration) { + super.dispatchConfigurationChanged(newConfig) + + // If the density or font scale changed, we dispose then recreate the composition. Note that + // we do this here after dispatching the new configuration to children (instead of doing + // this in onConfigurationChanged()) because the new configuration should first be + // dispatched to the AndroidComposeView that holds the current density before we recreate + // the composition. + val densityDpi = newConfig.densityDpi + val fontScale = newConfig.fontScale + if (densityDpi != lastDensityDpi || fontScale != lastFontScale) { + lastDensityDpi = densityDpi + lastFontScale = fontScale + + disposeComposition() + if (isAttachedToWindow) { + createComposition() + } + } + } +} + +/** A fork of [androidx.compose.ui.platform.ComposeView] that is open and can be subclassed. */ +open class OpenComposeView +internal constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + AbstractComposeView(context, attrs, defStyleAttr) { + + private val content = mutableStateOf<(@Composable () -> Unit)?>(null) + + @Suppress("RedundantVisibilityModifier") + protected override var shouldCreateCompositionOnAttachedToWindow: Boolean = false + + @Composable + override fun Content() { + content.value?.invoke() + } + + override fun getAccessibilityClassName(): CharSequence { + return javaClass.name + } + + /** + * Set the Jetpack Compose UI content for this view. Initial composition will occur when the + * view becomes attached to a window or when [createComposition] is called, whichever comes + * first. + */ + fun setContent(content: @Composable () -> Unit) { + shouldCreateCompositionOnAttachedToWindow = true + this.content.value = content + if (isAttachedToWindow) { + createComposition() + } + } +} diff --git a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt index 5055ee1d73f6..d31547bd0d64 100644 --- a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt +++ b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.lifecycle.LifecycleOwner import com.android.compose.theme.PlatformTheme +import com.android.compose.ui.platform.DensityAwareComposeView import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation import com.android.systemui.common.ui.compose.windowinsets.DisplayCutout import com.android.systemui.common.ui.compose.windowinsets.DisplayCutoutProvider @@ -84,7 +85,7 @@ object ComposeFacade : BaseComposeFacade { viewModel: FooterActionsViewModel, qsVisibilityLifecycleOwner: LifecycleOwner, ): View { - return ComposeView(context).apply { + return DensityAwareComposeView(context).apply { setContent { PlatformTheme { FooterActions(viewModel, qsVisibilityLifecycleOwner) } } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 17c4e022ba82..5a4e0a9cd5ce 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -16,6 +16,7 @@ package com.android.systemui.communal.ui.compose +import android.appwidget.AppWidgetHostView import android.os.Bundle import android.util.SizeF import android.widget.FrameLayout @@ -376,7 +377,7 @@ private fun SmartspaceContent( AndroidView( modifier = modifier, factory = { context -> - FrameLayout(context).apply { addView(model.remoteViews.apply(context, this)) } + AppWidgetHostView(context).apply { updateAppWidget(model.remoteViews) } }, // For reusing composition in lazy lists. onReset = {}, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt index 67a68200f269..ff53ff256931 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt @@ -37,9 +37,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn -/** Set this to `true` to use the LockscreenContent replacement of KeyguardRootView. */ -private val UseLockscreenContent = false - /** The lock screen scene shows when the device is locked. */ @SysUISingleton class LockscreenScene @@ -48,7 +45,6 @@ constructor( @Application private val applicationScope: CoroutineScope, private val viewModel: LockscreenSceneViewModel, private val lockscreenContent: Lazy<LockscreenContent>, - private val viewBasedLockscreenContent: Lazy<ViewBasedLockscreenContent>, ) : ComposableScene { override val key = SceneKey.Lockscreen @@ -73,7 +69,6 @@ constructor( ) { LockscreenScene( lockscreenContent = lockscreenContent, - viewBasedLockscreenContent = viewBasedLockscreenContent, modifier = modifier, ) } @@ -93,22 +88,13 @@ constructor( } @Composable -private fun SceneScope.LockscreenScene( +private fun LockscreenScene( lockscreenContent: Lazy<LockscreenContent>, - viewBasedLockscreenContent: Lazy<ViewBasedLockscreenContent>, modifier: Modifier = Modifier, ) { - if (UseLockscreenContent) { - lockscreenContent - .get() - .Content( - modifier = modifier.fillMaxSize(), - ) - } else { - with(viewBasedLockscreenContent.get()) { - Content( - modifier = modifier.fillMaxSize(), - ) - } - } + lockscreenContent + .get() + .Content( + modifier = modifier.fillMaxSize(), + ) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenSceneBlueprintModule.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenSceneBlueprintModule.kt index 9abb50c35ccf..3677cab890f5 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenSceneBlueprintModule.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenSceneBlueprintModule.kt @@ -20,6 +20,7 @@ import com.android.systemui.keyguard.ui.composable.blueprint.CommunalBlueprintMo import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule import com.android.systemui.keyguard.ui.composable.blueprint.ShortcutsBesideUdfpsBlueprintModule import com.android.systemui.keyguard.ui.composable.blueprint.SplitShadeBlueprintModule +import com.android.systemui.keyguard.ui.composable.section.OptionalSectionModule import dagger.Module @Module( @@ -27,6 +28,7 @@ import dagger.Module [ CommunalBlueprintModule::class, DefaultBlueprintModule::class, + OptionalSectionModule::class, ShortcutsBesideUdfpsBlueprintModule::class, SplitShadeBlueprintModule::class, ], diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/ViewBasedLockscreenContent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/ViewBasedLockscreenContent.kt deleted file mode 100644 index 8119d2a119ca..000000000000 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/ViewBasedLockscreenContent.kt +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.keyguard.ui.composable - -import android.graphics.Rect -import android.view.View -import android.view.ViewGroup -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.toComposeRect -import androidx.compose.ui.layout.Layout -import androidx.compose.ui.layout.onPlaced -import androidx.compose.ui.viewinterop.AndroidView -import androidx.core.view.isVisible -import com.android.compose.animation.scene.SceneScope -import com.android.systemui.keyguard.qualifiers.KeyguardRootView -import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel -import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneViewModel -import com.android.systemui.notifications.ui.composable.NotificationStack -import com.android.systemui.res.R -import javax.inject.Inject - -/** - * Renders the content of the lockscreen. - * - * This is different from [LockscreenContent] (which is pure compose) and uses a view-based - * implementation of the lockscreen scene content that relies on [KeyguardRootView]. - * - * TODO(b/316211368): remove this once [LockscreenContent] is feature complete. - */ -class ViewBasedLockscreenContent -@Inject -constructor( - private val lockscreenSceneViewModel: LockscreenSceneViewModel, - @KeyguardRootView private val viewProvider: () -> @JvmSuppressWildcards View, - private val keyguardRootViewModel: KeyguardRootViewModel, -) { - @Composable - fun SceneScope.Content( - modifier: Modifier = Modifier, - ) { - fun findSettingsMenu(): View { - return viewProvider().requireViewById(R.id.keyguard_settings_button) - } - - LockscreenLongPress( - viewModel = lockscreenSceneViewModel.longPress, - modifier = modifier, - ) { onSettingsMenuPlaced -> - AndroidView( - factory = { _ -> - val keyguardRootView = viewProvider() - // Remove the KeyguardRootView from any parent it might already have in legacy - // code just in case (a view can't have two parents). - (keyguardRootView.parent as? ViewGroup)?.removeView(keyguardRootView) - keyguardRootView - }, - modifier = Modifier.fillMaxSize(), - ) - - val notificationStackPosition by - keyguardRootViewModel.notificationBounds.collectAsState() - - Layout( - modifier = - Modifier.fillMaxSize().onPlaced { - val settingsMenuView = findSettingsMenu() - onSettingsMenuPlaced( - if (settingsMenuView.isVisible) { - val bounds = Rect() - settingsMenuView.getHitRect(bounds) - bounds.toComposeRect() - } else { - null - } - ) - }, - content = { - NotificationStack( - viewModel = lockscreenSceneViewModel.notifications, - isScrimVisible = false, - ) - } - ) { measurables, constraints -> - check(measurables.size == 1) - val height = notificationStackPosition.height.toInt() - val childConstraints = constraints.copy(minHeight = height, maxHeight = height) - val placeable = measurables[0].measure(childConstraints) - layout(constraints.maxWidth, constraints.maxHeight) { - val start = (constraints.maxWidth - placeable.measuredWidth) / 2 - placeable.placeRelative(x = start, y = notificationStackPosition.top.toInt()) - } - } - } - } -} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt index 7385a251200e..84d42463913c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt @@ -38,6 +38,7 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel import dagger.Binds import dagger.Module import dagger.multibindings.IntoSet +import java.util.Optional import javax.inject.Inject /** @@ -53,7 +54,7 @@ constructor( private val smartSpaceSection: SmartSpaceSection, private val notificationSection: NotificationSection, private val lockSection: LockSection, - private val ambientIndicationSection: AmbientIndicationSection, + private val ambientIndicationSectionOptional: Optional<AmbientIndicationSection>, private val bottomAreaSection: BottomAreaSection, private val settingsMenuSection: SettingsMenuSection, private val clockInteractor: KeyguardClockInteractor, @@ -94,8 +95,8 @@ constructor( with(notificationSection) { Notifications(modifier = Modifier.fillMaxWidth().weight(1f)) } - if (!isUdfpsVisible) { - with(ambientIndicationSection) { + if (!isUdfpsVisible && ambientIndicationSectionOptional.isPresent) { + with(ambientIndicationSectionOptional.get()) { AmbientIndication(modifier = Modifier.fillMaxWidth()) } } @@ -105,8 +106,8 @@ constructor( // Aligned to bottom and constrained to below the lock icon. Column(modifier = Modifier.fillMaxWidth()) { - if (isUdfpsVisible) { - with(ambientIndicationSection) { + if (isUdfpsVisible && ambientIndicationSectionOptional.isPresent) { + with(ambientIndicationSectionOptional.get()) { AmbientIndication(modifier = Modifier.fillMaxWidth()) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/ShortcutsBesideUdfpsBlueprint.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/ShortcutsBesideUdfpsBlueprint.kt index acd47797baca..414846276b2a 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/ShortcutsBesideUdfpsBlueprint.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/ShortcutsBesideUdfpsBlueprint.kt @@ -38,6 +38,7 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel import dagger.Binds import dagger.Module import dagger.multibindings.IntoSet +import java.util.Optional import javax.inject.Inject /** @@ -53,7 +54,7 @@ constructor( private val smartSpaceSection: SmartSpaceSection, private val notificationSection: NotificationSection, private val lockSection: LockSection, - private val ambientIndicationSection: AmbientIndicationSection, + private val ambientIndicationSectionOptional: Optional<AmbientIndicationSection>, private val bottomAreaSection: BottomAreaSection, private val settingsMenuSection: SettingsMenuSection, private val clockInteractor: KeyguardClockInteractor, @@ -94,8 +95,8 @@ constructor( with(notificationSection) { Notifications(modifier = Modifier.fillMaxWidth().weight(1f)) } - if (!isUdfpsVisible) { - with(ambientIndicationSection) { + if (!isUdfpsVisible && ambientIndicationSectionOptional.isPresent) { + with(ambientIndicationSectionOptional.get()) { AmbientIndication(modifier = Modifier.fillMaxWidth()) } } @@ -111,8 +112,8 @@ constructor( // Aligned to bottom and constrained to below the lock icon. Column(modifier = Modifier.fillMaxWidth()) { - if (isUdfpsVisible) { - with(ambientIndicationSection) { + if (isUdfpsVisible && ambientIndicationSectionOptional.isPresent) { + with(ambientIndicationSectionOptional.get()) { AmbientIndication(modifier = Modifier.fillMaxWidth()) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/AmbientIndicationSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/AmbientIndicationSection.kt index 1e5481ebfa6c..af9a195c4575 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/AmbientIndicationSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/AmbientIndicationSection.kt @@ -16,38 +16,11 @@ package com.android.systemui.keyguard.ui.composable.section -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import com.android.compose.animation.scene.ElementKey import com.android.compose.animation.scene.SceneScope -import javax.inject.Inject -class AmbientIndicationSection @Inject constructor() { - @Composable - fun SceneScope.AmbientIndication(modifier: Modifier = Modifier) { - MovableElement( - key = AmbientIndicationElementKey, - modifier = modifier, - ) { - content { - Box( - modifier = Modifier.fillMaxWidth().background(Color.Green), - ) { - Text( - text = "TODO(b/316211368): Ambient indication", - color = Color.White, - modifier = Modifier.align(Alignment.Center), - ) - } - } - } - } +/** Defines interface for classes that can render the ambient indication area. */ +interface AmbientIndicationSection { + @Composable fun SceneScope.AmbientIndication(modifier: Modifier) } - -private val AmbientIndicationElementKey = ElementKey("AmbientIndication") diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/ClockSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/ClockSection.kt index 0f3fc47d4e91..f021bb6743c4 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/ClockSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/ClockSection.kt @@ -16,76 +16,111 @@ package com.android.systemui.keyguard.ui.composable.section -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.Text +import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.viewinterop.AndroidView import com.android.compose.animation.scene.ElementKey import com.android.compose.animation.scene.SceneScope +import com.android.compose.modifiers.padding +import com.android.keyguard.KeyguardClockSwitch +import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor import com.android.systemui.keyguard.ui.composable.modifier.onTopPlacementChanged import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel +import com.android.systemui.res.R import javax.inject.Inject class ClockSection @Inject constructor( private val viewModel: KeyguardClockViewModel, + private val clockInteractor: KeyguardClockInteractor, ) { + @Composable fun SceneScope.SmallClock( onTopChanged: (top: Float?) -> Unit, modifier: Modifier = Modifier, ) { - if (viewModel.useLargeClock) { + val clockSize by viewModel.clockSize.collectAsState() + val currentClock by viewModel.currentClock.collectAsState() + viewModel.clock = currentClock + + if (clockSize != KeyguardClockSwitch.SMALL) { onTopChanged(null) return } + if (currentClock?.smallClock?.view == null) { + return + } + + val view = LocalView.current + + DisposableEffect(view) { + clockInteractor.clockEventController.registerListeners(view) + + onDispose { clockInteractor.clockEventController.unregisterListeners() } + } + MovableElement( key = ClockElementKey, modifier = modifier, ) { content { - Box( + AndroidView( + factory = { checkNotNull(currentClock).smallClock.view }, modifier = - Modifier.fillMaxWidth() - .background(Color.Magenta) - .onTopPlacementChanged(onTopChanged) - ) { - Text( - text = "TODO(b/316211368): Small clock", - color = Color.White, - modifier = Modifier.align(Alignment.Center), - ) - } + Modifier.padding( + horizontal = + dimensionResource(R.dimen.keyguard_affordance_horizontal_offset) + ) + .padding(top = { viewModel.getSmallClockTopMargin(view.context) }) + .onTopPlacementChanged(onTopChanged), + ) } } } @Composable fun SceneScope.LargeClock(modifier: Modifier = Modifier) { - if (!viewModel.useLargeClock) { + val clockSize by viewModel.clockSize.collectAsState() + val currentClock by viewModel.currentClock.collectAsState() + viewModel.clock = currentClock + + if (clockSize != KeyguardClockSwitch.LARGE) { return } + if (currentClock?.largeClock?.view == null) { + return + } + + val view = LocalView.current + + DisposableEffect(view) { + clockInteractor.clockEventController.registerListeners(view) + + onDispose { clockInteractor.clockEventController.unregisterListeners() } + } + MovableElement( key = ClockElementKey, modifier = modifier, ) { content { - Box( - modifier = Modifier.fillMaxWidth().background(Color.Blue), - ) { - Text( - text = "TODO(b/316211368): Large clock", - color = Color.White, - modifier = Modifier.align(Alignment.Center), - ) - } + AndroidView( + factory = { checkNotNull(currentClock).largeClock.view }, + modifier = + Modifier.fillMaxWidth() + .padding(top = { viewModel.getLargeClockTopMargin(view.context) }) + ) } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/OptionalSectionModule.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/OptionalSectionModule.kt new file mode 100644 index 000000000000..5b7a8e6eb52f --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/OptionalSectionModule.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.composable.section + +import dagger.BindsOptionalOf +import dagger.Module + +/** + * Dagger module for providing placeholders for optional lockscreen scene sections that don't exist + * in AOSP but may be provided by OEMs. + */ +@Module +interface OptionalSectionModule { + @BindsOptionalOf fun ambientIndicationSection(): AmbientIndicationSection +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt index 65a53f57f2e7..9778e53d8f69 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt @@ -40,6 +40,7 @@ import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Companion.Collaps import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Expanding import com.android.systemui.res.R import com.android.systemui.scene.ui.composable.Gone +import com.android.systemui.scene.ui.composable.Lockscreen import com.android.systemui.scene.ui.composable.QuickSettings as QuickSettingsSceneKey import com.android.systemui.scene.ui.composable.Shade @@ -77,7 +78,12 @@ private fun SceneScope.stateForQuickSettingsContent(): QSSceneAdapter.State { toScene == Shade -> QSSceneAdapter.State.QQS toScene == QuickSettingsSceneKey -> QSSceneAdapter.State.QS toScene == Gone -> QSSceneAdapter.State.CLOSED - else -> error("Bad transition for QuickSettings: $transitionState") + toScene == Lockscreen -> QSSceneAdapter.State.CLOSED + else -> + error( + "Bad transition for QuickSettings: fromScene=$fromScene," + + " toScene=$toScene" + ) } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt index 99f81ee5c7d3..e2beaeea6402 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt @@ -91,12 +91,19 @@ fun SceneScope.CollapsedShadeHeader( statusBarIconController: StatusBarIconController, modifier: Modifier = Modifier, ) { - val formatProgress = animateSceneFloatAsState(0.0f, ShadeHeader.Keys.transitionProgress) + val formatProgress = + animateSceneFloatAsState(0f, ShadeHeader.Keys.transitionProgress) + .unsafeCompositionState(initialValue = 0f) val cutoutWidth = LocalDisplayCutout.current.width() val cutoutLocation = LocalDisplayCutout.current.location - val useExpandedFormat = formatProgress.value > 0.5f || cutoutLocation != CutoutLocation.CENTER + val useExpandedFormat by + remember(formatProgress) { + derivedStateOf { + cutoutLocation != CutoutLocation.CENTER || formatProgress.value > 0.5f + } + } // This layout assumes it is globally positioned at (0, 0) and is the // same size as the screen. @@ -209,7 +216,9 @@ fun SceneScope.ExpandedShadeHeader( statusBarIconController: StatusBarIconController, modifier: Modifier = Modifier, ) { - val formatProgress = animateSceneFloatAsState(1.0f, ShadeHeader.Keys.transitionProgress) + val formatProgress = + animateSceneFloatAsState(1f, ShadeHeader.Keys.transitionProgress) + .unsafeCompositionState(initialValue = 1f) val useExpandedFormat by remember(formatProgress) { derivedStateOf { formatProgress.value > 0.5f } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/SysuiTestCaseSelfTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/SysuiTestCaseSelfTest.kt new file mode 100644 index 000000000000..be6bb9c39299 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/SysuiTestCaseSelfTest.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.google.common.truth.Truth +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class SysuiTestCaseSelfTest : SysuiTestCase() { + private val contextBeforeSetup = context + + // cf b/311612168 + @Test + fun captureCorrectContextBeforeSetupRuns() { + Truth.assertThat(contextBeforeSetup).isEqualTo(context) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractorTest.kt index 640807b110d2..8d6d052b8769 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractorTest.kt @@ -24,6 +24,7 @@ import android.view.DisplayInfo import android.view.WindowInsets import android.view.WindowManager import android.view.WindowMetrics +import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider @@ -36,15 +37,24 @@ import com.android.systemui.biometrics.shared.model.DisplayRotation.ROTATION_90 import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository +import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor +import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING +import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN +import com.android.systemui.keyguard.shared.model.KeyguardState.OFF +import com.android.systemui.keyguard.shared.model.TransitionState +import com.android.systemui.keyguard.shared.model.TransitionStep +import com.android.systemui.kosmos.testScope import com.android.systemui.log.SideFpsLogger import com.android.systemui.log.logcatLogBuffer import com.android.systemui.res.R +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import java.util.Optional import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -52,7 +62,6 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.junit.runners.JUnit4 import org.mockito.Mock import org.mockito.Mockito.mock import org.mockito.Mockito.spy @@ -60,11 +69,12 @@ import org.mockito.junit.MockitoJUnit @OptIn(ExperimentalCoroutinesApi::class) @SmallTest -@RunWith(JUnit4::class) +@RunWith(AndroidJUnit4::class) class SideFpsSensorInteractorTest : SysuiTestCase() { + private val kosmos = testKosmos() @JvmField @Rule var mockitoRule = MockitoJUnit.rule() - private val testScope = TestScope(StandardTestDispatcher()) + private val testScope = kosmos.testScope private val fingerprintRepository = FakeFingerprintPropertyRepository() @@ -94,6 +104,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { contextDisplayInfo.uniqueId = "current-display" whenever(fingerprintInteractiveToAuthProvider.enabledForCurrentUser) .thenReturn(isRestToUnlockEnabled) + overrideResource(R.bool.config_restToUnlockSupported, true) underTest = SideFpsSensorInteractor( mContext, @@ -101,6 +112,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { windowManager, displayStateInteractor, Optional.of(fingerprintInteractiveToAuthProvider), + kosmos.keyguardTransitionInteractor, SideFpsLogger(logcatLogBuffer("SfpsLogger")) ) } @@ -129,11 +141,62 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { assertThat(isAvailable).isFalse() } + private suspend fun sendTransition(from: KeyguardState, to: KeyguardState) { + kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps( + listOf( + TransitionStep( + from = from, + to = to, + transitionState = TransitionState.STARTED, + ), + TransitionStep( + from = from, + to = to, + transitionState = TransitionState.FINISHED, + value = 1.0f + ) + ), + testScope + ) + } + @Test - fun authenticationDurationIsAvailableWhenSFPSSensorIsAvailable() = + fun authenticationDurationIsLongerIfScreenIsOff() = testScope.runTest { - assertThat(underTest.authenticationDuration) - .isEqualTo(context.resources.getInteger(R.integer.config_restToUnlockDuration)) + val authenticationDuration by collectLastValue(underTest.authenticationDuration) + val longDuration = + context.resources.getInteger(R.integer.config_restToUnlockDurationScreenOff) + sendTransition(LOCKSCREEN, OFF) + + runCurrent() + assertThat(authenticationDuration).isEqualTo(longDuration) + } + + @Test + fun authenticationDurationIsLongerIfScreenIsDozing() = + testScope.runTest { + val authenticationDuration by collectLastValue(underTest.authenticationDuration) + val longDuration = + context.resources.getInteger(R.integer.config_restToUnlockDurationScreenOff) + sendTransition(LOCKSCREEN, DOZING) + runCurrent() + assertThat(authenticationDuration).isEqualTo(longDuration) + } + + @Test + fun authenticationDurationIsShorterIfScreenIsNotDozingOrOff() = + testScope.runTest { + val authenticationDuration by collectLastValue(underTest.authenticationDuration) + val shortDuration = + context.resources.getInteger(R.integer.config_restToUnlockDurationDefault) + val allOtherKeyguardStates = KeyguardState.entries.filter { it != OFF && it != DOZING } + + allOtherKeyguardStates.forEach { destinationState -> + sendTransition(OFF, destinationState) + + runCurrent() + assertThat(authenticationDuration).isEqualTo(shortDuration) + } } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageChangeRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageChangeRepositoryTest.kt new file mode 100644 index 000000000000..6380ace7ba4f --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageChangeRepositoryTest.kt @@ -0,0 +1,209 @@ +/* + * 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.common.data.repository + +import android.content.Context +import android.content.pm.PackageManager +import android.os.Handler +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.coroutines.collectValues +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.testKosmos +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(AndroidJUnit4::class) +class PackageChangeRepositoryTest : SysuiTestCase() { + + private val kosmos = testKosmos() + + @Mock private lateinit var context: Context + @Mock private lateinit var packageManager: PackageManager + @Mock private lateinit var handler: Handler + + private lateinit var repository: PackageChangeRepository + private lateinit var updateMonitor: PackageUpdateMonitor + + @Before + fun setUp() = + with(kosmos) { + MockitoAnnotations.initMocks(this@PackageChangeRepositoryTest) + whenever(context.packageManager).thenReturn(packageManager) + + repository = PackageChangeRepositoryImpl { user -> + updateMonitor = + PackageUpdateMonitor( + user = user, + bgDispatcher = testDispatcher, + scope = applicationCoroutineScope, + context = context, + bgHandler = handler, + logger = PackageUpdateLogger(logcatLogBuffer()) + ) + updateMonitor + } + } + + @Test + fun packageUninstalled() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(USER_100)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageRemoved( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 100, /* appId = */ 10) + ) + + assertThat(packageChange).isInstanceOf(PackageChangeModel.Uninstalled::class.java) + assertThat(packageChange?.packageName).isEqualTo(TEST_PACKAGE) + } + } + + @Test + fun packageUpdateStarted() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(USER_100)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageUpdateStarted( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 100, /* appId = */ 10) + ) + + assertThat(packageChange).isInstanceOf(PackageChangeModel.UpdateStarted::class.java) + assertThat(packageChange?.packageName).isEqualTo(TEST_PACKAGE) + } + } + + @Test + fun packageUpdateFinished() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(USER_100)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageUpdateFinished( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 100, /* appId = */ 10) + ) + + assertThat(packageChange) + .isInstanceOf(PackageChangeModel.UpdateFinished::class.java) + assertThat(packageChange?.packageName).isEqualTo(TEST_PACKAGE) + } + } + + @Test + fun packageInstalled() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(UserHandle.ALL)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageAdded( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 100, /* appId = */ 10) + ) + + assertThat(packageChange).isInstanceOf(PackageChangeModel.Installed::class.java) + assertThat(packageChange?.packageName).isEqualTo(TEST_PACKAGE) + } + } + + @Test + fun packageIsChanged() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(USER_100)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageChanged( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 100, /* appId = */ 10), + components = emptyArray() + ) + + assertThat(packageChange).isInstanceOf(PackageChangeModel.Changed::class.java) + assertThat(packageChange?.packageName).isEqualTo(TEST_PACKAGE) + } + } + + @Test + fun filtersOutUpdatesFromOtherUsers() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(repository.packageChanged(USER_100)) + assertThat(packageChange).isNull() + + updateMonitor.onPackageUpdateFinished( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 101, /* appId = */ 10) + ) + + updateMonitor.onPackageAdded( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 99, /* appId = */ 10) + ) + + assertThat(packageChange).isNull() + } + } + + @Test + fun listenToUpdatesFromAllUsers() = + with(kosmos) { + testScope.runTest { + val packageChanges by collectValues(repository.packageChanged(UserHandle.ALL)) + assertThat(packageChanges).isEmpty() + + updateMonitor.onPackageUpdateFinished( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 101, /* appId = */ 10) + ) + + updateMonitor.onPackageAdded( + packageName = TEST_PACKAGE, + uid = UserHandle.getUid(/* userId = */ 99, /* appId = */ 10) + ) + + assertThat(packageChanges).hasSize(2) + } + } + + private companion object { + val USER_100 = UserHandle.of(100) + const val TEST_PACKAGE = "pkg.test" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageUpdateMonitorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageUpdateMonitorTest.kt new file mode 100644 index 000000000000..d610925edd8a --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/common/data/repository/PackageUpdateMonitorTest.kt @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.common.data.repository + +import android.content.Context +import android.content.pm.PackageManager +import android.os.Handler +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.coroutines.collectValues +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.testKosmos +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.MockitoAnnotations + +@ExperimentalCoroutinesApi +@SmallTest +@RunWith(AndroidJUnit4::class) +class PackageUpdateMonitorTest : SysuiTestCase() { + private val kosmos = testKosmos() + + @Mock private lateinit var context: Context + @Mock private lateinit var packageManager: PackageManager + @Mock private lateinit var handler: Handler + + private lateinit var monitor: PackageUpdateMonitor + + @Before + fun setUp() = + with(kosmos) { + MockitoAnnotations.initMocks(this@PackageUpdateMonitorTest) + whenever(context.packageManager).thenReturn(packageManager) + + monitor = + PackageUpdateMonitor( + user = USER_100, + bgDispatcher = testDispatcher, + bgHandler = handler, + context = context, + scope = applicationCoroutineScope, + logger = PackageUpdateLogger(logcatLogBuffer()) + ) + } + + @Test + fun becomesActiveWhenFlowCollected() = + with(kosmos) { + testScope.runTest { + assertThat(monitor.isActive).isFalse() + val job = monitor.packageChanged.launchIn(this) + runCurrent() + assertThat(monitor.isActive).isTrue() + job.cancel() + runCurrent() + assertThat(monitor.isActive).isFalse() + } + } + + @Test + fun packageAdded() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(monitor.packageChanged) + assertThat(packageChange).isNull() + + monitor.onPackageAdded(TEST_PACKAGE, 123) + + assertThat(packageChange) + .isEqualTo( + PackageChangeModel.Installed(packageName = TEST_PACKAGE, packageUid = 123) + ) + } + } + + @Test + fun packageRemoved() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(monitor.packageChanged) + assertThat(packageChange).isNull() + + monitor.onPackageRemoved(TEST_PACKAGE, 123) + + assertThat(packageChange) + .isEqualTo( + PackageChangeModel.Uninstalled(packageName = TEST_PACKAGE, packageUid = 123) + ) + } + } + + @Test + fun packageChanged() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(monitor.packageChanged) + assertThat(packageChange).isNull() + + monitor.onPackageChanged(TEST_PACKAGE, 123, emptyArray()) + + assertThat(packageChange) + .isEqualTo( + PackageChangeModel.Changed(packageName = TEST_PACKAGE, packageUid = 123) + ) + } + } + + @Test + fun packageUpdateStarted() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(monitor.packageChanged) + assertThat(packageChange).isNull() + + monitor.onPackageUpdateStarted(TEST_PACKAGE, 123) + + assertThat(packageChange) + .isEqualTo( + PackageChangeModel.UpdateStarted( + packageName = TEST_PACKAGE, + packageUid = 123 + ) + ) + } + } + + @Test + fun packageUpdateFinished() = + with(kosmos) { + testScope.runTest { + val packageChange by collectLastValue(monitor.packageChanged) + assertThat(packageChange).isNull() + + monitor.onPackageUpdateFinished(TEST_PACKAGE, 123) + + assertThat(packageChange) + .isEqualTo( + PackageChangeModel.UpdateFinished( + packageName = TEST_PACKAGE, + packageUid = 123 + ) + ) + } + } + + @Test + fun handlesBackflow() = + with(kosmos) { + testScope.runTest { + val latch = MutableSharedFlow<Unit>() + val packageChanges by collectValues(monitor.packageChanged.onEach { latch.first() }) + assertThat(packageChanges).isEmpty() + + monitor.onPackageAdded(TEST_PACKAGE, 123) + monitor.onPackageUpdateStarted(TEST_PACKAGE, 123) + monitor.onPackageUpdateFinished(TEST_PACKAGE, 123) + + assertThat(packageChanges).isEmpty() + latch.emit(Unit) + assertThat(packageChanges).hasSize(1) + latch.emit(Unit) + assertThat(packageChanges).hasSize(2) + latch.emit(Unit) + assertThat(packageChanges) + .containsExactly( + PackageChangeModel.Installed(TEST_PACKAGE, 123), + PackageChangeModel.UpdateStarted(TEST_PACKAGE, 123), + PackageChangeModel.UpdateFinished(TEST_PACKAGE, 123), + ) + .inOrder() + } + } + + companion object { + private val USER_100 = UserHandle.of(100) + private const val TEST_PACKAGE = "pkg.test" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToAodTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToAodTransitionViewModelTest.kt index 9daf1860ebb8..e7037a682cca 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToAodTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToAodTransitionViewModelTest.kt @@ -94,7 +94,7 @@ class AlternateBouncerToAodTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(6) + assertThat(values.size).isEqualTo(5) values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt index 53bca483f73f..e141c2b3107f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt @@ -55,6 +55,28 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { private val underTest = kosmos.dreamingToLockscreenTransitionViewModel @Test + fun shortcutsAlpha_bothShortcutsReceiveLastValue() = + testScope.runTest { + val valuesLeft by collectValues(underTest.shortcutsAlpha) + val valuesRight by collectValues(underTest.shortcutsAlpha) + + keyguardTransitionRepository.sendTransitionSteps( + listOf( + step(0f, TransitionState.STARTED), + step(0.3f), + step(0.5f), + step(0.6f), + step(0.8f), + step(1f), + ), + testScope, + ) + + assertThat(valuesLeft.last()).isEqualTo(1f) + assertThat(valuesRight.last()).isEqualTo(1f) + } + + @Test fun dreamOverlayTranslationY() = testScope.runTest { val pixels = 100 @@ -73,7 +95,7 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(7) + assertThat(values.size).isEqualTo(6) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } } @@ -95,7 +117,7 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(4) + assertThat(values.size).isEqualTo(3) values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } } @@ -210,7 +232,7 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(-100f, 0f)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt index 3c07034f0e12..897ce6d305b6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt @@ -61,7 +61,7 @@ class GoneToDreamingTransitionViewModelTest : SysuiTestCase() { // Only three values should be present, since the dream overlay runs for a small // fraction of the overall animation time - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } } @@ -84,7 +84,7 @@ class GoneToDreamingTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt index a346e8b45795..4843f8ba4249 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt @@ -75,7 +75,7 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { // Only three values should be present, since the dream overlay runs for a small // fraction of the overall animation time - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } } @@ -98,10 +98,10 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { testScope = testScope, ) - assertThat(values.size).isEqualTo(6) + assertThat(values.size).isEqualTo(5) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } // Validate finished value - assertThat(values[5]).isEqualTo(0f) + assertThat(values[4]).isEqualTo(0f) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt index 274bde1ccfdf..a1b8aab402a7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt @@ -76,7 +76,7 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { ) // Only 3 values should be present, since the dream overlay runs for a small fraction // of the overall animation time - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } } @@ -99,7 +99,7 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { ), testScope = testScope, ) - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } } @@ -121,11 +121,11 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { ), testScope = testScope, ) - assertThat(values.size).isEqualTo(4) + assertThat(values.size).isEqualTo(3) values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } // Cancel will reset the translation - assertThat(values[3]).isEqualTo(0) + assertThat(values[2]).isEqualTo(0) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt index d419d4a2534c..2111ad5d975e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt @@ -95,7 +95,7 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(5) + assertThat(values.size).isEqualTo(4) values.forEach { assertThat(it).isIn(Range.closed(-100f, 0f)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt index f027bc849e51..90b83620084c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt @@ -95,7 +95,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { testScope, ) - assertThat(values.size).isEqualTo(3) + assertThat(values.size).isEqualTo(1) values.forEach { assertThat(it).isEqualTo(0f) } } @@ -107,7 +107,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { keyguardTransitionRepository.sendTransitionStep(step(0f, TransitionState.STARTED)) keyguardTransitionRepository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(2) + assertThat(values.size).isEqualTo(1) values.forEach { assertThat(it).isEqualTo(0f) } } @@ -121,7 +121,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { keyguardTransitionRepository.sendTransitionStep(step(0f, TransitionState.STARTED)) keyguardTransitionRepository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(2) + assertThat(values.size).isEqualTo(1) values.forEach { assertThat(it).isEqualTo(1f) } } @@ -135,7 +135,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { keyguardTransitionRepository.sendTransitionStep(step(0f, TransitionState.STARTED)) keyguardTransitionRepository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(2) + assertThat(values.size).isEqualTo(1) values.forEach { assertThat(it).isEqualTo(1f) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractorTest.kt index 90779cb1c0b3..20653ca18efc 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractorTest.kt @@ -55,6 +55,7 @@ class CustomTileInteractorTest : SysuiTestCase() { private val underTest: CustomTileInteractor = with(kosmos) { CustomTileInteractor( + tileSpec, customTileDefaultsRepository, customTileRepository, testScope.backgroundScope, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java index 53cb8a7eb81b..7a78b366dd7f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java @@ -25,15 +25,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.graphics.Point; import android.os.PowerManager; -import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.view.View; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.keyguard.KeyguardUpdateMonitor; @@ -68,7 +67,7 @@ import java.util.Collections; import java.util.HashSet; @SmallTest -@RunWith(AndroidTestingRunner.class) +@RunWith(AndroidJUnit4.class) @RunWithLooper(setAsMainLooper = true) public class DozeServiceHostTest extends SysuiTestCase { @@ -181,6 +180,7 @@ public class DozeServiceHostTest extends SysuiTestCase { DozeLog.PULSE_REASON_DOCKING, DozeLog.REASON_SENSOR_WAKE_UP_PRESENCE, DozeLog.REASON_SENSOR_QUICK_PICKUP, + DozeLog.PULSE_REASON_FINGERPRINT_ACTIVATED, DozeLog.REASON_SENSOR_TAP)); HashSet<Integer> reasonsThatDontPulse = new HashSet<>( Arrays.asList(DozeLog.REASON_SENSOR_PICKUP, @@ -232,7 +232,7 @@ public class DozeServiceHostTest extends SysuiTestCase { public void onSlpiTap_doesnt_pass_negative_values() { mDozeServiceHost.onSlpiTap(-1, 200); mDozeServiceHost.onSlpiTap(100, -2); - verifyZeroInteractions(mDozeInteractor); + verify(mDozeInteractor, never()).setLastTapToWakePosition(any()); } @Test public void dozeTimeTickSentToDozeInteractor() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractorTest.kt new file mode 100644 index 000000000000..dbff63f355c8 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractorTest.kt @@ -0,0 +1,22 @@ +/* + * 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.volume.panel.domain.interactor + +class ComponentsInteractorTest { + + // TODO(b/318080198) Write tests +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManagerTest.kt new file mode 100644 index 000000000000..e5fb9426e8e2 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManagerTest.kt @@ -0,0 +1,22 @@ +/* + * 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.volume.panel.ui.viewmodel + +class DefaultComponentsLayoutManagerTest { + + // TODO(b/318080198) Write tests +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModelTest.kt new file mode 100644 index 000000000000..9795237a3e7e --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModelTest.kt @@ -0,0 +1,22 @@ +/* + * 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.volume.panel.ui.viewmodel + +class VolumePanelViewModelTest { + + // TODO(b/318080198) Write tests +} diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 74e92ba8b14f..40fddc8b97f7 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"በቅንብሮች ውስጥ ነባሪ የማስታወሻዎች መተግበሪያን ያቀናብሩ"</string> <string name="install_app" msgid="5066668100199613936">"መተግበሪያን ጫን"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ወደ ውጫዊ ማሳያ ይንጸባረቅ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"የውስጥ ማሳያዎ ይንጸባረቃል። የፊት ማሳያዎ ይጠፋል።"</string> <string name="mirror_display" msgid="2515262008898122928">"ማሳያን አንጸባርቅ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"አሰናብት"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ማሳያ ተገናኝቷል"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 8aeeaf73bbb2..d19c77b72eff 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -330,12 +330,9 @@ <string name="quick_settings_screen_record_label" msgid="8650355346742003694">"تسجيل الشاشة"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"بدء"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"إيقاف"</string> - <!-- no translation found for qs_record_issue_label (8166290137285529059) --> - <skip /> - <!-- no translation found for qs_record_issue_start (2979831312582567056) --> - <skip /> - <!-- no translation found for qs_record_issue_stop (3531747965741982657) --> - <skip /> + <string name="qs_record_issue_label" msgid="8166290137285529059">"تسجيل المشكلة"</string> + <string name="qs_record_issue_start" msgid="2979831312582567056">"بدء"</string> + <string name="qs_record_issue_stop" msgid="3531747965741982657">"إيقاف"</string> <string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ما هو الجانب الذي تأثّر في تجربة استخدام الجهاز؟"</string> <string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"اختيار نوع المشكلة"</string> <string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"تسجيل الشاشة"</string> @@ -416,12 +413,9 @@ <string name="keyguard_indication_charging_time_dock" msgid="3149328898931741271">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • جارٍ الشحن • ستمتلئ البطارية خلال <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="communal_tutorial_indicator_text" msgid="4503010353591430123">"مرِّر سريعًا لليمين لبدء الدليل التوجيهي العام."</string> <string name="button_to_open_widget_editor" msgid="5599945944349057600">"فتح محرِّر التطبيقات المصغّرة"</string> - <!-- no translation found for button_to_remove_widget (3948204829181214098) --> - <skip /> - <!-- no translation found for hub_mode_add_widget_button_text (4831464661209971729) --> - <skip /> - <!-- no translation found for hub_mode_editing_exit_button_text (3704686734192264771) --> - <skip /> + <string name="button_to_remove_widget" msgid="3948204829181214098">"إزالة"</string> + <string name="hub_mode_add_widget_button_text" msgid="4831464661209971729">"إضافة تطبيق مصغّر"</string> + <string name="hub_mode_editing_exit_button_text" msgid="3704686734192264771">"تم"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"تبديل المستخدم"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"القائمة المنسدلة"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string> @@ -1214,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"يمكنك ضبط تطبيق تدوين الملاحظات التلقائي في \"الإعدادات\"."</string> <string name="install_app" msgid="5066668100199613936">"تثبيت التطبيق"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"هل تريد بث محتوى جهازك على الشاشة الخارجية؟"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"سيتم النسخ المطابق لمحتوى الشاشة الداخلية، وإيقاف الشاشة الأمامية."</string> <string name="mirror_display" msgid="2515262008898122928">"بث المحتوى على الشاشة"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"إغلاق"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"تم توصيل الشاشة"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index a1b538934236..4e78f55663df 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ছেটিঙত টোকাৰ ডিফ’ল্ট এপ্ ছেট কৰক"</string> <string name="install_app" msgid="5066668100199613936">"এপ্টো ইনষ্টল কৰক"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"বাহ্যিক ডিছপ্লে’লৈ মিৰ’ৰ কৰিবনে?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"আপোনাৰ ইনাৰ ডিছপ্লে’ প্ৰতিবিম্বিত কৰা হ’ব। আপোনাৰ ফ্ৰণ্ট ডিছপ্লে’ অফ কৰা হ’ব।"</string> <string name="mirror_display" msgid="2515262008898122928">"ডিছপ্লে’ মিৰ’ৰ কৰক"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"অগ্ৰাহ্য কৰক"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ডিছপ্লে’ সংযোগ কৰা হৈছে"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 2a9a9cfe2624..bf32c5e6eb0a 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ayarlarda defolt qeydlər tətbiqi ayarlayın"</string> <string name="install_app" msgid="5066668100199613936">"Tətbiqi quraşdırın"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Xarici displeyə əks etdirilsin?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"İç displey əks etdiriləcək. Ön ekran deaktiv ediləcək."</string> <string name="mirror_display" msgid="2515262008898122928">"Displeyi əks etdirin"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"İmtina edin"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Displey qoşulub"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 47468ffb033d..56c3e45b4726 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Podesite podrazumevanu aplikaciju za beleške u Podešavanjima"</string> <string name="install_app" msgid="5066668100199613936">"Instaliraj aplikaciju"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Želite li da preslikate na spoljnji ekran?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Unutrašnji ekran će se preslikati. Prednji ekran će se isključiti."</string> <string name="mirror_display" msgid="2515262008898122928">"Preslikaj ekran"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Odbaci"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ekran je povezan"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 1fe96a674e54..22d167ee50db 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Задайте стандартно приложение за бележки от настройките"</string> <string name="install_app" msgid="5066668100199613936">"Инсталиране на приложението"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Да се дублира ли на външния екран?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Съдържанието на вътрешния ви дисплей ще бъде дублирано. Предният ви дисплей ще бъде изключен."</string> <string name="mirror_display" msgid="2515262008898122928">"Дублиране на дисплея"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Отхвърляне"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Свързан е екран"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index fa301313dc81..045af935be6c 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"\'সেটিংস\' থেকে ডিফল্ট নোট নেওয়ার অ্যাপ সেট করুন"</string> <string name="install_app" msgid="5066668100199613936">"অ্যাপ ইনস্টল করুন"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"এক্সটার্নাল ডিসপ্লেতে মিরর করবেন?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"আপনার ইনার ডিসপ্লে মিরর করা হবে। আপনার ফ্রন্ট ডিসপ্লে বন্ধ করা হবে।"</string> <string name="mirror_display" msgid="2515262008898122928">"ডিসপ্লে দেখান"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"বাতিল করুন"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ডিসপ্লে কানেক্ট করা আছে"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index db5987fb869a..ae962ce7ead5 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Postavite zadanu aplikaciju za bilješke u Postavkama"</string> <string name="install_app" msgid="5066668100199613936">"Instaliraj aplikaciju"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Preslikati na vanjski ekran?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Unutrašnji ekran će se preslikavati. Prednji ekran će se isključiti."</string> <string name="mirror_display" msgid="2515262008898122928">"Preslikaj ekran"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Odbaci"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ekran je povezan"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index af4492bbb6b3..8cf88282d646 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -1207,10 +1207,9 @@ <string name="assistant_attention_content_description" msgid="4166330881435263596">"S\'ha detectat la presència d\'usuaris"</string> <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Defineix l\'aplicació de notes predeterminada a Configuració"</string> <string name="install_app" msgid="5066668100199613936">"Instal·la l\'aplicació"</string> - <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Replicar a la pantalla externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> - <string name="mirror_display" msgid="2515262008898122928">"Replica la pantalla"</string> + <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Duplicar a la pantalla externa?"</string> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"La pantalla interior es duplicarà. La pantalla frontal es desactivarà."</string> + <string name="mirror_display" msgid="2515262008898122928">"Duplica la pantalla"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ignora"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Pantalla connectada"</string> <string name="privacy_dialog_title" msgid="7839968133469098311">"Micròfon i càmera"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 25fcf99ffd21..17084dc4c543 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Výchozí aplikaci pro poznámky nastavíte v Nastavení"</string> <string name="install_app" msgid="5066668100199613936">"Nainstalovat aplikaci"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Zrcadlit na externí displej?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Vnitřní displej bude zrcadlen. Přední displej bude vypnutý."</string> <string name="mirror_display" msgid="2515262008898122928">"Zrcadlit displej"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Zavřít"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Displej připojen"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 91c223a7ed50..41abea3a51c8 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Angiv standardapp til noter i Indstillinger"</string> <string name="install_app" msgid="5066668100199613936">"Installer app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Vil du spejle til ekstern skærm?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Din indre skærm spejles. Din skærm på forsiden slukkes."</string> <string name="mirror_display" msgid="2515262008898122928">"Spejl skærm"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Luk"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Skærmen er tilsluttet"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 29b70184b82b..d95e229c2e9b 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Standard-Notizen-App in den Einstellungen einrichten"</string> <string name="install_app" msgid="5066668100199613936">"App installieren"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Auf externen Bildschirm spiegeln?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Dein inneres Display wird gespiegelt. Das Frontdisplay wird ausgeschaltet."</string> <string name="mirror_display" msgid="2515262008898122928">"Bildschirm spiegeln"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Schließen"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Bildschirm verbunden"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index dd24ca678f1a..5848e4ff460a 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ορίστε την προεπιλεγμένη εφαρμογή σημειώσεων στις Ρυθμίσεις"</string> <string name="install_app" msgid="5066668100199613936">"Εγκατάσταση εφαρμογής"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Κατοπτρισμός σε εξωτερική οθόνη;"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Θα γίνει κατοπτρισμός της εσωτερικής προβολής. Η μπροστινή οθόνη θα απενεργοποιηθεί."</string> <string name="mirror_display" msgid="2515262008898122928">"Κατοπτρισμός οθόνης"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Παράβλεψη"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Η οθόνη είναι συνδεδεμένη"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 2d052919c5b1..870e4dd499b3 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Set default notes app in Settings"</string> <string name="install_app" msgid="5066668100199613936">"Install app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Mirror to external display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Your inner display will be mirrored. Your front display will be turned off."</string> <string name="mirror_display" msgid="2515262008898122928">"Mirror display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display connected"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index c043b2c50972..f25baf286ba0 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Set default notes app in Settings"</string> <string name="install_app" msgid="5066668100199613936">"Install app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Mirror to external display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Your inner display will be mirrored. Your front display will be turned off."</string> <string name="mirror_display" msgid="2515262008898122928">"Mirror display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display connected"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 2d052919c5b1..870e4dd499b3 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Set default notes app in Settings"</string> <string name="install_app" msgid="5066668100199613936">"Install app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Mirror to external display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Your inner display will be mirrored. Your front display will be turned off."</string> <string name="mirror_display" msgid="2515262008898122928">"Mirror display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display connected"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 2d052919c5b1..870e4dd499b3 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Set default notes app in Settings"</string> <string name="install_app" msgid="5066668100199613936">"Install app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Mirror to external display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Your inner display will be mirrored. Your front display will be turned off."</string> <string name="mirror_display" msgid="2515262008898122928">"Mirror display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display connected"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 3691b2c3aaf0..b3ed7145c9b8 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Set default notes app in Settings"</string> <string name="install_app" msgid="5066668100199613936">"Install app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Mirror to external display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Your inner display will be mirrored. Your front display will be turned off."</string> <string name="mirror_display" msgid="2515262008898122928">"Mirror display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display connected"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 6a4818e1f3e1..c5355605fe17 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Configura la app de notas predeterminada en Configuración"</string> <string name="install_app" msgid="5066668100199613936">"Instalar app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"¿Quieres duplicar en la pantalla externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Se duplicará la pantalla interior. Se apagará la pantalla frontal."</string> <string name="mirror_display" msgid="2515262008898122928">"Duplicar pantalla"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Descartar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Pantalla conectada"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 4e41db3ef4b1..1157ff1933ba 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Configura la aplicación de notas predeterminada en Ajustes"</string> <string name="install_app" msgid="5066668100199613936">"Instalar aplicación"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"¿Proyectar a pantalla externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Se proyectará tu pantalla interior. Se apagará tu pantalla frontal."</string> <string name="mirror_display" msgid="2515262008898122928">"Proyectar pantalla"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Cerrar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Pantalla conectada"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 231ddebb7b8a..36b3f1e219e2 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Määrake seadetes märkmete vaikerakendus."</string> <string name="install_app" msgid="5066668100199613936">"Installi rakendus"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Kas peegeldada välisekraanile?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Teie siseekraani peegeldatakse. Teie esiekraan lülitatakse välja."</string> <string name="mirror_display" msgid="2515262008898122928">"Peegelda ekraani"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Loobu"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Kuvar on ühendatud"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 20bf71b0a6a3..5ea02d173fcb 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ezarri oharren aplikazio lehenetsia ezarpenetan"</string> <string name="install_app" msgid="5066668100199613936">"Instalatu aplikazioa"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Kanpoko pantailan islatu nahi duzu?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Barneko pantaila islatuko da. Aurreko pantaila desaktibatu egingo da."</string> <string name="mirror_display" msgid="2515262008898122928">"Islatu pantaila"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Baztertu"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Konektatutako pantaila"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index e161d7adb35f..aa77b4b4ddb7 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"برنامه پیشفرض یادداشت را در «تنظیمات» تنظیم کنید"</string> <string name="install_app" msgid="5066668100199613936">"نصب برنامه"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"روی نمایشگر خارجی قرینهسازی شود؟"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"نمایشگر داخلی شما قرینهسازی میشود. نمایشگر جلو خاموش میشود."</string> <string name="mirror_display" msgid="2515262008898122928">"قرینهسازی نمایشگر"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"بستن"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"نمایشگر متصل شد"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 240607b5ebba..882c42c3f848 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Aseta oletusmuistiinpanosovellus Asetuksista"</string> <string name="install_app" msgid="5066668100199613936">"Asenna sovellus"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Peilataanko ulkoiselle näytölle?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Sisänäyttö peilataan. Etunäyttö laitetaan pois päältä."</string> <string name="mirror_display" msgid="2515262008898122928">"Peilaa näyttö"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ohita"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Näyttö yhdistetty"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 82a56f5511ca..8370b01ccfd5 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Définir l\'application de prise de notes par défaut dans les Paramètres"</string> <string name="install_app" msgid="5066668100199613936">"Installer l\'application"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Dupliquer l\'écran sur un moniteur externe?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Votre écran intérieur sera dupliqué. Votre écran frontal sera désactivé."</string> <string name="mirror_display" msgid="2515262008898122928">"Dupliquer l\'écran"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Fermer"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Écran connecté"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index c35f9eeaadff..af81a31002a4 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Définir une appli de notes par défaut dans les paramètres"</string> <string name="install_app" msgid="5066668100199613936">"Installer l\'appli"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Dupliquer sur l\'écran externe ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Votre écran intérieur sera dupliqué. Votre écran frontal sera éteint."</string> <string name="mirror_display" msgid="2515262008898122928">"Dupliquer l\'écran"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Fermer"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Écran connecté"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 9cf968e883c3..ef0751b8f0c4 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Establece a aplicación de notas predeterminada en Configuración"</string> <string name="install_app" msgid="5066668100199613936">"Instalar aplicación"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Queres proxectar contido nunha pantalla externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Proxectarase a pantalla interior. Desactivarase a pantalla frontal."</string> <string name="mirror_display" msgid="2515262008898122928">"Proxectar pantalla"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Pechar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Pantalla conectada"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index df7b203a0deb..d92231c9bf93 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"સેટિંગમાં નોંધની ડિફૉલ્ટ ઍપ સેટ કરો"</string> <string name="install_app" msgid="5066668100199613936">"ઍપ ઇન્સ્ટૉલ કરો"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"શું બાહ્ય ડિસ્પ્લે પર મિરર કરીએ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"તમારું ઇનર ડિસ્પ્લે મિરર કરવામાં આવશે. તમારું ફ્રન્ટ ડિસ્પ્લે બંધ કરવામાં આવશે."</string> <string name="mirror_display" msgid="2515262008898122928">"મિરર ડિસ્પ્લે"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"છોડી દો"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display કનેક્ટેડ છે"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index eec3078af9fb..f8c78a908433 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"सेटिंग में जाकर, नोट लेने की सुविधा देने वाले ऐप्लिकेशन को डिफ़ॉल्ट के तौर पर सेट करें"</string> <string name="install_app" msgid="5066668100199613936">"ऐप्लिकेशन इंस्टॉल करें"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"क्या आपको किसी बाहरी डिवाइस पर डिसप्ले करना है?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"आपके फ़ोन के इनर डिसप्ले की स्क्रीन शेयर की जाएगी. फ़्रंट डिसप्ले को बंद कर दिया जाएगा."</string> <string name="mirror_display" msgid="2515262008898122928">"डिसप्ले करें"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"खारिज करें"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"डिसप्ले कनेक्ट किया गया"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index f0ed40036156..0803aeb7d1a3 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Postavite zadanu aplikaciju za bilješke u postavkama"</string> <string name="install_app" msgid="5066668100199613936">"Instalacija"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Želite li zrcaliti na vanjski zaslon?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Unutarnji zaslon bit će zrcaljen. Prednji zaslon bit će isključen."</string> <string name="mirror_display" msgid="2515262008898122928">"Zrcaljenje zaslona"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Odbaci"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Zaslon je povezan"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 30d296190f6a..fd9d832ceae0 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Állítson be alapértelmezett jegyzetkészítő alkalmazást a Beállításokban"</string> <string name="install_app" msgid="5066668100199613936">"Alkalmazás telepítése"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Tükrözi a kijelzőt a külső képernyőre?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"A belső kijelző tükrözve lesz. Az elülső kijelző ki lesz kapcsolva."</string> <string name="mirror_display" msgid="2515262008898122928">"Kijelző tükrözése"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Elvetés"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Kijelző csatlakoztatva"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index bbdeb1683c64..a9252e2e1eda 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Կարգավորեք նշումների կանխադրված հավելված Կարգավորումներում"</string> <string name="install_app" msgid="5066668100199613936">"Տեղադրել հավելվածը"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Հայելապատճենե՞լ արտաքին էկրանին"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ներքին էկրանը կհայելապատճենվի։ Առջևի էկրանը կանջատվի։"</string> <string name="mirror_display" msgid="2515262008898122928">"Հայելապատճենել էկրանը"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Փակել"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Էկրանը միացած է"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index f2ed0e7f9159..8ef809a04b6e 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Setel aplikasi catatan default di Setelan"</string> <string name="install_app" msgid="5066668100199613936">"Instal aplikasi"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Cerminkan ke layar eksternal?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Layar dalam akan dicerminkan. Layar depan akan dinonaktifkan."</string> <string name="mirror_display" msgid="2515262008898122928">"Cerminkan layar"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Tutup"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Layar terhubung"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index f1f1b0f5cbfc..cef3285e3558 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Stilltu sjálfgefið glósuforrit í stillingunum"</string> <string name="install_app" msgid="5066668100199613936">"Setja upp forrit"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Spegla yfir á ytri skjá?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Innri skjárinn þinn verður speglaður. Slökkt verður á framskjánum þínum."</string> <string name="mirror_display" msgid="2515262008898122928">"Spegla skjá"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Hunsa"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Skjár tengdur"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 223e39faef37..c5079fed39b6 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Imposta l\'app per le note predefinita nelle Impostazioni"</string> <string name="install_app" msgid="5066668100199613936">"Installa app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Vuoi eseguire il mirroring al display esterno?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Verrà eseguito il mirroring del tuo display interno. Il tuo display frontale verrà spento."</string> <string name="mirror_display" msgid="2515262008898122928">"Esegui il mirroring del display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Chiudi"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Display collegato"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 44fd608df981..486b22f9d222 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"צריך להגדיר את אפליקציית ברירת המחדל לפתקים ב\'הגדרות\'"</string> <string name="install_app" msgid="5066668100199613936">"התקנת האפליקציה"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"לשקף למסך חיצוני?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"המסך הפנימי שלך ישוכפל. המסך החיצוני שלך יכובה."</string> <string name="mirror_display" msgid="2515262008898122928">"תצוגת מראה"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"סגירה"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"המסך מחובר"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 38f2dc86e94c..c742f939466e 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"[設定] でデフォルトのメモアプリを設定してください"</string> <string name="install_app" msgid="5066668100199613936">"アプリをインストール"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"外部ディスプレイにミラーリングしますか？"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"インナー ディスプレイがミラーリングされます。フロント ディスプレイは OFF になります。"</string> <string name="mirror_display" msgid="2515262008898122928">"ディスプレイをミラーリングする"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"閉じる"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ディスプレイに接続しました"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index bb21f3f9f75f..9d386efadd02 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"დააყენეთ ნაგულისხმევი შენიშვნების აპი პარამეტრებში"</string> <string name="install_app" msgid="5066668100199613936">"აპის ინსტალაცია"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"აირეკლოს გარე ეკრანზე?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"თქვენი შიდა ეკრანი აირეკლება. თქვენი წინა ეკრანი გამოირთვება."</string> <string name="mirror_display" msgid="2515262008898122928">"ეკრანის არეკვლა"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"დახურვა"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ეკრანი დაკავშირებულია"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index b39d5a553b86..d2c60f157f98 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Параметрлерден әдепкі жазба қолданбасын орнатыңыз."</string> <string name="install_app" msgid="5066668100199613936">"Қолданбаны орнату"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Сыртқы экран арқылы да көрсету керек пе?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ішкі экран көшірмесі көрсетіледі. Алдыңғы экран өшіріледі."</string> <string name="mirror_display" msgid="2515262008898122928">"Көрсету"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Жабу"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Дисплей қосылды"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index e989a9d8b242..ec81523389b5 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"កំណត់កម្មវិធីកំណត់ចំណាំលំនាំដើមនៅក្នុងការកំណត់"</string> <string name="install_app" msgid="5066668100199613936">"ដំឡើងកម្មវិធី"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"បញ្ចាំងទៅផ្ទាំងអេក្រង់ខាងក្រៅឬ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"អេក្រង់ខាងក្នុងរបស់អ្នកនឹងត្រូវបានធ្វើសមកាលកម្មទៅវិញទៅមក។ អេក្រង់មុខរបស់អ្នកនឹងត្រូវបានបិទ។"</string> <string name="mirror_display" msgid="2515262008898122928">"បញ្ចាំងទៅផ្ទាំងអេក្រង់"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ច្រានចោល"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ផ្ទាំងអេក្រង់ត្រូវបានភ្ជាប់"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 39b14685cbca..33f45289ee22 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -93,7 +93,7 @@ <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"ಕೆಳಗಿನ ಬೌಂಡರಿ ಶೇಕಡಾ <xliff:g id="PERCENT">%1$d</xliff:g>"</string> <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"ಎಡಭಾಗದ ಬೌಂಡರಿ ಶೇಕಡಾ <xliff:g id="PERCENT">%1$d</xliff:g>"</string> <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"ಬಲಭಾಗದ ಬೌಂಡರಿ ಶೇಕಡಾ <xliff:g id="PERCENT">%1$d</xliff:g>"</string> - <string name="screenshot_work_profile_notification" msgid="203041724052970693">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ನಲ್ಲಿನ <xliff:g id="APP">%1$s</xliff:g> ನಲ್ಲಿ ಉಳಿಸಲಾಗಿದೆ"</string> + <string name="screenshot_work_profile_notification" msgid="203041724052970693">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ನಲ್ಲಿನ <xliff:g id="APP">%1$s</xliff:g> ನಲ್ಲಿ ಸೇವ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="screenshot_default_files_app_name" msgid="8721579578575161912">"ಫೈಲ್ಗಳು"</string> <string name="screenshot_detected_template" msgid="7940376642921719915">"ಈ ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು <xliff:g id="APPNAME">%1$s</xliff:g> ಪತ್ತೆಹಚ್ಚಿದೆ."</string> <string name="screenshot_detected_multiple_template" msgid="7644827792093819241">"<xliff:g id="APPNAME">%1$s</xliff:g> ಹಾಗೂ ತೆರೆದಿರುವ ಇತರ ಆ್ಯಪ್ಗಳು ಈ ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ಪತ್ತೆಹಚ್ಚಿವೆ."</string> @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಟಿಪ್ಪಣಿಗಳ ಆ್ಯಪ್ ಅನ್ನು ಸೆಟ್ ಮಾಡಿ"</string> <string name="install_app" msgid="5066668100199613936">"ಆ್ಯಪ್ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ಬಾಹ್ಯ ಡಿಸ್ಪ್ಲೇಗೆ ಪ್ರತಿಬಿಂಬಿಸಬೇಕೆ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ನಿಮ್ಮ ಒಳಗಿನ ಡಿಸ್ಪ್ಲೇ ಅನ್ನು ಪ್ರತಿಬಿಂಬಿಸಲಾಗುತ್ತದೆ. ನಿಮ್ಮ ಫ್ರಂಟ್ ಡಿಸ್ಪ್ಲೇ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ."</string> <string name="mirror_display" msgid="2515262008898122928">"ಮಿರರ್ ಡಿಸ್ಪ್ಲೇ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ವಜಾಗೊಳಿಸಿ"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ಡಿಸ್ಪ್ಲೇ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> diff --git a/packages/SystemUI/res/values-kn/tiles_states_strings.xml b/packages/SystemUI/res/values-kn/tiles_states_strings.xml index 16e82eacdd63..876562dd8584 100644 --- a/packages/SystemUI/res/values-kn/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-kn/tiles_states_strings.xml @@ -33,147 +33,147 @@ <!-- no translation found for tile_states_default:2 (9192445505551219506) --> <string-array name="tile_states_internet"> <item msgid="5499482407653291407">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="3048856902433862868">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="3048856902433862868">"ಆಫ್"</item> <item msgid="6877982264300789870">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_wifi"> <item msgid="8054147400538405410">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4293012229142257455">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4293012229142257455">"ಆಫ್"</item> <item msgid="6221288736127914861">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_cell"> <item msgid="1235899788959500719">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="2074416252859094119">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="2074416252859094119">"ಆಫ್"</item> <item msgid="287997784730044767">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_battery"> <item msgid="6311253873330062961">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="7838121007534579872">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="7838121007534579872">"ಆಫ್"</item> <item msgid="1578872232501319194">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_dnd"> <item msgid="467587075903158357">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="5376619709702103243">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="5376619709702103243">"ಆಫ್"</item> <item msgid="4875147066469902392">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_flashlight"> <item msgid="3465257127433353857">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="5044688398303285224">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="5044688398303285224">"ಆಫ್"</item> <item msgid="8527389108867454098">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_rotation"> <item msgid="4578491772376121579">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="5776427577477729185">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="5776427577477729185">"ಆಫ್"</item> <item msgid="7105052717007227415">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_bt"> <item msgid="5330252067413512277">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="5315121904534729843">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="5315121904534729843">"ಆಫ್"</item> <item msgid="503679232285959074">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_airplane"> <item msgid="1985366811411407764">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4801037224991420996">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4801037224991420996">"ಆಫ್"</item> <item msgid="1982293347302546665">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_location"> <item msgid="3316542218706374405">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4813655083852587017">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4813655083852587017">"ಆಫ್"</item> <item msgid="6744077414775180687">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_hotspot"> <item msgid="3145597331197351214">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="5715725170633593906">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="5715725170633593906">"ಆಫ್"</item> <item msgid="2075645297847971154">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_color_correction"> <item msgid="2840507878437297682">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="1909756493418256167">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="1909756493418256167">"ಆಫ್"</item> <item msgid="4531508423703413340">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_inversion"> <item msgid="3638187931191394628">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="9103697205127645916">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="9103697205127645916">"ಆಫ್"</item> <item msgid="8067744885820618230">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_saver"> <item msgid="39714521631367660">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="6983679487661600728">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="6983679487661600728">"ಆಫ್"</item> <item msgid="7520663805910678476">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_dark"> <item msgid="2762596907080603047">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="400477985171353">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="400477985171353">"ಆಫ್"</item> <item msgid="630890598801118771">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_work"> <item msgid="389523503690414094">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="8045580926543311193">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="8045580926543311193">"ಆಫ್"</item> <item msgid="4913460972266982499">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_cast"> <item msgid="6032026038702435350">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="1488620600954313499">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="1488620600954313499">"ಆಫ್"</item> <item msgid="588467578853244035">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_night"> <item msgid="7857498964264855466">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="2744885441164350155">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="2744885441164350155">"ಆಫ್"</item> <item msgid="151121227514952197">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_screenrecord"> <item msgid="1085836626613341403">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="8259411607272330225">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="8259411607272330225">"ಆಫ್"</item> <item msgid="578444932039713369">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_reverse"> <item msgid="3574611556622963971">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="8707481475312432575">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="8707481475312432575">"ಆಫ್"</item> <item msgid="8031106212477483874">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_reduce_brightness"> <item msgid="1839836132729571766">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4572245614982283078">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4572245614982283078">"ಆಫ್"</item> <item msgid="6536448410252185664">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_cameratoggle"> <item msgid="6680671247180519913">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4765607635752003190">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4765607635752003190">"ಆಫ್"</item> <item msgid="1697460731949649844">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_mictoggle"> <item msgid="6895831614067195493">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="3296179158646568218">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="3296179158646568218">"ಆಫ್"</item> <item msgid="8998632451221157987">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_controls"> <item msgid="8199009425335668294">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="4544919905196727508">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="4544919905196727508">"ಆಫ್"</item> <item msgid="3422023746567004609">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_wallet"> <item msgid="4177615438710836341">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="7571394439974244289">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="7571394439974244289">"ಆಫ್"</item> <item msgid="6866424167599381915">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_qr_code_scanner"> <item msgid="7435143266149257618">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="3301403109049256043">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="3301403109049256043">"ಆಫ್"</item> <item msgid="8878684975184010135">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_alarm"> <item msgid="4936533380177298776">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="2710157085538036590">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="2710157085538036590">"ಆಫ್"</item> <item msgid="7809470840976856149">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_onehanded"> <item msgid="8189342855739930015">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="146088982397753810">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="146088982397753810">"ಆಫ್"</item> <item msgid="460891964396502657">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_dream"> <item msgid="6184819793571079513">"ಲಭ್ಯವಿಲ್ಲ"</item> - <item msgid="8014986104355098744">"ಆಫ್ ಮಾಡಿ"</item> + <item msgid="8014986104355098744">"ಆಫ್"</item> <item msgid="5966994759929723339">"ಆನ್ ಮಾಡಿ"</item> </string-array> <string-array name="tile_states_font_scaling"> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 7bd6e6f95e0b..897b266fd65f 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"설정에서 기본 메모 앱 설정"</string> <string name="install_app" msgid="5066668100199613936">"앱 설치"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"외부 디스플레이로 미러링하시겠습니까?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"내부 디스플레이가 미러링됩니다. 전면 디스플레이는 꺼집니다."</string> <string name="mirror_display" msgid="2515262008898122928">"디스플레이 미러링"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"닫기"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"디스플레이 연결됨"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index d4974e800a4b..2f091ec484e0 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Параметрлерден демейки кыска жазуулар колдонмосун тууралаңыз"</string> <string name="install_app" msgid="5066668100199613936">"Колдонмону орнотуу"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Тышкы экранга чыгарасызбы?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ички экраныңыз башка экранга чыгарылат. Алдыңкы экраныңыз өчүрүлөт."</string> <string name="mirror_display" msgid="2515262008898122928">"Тышкы экран"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Жабуу"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Экран туташтырылды"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 431b77b2ebd9..c0c5d44319b7 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ຕັ້ງຄ່າແອັບຈົດບັນທຶກເລີ່ມຕົ້ນໃນການຕັ້ງຄ່າ"</string> <string name="install_app" msgid="5066668100199613936">"ຕິດຕັ້ງແອັບ"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ສາຍໃສ່ຈໍສະແດງຜົນພາຍນອກບໍ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ການສະແດງຜົນທາງໃນຂອງທ່ານຈະຖືກສະທ້ອນ. ການສະແດງຜົນທາງໜ້າຂອງທ່ານຈະຖືກປິດໄວ້."</string> <string name="mirror_display" msgid="2515262008898122928">"ຈໍສະແດງຜົນແບບສະທ້ອນ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ປິດໄວ້"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ເຊື່ອມຕໍ່ຈໍແລ້ວ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index a0eaea2e9aed..83d2724baff6 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Nustatykite numatytąją užrašų programą Nustatymuose"</string> <string name="install_app" msgid="5066668100199613936">"Įdiegti programą"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Bendrinti ekrano vaizdą išoriniame ekrane?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Bus bendrinamas vidinio rodinio ekrano vaizdas. Priekinis rodinys bus išjungtas."</string> <string name="mirror_display" msgid="2515262008898122928">"Bendrinti ekrano vaizdą"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Atsisakyti"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ekranas prijungtas"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index a419f877f075..4bc71c375b74 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Iestatījumos iestatiet noklusējuma piezīmju lietotni."</string> <string name="install_app" msgid="5066668100199613936">"Instalēt lietotni"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Vai spoguļot ārējā displejā?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Jūsu iekšējais displejs tiks spoguļots. Jūsu priekšējais displejs tiks izslēgts."</string> <string name="mirror_display" msgid="2515262008898122928">"Spoguļot displeju"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Nerādīt"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Pievienots displejs"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index ca9fe9e91c9b..28a2a024f2e6 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Поставете стандардна апликација за белешки во „Поставки“"</string> <string name="install_app" msgid="5066668100199613936">"Инсталирајте ја апликацијата"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Да се преслика на надворешниот екран?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Вашиот внатрешен екран ќе се отслика. Вашиот преден екран ќе се исклучи."</string> <string name="mirror_display" msgid="2515262008898122928">"Пресликај екран"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Отфрли"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Екранот е поврзан"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 5ff465672a0b..057f0b0c09e2 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ക്രമീകരണത്തിൽ കുറിപ്പുകൾക്കുള്ള ഡിഫോൾട്ട് ആപ്പ് സജ്ജീകരിക്കുക"</string> <string name="install_app" msgid="5066668100199613936">"ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്യൂ"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ബാഹ്യ ഡിസ്പ്ലേയിലേക്ക് മിറർ ചെയ്യണോ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"നിങ്ങളുടെ ഇന്നർ ഡിസ്പ്ലേ മിറർ ചെയ്യും. നിങ്ങളുടെ ഫ്രണ്ട് ഡിസ്പ്ലേ ഓഫാകും."</string> <string name="mirror_display" msgid="2515262008898122928">"മിറർ ഡിസ്പ്ലേ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ഡിസ്മിസ് ചെയ്യുക"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ഡിസ്പ്ലേ കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index a71aca289ab5..933652b17880 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Тохиргоонд тэмдэглэлийн өгөгдмөл апп тохируулна уу"</string> <string name="install_app" msgid="5066668100199613936">"Аппыг суулгах"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Гадны дэлгэцэд тусгал үүсгэх үү?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Таны дотоод дэлгэцийн тусгалыг үүсгэнэ. Таны урд талын дэлгэцийг унтраана."</string> <string name="mirror_display" msgid="2515262008898122928">"Дэлгэцийн тусгал үүсгэх"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Хаах"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Дэлгэц холбогдсон"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 9dfaa00d0e55..aad269b2460c 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"सेटिंग्ज मध्ये डीफॉल्ट टिपा अॅप सेट करा"</string> <string name="install_app" msgid="5066668100199613936">"अॅप इंस्टॉल करा"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"बाह्य डिस्प्लेवर मिरर करायचे आहे का?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"तुमचा अंतर्गत डिस्प्ले मिरर केला जाईल. तुमचा पुढील डिस्प्ले बंद केला जाईल."</string> <string name="mirror_display" msgid="2515262008898122928">"डिस्प्ले मिरर करा"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"डिसमिस करा"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"डिस्प्ले कनेक्ट केला आहे"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 553d221463b9..8287d2bef2ef 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Tetapkan apl nota lalai dalam Tetapan"</string> <string name="install_app" msgid="5066668100199613936">"Pasang apl"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Paparkan pada paparan luaran?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Paparan dalaman anda akan dicerminkan. Paparan depan anda akan dimatikan."</string> <string name="mirror_display" msgid="2515262008898122928">"Segerakkan paparan"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ketepikan"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Paparan disambungkan"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index d3f1badbb64b..25afad4991b6 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ဆက်တင်များတွင် မူရင်းမှတ်စုများအက်ပ် သတ်မှတ်ပါ"</string> <string name="install_app" msgid="5066668100199613936">"အက်ပ် ထည့်သွင်းရန်"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ပြင်ပဖန်သားပြင်သို့ စကရင်ပွားမလား။"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"အတွင်းပြကွက်ကို စကရင်ပွားပါမည်။ ရှေ့မျက်နှာပြင်ပြကွက်ကို ပိတ်မည်။"</string> <string name="mirror_display" msgid="2515262008898122928">"ဖန်သားပြင်ကို စကရင်ပွားရန်"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ပယ်ရန်"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ဖန်သားပြင်ကို ချိတ်ဆက်လိုက်ပါပြီ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 234e725e5164..d91574353c83 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Du kan velge en standardapp for notater i Innstillinger"</string> <string name="install_app" msgid="5066668100199613936">"Installer appen"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Vil du speile til en ekstern skjerm?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Den indre skjermen speiles. Den ytre skjermen slås av."</string> <string name="mirror_display" msgid="2515262008898122928">"Speil skjermen"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Lukk"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"En skjerm er koblet til"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 51839dbe5fc7..4abb4a4be0d2 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"सेटिङमा गई नोट बनाउने डिफल्ट एप तोक्नुहोस्"</string> <string name="install_app" msgid="5066668100199613936">"एप इन्स्टल गर्नुहोस्"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"बाह्य डिस्प्लेमा मिरर गर्ने हो?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"तपाईंको भित्री डिस्प्ले मिरर गरिने छ। तपाईंको अगाडिको डिस्प्ले अफ गरिने छ।"</string> <string name="mirror_display" msgid="2515262008898122928">"डिस्प्ले मिरर गर्नुहोस्"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"खारेज गर्नुहोस्"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"डिस्प्ले कनेक्ट गरिएको छ"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index f66b4e1972db..057673051e23 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Standaard notitie-app instellen in Instellingen"</string> <string name="install_app" msgid="5066668100199613936">"App installeren"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Spiegelen naar extern scherm?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Het scherm aan de binnenkant wordt gemirrord. Het scherm aan de voorkant wordt uitgezet."</string> <string name="mirror_display" msgid="2515262008898122928">"Scherm spiegelen"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Sluiten"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Scherm verbonden"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 0a457696c4a3..cb58e64f8eb0 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ସେଟିଂସରେ ଡିଫଲ୍ଟ ନୋଟ୍ସ ଆପ ସେଟ କରନ୍ତୁ"</string> <string name="install_app" msgid="5066668100199613936">"ଆପ ଇନଷ୍ଟଲ କରନ୍ତୁ"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେକୁ ମିରର କରିବେ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ଆପଣଙ୍କ ଇନର ଡିସପ୍ଲେକୁ ମିରର କରାଯିବ। ଆପଣଙ୍କ ଫ୍ରଣ୍ଟ ଡିସପ୍ଲେକୁ ବନ୍ଦ କରାଯିବ।"</string> <string name="mirror_display" msgid="2515262008898122928">"ଡିସପ୍ଲେ ମିରର କରନ୍ତୁ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ଖାରଜ କରନ୍ତୁ"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ଡିସପ୍ଲେ କନେକ୍ଟ କରାଯାଇଛି"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index c83659f733d4..0340bd192d58 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਨੋਟ ਐਪ ਨੂੰ ਸੈੱਟ ਕਰੋ"</string> <string name="install_app" msgid="5066668100199613936">"ਐਪ ਸਥਾਪਤ ਕਰੋ"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ਕੀ ਬਾਹਰੀ ਡਿਸਪਲੇ \'ਤੇ ਪ੍ਰਤਿਬਿੰਬਿਤ ਕਰਨਾ ਹੈ?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ਤੁਹਾਡੀ ਅੰਦਰੂਨੀ ਡਿਸਪਲੇ ਪ੍ਰਤੀਬਿੰਬਤ ਕੀਤੀ ਜਾਵੇਗੀ। ਤੁਹਾਡੀ ਅਗਲੀ ਡਿਸਪਲੇ ਬੰਦ ਕਰ ਦਿੱਤੀ ਜਾਵੇਗੀ।"</string> <string name="mirror_display" msgid="2515262008898122928">"ਡਿਸਪਲੇ ਨੂੰ ਪ੍ਰਤਿਬਿੰਬਿਤ ਕਰੋ"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ਖਾਰਜ ਕਰੋ"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ਡਿਸਪਲੇ ਨੂੰ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 91f2c7817ed6..aa24818d6aee 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ustaw domyślną aplikację do obsługi notatek w Ustawieniach"</string> <string name="install_app" msgid="5066668100199613936">"Zainstaluj aplikację"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Powielić na wyświetlaczu zewnętrznym?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Powstanie odbicie lustrzane Twojego wewnętrznego ekranu. Przedni ekran zostanie wyłączony."</string> <string name="mirror_display" msgid="2515262008898122928">"Powielaj obraz"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Zamknij"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Wyświetlacz podłączony"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 9fe372b66c6c..c65c56e8cefd 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Defina o app de notas padrão nas Configurações"</string> <string name="install_app" msgid="5066668100199613936">"Instalar o app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Espelhar para a tela externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Seu display interno será espelhado. O display frontal será desligado."</string> <string name="mirror_display" msgid="2515262008898122928">"Espelhar tela"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dispensar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Tela conectada"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 3bf9c7b906ec..0b9580d2a01c 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Predefina a app de notas nas Definições"</string> <string name="install_app" msgid="5066668100199613936">"Instalar app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Espelhar para o ecrã externo?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"O seu ecrã interior vai ser espelhado. O seu ecrã frontal vai ser desativado."</string> <string name="mirror_display" msgid="2515262008898122928">"Espelhar ecrã"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ignorar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ecrã ligado"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 9fe372b66c6c..c65c56e8cefd 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Defina o app de notas padrão nas Configurações"</string> <string name="install_app" msgid="5066668100199613936">"Instalar o app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Espelhar para a tela externa?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Seu display interno será espelhado. O display frontal será desligado."</string> <string name="mirror_display" msgid="2515262008898122928">"Espelhar tela"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Dispensar"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Tela conectada"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 18aa668d2fa5..b2fdef3bcde6 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Setează aplicația prestabilită de note din Setări"</string> <string name="install_app" msgid="5066668100199613936">"Instalează aplicația"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Oglindești pe ecranul extern?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ecranul interior va fi oglindit. Ecranul frontal va fi dezactivat."</string> <string name="mirror_display" msgid="2515262008898122928">"Afișare în oglindă"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Închide"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ecran conectat"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 51192f8e11ce..ff4bd45745c9 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Задайте стандартное приложение для заметок в настройках."</string> <string name="install_app" msgid="5066668100199613936">"Установить приложение"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Дублировать на внешний дисплей?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Для внутреннего экрана включится дублирование. Передний экран будет отключен."</string> <string name="mirror_display" msgid="2515262008898122928">"Дублировать"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Закрыть"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Экран подключен"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 7ade110cd5db..4b4d08bd8189 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"සැකසීම් තුළ පෙරනිමි සටහන් යෙදුම සකසන්න"</string> <string name="install_app" msgid="5066668100199613936">"යෙදුම ස්ථාපනය කරන්න"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"බාහිර සංදර්ශකයට දර්පණය කරන්න ද?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ඔබේ අභ්යන්තර සංදර්ශකය පිළිබිඹු වනු ඇත. ඔබේ ඉදිරිපස සංදර්ශකය ක්රියාවිරහිත වනු ඇත."</string> <string name="mirror_display" msgid="2515262008898122928">"සංදර්ශකය දර්පණය කරන්න"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"අස් කරන්න"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"සංදර්ශකය සම්බන්ධ කර ඇත"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 8d760d51603d..9e9507e92eb9 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Nastavte predvolenú aplikáciu na poznámky v Nastaveniach"</string> <string name="install_app" msgid="5066668100199613936">"Inštalovať aplikáciu"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Chcete zrkadliť na externú obrazovku?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Vnútorná obrazovka bude zrkadlená. Predná obrazovka bude vypnutá."</string> <string name="mirror_display" msgid="2515262008898122928">"Zrkadliť obrazovku"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Zavrieť"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Obrazovka je pripojená"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 4ae80ef5ba4c..cba54167fe86 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Nastavite privzeto aplikacijo za zapiske v nastavitvah."</string> <string name="install_app" msgid="5066668100199613936">"Namesti aplikacijo"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Želite zrcaliti na zunanji zaslon?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Notranji zaslon bo zrcaljen. Sprednji zaslon bo izklopljen."</string> <string name="mirror_display" msgid="2515262008898122928">"Zrcali zaslon"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Opusti"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Zaslon je povezan"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 83727038c0af..b35668f45d37 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Cakto aplikacionin e parazgjedhur të shënimeve te \"Cilësimet\""</string> <string name="install_app" msgid="5066668100199613936">"Instalo aplikacionin"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Të pasqyrohet në ekranin e jashtëm?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ekrani i brendshëm do të pasqyrohet. Ekrani i parmë do të çaktivizohet."</string> <string name="mirror_display" msgid="2515262008898122928">"Pasqyro ekranin"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Hiq"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ekrani është lidhur"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 1bda1dbe0ae1..1d45fbd5267c 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Подесите подразумевану апликацију за белешке у Подешавањима"</string> <string name="install_app" msgid="5066668100199613936">"Инсталирај апликацију"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Желите ли да пресликате на спољњи екран?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Унутрашњи екран ће се пресликати. Предњи екран ће се искључити."</string> <string name="mirror_display" msgid="2515262008898122928">"Пресликај екран"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Одбаци"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Екран је повезан"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 8cfafcf2fcdd..0d6272f532b1 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ställ in en standardapp för anteckningar i inställningarna"</string> <string name="install_app" msgid="5066668100199613936">"Installera appen"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Vill du spegla till extern skärm?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Den inre skärmen speglas. Den främre skärmen stängs av."</string> <string name="mirror_display" msgid="2515262008898122928">"Spegla skärm"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ignorera"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Skärm har anslutits"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 286e65abf384..1bd2ed7aa30d 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -252,7 +252,7 @@ <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Hakuna vifaa vilivyooanishwa vinavyopatikana"</string> <string name="quick_settings_bluetooth_tile_subtitle" msgid="212752719010829550">"Gusa ili uunganishe au utenganishe kifaa"</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Oanisha kifaa kipya"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Unganisha kifaa kipya"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Angalia vyote"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Tumia Bluetooth"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Imeunganishwa"</string> @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Teua programu chaguomsingi ya madokezo katika Mipangilio"</string> <string name="install_app" msgid="5066668100199613936">"Sakinisha programu"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Ungependa kuonyesha kwenye skrini ya nje?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Mwonekano wa ndani wa kifaa chako utaakisiwa. Mwonekano wa mbele wa kifaa chako utazimwa."</string> <string name="mirror_display" msgid="2515262008898122928">"Akisi skrini"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Ondoa"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Skrini imeunganishwa"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index aab713f7517a..0cd076f77d3e 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"குறிப்பு எடுப்பதற்கான இயல்புநிலை ஆப்ஸை அமைப்புகளில் அமையுங்கள்"</string> <string name="install_app" msgid="5066668100199613936">"ஆப்ஸை நிறுவுங்கள்"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"வெளிப்புறக் காட்சிக்கு மிரர் செய்யவா?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"உங்கள் உட்புற டிஸ்பிளே பிரதிபலிக்கப்படும். உங்கள் முன்புற டிஸ்பிளே முடக்கப்படும்."</string> <string name="mirror_display" msgid="2515262008898122928">"டிஸ்பிளேயை மிரர் செய்"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"வேண்டாம்"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"டிஸ்ப்ளே இணைக்கப்பட்டது"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 2536a96050fa..6a59812d39b4 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"సెట్టింగ్లలో ఆటోమేటిక్గా ఉండేలా ఒక నోట్స్ యాప్ను సెట్ చేసుకోండి"</string> <string name="install_app" msgid="5066668100199613936">"యాప్ను ఇన్స్టాల్ చేయండి"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"ఎక్స్టర్నల్ డిస్ప్లేకి మిర్రర్ చేయాలా?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"మీ లోపలి డిస్ప్లే మిర్రర్ చేయబడుతుంది. మీ ముందు వైపు డిస్ప్లే ఆఫ్ చేయబడుతుంది."</string> <string name="mirror_display" msgid="2515262008898122928">"మిర్రర్ డిస్ప్లే"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"విస్మరించండి"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"డిస్ప్లే కనెక్ట్ చేయబడింది"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 3c96e30f4631..dc4c6cf36b7a 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"กำหนดแอปการจดบันทึกเริ่มต้นในการตั้งค่า"</string> <string name="install_app" msgid="5066668100199613936">"ติดตั้งแอป"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"มิเรอร์ไปยังจอแสดงผลภายนอกไหม"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"ระบบจะมิเรอร์หน้าจอด้านใน และจะปิดหน้าจอด้านหน้า"</string> <string name="mirror_display" msgid="2515262008898122928">"มิเรอร์จอแสดงผล"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"ปิด"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"เชื่อมต่อจอแสดงผลแล้ว"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 8fc5b6b6668a..c09ac9748b6f 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Magtakda ng default na app sa pagtatala sa Mga Setting"</string> <string name="install_app" msgid="5066668100199613936">"I-install ang app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"I-mirror sa external na display?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Imi-mirror ang inner display mo. Io-off ang iyong front display."</string> <string name="mirror_display" msgid="2515262008898122928">"I-mirror ang display"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"I-dismiss"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Naikonekta ang display"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index a4083efc84f8..ee1909b28098 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Ayarlar\'ı kullanarak varsayılan notlar ayarlayın"</string> <string name="install_app" msgid="5066668100199613936">"Uygulamayı yükle"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Harici ekrana yansıtılsın mı?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"İç ekranınız yansıtılacak. Ön ekranınız kapatılacak."</string> <string name="mirror_display" msgid="2515262008898122928">"Ekranı yansıt"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Kapat"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Ekran bağlandı"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 5e0f2c2ed352..04a97bcecb80 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Призначте стандартний додаток для нотаток у налаштуваннях"</string> <string name="install_app" msgid="5066668100199613936">"Установити додаток"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Дублювати на зовнішньому екрані?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ваш внутрішній екран буде продубльовано. Передній екран буде вимкнено."</string> <string name="mirror_display" msgid="2515262008898122928">"Дублювати екран"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Закрити"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Дисплей під’єднано"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index c28e064e1f22..fd984b9c4ae7 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"ترتیبات میں ڈیفالٹ نوٹس ایپ سیٹ کریں"</string> <string name="install_app" msgid="5066668100199613936">"ایپ انسٹال کریں"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"بیرونی ڈسپلے پر مرر کریں؟"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"آپ کے اندرونی ڈسپلے کو دو طرفہ مطابقت پذیر بنایا جائے گا۔ آپ کا فرنٹ ڈسپلے آف ہو جائے گا۔"</string> <string name="mirror_display" msgid="2515262008898122928">"ڈسپلے کو مرر کریں"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"برخاست کریں"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"ڈسپلے منسلک ہے"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index e032c76f48b5..b9a9832ea249 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Standart qaydlar ilovasini Sozlamalar orqali tanlang"</string> <string name="install_app" msgid="5066668100199613936">"Ilovani oʻrnatish"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Tashqi displeyda aks ettirilsinmi?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Ichki ekran uchun aks ettirish yoqiladi. Old ekran oʻchiriladi."</string> <string name="mirror_display" msgid="2515262008898122928">"Displeyni aks ettirish"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Yopish"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Displey ulandi"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index b87619e497df..b1ff9a86ee6e 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Đặt ứng dụng ghi chú mặc định trong phần Cài đặt"</string> <string name="install_app" msgid="5066668100199613936">"Cài đặt ứng dụng"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Phản chiếu sang màn hình ngoài?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Màn hình trong của bạn sẽ được phản chiếu. Màn hình ngoài của bạn sẽ tắt."</string> <string name="mirror_display" msgid="2515262008898122928">"Phản chiếu màn hình"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Đóng"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Đã kết nối màn hình"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 43dfbe8e8ff1..237fd572530f 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"在设置中设置默认记事应用"</string> <string name="install_app" msgid="5066668100199613936">"安装应用"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"镜像到外接显示屏？"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"系统将镜像您的内屏，而关闭外屏。"</string> <string name="mirror_display" msgid="2515262008898122928">"镜像到显示屏"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"关闭"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"显示屏已连接"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 784f667575b9..313af30bf5a6 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"在「設定」中指定預設筆記應用程式"</string> <string name="install_app" msgid="5066668100199613936">"安裝應用程式"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"要鏡像投射至外部顯示屏嗎？"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"鏡像畫面將顯示在內部螢幕，前方螢幕則會關閉。"</string> <string name="mirror_display" msgid="2515262008898122928">"鏡像顯示"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"關閉"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"已連接顯示屏"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 15da239353d0..6a13d3dc22a5 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"在「設定」中指定預設記事應用程式"</string> <string name="install_app" msgid="5066668100199613936">"安裝應用程式"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"要以鏡像方式投放至外部螢幕嗎？"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"鏡像畫面將顯示在內螢幕，封面螢幕則會關閉。"</string> <string name="mirror_display" msgid="2515262008898122928">"鏡像顯示"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"關閉"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"螢幕已連結"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 31cdca973cde..23862a78b9d9 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -1208,8 +1208,7 @@ <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Setha i-app yamanothi azenzakalelayo Kumsethingi"</string> <string name="install_app" msgid="5066668100199613936">"Faka i-app"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Fanisa nesibonisi sangaphandle?"</string> - <!-- no translation found for connected_display_dialog_dual_display_stop_warning (4174707498892447947) --> - <skip /> + <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Isibonisi sakho sangaphakathi sizoboniswa. Isibonisi sakho sangaphambili sizovalwa."</string> <string name="mirror_display" msgid="2515262008898122928">"Isibonisi sokufanisa"</string> <string name="dismiss_dialog" msgid="2195508495854675882">"Chitha"</string> <string name="connected_display_icon_desc" msgid="6373560639989971997">"Isibonisi sixhunyiwe"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index e01a2aa674b3..10f7c4d3ee5b 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -962,11 +962,20 @@ <!-- Whether to show bottom sheets edge to edge --> <bool name="config_edgeToEdgeBottomSheetDialog">true</bool> + <!-- Device specific config that controls whether rest to unlock feature is supported. --> + <bool name="config_restToUnlockSupported">false</bool> + + <!-- + Time in milliseconds the user has to touch the side FPS sensor to successfully authenticate when + the screen is turned off with AOD not enabled. + TODO(b/302332976) Get this value from the HAL if they can provide an API for it. + --> + <integer name="config_restToUnlockDurationScreenOff">500</integer> <!-- Time in milliseconds the user has to touch the side FPS sensor to successfully authenticate TODO(b/302332976) Get this value from the HAL if they can provide an API for it. --> - <integer name="config_restToUnlockDuration">300</integer> + <integer name="config_restToUnlockDurationDefault">300</integer> <!-- Width in pixels of the Side FPS sensor. diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ee89edefcdbf..90d8cdb724e4 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -608,6 +608,11 @@ <dimen name="volume_panel_slice_vertical_padding">8dp</dimen> <dimen name="volume_panel_slice_horizontal_padding">24dp</dimen> + <dimen name="volume_panel_corner_radius">52dp</dimen> + <dimen name="volume_panel_content_padding">24dp</dimen> + <dimen name="volume_panel_bottom_bar_horizontal_padding">24dp</dimen> + <dimen name="volume_panel_bottom_bar_bottom_padding">20dp</dimen> + <!-- Size of each item in the ringer selector drawer. --> <dimen name="volume_ringer_drawer_item_size">42dp</dimen> <dimen name="volume_ringer_drawer_item_size_half">21dp</dimen> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index c48dd9d2f68b..3f026a4cec8a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -930,6 +930,15 @@ <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> </style> + <style name="Theme.VolumePanelActivity" parent="@style/Theme.SystemUI"> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowActionBar">false</item> + <item name="android:windowNoTitle">true</item> + <!-- Setting a placeholder will avoid using the SystemUI icon on the splash screen. --> + <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_blank</item> + </style> + <style name="Theme.UserSwitcherFullscreenDialog" parent="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen"> <item name="android:statusBarColor">@color/user_switcher_fullscreen_bg</item> <item name="android:windowBackground">@color/user_switcher_fullscreen_bg</item> diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index bcc20448297d..82410fd39dcd 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -33,6 +33,7 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener import androidx.annotation.VisibleForTesting import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.customization.R import com.android.systemui.dagger.qualifiers.Background @@ -325,6 +326,10 @@ constructor( } } + if (visible) { + refreshTime() + } + smallTimeListener?.update(shouldTimeListenerRun) largeTimeListener?.update(shouldTimeListenerRun) } @@ -346,6 +351,19 @@ constructor( weatherData = data clock?.run { events.onWeatherDataChanged(data) } } + + override fun onTimeChanged() { + refreshTime() + } + + private fun refreshTime() { + if (!migrateClocksToBlueprint()) { + return + } + + clock?.smallClock?.events?.onTimeTick() + clock?.largeClock?.events?.onTimeTick() + } } private val zenModeCallback = object : ZenModeController.Callback { @@ -558,7 +576,8 @@ constructor( isRunning = true when (clockFace.config.tickRate) { ClockTickRate.PER_MINUTE -> { - /* Handled by KeyguardClockSwitchController */ + // Handled by KeyguardClockSwitchController and + // by KeyguardUpdateMonitorCallback#onTimeChanged. } ClockTickRate.PER_SECOND -> executor.execute(secondsRunnable) ClockTickRate.PER_FRAME -> { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index f3cd01f908da..4d84d0b3b666 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -217,7 +217,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private static final int MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED = 348; /** Biometric authentication state: Not listening. */ - private static final int BIOMETRIC_STATE_STOPPED = 0; + @VisibleForTesting + protected static final int BIOMETRIC_STATE_STOPPED = 0; /** Biometric authentication state: Listening. */ private static final int BIOMETRIC_STATE_RUNNING = 1; @@ -1803,6 +1804,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab public void onFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric) { handleBiometricDetected(userId, FINGERPRINT, isStrongBiometric); + setFingerprintRunningState(BIOMETRIC_STATE_STOPPED); } }; diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index 175fcdb6e11a..d5dc85cd8715 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -26,7 +26,6 @@ import static com.android.systemui.Flags.keyguardBottomAreaRefactor; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1; import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED; -import static com.android.systemui.Flags.newAodTransition; import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow; import android.annotation.SuppressLint; @@ -395,16 +394,6 @@ public class LockIconViewController implements Dumpable { mView.updateIcon(ICON_LOCK, true); mView.setContentDescription(mLockedLabel); mView.setVisibility(View.VISIBLE); - } else if (mIsDozing && newAodTransition()) { - mView.animate() - .alpha(0f) - .setDuration(FADE_OUT_DURATION_MS) - .withEndAction(() -> { - mView.clearIcon(); - mView.setVisibility(View.INVISIBLE); - mView.setContentDescription(null); - }) - .start(); } else { mView.clearIcon(); mView.setVisibility(View.INVISIBLE); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt index f4231ac01fee..348b54e0c7f6 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt @@ -26,6 +26,8 @@ import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.isDefaultOrientation import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor +import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.log.SideFpsLogger import com.android.systemui.res.R import java.util.Optional @@ -47,9 +49,13 @@ constructor( windowManager: WindowManager, displayStateInteractor: DisplayStateInteractor, fingerprintInteractiveToAuthProvider: Optional<FingerprintInteractiveToAuthProvider>, + keyguardTransitionInteractor: KeyguardTransitionInteractor, private val logger: SideFpsLogger, ) { + private val isProlongedTouchEnabledForDevice = + context.resources.getBoolean(R.bool.config_restToUnlockSupported) + private val sensorLocationForCurrentDisplay = combine( displayStateInteractor.displayChanges, @@ -62,11 +68,24 @@ constructor( val isAvailable: Flow<Boolean> = fingerprintPropertyRepository.sensorType.map { it == FingerprintSensorType.POWER_BUTTON } - val authenticationDuration: Long = - context.resources?.getInteger(R.integer.config_restToUnlockDuration)?.toLong() ?: 0L + val authenticationDuration: Flow<Long> = + keyguardTransitionInteractor + .isFinishedInStateWhere { it == KeyguardState.OFF || it == KeyguardState.DOZING } + .map { + if (it) + context.resources + ?.getInteger(R.integer.config_restToUnlockDurationScreenOff) + ?.toLong() + else + context.resources + ?.getInteger(R.integer.config_restToUnlockDurationDefault) + ?.toLong() + } + .map { it ?: 0L } + .onEach { logger.authDurationChanged(it) } val isProlongedTouchRequiredForAuthentication: Flow<Boolean> = - if (fingerprintInteractiveToAuthProvider.isEmpty) { + if (fingerprintInteractiveToAuthProvider.isEmpty || !isProlongedTouchEnabledForDevice) { flowOf(false) } else { combine( diff --git a/packages/SystemUI/src/com/android/systemui/common/data/CommonDataLayerModule.kt b/packages/SystemUI/src/com/android/systemui/common/data/CommonDataLayerModule.kt index 27c9b3fa7c9e..d1c728cd74fa 100644 --- a/packages/SystemUI/src/com/android/systemui/common/data/CommonDataLayerModule.kt +++ b/packages/SystemUI/src/com/android/systemui/common/data/CommonDataLayerModule.kt @@ -16,6 +16,8 @@ package com.android.systemui.common.data +import com.android.systemui.common.data.repository.PackageChangeRepository +import com.android.systemui.common.data.repository.PackageChangeRepositoryImpl import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.common.ui.data.repository.ConfigurationRepositoryImpl import dagger.Binds @@ -23,5 +25,13 @@ import dagger.Module @Module abstract class CommonDataLayerModule { - @Binds abstract fun bindRepository(impl: ConfigurationRepositoryImpl): ConfigurationRepository + @Binds + abstract fun bindConfigurationRepository( + impl: ConfigurationRepositoryImpl + ): ConfigurationRepository + + @Binds + abstract fun bindPackageChangeRepository( + impl: PackageChangeRepositoryImpl + ): PackageChangeRepository } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundComponent.kt b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageChangeRepository.kt index d382d2063f06..7c7b3db53b51 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageChangeRepository.kt @@ -14,23 +14,18 @@ * limitations under the License. */ -package com.android.systemui.qs.tiles.impl.custom.di.bound +package com.android.systemui.common.data.repository import android.os.UserHandle -import dagger.BindsInstance -import dagger.Subcomponent -import kotlinx.coroutines.CoroutineScope +import com.android.systemui.common.data.shared.model.PackageChangeModel +import kotlinx.coroutines.flow.Flow -/** @see CustomTileBoundScope */ -@CustomTileBoundScope -@Subcomponent(modules = [CustomTileBoundModule::class]) -interface CustomTileBoundComponent { - - @Subcomponent.Builder - interface Builder { - @BindsInstance fun user(@CustomTileUser user: UserHandle): Builder - @BindsInstance fun coroutineScope(@CustomTileBoundScope scope: CoroutineScope): Builder - - fun build(): CustomTileBoundComponent - } +interface PackageChangeRepository { + /** + * Emits values when packages for the specified user are changed. See supported modifications in + * [PackageChangeModel] + * + * [UserHandle.USER_ALL] may be used to listen to all users. + */ + fun packageChanged(user: UserHandle): Flow<PackageChangeModel> } diff --git a/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageChangeRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageChangeRepositoryImpl.kt new file mode 100644 index 000000000000..b1b348c1600a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageChangeRepositoryImpl.kt @@ -0,0 +1,42 @@ +/* + * 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.common.data.repository + +import android.os.UserHandle +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filter + +@SysUISingleton +class PackageChangeRepositoryImpl +@Inject +constructor( + private val monitorFactory: PackageUpdateMonitor.Factory, +) : PackageChangeRepository { + /** + * A [PackageUpdateMonitor] which monitors package updates for all users. The per-user filtering + * is done by [packageChanged]. + */ + private val monitor by lazy { monitorFactory.create(UserHandle.ALL) } + + override fun packageChanged(user: UserHandle): Flow<PackageChangeModel> = + monitor.packageChanged.filter { + user == UserHandle.ALL || user == UserHandle.getUserHandleForUid(it.packageUid) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateLogger.kt b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateLogger.kt new file mode 100644 index 000000000000..adbb37cc3a42 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateLogger.kt @@ -0,0 +1,57 @@ +/* + * 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.common.data.repository + +import android.os.UserHandle +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.core.LogLevel +import com.android.systemui.log.dagger.PackageChangeRepoLog +import javax.inject.Inject + +private fun getChangeString(model: PackageChangeModel) = + when (model) { + is PackageChangeModel.Installed -> "installed" + is PackageChangeModel.Uninstalled -> "uninstalled" + is PackageChangeModel.UpdateStarted -> "started updating" + is PackageChangeModel.UpdateFinished -> "finished updating" + is PackageChangeModel.Changed -> "changed" + } + +/** A debug logger for [PackageChangeRepository]. */ +@SysUISingleton +class PackageUpdateLogger @Inject constructor(@PackageChangeRepoLog private val buffer: LogBuffer) { + + fun logChange(model: PackageChangeModel) { + buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = model.packageName + str2 = getChangeString(model) + int1 = model.packageUid + }, + { + val user = UserHandle.getUserHandleForUid(int1) + "Package $str1 ($int1) $str2 on user $user" + } + ) + } +} + +private const val TAG = "PackageChangeRepoLog" diff --git a/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateMonitor.kt b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateMonitor.kt new file mode 100644 index 000000000000..f7cc34457079 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/data/repository/PackageUpdateMonitor.kt @@ -0,0 +1,127 @@ +/* + * 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.common.data.repository + +import android.content.Context +import android.os.Handler +import android.os.UserHandle +import com.android.internal.content.PackageMonitor +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach + +/** + * A wrapper around [PackageMonitor] which exposes package updates as a flow. + * + * External clients should use [PackageChangeRepository] instead to ensure only a single callback is + * registered for all of SystemUI. + */ +class PackageUpdateMonitor +@AssistedInject +constructor( + @Assisted private val user: UserHandle, + @Background private val bgDispatcher: CoroutineDispatcher, + @Background private val bgHandler: Handler, + @Application private val context: Context, + @Application private val scope: CoroutineScope, + private val logger: PackageUpdateLogger, +) : PackageMonitor() { + + @AssistedFactory + fun interface Factory { + fun create(user: UserHandle): PackageUpdateMonitor + } + + var isActive = false + private set + + private val _packageChanged = + MutableSharedFlow<PackageChangeModel>(replay = 0, extraBufferCapacity = BUFFER_CAPACITY) + .apply { + // Automatically register/unregister as needed, depending on whether + // there are subscribers to this flow. + subscriptionCount + .map { it > 0 } + .distinctUntilChanged() + .onEach { active -> + if (active) { + register(context, user, bgHandler) + } else if (isActive) { + // Avoid calling unregister if we were not previously active, as this + // will cause an IllegalStateException. + unregister() + } + isActive = active + } + .flowOn(bgDispatcher) + .launchIn(scope) + } + + val packageChanged: Flow<PackageChangeModel> + get() = _packageChanged.onEach(logger::logChange) + + override fun onPackageAdded(packageName: String, uid: Int) { + super.onPackageAdded(packageName, uid) + _packageChanged.tryEmit(PackageChangeModel.Installed(packageName, uid)) + } + + override fun onPackageRemoved(packageName: String, uid: Int) { + super.onPackageRemoved(packageName, uid) + _packageChanged.tryEmit(PackageChangeModel.Uninstalled(packageName, uid)) + } + + override fun onPackageChanged( + packageName: String, + uid: Int, + components: Array<out String> + ): Boolean { + super.onPackageChanged(packageName, uid, components) + _packageChanged.tryEmit(PackageChangeModel.Changed(packageName, uid)) + return false + } + + override fun onPackageUpdateStarted(packageName: String, uid: Int) { + super.onPackageUpdateStarted(packageName, uid) + _packageChanged.tryEmit(PackageChangeModel.UpdateStarted(packageName, uid)) + } + + override fun onPackageUpdateFinished(packageName: String, uid: Int) { + super.onPackageUpdateFinished(packageName, uid) + _packageChanged.tryEmit(PackageChangeModel.UpdateFinished(packageName, uid)) + } + + private companion object { + // This capacity is the number of package changes that we will keep buffered in the shared + // flow. It is unlikely that at any given time there would be this many changes being + // processed by consumers, but this is done just in case that many packages are changed at + // the same time and there is backflow due to consumers processing the changes more slowly + // than they are being emitted. + const val BUFFER_CAPACITY = 100 + } +} diff --git a/packages/SystemUI/src/com/android/systemui/common/data/shared/model/PackageChangeModel.kt b/packages/SystemUI/src/com/android/systemui/common/data/shared/model/PackageChangeModel.kt new file mode 100644 index 000000000000..853eff77b66c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/data/shared/model/PackageChangeModel.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.common.data.shared.model + +import android.content.Intent + +/** Represents changes to an installed package. */ +sealed interface PackageChangeModel { + val packageName: String + val packageUid: Int + + /** + * An existing application package was uninstalled. + * + * Equivalent to receiving the [Intent.ACTION_PACKAGE_REMOVED] broadcast with + * [Intent.EXTRA_REPLACING] set to false. + */ + data class Uninstalled(override val packageName: String, override val packageUid: Int) : + PackageChangeModel + + /** + * A new version of an existing application is going to be installed. + * + * Equivalent to receiving the [Intent.ACTION_PACKAGE_REMOVED] broadcast with + * [Intent.EXTRA_REPLACING] set to true. + */ + data class UpdateStarted(override val packageName: String, override val packageUid: Int) : + PackageChangeModel + + /** + * A new version of an existing application package has been installed, replacing the old + * version. + * + * Equivalent to receiving the [Intent.ACTION_PACKAGE_ADDED] broadcast with + * [Intent.EXTRA_REPLACING] set to true. + */ + data class UpdateFinished(override val packageName: String, override val packageUid: Int) : + PackageChangeModel + + /** + * A new application package has been installed. + * + * Equivalent to receiving the [Intent.ACTION_PACKAGE_ADDED] broadcast with + * [Intent.EXTRA_REPLACING] set to false. + */ + data class Installed(override val packageName: String, override val packageUid: Int) : + PackageChangeModel + + /** + * An existing application package has been changed (for example, a component has been enabled + * or disabled). + * + * Equivalent to receiving the [Intent.ACTION_PACKAGE_CHANGED] broadcast. + */ + data class Changed(override val packageName: String, override val packageUid: Int) : + PackageChangeModel +} diff --git a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.kt b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.kt index 847b98e82d80..10768ea6122a 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.kt @@ -16,7 +16,6 @@ package com.android.systemui.communal.dagger -import android.content.Context import com.android.systemui.communal.data.db.CommunalDatabaseModule import com.android.systemui.communal.data.repository.CommunalMediaRepositoryModule import com.android.systemui.communal.data.repository.CommunalRepositoryModule @@ -24,9 +23,8 @@ import com.android.systemui.communal.data.repository.CommunalTutorialRepositoryM import com.android.systemui.communal.data.repository.CommunalWidgetRepositoryModule import com.android.systemui.communal.widgets.EditWidgetsActivityStarter import com.android.systemui.communal.widgets.EditWidgetsActivityStarterImpl -import com.android.systemui.dagger.qualifiers.Application +import dagger.Binds import dagger.Module -import dagger.Provides @Module( includes = @@ -38,11 +36,9 @@ import dagger.Provides CommunalDatabaseModule::class, ] ) -class CommunalModule { - @Provides - fun provideEditWidgetsActivityStarter( - @Application context: Context - ): EditWidgetsActivityStarter { - return EditWidgetsActivityStarterImpl(context) - } +interface CommunalModule { + @Binds + fun bindEditWidgetsActivityStarter( + starter: EditWidgetsActivityStarterImpl + ): EditWidgetsActivityStarter } diff --git a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivityStarter.kt b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivityStarter.kt index 846e3000284f..55acad0e9ed5 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivityStarter.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivityStarter.kt @@ -19,17 +19,26 @@ package com.android.systemui.communal.widgets import android.content.Context import android.content.Intent import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.plugins.ActivityStarter +import javax.inject.Inject interface EditWidgetsActivityStarter { fun startActivity() } -class EditWidgetsActivityStarterImpl(@Application private val applicationContext: Context) : - EditWidgetsActivityStarter { +class EditWidgetsActivityStarterImpl +@Inject +constructor( + @Application private val applicationContext: Context, + private val activityStarter: ActivityStarter, +) : EditWidgetsActivityStarter { + override fun startActivity() { - applicationContext.startActivity( + activityStarter.startActivityDismissingKeyguard( Intent(applicationContext, EditWidgetsActivity::class.java) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK), + /* onlyProvisioned = */ true, + /* dismissShade = */ true, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/PanelConfirmationDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/controls/management/PanelConfirmationDialogFactory.kt index 5df26b3176ff..a6b432019486 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/PanelConfirmationDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/PanelConfirmationDialogFactory.kt @@ -28,27 +28,26 @@ import javax.inject.Inject /** * Factory to create dialogs for consenting to show app panels for specific apps. * - * [internalDialogFactory] is for facilitating testing. + * [dialogFactory] is for facilitating testing. */ -class PanelConfirmationDialogFactory( - private val internalDialogFactory: (Context) -> SystemUIDialog +class PanelConfirmationDialogFactory @Inject constructor( + private val dialogFactory: SystemUIDialog.Factory ) { - @Inject constructor() : this({ SystemUIDialog(it) }) /** * Creates a dialog to show to the user. [response] will be true if an only if the user responds * affirmatively. */ fun createConfirmationDialog( - context: Context, - appName: CharSequence, - response: Consumer<Boolean> + context: Context, + appName: CharSequence, + response: Consumer<Boolean> ): Dialog { val listener = DialogInterface.OnClickListener { _, which -> response.accept(which == DialogInterface.BUTTON_POSITIVE) } - return internalDialogFactory(context).apply { + return dialogFactory.create(context).apply { setTitle(this.context.getString(R.string.controls_panel_authorization_title, appName)) setMessage(this.context.getString(R.string.controls_panel_authorization, appName)) setCanceledOnTouchOutside(true) diff --git a/packages/SystemUI/src/com/android/systemui/controls/start/ControlsStartable.kt b/packages/SystemUI/src/com/android/systemui/controls/start/ControlsStartable.kt index 0218f452a13b..20bfbc9c2ab8 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/start/ControlsStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/start/ControlsStartable.kt @@ -26,6 +26,8 @@ import android.os.UserManager import androidx.annotation.WorkerThread import com.android.systemui.CoreStartable import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.common.data.shared.model.PackageChangeModel +import com.android.systemui.common.data.repository.PackageChangeRepository import com.android.systemui.controls.controller.ControlsController import com.android.systemui.controls.dagger.ControlsComponent import com.android.systemui.controls.management.ControlsListingController @@ -33,8 +35,16 @@ import com.android.systemui.controls.panels.AuthorizedPanelsRepository import com.android.systemui.controls.panels.SelectedComponentRepository import com.android.systemui.controls.ui.SelectedItem import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.settings.UserTracker +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach import java.util.concurrent.Executor import javax.inject.Inject @@ -53,13 +63,16 @@ import javax.inject.Inject class ControlsStartable @Inject constructor( - @Background private val executor: Executor, - private val controlsComponent: ControlsComponent, - private val userTracker: UserTracker, - private val authorizedPanelsRepository: AuthorizedPanelsRepository, - private val selectedComponentRepository: SelectedComponentRepository, - private val userManager: UserManager, - private val broadcastDispatcher: BroadcastDispatcher, + @Application private val scope: CoroutineScope, + @Background private val bgDispatcher: CoroutineDispatcher, + @Background private val executor: Executor, + private val controlsComponent: ControlsComponent, + private val userTracker: UserTracker, + private val authorizedPanelsRepository: AuthorizedPanelsRepository, + private val selectedComponentRepository: SelectedComponentRepository, + private val packageChangeRepository: PackageChangeRepository, + private val userManager: UserManager, + private val broadcastDispatcher: BroadcastDispatcher, ) : CoreStartable { // These two controllers can only be accessed after `start` method once we've checked if the @@ -78,6 +91,8 @@ constructor( } } + private var packageJob: Job? = null + override fun start() {} override fun onBootCompleted() { @@ -94,6 +109,21 @@ constructor( controlsListingController.forceReload() selectDefaultPanelIfNecessary() bindToPanel() + monitorPackageUninstall() + } + + private fun monitorPackageUninstall() { + packageJob?.cancel() + packageJob = packageChangeRepository.packageChanged(userTracker.userHandle) + .filter { + val selectedPackage = + selectedComponentRepository.getSelectedComponent()?.componentName?.packageName + // Selected package was uninstalled + (it is PackageChangeModel.Uninstalled) && (it.packageName == selectedPackage) + } + .onEach { selectedComponentRepository.removeSelectedComponent() } + .flowOn(bgDispatcher) + .launchIn(scope) } private fun selectDefaultPanelIfNecessary() { diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialogsFactory.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialogsFactory.kt index 2ad6014fd7cd..e42a4a6af0de 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialogsFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialogsFactory.kt @@ -25,20 +25,21 @@ import com.android.systemui.statusbar.phone.SystemUIDialog import java.util.function.Consumer import javax.inject.Inject -class ControlsDialogsFactory(private val internalDialogFactory: (Context) -> SystemUIDialog) { +class ControlsDialogsFactory @Inject constructor( + private val dialogFactory: SystemUIDialog.Factory +) { - @Inject constructor() : this({ SystemUIDialog(it) }) fun createRemoveAppDialog( - context: Context, - appName: CharSequence, - response: Consumer<Boolean> + context: Context, + appName: CharSequence, + response: Consumer<Boolean> ): Dialog { val listener = DialogInterface.OnClickListener { _, which -> response.accept(which == DialogInterface.BUTTON_POSITIVE) } - return internalDialogFactory(context).apply { + return dialogFactory.create(context).apply { setTitle(context.getString(R.string.controls_panel_remove_app_authorization, appName)) setCanceledOnTouchOutside(true) setOnCancelListener { response.accept(false) } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt index ac71664e5590..87a736d926b5 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt @@ -54,6 +54,7 @@ import com.android.systemui.statusbar.phone.StatusBarHeadsUpChangeListener import com.android.systemui.stylus.StylusUsiPowerStartable import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator import com.android.systemui.theme.ThemeOverlayController +import com.android.systemui.unfold.DisplaySwitchLatencyTracker import com.android.systemui.usb.StorageNotification import com.android.systemui.util.NotificationChannels import com.android.systemui.util.StartBinderLoggerModule @@ -141,6 +142,12 @@ abstract class SystemUICoreStartableModule { @ClassKey(LatencyTester::class) abstract fun bindLatencyTester(sysui: LatencyTester): CoreStartable + /** Inject into DisplaySwitchLatencyTracker. */ + @Binds + @IntoMap + @ClassKey(DisplaySwitchLatencyTracker::class) + abstract fun bindDisplaySwitchLatencyTracker(sysui: DisplaySwitchLatencyTracker): CoreStartable + /** Inject into NotificationChannels. */ @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt index efa1c0a07490..684627ba27bf 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt @@ -19,6 +19,7 @@ package com.android.systemui.deviceentry.domain.interactor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.FingerprintAuthenticationStatus import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterIsInstance @@ -31,4 +32,11 @@ constructor( ) { val fingerprintFailure: Flow<FailFingerprintAuthenticationStatus> = repository.authenticationStatus.filterIsInstance<FailFingerprintAuthenticationStatus>() + + /** Whether fingerprint authentication is currently running or not */ + val isRunning: Flow<Boolean> = repository.isRunning + + /** Provide the current status of fingerprint authentication. */ + val authenticationStatus: Flow<FingerprintAuthenticationStatus> = + repository.authenticationStatus } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java index 4c4aa5ce1911..8776ec5496c8 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java @@ -118,6 +118,11 @@ public interface DozeHost { * Called when the dozing state may have been updated. */ default void onDozingChanged(boolean isDozing) {} + + /** + * Called when fingerprint acquisition has started and screen state might need updating. + */ + default void onSideFingerprintAcquisitionStarted() {} } interface PulseCallback { diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java index 5b90ef2bb806..424bd0a3e23b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java @@ -514,6 +514,7 @@ public class DozeLog implements Dumpable { case REASON_SENSOR_TAP: return "tap"; case REASON_SENSOR_UDFPS_LONG_PRESS: return "udfps"; case REASON_SENSOR_QUICK_PICKUP: return "quickPickup"; + case PULSE_REASON_FINGERPRINT_ACTIVATED: return "fingerprint-triggered"; default: throw new IllegalArgumentException("invalid reason: " + pulseReason); } } @@ -542,7 +543,9 @@ public class DozeLog implements Dumpable { PULSE_REASON_SENSOR_SIGMOTION, REASON_SENSOR_PICKUP, REASON_SENSOR_DOUBLE_TAP, PULSE_REASON_SENSOR_LONG_PRESS, PULSE_REASON_DOCKING, REASON_SENSOR_WAKE_UP_PRESENCE, PULSE_REASON_SENSOR_WAKE_REACH, REASON_SENSOR_TAP, - REASON_SENSOR_UDFPS_LONG_PRESS, REASON_SENSOR_QUICK_PICKUP}) + REASON_SENSOR_UDFPS_LONG_PRESS, REASON_SENSOR_QUICK_PICKUP, + PULSE_REASON_FINGERPRINT_ACTIVATED + }) public @interface Reason {} public static final int PULSE_REASON_NONE = -1; public static final int PULSE_REASON_INTENT = 0; @@ -557,6 +560,7 @@ public class DozeLog implements Dumpable { public static final int REASON_SENSOR_TAP = 9; public static final int REASON_SENSOR_UDFPS_LONG_PRESS = 10; public static final int REASON_SENSOR_QUICK_PICKUP = 11; + public static final int PULSE_REASON_FINGERPRINT_ACTIVATED = 12; - public static final int TOTAL_REASONS = 12; + public static final int TOTAL_REASONS = 13; } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java index 795c3d4528c5..93111874c69b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java @@ -265,6 +265,10 @@ public class DozeTriggers implements DozeMachine.Part { mDozeLog.traceNotificationPulse(); } + private void onSideFingerprintAcquisitionStarted() { + requestPulse(DozeLog.PULSE_REASON_FINGERPRINT_ACTIVATED, false, null); + } + private static void runIfNotNull(Runnable runnable) { if (runnable != null) { runnable.run(); @@ -690,5 +694,10 @@ public class DozeTriggers implements DozeMachine.Part { public void onNotificationAlerted(Runnable onPulseSuppressedListener) { onNotification(onPulseSuppressedListener); } + + @Override + public void onSideFingerprintAcquisitionStarted() { + DozeTriggers.this.onSideFingerprintAcquisitionStarted(); + } }; } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt index 50836fe9ee51..afef8751b065 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt @@ -46,6 +46,7 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel import com.android.systemui.plugins.FalsingManager import com.android.systemui.res.R +import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.shade.NotificationShadeWindowView import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.KeyguardIndicationController @@ -111,7 +112,9 @@ constructor( bindKeyguardRootView() initializeViews() - KeyguardBlueprintViewBinder.bind(keyguardRootView, keyguardBlueprintViewModel) + if (!SceneContainerFlag.isEnabled) { + KeyguardBlueprintViewBinder.bind(keyguardRootView, keyguardBlueprintViewModel) + } keyguardBlueprintCommandListener.start() } @@ -144,6 +147,10 @@ constructor( } private fun bindKeyguardRootView() { + if (SceneContainerFlag.isEnabled) { + return + } + rootViewHandle?.dispose() rootViewHandle = KeyguardRootViewBinder.bind( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt index 31ef100abbcb..2f937bcd3414 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt @@ -110,7 +110,7 @@ interface KeyguardRepository { val isKeyguardGoingAway: Flow<Boolean> /** Is the always-on display available to be used? */ - val isAodAvailable: Flow<Boolean> + val isAodAvailable: StateFlow<Boolean> fun setAodAvailable(value: Boolean) @@ -338,7 +338,7 @@ constructor( .distinctUntilChanged() private val _isAodAvailable = MutableStateFlow(false) - override val isAodAvailable: Flow<Boolean> = _isAodAvailable.asStateFlow() + override val isAodAvailable: StateFlow<Boolean> = _isAodAvailable.asStateFlow() override fun setAodAvailable(value: Boolean) { _isAodAvailable.value = value diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt index 21651ba2cc2b..6eb3b64d4c09 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt @@ -104,7 +104,7 @@ constructor( val dozeTimeTick: Flow<Long> = repository.dozeTimeTick /** Whether Always-on Display mode is available. */ - val isAodAvailable: Flow<Boolean> = repository.isAodAvailable + val isAodAvailable: StateFlow<Boolean> = repository.isAodAvailable /** Doze transition information. */ val dozeTransitionModel: Flow<DozeTransitionModel> = repository.dozeTransitionModel diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt index 12775854c737..cf1d2477c9af 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt @@ -32,6 +32,7 @@ import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map @@ -89,7 +90,6 @@ constructor( val start = (startTime / transitionDuration).toFloat() val chunks = (transitionDuration / duration).toFloat() logger.logCreate(name, start) - var isComplete = true fun stepToValue(step: TransitionStep): Float? { val value = (step.value - start) * chunks @@ -98,17 +98,13 @@ constructor( // middle, it is possible this animation is being skipped but we need to inform // the ViewModels of the last update STARTED -> { - isComplete = false onStart?.invoke() max(0f, min(1f, value)) } // Always send a final value of 1. Because of rounding, [value] may never be // exactly 1. RUNNING -> - if (isComplete) { - null - } else if (value >= 1f) { - isComplete = true + if (value >= 1f) { 1f } else if (value >= 0f) { value @@ -132,6 +128,7 @@ constructor( value } .filterNotNull() + .distinctUntilChanged() } /** diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt index 528a2eebc9cd..5bb27824753d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt @@ -16,6 +16,7 @@ package com.android.systemui.keyguard.ui.viewmodel +import android.content.Context import androidx.constraintlayout.helper.widget.Layer import com.android.keyguard.KeyguardClockSwitch.LARGE import com.android.keyguard.KeyguardClockSwitch.SMALL @@ -25,6 +26,9 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.shared.model.SettingsClockSize import com.android.systemui.plugins.clocks.ClockController +import com.android.systemui.res.R +import com.android.systemui.statusbar.policy.SplitShadeStateController +import com.android.systemui.util.Utils import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted @@ -36,9 +40,10 @@ import kotlinx.coroutines.flow.stateIn class KeyguardClockViewModel @Inject constructor( - val keyguardInteractor: KeyguardInteractor, - val keyguardClockInteractor: KeyguardClockInteractor, + keyguardInteractor: KeyguardInteractor, + private val keyguardClockInteractor: KeyguardClockInteractor, @Application private val applicationScope: CoroutineScope, + private val splitShadeStateController: SplitShadeStateController, ) { var burnInLayer: Layer? = null val useLargeClock: Boolean @@ -85,4 +90,43 @@ constructor( started = SharingStarted.WhileSubscribed(), initialValue = false ) + + // Needs to use a non application context to get display cutout. + fun getSmallClockTopMargin(context: Context) = + if (splitShadeStateController.shouldUseSplitNotificationShade(context.resources)) { + context.resources.getDimensionPixelSize(R.dimen.keyguard_split_shade_top_margin) + } else { + context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin) + + Utils.getStatusBarHeaderHeightKeyguard(context) + } + + fun getLargeClockTopMargin(context: Context): Int { + var largeClockTopMargin = + context.resources.getDimensionPixelSize(R.dimen.status_bar_height) + + context.resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_padding_top + ) + + context.resources.getDimensionPixelSize(R.dimen.keyguard_smartspace_top_offset) + largeClockTopMargin += getDimen(context, DATE_WEATHER_VIEW_HEIGHT) + largeClockTopMargin += getDimen(context, ENHANCED_SMARTSPACE_HEIGHT) + if (!useLargeClock) { + largeClockTopMargin -= + context.resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_height + ) + } + + return largeClockTopMargin + } + + private fun getDimen(context: Context, name: String): Int { + val res = context.packageManager.getResourcesForApplication(context.packageName) + val id = res.getIdentifier(name, "dimen", context.packageName) + return res.getDimensionPixelSize(id) + } + + companion object { + private const val DATE_WEATHER_VIEW_HEIGHT = "date_weather_view_height" + private const val ENHANCED_SMARTSPACE_HEIGHT = "enhanced_smartspace_height" + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt index 1dbf1f14b569..693e3b7506fc 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt @@ -28,13 +28,16 @@ import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.biometrics.shared.model.isDefaultOrientation import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFingerprintAuthInteractor import com.android.systemui.keyguard.shared.model.AcquiredFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus import com.android.systemui.res.R +import com.android.systemui.statusbar.phone.DozeServiceHost import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow @@ -43,6 +46,7 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onCompletion @@ -54,9 +58,13 @@ class SideFpsProgressBarViewModel @Inject constructor( private val context: Context, - private val fpAuthRepository: DeviceEntryFingerprintAuthRepository, + private val fpAuthRepository: DeviceEntryFingerprintAuthInteractor, private val sfpsSensorInteractor: SideFpsSensorInteractor, + // todo (b/317432075) Injecting DozeServiceHost directly instead of using it through + // DozeInteractor as DozeServiceHost already depends on DozeInteractor. + private val dozeServiceHost: DozeServiceHost, displayStateInteractor: DisplayStateInteractor, + @Main private val mainDispatcher: CoroutineDispatcher, @Application private val applicationScope: CoroutineScope, ) { private val _progress = MutableStateFlow(0.0f) @@ -168,18 +176,21 @@ constructor( return@collectLatest } animatorJob = - fpAuthRepository.authenticationStatus - .onEach { authStatus -> + combine( + sfpsSensorInteractor.authenticationDuration, + fpAuthRepository.authenticationStatus, + ::Pair + ) + .onEach { (authDuration, authStatus) -> when (authStatus) { is AcquiredFingerprintAuthenticationStatus -> { if (authStatus.fingerprintCaptureStarted) { _visible.value = true + dozeServiceHost.fireSideFpsAcquisitionStarted() _animator?.cancel() _animator = ValueAnimator.ofFloat(0.0f, 1.0f) - .setDuration( - sfpsSensorInteractor.authenticationDuration - ) + .setDuration(authDuration) .apply { addUpdateListener { _progress.value = it.animatedValue as Float @@ -209,6 +220,7 @@ constructor( else -> Unit } } + .flowOn(mainDispatcher) .onCompletion { _animator?.cancel() } .launchIn(applicationScope) } diff --git a/packages/SystemUI/src/com/android/systemui/log/SideFpsLogger.kt b/packages/SystemUI/src/com/android/systemui/log/SideFpsLogger.kt index 919072a63220..171656a48e58 100644 --- a/packages/SystemUI/src/com/android/systemui/log/SideFpsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/log/SideFpsLogger.kt @@ -108,4 +108,13 @@ class SideFpsLogger @Inject constructor(@BouncerLog private val buffer: LogBuffe } ) } + + fun authDurationChanged(duration: Long) { + buffer.log( + TAG, + LogLevel.DEBUG, + { long1 = duration }, + { "SideFpsSensor auth duration changed: $long1" } + ) + } } diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java index 0d5ba641b599..1e677719e92a 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -18,6 +18,7 @@ package com.android.systemui.log.dagger; import android.os.Build; +import com.android.systemui.common.data.repository.PackageChangeRepository; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.log.LogBuffer; import com.android.systemui.log.LogBufferFactory; @@ -600,4 +601,12 @@ public class LogModule { public static LogBuffer provideQBluetoothTileDialogLogBuffer(LogBufferFactory factory) { return factory.create("BluetoothTileDialogLog", 50); } + + /** Provides a {@link LogBuffer} for {@link PackageChangeRepository} */ + @Provides + @SysUISingleton + @PackageChangeRepoLog + public static LogBuffer providePackageChangeRepoLogBuffer(LogBufferFactory factory) { + return factory.create("PackageChangeRepo", 50); + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileUser.kt b/packages/SystemUI/src/com/android/systemui/log/dagger/PackageChangeRepoLog.kt index efc743127418..93b776c2c85a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileUser.kt +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/PackageChangeRepoLog.kt @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.android.systemui.qs.tiles.impl.custom.di.bound +package com.android.systemui.log.dagger +import com.android.systemui.common.data.repository.PackageChangeRepository +import com.android.systemui.log.LogBuffer import javax.inject.Qualifier -/** User associated with current custom tile binding. */ +/** A [LogBuffer] for [PackageChangeRepository]. */ @Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) -annotation class CustomTileUser +annotation class PackageChangeRepoLog diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index a6c623391bb0..7e06f5a21113 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -87,6 +87,7 @@ import java.util.Locale; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Provider; /** */ @@ -149,6 +150,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { public static final String EXTRA_CONFIRM_ONLY = "extra_confirm_only"; private final Context mContext; + private final SystemUIDialog.Factory mSystemUIDialogFactory; private final NotificationManager mNoMan; private final PowerManager mPowerMan; private final KeyguardManager mKeyguard; @@ -186,11 +188,17 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { /** */ @Inject - public PowerNotificationWarnings(Context context, ActivityStarter activityStarter, - BroadcastSender broadcastSender, Lazy<BatteryController> batteryControllerLazy, - DialogLaunchAnimator dialogLaunchAnimator, UiEventLogger uiEventLogger, - GlobalSettings globalSettings, UserTracker userTracker) { + public PowerNotificationWarnings( + Context context, + ActivityStarter activityStarter, + BroadcastSender broadcastSender, + Lazy<BatteryController> batteryControllerLazy, + DialogLaunchAnimator dialogLaunchAnimator, + UiEventLogger uiEventLogger, + UserTracker userTracker, + SystemUIDialog.Factory systemUIDialogFactory) { mContext = context; + mSystemUIDialogFactory = systemUIDialogFactory; mNoMan = mContext.getSystemService(NotificationManager.class); mPowerMan = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mKeyguard = mContext.getSystemService(KeyguardManager.class); @@ -444,7 +452,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private void showHighTemperatureDialog() { if (mHighTempDialog != null) return; - final SystemUIDialog d = new SystemUIDialog(mContext); + final SystemUIDialog d = mSystemUIDialogFactory.create(); d.setIconAttribute(android.R.attr.alertDialogIcon); d.setTitle(R.string.high_temp_title); d.setMessage(R.string.high_temp_dialog_message); @@ -479,7 +487,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private void showThermalShutdownDialog() { if (mThermalShutdownDialog != null) return; - final SystemUIDialog d = new SystemUIDialog(mContext); + final SystemUIDialog d = mSystemUIDialogFactory.create(); d.setIconAttribute(android.R.attr.alertDialogIcon); d.setTitle(R.string.thermal_shutdown_title); d.setMessage(R.string.thermal_shutdown_dialog_message); @@ -643,7 +651,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private void showStartSaverConfirmation(Bundle extras) { if (mSaverConfirmation != null || mUseExtraSaverConfirmation) return; - final SystemUIDialog d = new SystemUIDialog(mContext); + final SystemUIDialog d = mSystemUIDialogFactory.create(); final boolean confirmOnly = extras.getBoolean(BatterySaverUtils.EXTRA_CONFIRM_TEXT_ONLY); final int batterySaverTriggerMode = extras.getInt(BatterySaverUtils.EXTRA_POWER_SAVE_MODE_TRIGGER, diff --git a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt index faf9fbe3239d..7505566898c0 100644 --- a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt +++ b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt @@ -51,7 +51,10 @@ enum class WakeSleepReason( BIOMETRIC(isTouch = false, PowerManager.WAKE_REASON_BIOMETRIC), /** Something else happened to wake up or sleep the device. */ - OTHER(isTouch = false, PowerManager.WAKE_REASON_UNKNOWN); + OTHER(isTouch = false, PowerManager.WAKE_REASON_UNKNOWN), + + /** Device goes to sleep due to folding of a foldable device. */ + FOLD(isTouch = false, PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD); companion object { fun fromPowerManagerWakeReason(reason: Int): WakeSleepReason { @@ -72,6 +75,7 @@ enum class WakeSleepReason( fun fromPowerManagerSleepReason(reason: Int): WakeSleepReason { return when (reason) { PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON -> POWER_BUTTON + PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD -> FOLD else -> OTHER } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt index 6f35cfbfb4a5..b5def41fb3c7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt @@ -148,7 +148,8 @@ class FgsManagerControllerImpl @Inject constructor( private val deviceConfigProxy: DeviceConfigProxy, private val dialogLaunchAnimator: DialogLaunchAnimator, private val broadcastDispatcher: BroadcastDispatcher, - private val dumpManager: DumpManager + private val dumpManager: DumpManager, + private val systemUIDialogFactory: SystemUIDialog.Factory, ) : Dumpable, FgsManagerController { companion object { @@ -375,7 +376,7 @@ class FgsManagerControllerImpl @Inject constructor( override fun showDialog(expandable: Expandable?) { synchronized(lock) { if (dialog == null) { - val dialog = SystemUIDialog(context) + val dialog = systemUIDialogFactory.create() dialog.setTitle(R.string.fgs_manager_dialog_title) dialog.setMessage(R.string.fgs_manager_dialog_message) diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java index 47b062430ca5..a45d6f63cd81 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -259,7 +259,11 @@ public class TileQueryHelper { private State getState(Collection<QSTile> tiles, String spec) { for (QSTile tile : tiles) { if (spec.equals(tile.getTileSpec())) { - return tile.getState().copy(); + if (tile.isTileReady()) { + return tile.getState().copy(); + } else { + return null; + } } } return null; diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/CurrentTilesInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/CurrentTilesInteractor.kt index 5d28c8c0b69a..957cb1eb95d1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/CurrentTilesInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/interactor/CurrentTilesInteractor.kt @@ -319,7 +319,7 @@ constructor( override fun dumpProto(systemUIProtoDump: SystemUIProtoDump, args: Array<String>) { val data = - currentTiles.value.map { it.tile.state }.mapNotNull { it.toProto() }.toTypedArray() + currentTiles.value.map { it.tile.state }.mapNotNull { it?.toProto() }.toTypedArray() systemUIProtoDump.tiles = data } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index ccf7afbe7016..c9b002209fa8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -55,6 +55,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements private final DataSaverController mDataSaverController; private final DialogLaunchAnimator mDialogLaunchAnimator; + private final SystemUIDialog.Factory mSystemUIDialogFactory; @Inject public DataSaverTile( @@ -68,12 +69,14 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements ActivityStarter activityStarter, QSLogger qsLogger, DataSaverController dataSaverController, - DialogLaunchAnimator dialogLaunchAnimator + DialogLaunchAnimator dialogLaunchAnimator, + SystemUIDialog.Factory systemUIDialogFactory ) { super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); mDataSaverController = dataSaverController; mDialogLaunchAnimator = dialogLaunchAnimator; + mSystemUIDialogFactory = systemUIDialogFactory; mDataSaverController.observe(getLifecycle(), this); } @@ -98,7 +101,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements // Show a dialog to confirm first. Dialogs shown by the DialogLaunchAnimator must be created // and shown on the main thread, so we post it to the UI handler. mUiHandler.post(() -> { - SystemUIDialog dialog = new SystemUIDialog(mContext); + SystemUIDialog dialog = mSystemUIDialogFactory.create(); dialog.setTitle(com.android.internal.R.string.data_saver_enable_title); dialog.setMessage(com.android.internal.R.string.data_saver_description); dialog.setPositiveButton(com.android.internal.R.string.data_saver_enable_button, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/actions/QSTileIntentUserInputHandler.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/actions/QSTileIntentUserInputHandler.kt index 840db260a8d6..fc06090750ec 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/actions/QSTileIntentUserInputHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/actions/QSTileIntentUserInputHandler.kt @@ -63,6 +63,10 @@ constructor(private val activityStarter: ActivityStarter) : QSTileIntentUserInpu InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_QS_TILE, ) } - activityStarter.postStartActivityDismissingKeyguard(pendingIntent, animationController) + activityStarter.startPendingIntentMaybeDismissingKeyguard( + pendingIntent, + null, + animationController + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt index 0a9a6d3c4eba..bc016bd221e9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt @@ -158,6 +158,33 @@ constructor( ) } + fun logError( + tileSpec: TileSpec, + message: String, + error: Throwable, + ) { + tileSpec + .getLogBuffer() + .log( + tileSpec.getLogTag(), + LogLevel.ERROR, + {}, + { message }, + error, + ) + } + + fun logCustomTileUserActionDelivered(tileSpec: TileSpec) { + tileSpec + .getLogBuffer() + .log( + tileSpec.getLogTag(), + LogLevel.DEBUG, + {}, + { "user action delivered to the service" }, + ) + } + private fun TileSpec.getLogTag(): String = "${TAG_FORMAT_PREFIX}_${this.spec}" private fun TileSpec.getLogBuffer(): LogBuffer = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/di/NewQSTileFactory.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/di/NewQSTileFactory.kt index 382cfe267aae..6c9a8a4f3a3e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/di/NewQSTileFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/di/NewQSTileFactory.kt @@ -56,7 +56,7 @@ constructor( override fun createTile(tileSpec: String): QSTile? { val viewModel: QSTileViewModel = when (val spec = TileSpec.create(tileSpec)) { - is TileSpec.CustomTileSpec -> null + is TileSpec.CustomTileSpec -> createCustomTileViewModel(spec) is TileSpec.PlatformTileSpec -> tileMap[tileSpec]?.get() is TileSpec.Invalid -> null } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileInteractor.kt deleted file mode 100644 index 14bf25d10d88..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileInteractor.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.qs.tiles.impl.custom - -import android.os.UserHandle -import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger -import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor -import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel -import com.android.systemui.qs.tiles.impl.di.QSTileScope -import javax.inject.Inject -import kotlinx.coroutines.flow.Flow - -@QSTileScope -class CustomTileInteractor @Inject constructor() : QSTileDataInteractor<CustomTileDataModel> { - - override fun tileData( - user: UserHandle, - triggers: Flow<DataUpdateTrigger> - ): Flow<CustomTileDataModel> { - TODO("Not yet implemented") - } - - override fun availability(user: UserHandle): Flow<Boolean> { - TODO("Not yet implemented") - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileMapper.kt deleted file mode 100644 index e23a5c2f0b6a..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileMapper.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.qs.tiles.impl.custom - -import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper -import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel -import com.android.systemui.qs.tiles.impl.di.QSTileScope -import com.android.systemui.qs.tiles.viewmodel.QSTileConfig -import com.android.systemui.qs.tiles.viewmodel.QSTileState -import javax.inject.Inject - -@QSTileScope -class CustomTileMapper @Inject constructor() : QSTileDataToStateMapper<CustomTileDataModel> { - - override fun map(config: QSTileConfig, data: CustomTileDataModel): QSTileState { - TODO("Not yet implemented") - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileComponent.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileComponent.kt index 88bc8fa81e1a..7b099c2cb0c6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileComponent.kt @@ -16,7 +16,10 @@ package com.android.systemui.qs.tiles.impl.custom.di +import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepository import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel +import com.android.systemui.qs.tiles.impl.custom.domain.interactor.CustomTileInteractor +import com.android.systemui.qs.tiles.impl.custom.domain.interactor.CustomTileServiceInteractor import com.android.systemui.qs.tiles.impl.di.QSTileComponent import com.android.systemui.qs.tiles.impl.di.QSTileScope import dagger.Subcomponent @@ -25,6 +28,12 @@ import dagger.Subcomponent @Subcomponent(modules = [QSTileConfigModule::class, CustomTileModule::class]) interface CustomTileComponent : QSTileComponent<CustomTileDataModel> { + fun customTileInterfaceInteractor(): CustomTileServiceInteractor + + fun customTileInteractor(): CustomTileInteractor + + fun customTilePackageUpdatesRepository(): CustomTilePackageUpdatesRepository + @Subcomponent.Builder interface Builder { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileModule.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileModule.kt index ba8b23ab795a..196fa12cacc9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/CustomTileModule.kt @@ -20,14 +20,16 @@ import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor import com.android.systemui.qs.tiles.base.viewmodel.QSTileCoroutineScopeFactory -import com.android.systemui.qs.tiles.impl.custom.CustomTileInteractor -import com.android.systemui.qs.tiles.impl.custom.CustomTileMapper -import com.android.systemui.qs.tiles.impl.custom.CustomTileUserActionInteractor import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileDefaultsRepository import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileDefaultsRepositoryImpl +import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepository +import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepositoryImpl import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileRepository import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileRepositoryImpl +import com.android.systemui.qs.tiles.impl.custom.domain.CustomTileMapper import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel +import com.android.systemui.qs.tiles.impl.custom.domain.interactor.CustomTileDataInteractor +import com.android.systemui.qs.tiles.impl.custom.domain.interactor.CustomTileUserActionInteractor import com.android.systemui.qs.tiles.impl.di.QSTileScope import dagger.Binds import dagger.Module @@ -40,7 +42,7 @@ interface CustomTileModule { @Binds fun bindDataInteractor( - dataInteractor: CustomTileInteractor + dataInteractor: CustomTileDataInteractor ): QSTileDataInteractor<CustomTileDataModel> @Binds @@ -58,6 +60,11 @@ interface CustomTileModule { @Binds fun bindCustomTileRepository(impl: CustomTileRepositoryImpl): CustomTileRepository + @Binds + abstract fun bindCustomTilePackageUpdatesRepository( + impl: CustomTilePackageUpdatesRepositoryImpl + ): CustomTilePackageUpdatesRepository + companion object { @Provides diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/CustomTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/CustomTileMapper.kt new file mode 100644 index 000000000000..875079cae8eb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/CustomTileMapper.kt @@ -0,0 +1,130 @@ +/* + * 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.qs.tiles.impl.custom.domain + +import android.annotation.SuppressLint +import android.app.IUriGrantsManager +import android.content.Context +import android.graphics.drawable.Drawable +import android.os.UserHandle +import android.service.quicksettings.Tile +import android.widget.Button +import android.widget.Switch +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper +import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import javax.inject.Inject + +@SysUISingleton +class CustomTileMapper +@Inject +constructor( + private val context: Context, + private val uriGrantsManager: IUriGrantsManager, +) : QSTileDataToStateMapper<CustomTileDataModel> { + + override fun map(config: QSTileConfig, data: CustomTileDataModel): QSTileState { + val userContext = context.createContextAsUser(UserHandle(data.user.identifier), 0) + + val iconResult = + getIconProvider( + userContext = userContext, + icon = data.tile.icon, + callingAppUid = data.callingAppUid, + packageName = data.componentName.packageName, + defaultIcon = data.defaultTileIcon, + ) + + return QSTileState.build(iconResult.iconProvider, data.tile.label) { + var tileState: Int = data.tile.state + if (data.hasPendingBind) { + tileState = Tile.STATE_UNAVAILABLE + } + + icon = iconResult.iconProvider + activationState = + if (iconResult.failedToLoad) { + QSTileState.ActivationState.INACTIVE + } else { + QSTileState.ActivationState.valueOf(tileState) + } + + if (!data.tile.subtitle.isNullOrEmpty()) { + secondaryLabel = data.tile.subtitle + } + + contentDescription = data.tile.contentDescription + stateDescription = data.tile.stateDescription + + if (!data.isToggleable) { + sideViewIcon = QSTileState.SideViewIcon.Chevron + } + + supportedActions = + if (tileState == Tile.STATE_UNAVAILABLE) { + setOf(QSTileState.UserAction.LONG_CLICK) + } else { + setOf(QSTileState.UserAction.CLICK, QSTileState.UserAction.LONG_CLICK) + } + expandedAccessibilityClass = + if (data.isToggleable) { + Switch::class + } else { + Button::class + } + } + } + + @SuppressLint("MissingPermission") // android.permission.INTERACT_ACROSS_USERS_FULL + private fun getIconProvider( + userContext: Context, + icon: android.graphics.drawable.Icon?, + callingAppUid: Int, + packageName: String, + defaultIcon: android.graphics.drawable.Icon?, + ): IconResult { + var failedToLoad = false + val drawable: Drawable? = + try { + icon?.loadDrawableCheckingUriGrant( + userContext, + uriGrantsManager, + callingAppUid, + packageName, + ) + } catch (e: Exception) { + failedToLoad = true + null + } ?: defaultIcon?.loadDrawable(userContext) + return IconResult( + { + drawable?.constantState?.newDrawable()?.let { + Icon.Loaded(it, contentDescription = null) + } + }, + failedToLoad, + ) + } + + class IconResult( + val iconProvider: () -> Icon?, + val failedToLoad: Boolean, + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/entity/CustomTileDataModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/entity/CustomTileDataModel.kt index f095c01126c4..5b6ff1e033fb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/entity/CustomTileDataModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/entity/CustomTileDataModel.kt @@ -20,16 +20,14 @@ import android.content.ComponentName import android.graphics.drawable.Icon import android.os.UserHandle import android.service.quicksettings.Tile -import com.android.systemui.qs.tiles.impl.custom.di.bound.CustomTileBoundComponent data class CustomTileDataModel( val user: UserHandle, val componentName: ComponentName, val tile: Tile, + val isToggleable: Boolean, val callingAppUid: Int, val hasPendingBind: Boolean, - val shouldShowChevron: Boolean, - val defaultTileLabel: CharSequence?, - val defaultTileIcon: Icon?, - val component: CustomTileBoundComponent, + val defaultTileLabel: CharSequence, + val defaultTileIcon: Icon, ) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt new file mode 100644 index 000000000000..cff95d8368a2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.custom.domain.interactor + +import android.os.UserHandle +import android.service.quicksettings.Tile +import com.android.systemui.common.coroutine.ConflatedCallbackFlow +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger +import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor +import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults +import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileDefaultsRepository +import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepository +import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel +import com.android.systemui.qs.tiles.impl.di.QSTileScope +import com.android.systemui.user.data.repository.UserRepository +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.launch + +@QSTileScope +@OptIn(ExperimentalCoroutinesApi::class) +class CustomTileDataInteractor +@Inject +constructor( + private val tileSpec: TileSpec.CustomTileSpec, + private val defaultsRepository: CustomTileDefaultsRepository, + private val serviceInteractor: CustomTileServiceInteractor, + private val customTileInteractor: CustomTileInteractor, + private val packageUpdatesRepository: CustomTilePackageUpdatesRepository, + userRepository: UserRepository, + @QSTileScope private val tileScope: CoroutineScope, +) : QSTileDataInteractor<CustomTileDataModel> { + + private val mutableUserFlow = MutableStateFlow(userRepository.getSelectedUserInfo().userHandle) + private val bindingFlow = + mutableUserFlow + .flatMapLatest { user -> + ConflatedCallbackFlow.conflatedCallbackFlow { + serviceInteractor.setUser(user) + + // Wait for the CustomTileInteractor to become initialized first, because + // binding + // the service might access it + customTileInteractor.initForUser(user) + // Bind the TileService for not active tile + serviceInteractor.bindOnStart() + + packageUpdatesRepository + .getPackageChangesForUser(user) + .onEach { + defaultsRepository.requestNewDefaults( + user, + tileSpec.componentName, + true + ) + } + .launchIn(this) + + send(Unit) + awaitClose { serviceInteractor.unbind() } + } + } + .shareIn(tileScope, SharingStarted.WhileSubscribed()) + + init { + // Initialize binding once to flush all the pending messages inside + // CustomTileServiceInteractor and then unbind if the tile data isn't observed. This ensures + // that all the interactors are loaded and warmed up before binding. + tileScope.launch { bindingFlow.first() } + } + + override fun tileData( + user: UserHandle, + triggers: Flow<DataUpdateTrigger> + ): Flow<CustomTileDataModel> { + tileScope.launch { mutableUserFlow.emit(user) } + return bindingFlow.combine(triggers) { _, _ -> }.flatMapLatest { dataFlow(user) } + } + + private fun dataFlow(user: UserHandle): Flow<CustomTileDataModel> = + combine( + serviceInteractor.refreshEvents.onStart { emit(Unit) }, + serviceInteractor.callingAppIds, + customTileInteractor.getTiles(user), + defaultsRepository.defaults(user).mapNotNull { it as? CustomTileDefaults.Result }, + ) { _: Unit, callingAppId: Int, tile: Tile, defaults: CustomTileDefaults.Result -> + CustomTileDataModel( + user = user, + componentName = tileSpec.componentName, + tile = tile, + callingAppUid = callingAppId, + hasPendingBind = serviceInteractor.hasPendingBind(), + defaultTileLabel = defaults.label, + defaultTileIcon = defaults.icon, + isToggleable = customTileInteractor.isTileToggleable(), + ) + } + + override fun availability(user: UserHandle): Flow<Boolean> = + with(defaultsRepository) { + requestNewDefaults(user, tileSpec.componentName) + return defaults(user).map { it is CustomTileDefaults.Result } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractor.kt index 10b012d30fcd..fd96fc5b6693 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractor.kt @@ -19,12 +19,14 @@ package com.android.systemui.qs.tiles.impl.custom.domain.interactor import android.os.UserHandle import android.service.quicksettings.Tile import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileDefaultsRepository import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileRepository import com.android.systemui.qs.tiles.impl.di.QSTileScope import javax.inject.Inject import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow @@ -32,21 +34,29 @@ import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock /** Manages updates of the [Tile] assigned for the current custom tile. */ @QSTileScope class CustomTileInteractor @Inject constructor( + private val tileSpec: TileSpec.CustomTileSpec, private val defaultsRepository: CustomTileDefaultsRepository, private val customTileRepository: CustomTileRepository, @QSTileScope private val tileScope: CoroutineScope, @Background private val backgroundContext: CoroutineContext, ) { + private val userMutex = Mutex() private val tileUpdates = MutableSharedFlow<Tile>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST) + private var currentUser: UserHandle? = null + private var updatesJob: Job? = null + /** [Tile] updates. [updateTile] to emit a new one. */ fun getTiles(user: UserHandle): Flow<Tile> = customTileRepository.getTiles(user) @@ -55,7 +65,7 @@ constructor( * * @throws IllegalStateException when the repository stores a tile for another user. This means * the tile hasn't been updated for the current user. Can happen when this is accessed before - * [init] returns. + * [initForUser] returns. */ fun getTile(user: UserHandle): Tile = customTileRepository.getTile(user) @@ -67,45 +77,60 @@ constructor( suspend fun isTileToggleable(): Boolean = customTileRepository.isTileToggleable() /** - * Initializes the repository for the current user. Suspends until it's safe to call [tile] + * Initializes the repository for the current user. Suspends until it's safe to call [getTile] * which needs at least one of the following: * - defaults are loaded; * - receive tile update in [updateTile]; * - restoration happened for a persisted tile. */ suspend fun initForUser(user: UserHandle) { - launchUpdates(user) - customTileRepository.restoreForTheUserIfNeeded(user, customTileRepository.isTileActive()) - // Suspend to make sure it gets the tile from one of the sources: restoration, defaults, or - // tile update. - customTileRepository.getTiles(user).firstOrNull() + userMutex.withLock { + if (currentUser == user) { + return + } + updatesJob?.cancel() + defaultsRepository.requestNewDefaults(user, tileSpec.componentName) + launchUpdates(user) + customTileRepository.restoreForTheUserIfNeeded( + user, + customTileRepository.isTileActive() + ) + // Suspend to make sure it gets the tile from one of the sources: restoration, defaults, + // or + // tile update. + customTileRepository.getTiles(user).firstOrNull() + currentUser = user + } } private fun launchUpdates(user: UserHandle) { - tileUpdates - .onEach { - customTileRepository.updateWithTile( - user, - it, - customTileRepository.isTileActive(), - ) - } - .flowOn(backgroundContext) - .launchIn(tileScope) - defaultsRepository - .defaults(user) - .onEach { - customTileRepository.updateWithDefaults( - user, - it, - customTileRepository.isTileActive(), - ) + updatesJob = + tileScope.launch { + tileUpdates + .onEach { + customTileRepository.updateWithTile( + user, + it, + customTileRepository.isTileActive(), + ) + } + .flowOn(backgroundContext) + .launchIn(this) + defaultsRepository + .defaults(user) + .onEach { + customTileRepository.updateWithDefaults( + user, + it, + customTileRepository.isTileActive(), + ) + } + .flowOn(backgroundContext) + .launchIn(this) } - .flowOn(backgroundContext) - .launchIn(tileScope) } - /** Updates current [Tile]. Emits a new event in [tiles]. */ + /** Updates current [Tile]. Emits a new event in [getTiles]. */ fun updateTile(newTile: Tile) { tileUpdates.tryEmit(newTile) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileServiceInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileServiceInteractor.kt new file mode 100644 index 000000000000..acff40f816a9 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileServiceInteractor.kt @@ -0,0 +1,216 @@ +/* + * 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.qs.tiles.impl.custom.domain.interactor + +import android.app.PendingIntent +import android.content.ComponentName +import android.os.IBinder +import android.os.Process +import android.os.RemoteException +import android.os.UserHandle +import android.service.quicksettings.IQSTileService +import android.service.quicksettings.Tile +import android.service.quicksettings.TileService +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.qs.external.CustomTileInterface +import com.android.systemui.qs.external.TileServiceManager +import com.android.systemui.qs.external.TileServices +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.qs.tiles.base.logging.QSTileLogger +import com.android.systemui.qs.tiles.impl.di.QSTileScope +import com.android.systemui.user.data.repository.UserRepository +import dagger.Lazy +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.Job +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.channels.produce +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.launch + +/** + * Communicates with [TileService] via [TileServiceManager] and [IQSTileService]. This interactor is + * also responsible for the binding to the [TileService]. + */ +@OptIn(ExperimentalCoroutinesApi::class) +@QSTileScope +class CustomTileServiceInteractor +@Inject +constructor( + private val tileSpec: TileSpec.CustomTileSpec, + private val activityStarter: ActivityStarter, + private val userActionInteractor: Lazy<CustomTileUserActionInteractor>, + private val customTileInteractor: CustomTileInteractor, + private val userRepository: UserRepository, + private val qsTileLogger: QSTileLogger, + private val tileServices: TileServices, + @QSTileScope private val tileScope: CoroutineScope, +) { + + private val tileReceivingInterface = ReceivingInterface() + private var tileServiceManager: TileServiceManager? = null + private val tileServiceInterface: IQSTileService + get() = getTileServiceManager().tileService + + private var currentUser: UserHandle = userRepository.getSelectedUserInfo().userHandle + private var destructionJob: Job? = null + + val callingAppIds: Flow<Int> + get() = tileReceivingInterface.mutableCallingAppIds + val refreshEvents: Flow<Unit> + get() = tileReceivingInterface.mutableRefreshEvents + + /** Clears all pending binding for an active tile and binds not active one. */ + fun bindOnStart() { + try { + with(getTileServiceManager()) { + if (isActiveTile) { + clearPendingBind() + } else { + setBindRequested(true) + tileServiceInterface.onStartListening() + } + } + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Binding to the service failed", e) + } + } + + /** Binds active tile WITHOUT CLEARING pending binds. */ + fun bindOnClick() { + try { + with(getTileServiceManager()) { + if (isActiveTile) { + setBindRequested(true) + tileServiceInterface.onStartListening() + } + } + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Binding to the service on click failed", e) + } + } + + /** Releases resources held by the binding and prepares the interactor to be collected */ + fun unbind() { + try { + with(userActionInteractor.get()) { + clearLastClickedView() + tileServiceInterface.onStopListening() + revokeToken(false) + setShowingDialog(false) + } + getTileServiceManager().setBindRequested(false) + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Unbinding failed", e) + } + } + + /** + * Checks if [TileServiceManager] has a pending [android.service.quicksettings.TileService] + * bind. + */ + fun hasPendingBind(): Boolean = getTileServiceManager().hasPendingBind() + + /** Sets a [user] for the custom tile to use. User change triggers service rebinding. */ + fun setUser(user: UserHandle) { + if (user == currentUser) { + return + } + currentUser = user + destructionJob?.cancel() + + tileServiceManager = null + } + + /** Sends click event to [TileService] using [IQSTileService.onClick]. */ + fun onClick(token: IBinder) { + tileServiceInterface.onClick(token) + } + + private fun getTileServiceManager(): TileServiceManager = + synchronized(tileServices) { + if (tileServiceManager == null) { + tileServices + .getTileWrapper(tileReceivingInterface) + .also { destructionJob = createDestructionJob() } + .also { tileServiceManager = it } + } else { + tileServiceManager!! + } + } + + /** + * This job used to free the resources when the [QSTileScope] coroutine scope gets cancelled by + * the View Model. + */ + private fun createDestructionJob(): Job = + tileScope.launch { + produce<Unit> { + awaitClose { + userActionInteractor.get().revokeToken(true) + tileServices.freeService(tileReceivingInterface, getTileServiceManager()) + destructionJob = null + } + } + } + + private inner class ReceivingInterface : CustomTileInterface { + + override val user: Int + get() = currentUser.identifier + override val qsTile: Tile + get() = customTileInteractor.getTile(currentUser) + override val component: ComponentName = tileSpec.componentName + + val mutableCallingAppIds = MutableStateFlow(Process.INVALID_UID) + val mutableRefreshEvents = MutableSharedFlow<Unit>() + + override fun getTileSpec(): String = tileSpec.spec + + override fun refreshState() { + tileScope.launch { mutableRefreshEvents.emit(Unit) } + } + + override fun updateTileState(tile: Tile, uid: Int) { + customTileInteractor.updateTile(tile) + mutableCallingAppIds.tryEmit(uid) + } + + override fun onDialogShown() { + userActionInteractor.get().setShowingDialog(true) + } + + override fun onDialogHidden() = + with(userActionInteractor.get()) { + setShowingDialog(false) + revokeToken(true) + } + + override fun startActivityAndCollapse(pendingIntent: PendingIntent) { + userActionInteractor.get().startActivityAndCollapse(pendingIntent) + } + + override fun startUnlockAndRun() { + activityStarter.postQSRunnableDismissingKeyguard { + tileServiceInterface.onUnlockComplete() + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileUserActionInteractor.kt new file mode 100644 index 000000000000..c3e1feaa6dfe --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileUserActionInteractor.kt @@ -0,0 +1,193 @@ +/* + * 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.qs.tiles.impl.custom.domain.interactor + +import android.app.PendingIntent +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.net.Uri +import android.os.Binder +import android.os.IBinder +import android.os.RemoteException +import android.os.UserHandle +import android.provider.Settings +import android.service.quicksettings.TileService +import android.view.IWindowManager +import android.view.View +import android.view.WindowManager +import androidx.annotation.GuardedBy +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandler +import com.android.systemui.qs.tiles.base.interactor.QSTileInput +import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor +import com.android.systemui.qs.tiles.base.logging.QSTileLogger +import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel +import com.android.systemui.qs.tiles.impl.di.QSTileScope +import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction +import com.android.systemui.settings.DisplayTracker +import java.util.concurrent.atomic.AtomicReference +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.withContext + +@QSTileScope +class CustomTileUserActionInteractor +@Inject +constructor( + private val context: Context, + private val tileSpec: TileSpec, + private val qsTileLogger: QSTileLogger, + private val windowManager: IWindowManager, + private val displayTracker: DisplayTracker, + private val qsTileIntentUserInputHandler: QSTileIntentUserInputHandler, + @Background private val backgroundContext: CoroutineContext, + private val serviceInteractor: CustomTileServiceInteractor, +) : QSTileUserActionInteractor<CustomTileDataModel> { + + private val token: IBinder = Binder() + + @GuardedBy("token") private var isTokenGranted: Boolean = false + @GuardedBy("token") private var isShowingDialog: Boolean = false + private val lastClickedView: AtomicReference<View> = AtomicReference<View>() + + override suspend fun handleInput(input: QSTileInput<CustomTileDataModel>) = + with(input) { + when (action) { + is QSTileUserAction.Click -> click(action.view, data.tile.activityLaunchForClick) + is QSTileUserAction.LongClick -> + longClick(user, action.view, data.componentName, data.tile.state) + } + qsTileLogger.logCustomTileUserActionDelivered(tileSpec) + } + + private fun click( + view: View?, + activityLaunchForClick: PendingIntent?, + ) { + grantToken() + try { + // Bind active tile to deliver user action + serviceInteractor.bindOnClick() + if (activityLaunchForClick == null) { + lastClickedView.set(view) + serviceInteractor.onClick(token) + } else { + qsTileIntentUserInputHandler.handle(view, activityLaunchForClick) + } + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Failed to deliver click", e) + } + } + + fun revokeToken(ignoreShownDialog: Boolean) { + synchronized(token) { + if (isTokenGranted && (ignoreShownDialog || !isShowingDialog)) { + try { + windowManager.removeWindowToken(token, displayTracker.defaultDisplayId) + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Failed to remove a window token", e) + } + isTokenGranted = false + } + } + } + + fun setShowingDialog(isShowingDialog: Boolean) { + synchronized(token) { this.isShowingDialog = isShowingDialog } + } + + fun startActivityAndCollapse(pendingIntent: PendingIntent) { + if (!pendingIntent.isActivity) { + return + } + if (!isTokenGranted) { + return + } + qsTileIntentUserInputHandler.handle(lastClickedView.getAndSet(null), pendingIntent) + } + + fun clearLastClickedView() = lastClickedView.set(null) + + private fun grantToken() { + synchronized(token) { + if (!isTokenGranted) { + try { + windowManager.addWindowToken( + token, + WindowManager.LayoutParams.TYPE_QS_DIALOG, + displayTracker.defaultDisplayId, + null /* options */ + ) + } catch (e: RemoteException) { + qsTileLogger.logError(tileSpec, "Failed to grant a window token", e) + } + isTokenGranted = true + } + } + } + + private suspend fun longClick( + user: UserHandle, + view: View?, + componentName: ComponentName, + state: Int + ) { + val resolvedIntent: Intent? = + resolveIntent( + Intent(TileService.ACTION_QS_TILE_PREFERENCES).apply { + setPackage(componentName.packageName) + }, + user, + ) + ?.apply { + putExtra(Intent.EXTRA_COMPONENT_NAME, componentName) + putExtra(TileService.EXTRA_STATE, state) + } + if (resolvedIntent == null) { + qsTileIntentUserInputHandler.handle( + view, + Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) + .setData( + Uri.fromParts(IntentFilter.SCHEME_PACKAGE, componentName.packageName, null) + ) + ) + } else { + qsTileIntentUserInputHandler.handle(view, resolvedIntent) + } + } + + /** + * Returns an intent resolved by [android.content.pm.PackageManager.resolveActivityAsUser] or + * null. + */ + private suspend fun resolveIntent(intent: Intent, user: UserHandle): Intent? = + withContext(backgroundContext) { + val activityInfo = + context.packageManager + .resolveActivityAsUser(intent, 0, user.identifier) + ?.activityInfo + activityInfo ?: return@withContext null + with(activityInfo) { + Intent(TileService.ACTION_QS_TILE_PREFERENCES).apply { + setClassName(packageName, name) + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileState.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileState.kt index be1b7404314f..b927e41bc97e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileState.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileState.kt @@ -32,7 +32,7 @@ import kotlin.reflect.KClass * // TODO(b/http://b/299909989): Clean up legacy mappings after the transition */ data class QSTileState( - val icon: () -> Icon, + val icon: () -> Icon?, val label: CharSequence, val activationState: ActivationState, val secondaryLabel: CharSequence?, @@ -60,7 +60,7 @@ data class QSTileState( ) } - fun build(icon: () -> Icon, label: CharSequence, build: Builder.() -> Unit): QSTileState = + fun build(icon: () -> Icon?, label: CharSequence, build: Builder.() -> Unit): QSTileState = Builder(icon, label).apply(build).build() } @@ -108,7 +108,7 @@ data class QSTileState( } class Builder( - var icon: () -> Icon, + var icon: () -> Icon?, var label: CharSequence, ) { var activationState: ActivationState = ActivationState.INACTIVE diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModel.kt index ef3df482ea45..226e2fa0549f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModel.kt @@ -45,7 +45,10 @@ interface QSTileViewModel { */ fun onUserChanged(user: UserHandle) - /** Triggers the emission of the new [QSTileState] in a [state]. */ + /** + * Triggers the emission of the new [QSTileState] in a [state]. The new value can still be + * skipped if there is no change. + */ fun forceUpdate() /** Notifies underlying logic about user input. */ diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt index 977df81a0783..4780a2e9ccee 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt @@ -37,6 +37,7 @@ import java.util.function.Supplier import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.collectIndexed +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach @@ -60,27 +61,34 @@ constructor( private val listeningClients: MutableCollection<Any> = mutableSetOf() // Cancels the jobs when the adapter is no longer alive - private var availabilityJob: Job? = null + private var tileAdapterJob: Job? = null // Cancels the jobs when clients stop listening private var stateJob: Job? = null init { - availabilityJob = + tileAdapterJob = applicationScope.launch { - qsTileViewModel.isAvailable.collectIndexed { index, isAvailable -> - if (!isAvailable) { - qsHost.removeTile(tileSpec) - } - // qsTileViewModel.isAvailable flow often starts with isAvailable == true. - // That's - // why we only allow isAvailable == true once and throw an exception afterwards. - if (index > 0 && isAvailable) { - // See com.android.systemui.qs.pipeline.domain.model.AutoAddable for - // additional - // guidance on how to auto add your tile - throw UnsupportedOperationException("Turning on tile is not supported now") + launch { + qsTileViewModel.isAvailable.collectIndexed { index, isAvailable -> + if (!isAvailable) { + qsHost.removeTile(tileSpec) + } + // qsTileViewModel.isAvailable flow often starts with isAvailable == true. + // That's + // why we only allow isAvailable == true once and throw an exception + // afterwards. + if (index > 0 && isAvailable) { + // See com.android.systemui.qs.pipeline.domain.model.AutoAddable for + // additional + // guidance on how to auto add your tile + throw UnsupportedOperationException( + "Turning on tile is not supported now" + ) + } } } + // Warm up tile with some initial state + launch { qsTileViewModel.state.first() } } // QSTileHost doesn't call this when userId is initialized @@ -185,7 +193,7 @@ constructor( override fun destroy() { stateJob?.cancel() - availabilityJob?.cancel() + tileAdapterJob?.cancel() qsTileViewModel.destroy() } @@ -222,8 +230,9 @@ constructor( QSTile.BooleanState().apply { spec = config.tileSpec.spec label = viewModelState.label - // This value is synthetic and doesn't have any meaning - value = false + // This value is synthetic and doesn't have any meaning. It's only needed to satisfy + // CTS tests. + value = viewModelState.activationState == QSTileState.ActivationState.ACTIVE secondaryLabel = viewModelState.secondaryLabel handlesLongClick = @@ -233,6 +242,7 @@ constructor( when (val stateIcon = viewModelState.icon()) { is Icon.Loaded -> DrawableIcon(stateIcon.drawable) is Icon.Resource -> ResourceIcon.get(stateIcon.res) + null -> null } } state = viewModelState.activationState.legacyState diff --git a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt index acd7510a6c2a..41cd221186fe 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt @@ -23,7 +23,6 @@ import android.content.DialogInterface.BUTTON_NEUTRAL import android.content.Intent import android.provider.Settings import android.view.LayoutInflater -import androidx.annotation.VisibleForTesting import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger import com.android.systemui.res.R @@ -44,31 +43,15 @@ import javax.inject.Provider * Controller for [UserDialog]. */ @SysUISingleton -class UserSwitchDialogController @VisibleForTesting constructor( - private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>, - private val activityStarter: ActivityStarter, - private val falsingManager: FalsingManager, - private val dialogLaunchAnimator: DialogLaunchAnimator, - private val uiEventLogger: UiEventLogger, - private val dialogFactory: (Context) -> SystemUIDialog +class UserSwitchDialogController @Inject constructor( + private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>, + private val activityStarter: ActivityStarter, + private val falsingManager: FalsingManager, + private val dialogLaunchAnimator: DialogLaunchAnimator, + private val uiEventLogger: UiEventLogger, + private val dialogFactory: SystemUIDialog.Factory ) { - @Inject - constructor( - userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>, - activityStarter: ActivityStarter, - falsingManager: FalsingManager, - dialogLaunchAnimator: DialogLaunchAnimator, - uiEventLogger: UiEventLogger - ) : this( - userDetailViewAdapterProvider, - activityStarter, - falsingManager, - dialogLaunchAnimator, - uiEventLogger, - { SystemUIDialog(it) } - ) - companion object { private const val INTERACTION_JANK_TAG = "switch_user" private val USER_SETTINGS_INTENT = Intent(Settings.ACTION_USER_SETTINGS) @@ -81,7 +64,7 @@ class UserSwitchDialogController @VisibleForTesting constructor( * [userDetailViewAdapterProvider] and show it as launched from [expandable]. */ fun showDialog(context: Context, expandable: Expandable) { - with(dialogFactory(context)) { + with(dialogFactory.create()) { setShowForAllUsers(true) setCanceledOnTouchOutside(true) diff --git a/packages/SystemUI/src/com/android/systemui/reardisplay/RearDisplayDialogController.java b/packages/SystemUI/src/com/android/systemui/reardisplay/RearDisplayDialogController.java index f07162377358..9076182def70 100644 --- a/packages/SystemUI/src/com/android/systemui/reardisplay/RearDisplayDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/reardisplay/RearDisplayDialogController.java @@ -21,8 +21,10 @@ import android.annotation.SuppressLint; import android.annotation.TestApi; import android.content.Context; import android.content.res.Configuration; +import android.content.res.Resources; import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateManagerGlobal; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup.LayoutParams; import android.widget.LinearLayout; @@ -72,20 +74,27 @@ public class RearDisplayDialogController implements private DeviceStateManager.DeviceStateCallback mDeviceStateManagerCallback = new DeviceStateManagerCallback(); - private final Context mContext; private final CommandQueue mCommandQueue; private final Executor mExecutor; + private final Resources mResources; + private final LayoutInflater mLayoutInflater; + private final SystemUIDialog.Factory mSystemUIDialogFactory; - @VisibleForTesting - SystemUIDialog mRearDisplayEducationDialog; + private SystemUIDialog mRearDisplayEducationDialog; @Nullable LinearLayout mDialogViewContainer; @Inject - public RearDisplayDialogController(Context context, CommandQueue commandQueue, - @Main Executor executor) { - mContext = context; + public RearDisplayDialogController( + CommandQueue commandQueue, + @Main Executor executor, + @Main Resources resources, + LayoutInflater layoutInflater, + SystemUIDialog.Factory systemUIDialogFactory) { mCommandQueue = commandQueue; mExecutor = executor; + mResources = resources; + mLayoutInflater = layoutInflater; + mSystemUIDialogFactory = systemUIDialogFactory; } @Override @@ -104,8 +113,7 @@ public class RearDisplayDialogController implements if (mRearDisplayEducationDialog != null && mRearDisplayEducationDialog.isShowing() && mDialogViewContainer != null) { // Refresh the dialog view when configuration is changed. - Context dialogContext = mRearDisplayEducationDialog.getContext(); - View dialogView = createDialogView(dialogContext); + View dialogView = createDialogView(mRearDisplayEducationDialog.getContext()); mDialogViewContainer.removeAllViews(); mDialogViewContainer.addView(dialogView); } @@ -114,9 +122,7 @@ public class RearDisplayDialogController implements private void createAndShowDialog() { mServiceNotified = false; Context dialogContext = mRearDisplayEducationDialog.getContext(); - View dialogView = createDialogView(dialogContext); - mDialogViewContainer = new LinearLayout(dialogContext); mDialogViewContainer.setLayoutParams( new LinearLayout.LayoutParams( @@ -133,11 +139,11 @@ public class RearDisplayDialogController implements private View createDialogView(Context context) { View dialogView; + LayoutInflater inflater = mLayoutInflater.cloneInContext(context); if (mStartedFolded) { - dialogView = View.inflate(context, - R.layout.activity_rear_display_education, null); + dialogView = inflater.inflate(R.layout.activity_rear_display_education, null); } else { - dialogView = View.inflate(context, + dialogView = inflater.inflate( R.layout.activity_rear_display_education_opened, null); } LottieAnimationView animationView = dialogView.findViewById( @@ -172,9 +178,9 @@ public class RearDisplayDialogController implements * Ensures we're not using old values from when the dialog may have been shown previously. */ private void initializeValues(int startingBaseState) { - mRearDisplayEducationDialog = new SystemUIDialog(mContext); + mRearDisplayEducationDialog = mSystemUIDialogFactory.create(); if (mFoldedStates == null) { - mFoldedStates = mContext.getResources().getIntArray( + mFoldedStates = mResources.getIntArray( com.android.internal.R.array.config_foldedDeviceStates); } mStartedFolded = isFoldedState(startingBaseState); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java index c9df317508f9..9b8dd0b75a24 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java @@ -275,7 +275,12 @@ public class NotificationLockscreenUserManagerImpl implements updateLockscreenNotificationSetting(); updatePublicMode(); - mPresenter.onUserSwitched(mCurrentUserId); + if (mPresenter != null) { + mPresenter.onUserSwitched(mCurrentUserId); + } else { + Log.w(TAG, "user switch before setup with presenter", + new Exception()); + } for (UserChangedListener listener : mListeners) { listener.onUserChanged(mCurrentUserId); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 0f640c9c2608..805b44cc0673 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -4455,9 +4455,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mSectionsManager.setHeaderForegroundColors(onSurface, onSurfaceVariant); - mFooterView.updateColors(); + if (mFooterView != null) { + mFooterView.updateColors(); + } - mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant); + if (mEmptyShadeView != null) { + mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant); + } } void goToFullShade(long delay) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java index 600d4afde935..45005cbc28a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java @@ -55,11 +55,12 @@ import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; import com.android.systemui.util.Assert; +import dagger.Lazy; + import java.util.ArrayList; import javax.inject.Inject; -import dagger.Lazy; import kotlinx.coroutines.ExperimentalCoroutinesApi; /** @@ -175,6 +176,16 @@ public final class DozeServiceHost implements DozeHost { } } + /** + * Notify the registered callback about SPFS fingerprint acquisition started event. + */ + public void fireSideFpsAcquisitionStarted() { + Assert.isMainThread(); + for (int i = 0; i < mCallbacks.size(); i++) { + mCallbacks.get(i).onSideFingerprintAcquisitionStarted(); + } + } + void fireNotificationPulse(NotificationEntry entry) { Runnable pulseSuppressedListener = () -> { if (NotificationIconContainerRefactor.isEnabled()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java index af6da3fb6e51..3394eacddbd8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java @@ -149,6 +149,14 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh return create(new DialogDelegate<>(){}, mContext); } + /** Creates a new instance of {@link SystemUIDialog} with no customized behavior. + * + * When you just need a dialog created with a specific {@link Context}, call this. + */ + public SystemUIDialog create(Context context) { + return create(new DialogDelegate<>(){}, context); + } + /** * Creates a new instance of {@link SystemUIDialog} with {@code delegate} as the {@link * Delegate}. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index 0c5472f0ecfb..16334d3c9860 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -41,15 +41,14 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; -import com.android.systemui.log.core.LogLevel; import com.android.systemui.res.R; import com.android.systemui.user.domain.interactor.SelectedUserInteractor; import dagger.Lazy; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import javax.inject.Inject; @@ -63,7 +62,8 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum private static final boolean DEBUG_AUTH_WITH_ADB = false; private static final String AUTH_BROADCAST_KEY = "debug_trigger_auth"; - private final ArrayList<Callback> mCallbacks = new ArrayList<>(); + private final ConcurrentHashMap.KeySetView<Callback, Boolean> mCallbacks = + ConcurrentHashMap.<Callback>newKeySet(); private final Context mContext; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final LockPatternUtils mLockPatternUtils; @@ -157,9 +157,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum @Override public void addCallback(@NonNull Callback callback) { Objects.requireNonNull(callback, "Callback must not be null. b/128895449"); - if (!mCallbacks.contains(callback)) { - mCallbacks.add(callback); - } + mCallbacks.add(callback); } @Override @@ -221,18 +219,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum } private void invokeForEachCallback(Consumer<Callback> consumer) { - // Copy the list to allow removal during callback. - ArrayList<Callback> copyOfCallbacks = new ArrayList<>(mCallbacks); - for (int i = 0; i < copyOfCallbacks.size(); i++) { - Callback callback = copyOfCallbacks.get(i); - // Temporary fix for b/315731775, callback is null even though only non-null callbacks - // are added to the list by addCallback - if (callback != null) { - consumer.accept(callback); - } else { - mLogger.log("KeyguardStateController callback is null", LogLevel.DEBUG); - } - } + mCallbacks.forEach(consumer); } private void notifyUnlockedChanged() { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java index 8087a8755a6e..550a65c01bfc 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java @@ -48,6 +48,8 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.util.leak.LeakDetector; +import dagger.Lazy; + import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -87,6 +89,7 @@ public class TunerServiceImpl extends TunerService { // Set of all tunables, used for leak detection. private final HashSet<Tunable> mTunables = LeakDetector.ENABLED ? new HashSet<>() : null; private final Context mContext; + private final Lazy<SystemUIDialog.Factory> mSystemUIDialogFactoryLazy; private final LeakDetector mLeakDetector; private final DemoModeController mDemoModeController; @@ -104,9 +107,11 @@ public class TunerServiceImpl extends TunerService { @Main Handler mainHandler, LeakDetector leakDetector, DemoModeController demoModeController, - UserTracker userTracker) { + UserTracker userTracker, + Lazy<SystemUIDialog.Factory> systemUIDialogFactoryLazy) { super(context); mContext = context; + mSystemUIDialogFactoryLazy = systemUIDialogFactoryLazy; mContentResolver = mContext.getContentResolver(); mLeakDetector = leakDetector; mDemoModeController = demoModeController; @@ -301,7 +306,7 @@ public class TunerServiceImpl extends TunerService { @Override public void showResetRequest(Runnable onDisabled) { - SystemUIDialog dialog = new SystemUIDialog(mContext); + SystemUIDialog dialog = mSystemUIDialogFactoryLazy.get().create(); dialog.setShowForAllUsers(true); dialog.setMessage(R.string.remove_from_settings_prompt); dialog.setButton(DialogInterface.BUTTON_NEGATIVE, mContext.getString(R.string.cancel), diff --git a/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyLogger.kt b/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyLogger.kt new file mode 100644 index 000000000000..76f7609f81c7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyLogger.kt @@ -0,0 +1,55 @@ +/* + * 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.unfold + +import com.android.systemui.shared.system.SysUiStatsLog + +class DisplaySwitchLatencyLogger { + + /** + * Based on data present in [displaySwitchLatencyEvent], logs metrics for atom + * [DisplaySwitchLatencyTracked] + */ + fun log(displaySwitchLatencyEvent: DisplaySwitchLatencyTracker.DisplaySwitchLatencyEvent) { + with(displaySwitchLatencyEvent) { + SysUiStatsLog.write( + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED, + latencyMs, + fromFoldableDeviceState, + fromState, + fromFocusedAppUid, + fromPipAppUid, + fromVisibleAppsUid.toIntArray(), + fromDensityDpi, + toState, + toFoldableDeviceState, + toFocusedAppUid, + toPipAppUid, + toVisibleAppsUid.toIntArray(), + toDensityDpi, + notificationCount, + externalDisplayCount, + throttlingLevel, + vskinTemperatureC, + hallSensorToFirstHingeAngleChangeMs, + hallSensorToDeviceStateChangeMs, + onScreenTurningOnToOnDrawnMs, + onDrawnToOnScreenTurnedOnMs, + ) + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyTracker.kt b/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyTracker.kt new file mode 100644 index 000000000000..92a64a618ba9 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/unfold/DisplaySwitchLatencyTracker.kt @@ -0,0 +1,248 @@ +/* + * 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.unfold + +import android.content.Context +import android.util.Log +import com.android.app.tracing.TraceUtils.instantForTrack +import com.android.app.tracing.TraceUtils.traceAsync +import com.android.systemui.CoreStartable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.display.data.repository.DeviceStateRepository +import com.android.systemui.display.data.repository.DeviceStateRepository.DeviceState +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.power.domain.interactor.PowerInteractor +import com.android.systemui.power.shared.model.ScreenPowerState +import com.android.systemui.power.shared.model.WakeSleepReason +import com.android.systemui.shared.system.SysUiStatsLog +import com.android.systemui.unfold.dagger.UnfoldSingleThreadBg +import com.android.systemui.unfold.domain.interactor.UnfoldTransitionInteractor +import com.android.systemui.util.Compile +import com.android.systemui.util.Utils.isDeviceFoldable +import com.android.systemui.util.animation.data.repository.AnimationStatusRepository +import com.android.systemui.util.kotlin.pairwise +import com.android.systemui.util.time.SystemClock +import com.android.systemui.util.time.measureTimeMillis +import java.util.concurrent.Executor +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.asCoroutineDispatcher +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.launch + +/** + * [DisplaySwitchLatencyTracker] tracks latency and related fields for display switch of a foldable + * device. This class populates [DisplaySwitchLatencyEvent] while an ongoing display switch event + */ +@SysUISingleton +class DisplaySwitchLatencyTracker +@Inject +constructor( + private val context: Context, + private val deviceStateRepository: DeviceStateRepository, + private val powerInteractor: PowerInteractor, + private val unfoldTransitionInteractor: UnfoldTransitionInteractor, + private val animationStatusRepository: AnimationStatusRepository, + private val keyguardInteractor: KeyguardInteractor, + @UnfoldSingleThreadBg private val singleThreadBgExecutor: Executor, + @Application private val applicationScope: CoroutineScope, + private val displaySwitchLatencyLogger: DisplaySwitchLatencyLogger, + private val systemClock: SystemClock +) : CoreStartable { + + private val backgroundDispatcher = singleThreadBgExecutor.asCoroutineDispatcher() + + @OptIn(ExperimentalCoroutinesApi::class) + override fun start() { + if (!isDeviceFoldable(context)) { + return + } + applicationScope.launch(backgroundDispatcher) { + deviceStateRepository.state + .pairwise() + .filter { + // Start tracking only when the foldable device is + //folding(UNFOLDED/HALF_FOLDED -> FOLDED) or + //unfolding(FOLDED -> HALF_FOLD/UNFOLDED) + foldableDeviceState -> + foldableDeviceState.previousValue == DeviceState.FOLDED || + foldableDeviceState.newValue == DeviceState.FOLDED + } + .flatMapLatest { foldableDeviceState -> + flow { + var displaySwitchLatencyEvent = DisplaySwitchLatencyEvent() + val toFoldableDeviceState = foldableDeviceState.newValue.toStatsInt() + displaySwitchLatencyEvent = + displaySwitchLatencyEvent.withBeforeFields( + foldableDeviceState.previousValue.toStatsInt() + ) + + val displaySwitchTimeMs = + measureTimeMillis(systemClock) { + traceAsync(TAG, "displaySwitch") { + waitForDisplaySwitch(toFoldableDeviceState) + } + } + + displaySwitchLatencyEvent = + displaySwitchLatencyEvent.withAfterFields( + toFoldableDeviceState, + displaySwitchTimeMs.toInt(), + getCurrentState() + ) + emit(displaySwitchLatencyEvent) + } + } + .collect { displaySwitchLatencyLogger.log(it) } + } + } + + private fun DeviceState.toStatsInt(): Int = + when (this) { + DeviceState.FOLDED -> FOLDABLE_DEVICE_STATE_CLOSED + DeviceState.HALF_FOLDED -> FOLDABLE_DEVICE_STATE_HALF_OPEN + DeviceState.UNFOLDED -> FOLDABLE_DEVICE_STATE_OPEN + DeviceState.CONCURRENT_DISPLAY -> FOLDABLE_DEVICE_STATE_FLIPPED + else -> FOLDABLE_DEVICE_STATE_UNKNOWN + } + + private suspend fun waitForDisplaySwitch(toFoldableDeviceState: Int) { + val isTransitionEnabled = + unfoldTransitionInteractor.isAvailable && + animationStatusRepository.areAnimationsEnabled().first() + if (shouldWaitForScreenOn(toFoldableDeviceState, isTransitionEnabled)) { + waitForScreenTurnedOn() + } else { + traceAsync(TAG, "waitForTransitionStart()") { + unfoldTransitionInteractor.waitForTransitionStart() + } + } + } + + private fun shouldWaitForScreenOn( + toFoldableDeviceState: Int, + isTransitionEnabled: Boolean + ): Boolean = (toFoldableDeviceState == FOLDABLE_DEVICE_STATE_CLOSED || !isTransitionEnabled) + + private suspend fun waitForScreenTurnedOn() { + traceAsync(TAG, "waitForScreenTurnedOn()") { + powerInteractor.screenPowerState.filter { it == ScreenPowerState.SCREEN_ON }.first() + } + } + + private fun getCurrentState(): Int = + when { + isStateAod() -> SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__TO_STATE__AOD + else -> SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__TO_STATE__UNKNOWN + } + + private fun isStateAod(): Boolean { + val lastWakefulnessEvent = powerInteractor.detailedWakefulness.value + val isAodEnabled = keyguardInteractor.isAodAvailable.value + + return (lastWakefulnessEvent.isAsleep() && + (lastWakefulnessEvent.lastSleepReason == WakeSleepReason.FOLD) && + isAodEnabled) + } + + private inline fun log(msg: () -> String) { + if (DEBUG) Log.d(TAG, msg()) + } + + private fun DisplaySwitchLatencyEvent.withBeforeFields( + fromFoldableDeviceState: Int + ): DisplaySwitchLatencyEvent { + log { "fromFoldableDeviceState=$fromFoldableDeviceState" } + instantForTrack(TAG, "fromFoldableDeviceState=$fromFoldableDeviceState") + + return copy(fromFoldableDeviceState = fromFoldableDeviceState) + } + + private fun DisplaySwitchLatencyEvent.withAfterFields( + toFoldableDeviceState: Int, + displaySwitchTimeMs: Int, + toState: Int + ): DisplaySwitchLatencyEvent { + log { + "toFoldableDeviceState=$toFoldableDeviceState, " + + "toState=$toState, " + + "latencyMs=$displaySwitchTimeMs" + } + instantForTrack(TAG, "toFoldableDeviceState=$toFoldableDeviceState, toState=$toState") + + return copy( + toFoldableDeviceState = toFoldableDeviceState, + latencyMs = displaySwitchTimeMs, + toState = toState + ) + } + + /** + * Stores values corresponding to all respective [DisplaySwitchLatencyTrackedField] in a single + * event of display switch for foldable devices. + * + * Once the data is captured in this data class and appropriate to log, it is logged through + * [DisplaySwitchLatencyLogger] + */ + data class DisplaySwitchLatencyEvent( + val latencyMs: Int = VALUE_UNKNOWN, + val fromFoldableDeviceState: Int = FOLDABLE_DEVICE_STATE_UNKNOWN, + val fromState: Int = SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_STATE__UNKNOWN, + val fromFocusedAppUid: Int = VALUE_UNKNOWN, + val fromPipAppUid: Int = VALUE_UNKNOWN, + val fromVisibleAppsUid: Set<Int> = setOf(), + val fromDensityDpi: Int = VALUE_UNKNOWN, + val toFoldableDeviceState: Int = FOLDABLE_DEVICE_STATE_UNKNOWN, + val toState: Int = SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_STATE__UNKNOWN, + val toFocusedAppUid: Int = VALUE_UNKNOWN, + val toPipAppUid: Int = VALUE_UNKNOWN, + val toVisibleAppsUid: Set<Int> = setOf(), + val toDensityDpi: Int = VALUE_UNKNOWN, + val notificationCount: Int = VALUE_UNKNOWN, + val externalDisplayCount: Int = VALUE_UNKNOWN, + val throttlingLevel: Int = + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__THROTTLING_LEVEL__NONE, + val vskinTemperatureC: Int = VALUE_UNKNOWN, + val hallSensorToFirstHingeAngleChangeMs: Int = VALUE_UNKNOWN, + val hallSensorToDeviceStateChangeMs: Int = VALUE_UNKNOWN, + val onScreenTurningOnToOnDrawnMs: Int = VALUE_UNKNOWN, + val onDrawnToOnScreenTurnedOnMs: Int = VALUE_UNKNOWN + ) + + companion object { + private const val VALUE_UNKNOWN = -1 + private const val TAG = "DisplaySwitchLatency" + private val DEBUG = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.VERBOSE) + + private const val FOLDABLE_DEVICE_STATE_UNKNOWN = + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_FOLDABLE_DEVICE_STATE__STATE_UNKNOWN + const val FOLDABLE_DEVICE_STATE_CLOSED = + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_FOLDABLE_DEVICE_STATE__STATE_CLOSED + const val FOLDABLE_DEVICE_STATE_HALF_OPEN = + SysUiStatsLog + .DISPLAY_SWITCH_LATENCY_TRACKED__FROM_FOLDABLE_DEVICE_STATE__STATE_HALF_OPENED + private const val FOLDABLE_DEVICE_STATE_OPEN = + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_FOLDABLE_DEVICE_STATE__STATE_OPENED + private const val FOLDABLE_DEVICE_STATE_FLIPPED = + SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__FROM_FOLDABLE_DEVICE_STATE__STATE_FLIPPED + } +} diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTraceLogger.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTraceLogger.kt index 94912bf82377..adf50a1e661b 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTraceLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTraceLogger.kt @@ -22,8 +22,8 @@ import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.unfold.data.repository.FoldStateRepository import com.android.systemui.unfold.system.DeviceStateRepository -import com.android.systemui.unfold.updates.FoldStateRepository import javax.inject.Inject import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTransitionModule.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTransitionModule.kt index 50515daedc51..8bef53c8c4fb 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTransitionModule.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldTransitionModule.kt @@ -27,6 +27,8 @@ import com.android.systemui.keyguard.LifecycleScreenStatusProvider import com.android.systemui.unfold.config.UnfoldTransitionConfig import com.android.systemui.unfold.dagger.UnfoldBgProgressFlag import com.android.systemui.unfold.dagger.UnfoldMain +import com.android.systemui.unfold.data.repository.FoldStateRepository +import com.android.systemui.unfold.data.repository.FoldStateRepositoryImpl import com.android.systemui.unfold.data.repository.UnfoldTransitionRepository import com.android.systemui.unfold.data.repository.UnfoldTransitionRepositoryImpl import com.android.systemui.unfold.domain.interactor.UnfoldTransitionInteractor @@ -168,6 +170,11 @@ class UnfoldTransitionModule { @Provides fun screenStatusProvider(impl: LifecycleScreenStatusProvider): ScreenStatusProvider = impl + @Provides + @Singleton + fun provideDisplaySwitchLatencyLogger(): DisplaySwitchLatencyLogger = + DisplaySwitchLatencyLogger() + @Module interface Bindings { @Binds @@ -178,6 +185,8 @@ class UnfoldTransitionModule { @Binds fun bindRepository(impl: UnfoldTransitionRepositoryImpl): UnfoldTransitionRepository @Binds fun bindInteractor(impl: UnfoldTransitionInteractorImpl): UnfoldTransitionInteractor + + @Binds fun bindFoldStateRepository(impl: FoldStateRepositoryImpl): FoldStateRepository } } diff --git a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/FoldStateRepository.kt b/packages/SystemUI/src/com/android/systemui/unfold/data/repository/FoldStateRepository.kt index 61b0b40a55bf..04b00ca58c47 100644 --- a/packages/SystemUI/unfold/src/com/android/systemui/unfold/updates/FoldStateRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/data/repository/FoldStateRepository.kt @@ -13,9 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.unfold.updates +package com.android.systemui.unfold.data.repository -import com.android.systemui.unfold.updates.FoldStateRepository.FoldUpdate +import com.android.systemui.unfold.data.repository.FoldStateRepository.FoldUpdate +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_CLOSED +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_FULL_OPEN +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_HALF_OPEN +import com.android.systemui.unfold.updates.FOLD_UPDATE_START_CLOSING +import com.android.systemui.unfold.updates.FOLD_UPDATE_START_OPENING +import com.android.systemui.unfold.updates.FoldStateProvider import javax.inject.Inject import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.awaitClose @@ -50,7 +56,7 @@ interface FoldStateRepository { FOLD_UPDATE_FINISH_HALF_OPEN -> FINISH_HALF_OPEN FOLD_UPDATE_FINISH_FULL_OPEN -> FINISH_FULL_OPEN FOLD_UPDATE_FINISH_CLOSED -> FINISH_CLOSED - else -> error("FoldUpdateNotFound") + else -> error("Fold update with id $oldId is not supported") } } } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt index a2e77afedea6..3e2e564c307c 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/domain/interactor/UnfoldTransitionInteractor.kt @@ -15,16 +15,26 @@ */ package com.android.systemui.unfold.domain.interactor -import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionFinished import com.android.systemui.unfold.data.repository.UnfoldTransitionRepository +import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionFinished +import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionStarted import javax.inject.Inject import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first +/** + * Contains business-logic related to fold-unfold transitions while interacting with + * [UnfoldTransitionRepository] + */ interface UnfoldTransitionInteractor { + /** Returns availability of fold/unfold transitions on the device */ val isAvailable: Boolean + /** Suspends and waits for a fold/unfold transition to finish */ suspend fun waitForTransitionFinish() + + /** Suspends and waits for a fold/unfold transition to start */ + suspend fun waitForTransitionStart() } class UnfoldTransitionInteractorImpl @@ -37,4 +47,8 @@ constructor(private val repository: UnfoldTransitionRepository) : UnfoldTransiti override suspend fun waitForTransitionFinish() { repository.transitionStatus.filter { it is TransitionFinished }.first() } + + override suspend fun waitForTransitionStart() { + repository.transitionStatus.filter { it is TransitionStarted }.first() + } } diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index fa6d0552c9e9..7861ded6cd24 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -82,6 +82,14 @@ public class Utils { } /** + * Returns {@code true} if the device is a foldable device + */ + public static boolean isDeviceFoldable(Context context) { + return context.getResources() + .getIntArray(com.android.internal.R.array.config_foldedDeviceStates).length != 0; + } + + /** * Allow the media player to be shown in the QS area, controlled by 2 flags. * On by default, but can be disabled by setting either flag to 0/false. */ diff --git a/packages/SystemUI/src/com/android/systemui/util/time/MeasureTimeUtil.kt b/packages/SystemUI/src/com/android/systemui/util/time/MeasureTimeUtil.kt new file mode 100644 index 000000000000..f13196857167 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/time/MeasureTimeUtil.kt @@ -0,0 +1,32 @@ +/* + * 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.util.time + +import kotlin.contracts.ExperimentalContracts +import kotlin.contracts.InvocationKind +import kotlin.contracts.contract + +/** + * Executes the given [block] and returns elapsed time using provided [systemClock] in milliseconds. + */ +@OptIn(ExperimentalContracts::class) +inline fun measureTimeMillis(systemClock: SystemClock, block: () -> Unit): Long { + contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) } + val start = systemClock.currentTimeMillis() + block() + return systemClock.currentTimeMillis() - start +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java index 8d06a8f3afd8..497c4cb070f0 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java +++ b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java @@ -38,6 +38,8 @@ import com.android.systemui.volume.VolumeDialogComponent; import com.android.systemui.volume.VolumeDialogImpl; import com.android.systemui.volume.VolumePanelFactory; import com.android.systemui.volume.VolumeUI; +import com.android.systemui.volume.panel.dagger.VolumePanelComponent; +import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory; import dagger.Binds; import dagger.Lazy; @@ -48,9 +50,13 @@ import dagger.multibindings.IntoMap; import dagger.multibindings.IntoSet; /** Dagger Module for code in the volume package. */ -@Module +@Module( + subcomponents = { + VolumePanelComponent.class + } +) public interface VolumeModule { - /** Starts VolumeUI. */ + /** Starts VolumeUI. */ @Binds @IntoMap @ClassKey(VolumeUI.class) @@ -61,11 +67,15 @@ public interface VolumeModule { @IntoSet ConfigurationController.ConfigurationListener bindVolumeUIConfigChanges(VolumeUI impl); - /** */ + /** */ @Binds VolumeComponent provideVolumeComponent(VolumeDialogComponent volumeDialogComponent); - /** */ + /** */ + @Binds + VolumePanelComponentFactory bindVolumePanelComponentFactory(VolumePanelComponent.Factory impl); + + /** */ @Provides static VolumeDialog provideVolumeDialog( Context context, diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/VolumePanelComponentKey.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/VolumePanelComponentKey.kt new file mode 100644 index 000000000000..22a74d27ba1f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/VolumePanelComponentKey.kt @@ -0,0 +1,20 @@ +/* + * 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.volume.panel + +/** Uniquely identifies the [com.android.systemui.volume.panel.ui.VolumePanelComponent]. */ +typealias VolumePanelComponentKey = String diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/CoroutineModule.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/CoroutineModule.kt new file mode 100644 index 000000000000..3ce0bacaed1a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/CoroutineModule.kt @@ -0,0 +1,43 @@ +/* + * 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.volume.panel.dagger + +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import dagger.Module +import dagger.Provides +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob + +/** Provides Volume Panel coroutine tools. */ +@Module +interface CoroutineModule { + + companion object { + + /** + * Provides a coroutine scope to use inside [VolumePanelScope]. + * [com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel] manages the + * lifecycle of this scope. It's cancelled when the View Model is destroyed. This helps to + * free occupied resources when volume panel is not shown. + */ + @VolumePanelScope + @Provides + fun provideCoroutineScope(@Application applicationScope: CoroutineScope): CoroutineScope = + CoroutineScope(applicationScope.coroutineContext + SupervisorJob()) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/DefaultMultibindsModule.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/DefaultMultibindsModule.kt new file mode 100644 index 000000000000..3660ac166b12 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/DefaultMultibindsModule.kt @@ -0,0 +1,31 @@ +/* + * 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.volume.panel.dagger + +import com.android.systemui.volume.panel.VolumePanelComponentKey +import com.android.systemui.volume.panel.domain.ComponentAvailabilityCriteria +import dagger.Module +import dagger.multibindings.Multibinds + +/** + * Provides empty multibinding maps for [ComponentAvailabilityCriteria] and [VolumePanelComponent] + */ +@Module +interface DefaultMultibindsModule { + + @Multibinds fun criteriaMap(): Map<VolumePanelComponentKey, ComponentAvailabilityCriteria> +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/VolumePanelComponent.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/VolumePanelComponent.kt new file mode 100644 index 000000000000..0a057eb5c927 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/VolumePanelComponent.kt @@ -0,0 +1,59 @@ +/* + * 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.volume.panel.dagger + +import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import com.android.systemui.volume.panel.domain.DomainModule +import com.android.systemui.volume.panel.domain.interactor.ComponentsInteractor +import com.android.systemui.volume.panel.ui.UiModule +import com.android.systemui.volume.panel.ui.viewmodel.ComponentsLayoutManager +import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel +import dagger.BindsInstance +import dagger.Subcomponent +import kotlinx.coroutines.CoroutineScope + +/** + * Core Volume Panel dagger component. It's managed by [VolumePanelViewModel] and lives alongside + * it. + */ +@VolumePanelScope +@Subcomponent( + modules = + [ + // Volume Panel infra modules + CoroutineModule::class, + DefaultMultibindsModule::class, + DomainModule::class, + UiModule::class, + // Components modules + ] +) +interface VolumePanelComponent { + + fun coroutineScope(): CoroutineScope + + fun componentsInteractor(): ComponentsInteractor + + fun componentsLayoutManager(): ComponentsLayoutManager + + @Subcomponent.Factory + interface Factory : VolumePanelComponentFactory { + + override fun create(@BindsInstance viewModel: VolumePanelViewModel): VolumePanelComponent + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/factory/VolumePanelComponentFactory.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/factory/VolumePanelComponentFactory.kt new file mode 100644 index 000000000000..e470c3f25145 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/factory/VolumePanelComponentFactory.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.panel.dagger.factory + +import com.android.systemui.volume.panel.dagger.VolumePanelComponent +import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel +import dagger.BindsInstance + +/** + * Common interface for all [dagger.Subcomponent.Factory] providing [VolumePanelComponent]. + * [VolumePanelViewModel] uses it to create a new instance of the class. + */ +interface VolumePanelComponentFactory { + + fun create(@BindsInstance viewModel: VolumePanelViewModel): VolumePanelComponent +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundScope.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/scope/VolumePanelScope.kt index 4a4ba2bf7ef9..e597d11067b4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundScope.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/dagger/scope/VolumePanelScope.kt @@ -14,16 +14,12 @@ * limitations under the License. */ -package com.android.systemui.qs.tiles.impl.custom.di.bound +package com.android.systemui.volume.panel.dagger.scope import javax.inject.Scope /** - * Scope annotation for bound custom tile scope. This scope lives when a particular - * [com.android.systemui.qs.external.CustomTile] is listening and bound to the - * [android.service.quicksettings.TileService]. + * Volume Panel dependency injection scope. This scope is created alongside Volume Panel and + * destroyed when it's lo longer present. */ -@MustBeDocumented -@Retention(AnnotationRetention.RUNTIME) -@Scope -annotation class CustomTileBoundScope +@MustBeDocumented @Retention(AnnotationRetention.RUNTIME) @Scope annotation class VolumePanelScope diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/ComponentAvailabilityCriteria.kt index f34704be8bc5..d9702e433a79 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/CustomTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/ComponentAvailabilityCriteria.kt @@ -14,19 +14,24 @@ * limitations under the License. */ -package com.android.systemui.qs.tiles.impl.custom +package com.android.systemui.volume.panel.domain -import com.android.systemui.qs.tiles.base.interactor.QSTileInput -import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor -import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel -import com.android.systemui.qs.tiles.impl.di.QSTileScope +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOf -@QSTileScope -class CustomTileUserActionInteractor @Inject constructor() : - QSTileUserActionInteractor<CustomTileDataModel> { +interface ComponentAvailabilityCriteria { - override suspend fun handleInput(input: QSTileInput<CustomTileDataModel>) { - TODO("Not yet implemented") - } + /** + * Checks if the controller is currently available. Can be used to filter out unwanted + * components. For example, hide components for the hardware that is temporarily unavailable. + */ + fun isAvailable(): Flow<Boolean> +} + +@VolumePanelScope +class AlwaysAvailableCriteria @Inject constructor() : ComponentAvailabilityCriteria { + + override fun isAvailable(): Flow<Boolean> = flowOf(true) } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/domain/DomainModule.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/DomainModule.kt new file mode 100644 index 000000000000..7817630d09d2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/DomainModule.kt @@ -0,0 +1,52 @@ +/* + * 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.volume.panel.domain + +import com.android.systemui.volume.panel.VolumePanelComponentKey +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import com.android.systemui.volume.panel.domain.interactor.ComponentsInteractor +import com.android.systemui.volume.panel.domain.interactor.ComponentsInteractorImpl +import dagger.Binds +import dagger.Module +import dagger.Provides + +/** Domain layer bindings module. */ +@Module +interface DomainModule { + + @Binds fun bindComponentsInteractor(impl: ComponentsInteractorImpl): ComponentsInteractor + + @Binds + fun bindDefaultComponentAvailabilityCriteria( + impl: AlwaysAvailableCriteria + ): ComponentAvailabilityCriteria + + companion object { + + /** + * Enabled components collection. These are the components processed by Volume Panel logic + * and possibly shown in the UI. + * + * There should be a binding in [VolumePanelScope] for [ComponentAvailabilityCriteria] and + * [com.android.systemui.volume.panel.ui.VolumePanelComponent] for each component from this + * collection. + */ + @Provides + @VolumePanelScope + fun provideEnabledComponents(): Collection<VolumePanelComponentKey> = setOf() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractor.kt new file mode 100644 index 000000000000..e5b52ea5eb88 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractor.kt @@ -0,0 +1,68 @@ +/* + * 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.volume.panel.domain.interactor + +import com.android.systemui.volume.panel.VolumePanelComponentKey +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import com.android.systemui.volume.panel.domain.ComponentAvailabilityCriteria +import com.android.systemui.volume.panel.domain.model.ComponentModel +import javax.inject.Inject +import javax.inject.Provider +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.shareIn + +interface ComponentsInteractor { + + /** + * Components collection for the UI layer. Uses [ComponentAvailabilityCriteria] to dynamically + * determine each component availability. + */ + val components: Flow<Collection<ComponentModel>> +} + +@VolumePanelScope +class ComponentsInteractorImpl +@Inject +constructor( + enabledComponents: Collection<VolumePanelComponentKey>, + defaultCriteria: Provider<ComponentAvailabilityCriteria>, + @VolumePanelScope coroutineScope: CoroutineScope, + private val criteriaByKey: + Map< + VolumePanelComponentKey, + @JvmSuppressWildcards + Provider<@JvmSuppressWildcards ComponentAvailabilityCriteria> + >, +) : ComponentsInteractor { + + override val components: Flow<Collection<ComponentModel>> = + combine( + enabledComponents.map { componentKey -> + val componentCriteria = (criteriaByKey[componentKey] ?: defaultCriteria).get() + componentCriteria.isAvailable().map { isAvailable -> + ComponentModel(componentKey, isAvailable = isAvailable) + } + } + ) { + it.asList() + } + .shareIn(coroutineScope, SharingStarted.Eagerly, replay = 1) +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/domain/model/ComponentModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/model/ComponentModel.kt new file mode 100644 index 000000000000..9765713f0a50 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/domain/model/ComponentModel.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.volume.panel.domain.model + +import com.android.systemui.volume.panel.VolumePanelComponentKey + +/** + * Represents a current state of the Volume Panel component. + * + * @property key identifies the component the entity represents. + * @property isAvailable is true when the component is supported by the device. + */ +data class ComponentModel( + val key: VolumePanelComponentKey, + val isAvailable: Boolean, +) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundModule.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/UiModule.kt index 889424a8e8d3..bfa7ef2e42c2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/di/bound/CustomTileBoundModule.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/UiModule.kt @@ -14,18 +14,16 @@ * limitations under the License. */ -package com.android.systemui.qs.tiles.impl.custom.di.bound +package com.android.systemui.volume.panel.ui -import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepository -import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepositoryImpl +import com.android.systemui.volume.panel.ui.viewmodel.ComponentsLayoutManager +import com.android.systemui.volume.panel.ui.viewmodel.DefaultComponentsLayoutManager import dagger.Binds import dagger.Module +/** UI layer bindings module. */ @Module -interface CustomTileBoundModule { +interface UiModule { - @Binds - fun bindCustomTilePackageUpdatesRepository( - impl: CustomTilePackageUpdatesRepositoryImpl - ): CustomTilePackageUpdatesRepository + @Binds fun bindSorter(impl: DefaultComponentsLayoutManager): ComponentsLayoutManager } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentState.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentState.kt new file mode 100644 index 000000000000..0a226e28da19 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentState.kt @@ -0,0 +1,31 @@ +/* + * 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.volume.panel.ui.model + +import com.android.systemui.volume.panel.VolumePanelComponentKey + +/** + * State of the [VolumePanelComponent]. + * + * @property key uniquely identifies this component + * @property component is an inflated component obtained be the View Model + * @property isVisible determines component visibility in the UI + */ +data class ComponentState( + val key: VolumePanelComponentKey, + val isVisible: Boolean, +) diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentsLayout.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentsLayout.kt new file mode 100644 index 000000000000..5690ac31718f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/ComponentsLayout.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.panel.ui.model + +/** Represents components grouping into the layout. */ +data class ComponentsLayout( + val contentComponents: List<ComponentState>, + val bottomBarComponent: ComponentState, +) diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/VolumePanelState.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/VolumePanelState.kt new file mode 100644 index 000000000000..399342f749a6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/model/VolumePanelState.kt @@ -0,0 +1,41 @@ +/* + * 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.volume.panel.ui.model + +import android.content.res.Configuration +import android.content.res.Configuration.Orientation + +/** + * State of the Volume Panel itself. + * + * @property orientation is current Volume Panel orientation. + */ +data class VolumePanelState( + @Orientation val orientation: Int, + val isVisible: Boolean, +) { + init { + require( + orientation == Configuration.ORIENTATION_PORTRAIT || + orientation == Configuration.ORIENTATION_LANDSCAPE || + orientation == Configuration.ORIENTATION_UNDEFINED || + orientation == Configuration.ORIENTATION_SQUARE + ) { + "Unknown orientation: $orientation" + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/ComponentsLayoutManager.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/ComponentsLayoutManager.kt new file mode 100644 index 000000000000..f45401a0dd0a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/ComponentsLayoutManager.kt @@ -0,0 +1,50 @@ +/* + * 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.volume.panel.ui.viewmodel + +import com.android.systemui.volume.panel.ui.model.ComponentState +import com.android.systemui.volume.panel.ui.model.ComponentsLayout +import com.android.systemui.volume.panel.ui.model.VolumePanelState + +/** + * Lays out components to [ComponentsLayout], that UI uses to render the Volume Panel. + * + * Vertical layout shows the list from top to bottom: + * ``` + * ----- + * | 1 | + * | 2 | + * | 3 | + * | 4 | + * ----- + * ``` + * + * Horizontal layout shows the list in a grid from, filling the columns first: + * ``` + * ---------- + * | 1 || 3 | + * | 2 || 4 | + * ---------- + * ``` + */ +interface ComponentsLayoutManager { + + fun layout( + volumePanelState: VolumePanelState, + components: Collection<ComponentState>, + ): ComponentsLayout +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManager.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManager.kt new file mode 100644 index 000000000000..cedfaf36d300 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManager.kt @@ -0,0 +1,37 @@ +/* + * 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.volume.panel.ui.viewmodel + +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import com.android.systemui.volume.panel.ui.model.ComponentState +import com.android.systemui.volume.panel.ui.model.ComponentsLayout +import com.android.systemui.volume.panel.ui.model.VolumePanelState +import javax.inject.Inject + +/** + * Default [ComponentsLayoutManager]. It places [VolumePanelComponents.BOTTOM_BAR] to + * [ComponentsLayout.bottomBarComponent] and everything else to + * [ComponentsLayout.contentComponents]. + */ +@VolumePanelScope +class DefaultComponentsLayoutManager @Inject constructor() : ComponentsLayoutManager { + + override fun layout( + volumePanelState: VolumePanelState, + components: Collection<ComponentState> + ): ComponentsLayout = TODO("Unimplemented yet") +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModel.kt new file mode 100644 index 000000000000..dda361abb378 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModel.kt @@ -0,0 +1,127 @@ +/* + * 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.volume.panel.ui.viewmodel + +import android.content.Context +import android.content.res.Resources +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.statusbar.policy.ConfigurationController +import com.android.systemui.statusbar.policy.onConfigChanged +import com.android.systemui.volume.panel.dagger.VolumePanelComponent +import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory +import com.android.systemui.volume.panel.domain.interactor.ComponentsInteractor +import com.android.systemui.volume.panel.ui.model.ComponentState +import com.android.systemui.volume.panel.ui.model.ComponentsLayout +import com.android.systemui.volume.panel.ui.model.VolumePanelState +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch + +class VolumePanelViewModel( + resources: Resources, + daggerComponentFactory: VolumePanelComponentFactory, + configurationController: ConfigurationController, +) : ViewModel() { + + private val volumePanelComponent: VolumePanelComponent = daggerComponentFactory.create(this) + + private val scope: CoroutineScope + get() = volumePanelComponent.coroutineScope() + + private val componentsInteractor: ComponentsInteractor + get() = volumePanelComponent.componentsInteractor() + + private val componentsLayoutManager: ComponentsLayoutManager + get() = volumePanelComponent.componentsLayoutManager() + + private val mutablePanelVisibility = MutableStateFlow(true) + + val volumePanelState: StateFlow<VolumePanelState> = + combine( + configurationController.onConfigChanged.distinctUntilChanged(), + mutablePanelVisibility, + ) { configuration, isVisible -> + VolumePanelState(orientation = configuration.orientation, isVisible = isVisible) + } + .stateIn( + volumePanelComponent.coroutineScope(), + SharingStarted.Eagerly, + VolumePanelState( + orientation = resources.configuration.orientation, + isVisible = mutablePanelVisibility.value, + ), + ) + val mComponentsLayout: Flow<ComponentsLayout> = + combine( + componentsInteractor.components, + volumePanelState, + ) { components, scope -> + val componentStates = + components.map { model -> + ComponentState( + model.key, + model.isAvailable, + ) + } + componentsLayoutManager.layout(scope, componentStates) + } + .shareIn( + volumePanelComponent.coroutineScope(), + SharingStarted.Eagerly, + replay = 1, + ) + + fun dismissPanel() { + scope.launch { mutablePanelVisibility.emit(false) } + } + + override fun onCleared() { + scope.cancel() + super.onCleared() + } + + class Factory + @Inject + constructor( + @Application private val context: Context, + private val daggerComponentFactory: VolumePanelComponentFactory, + private val configurationController: ConfigurationController, + ) : ViewModelProvider.Factory { + + @Suppress("UNCHECKED_CAST") + override fun <T : ViewModel> create(modelClass: Class<T>): T { + check(modelClass == VolumePanelViewModel::class.java) + return VolumePanelViewModel( + context.resources, + daggerComponentFactory, + configurationController, + ) + as T + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index d03a898cf6d1..c5ce856e9785 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -30,6 +30,7 @@ import static android.telephony.SubscriptionManager.NAME_SOURCE_CARRIER_ID; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_CANCELLING_RESTARTING; +import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_STOPPED; import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT; import static com.android.keyguard.KeyguardUpdateMonitor.HAL_POWER_PRESS_TIMEOUT; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED; @@ -1973,6 +1974,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + public void detectFingerprint_onSuccess_biometricStateStopped() { + // GIVEN FP detection is running + givenDetectFingerprintWithClearingFingerprintManagerInvocations(); + + // WHEN detection is successful + ArgumentCaptor<FingerprintManager.FingerprintDetectionCallback> fpDetectCallbackCaptor = + ArgumentCaptor.forClass(FingerprintManager.FingerprintDetectionCallback.class); + verify(mFingerprintManager).detectFingerprint( + any(), fpDetectCallbackCaptor.capture(), any()); + fpDetectCallbackCaptor.getValue().onFingerprintDetected(0, 0, true); + mTestableLooper.processAllMessages(); + + // THEN fingerprint detect state should immediately update to STOPPED + assertThat(mKeyguardUpdateMonitor.mFingerprintRunningState) + .isEqualTo(BIOMETRIC_STATE_STOPPED); + } + + @Test public void testFingerprintSensorProperties() throws RemoteException { mFingerprintAuthenticatorsRegisteredCallback.onAllAuthenticatorsRegistered( new ArrayList<>()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt index bfb5485e47b7..c52571188256 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt @@ -120,7 +120,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { fontScalingDialogDelegate ) - whenever(dialogFactory.create(any())).thenReturn(dialog) + whenever(dialogFactory.create(any(), any())).thenReturn(dialog) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt index cb261789d7bf..755fa021b07c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt @@ -75,6 +75,7 @@ import com.android.systemui.unfold.compat.ScreenSizeFoldProvider import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import java.util.Optional @@ -82,6 +83,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -235,15 +237,18 @@ class SideFpsOverlayViewBinderTest : SysuiTestCase() { windowManager, displayStateInteractor, Optional.of(fingerprintInteractiveToAuthProvider), + mock(), SideFpsLogger(logcatLogBuffer("SfpsLogger")) ) sideFpsProgressBarViewModel = SideFpsProgressBarViewModel( mContext, - deviceEntryFingerprintAuthRepository, + mock(), sfpsSensorInteractor, + mock(), displayStateInteractor, + UnconfinedTestDispatcher(), testScope.backgroundScope, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/SideFpsOverlayViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/SideFpsOverlayViewModelTest.kt index 823b952d9888..bdca948da6e6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/SideFpsOverlayViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/SideFpsOverlayViewModelTest.kt @@ -72,6 +72,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.unfold.compat.ScreenSizeFoldProvider import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat @@ -238,15 +239,18 @@ class SideFpsOverlayViewModelTest : SysuiTestCase() { windowManager, displayStateInteractor, Optional.of(fingerprintInteractiveToAuthProvider), + mock(), SideFpsLogger(logcatLogBuffer("SfpsLogger")) ) sideFpsProgressBarViewModel = SideFpsProgressBarViewModel( mContext, - deviceEntryFingerprintAuthRepository, + mock(), sfpsSensorInteractor, + mock(), displayStateInteractor, + StandardTestDispatcher(), testScope.backgroundScope, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java index 4022d4388ab1..3ff43c6a3787 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.when; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; -import android.view.LayoutInflater; -import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -95,7 +93,7 @@ public class BroadcastDialogDelegateTest extends SysuiTestCase { mFeatureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM, true); when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState); - when(mSystemUIDialogFactory.create(any())).thenReturn(mDialog); + when(mSystemUIDialogFactory.create(any(), any())).thenReturn(mDialog); mBroadcastDialogDelegate = new BroadcastDialogDelegate( mContext, diff --git a/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt index 65f68f9df3e1..35ac2ae4ed44 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.FeatureFlags import com.android.systemui.model.SysUiState import com.android.systemui.settings.UserTracker +import com.android.systemui.statusbar.phone.DialogDelegate import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any @@ -69,7 +70,8 @@ class ContrastDialogDelegateTest : SysuiTestCase() { mDependency.injectTestDependency(SysUiState::class.java, sysuiState) mDependency.injectMockDependency(DialogLaunchAnimator::class.java) whenever(sysuiState.setFlag(any(), any())).thenReturn(sysuiState) - whenever(sysuiDialogFactory.create(any())).thenReturn(sysuiDialog) + whenever(sysuiDialogFactory.create(any(SystemUIDialog.Delegate::class.java))) + .thenReturn(sysuiDialog) whenever(sysuiDialog.layoutInflater).thenReturn(LayoutInflater.from(mContext)) whenever(mockUserTracker.userId).thenReturn(context.userId) diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/PanelConfirmationDialogFactoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/PanelConfirmationDialogFactoryTest.kt index 4e8f86615522..7f0ea9a7a6d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/PanelConfirmationDialogFactoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/PanelConfirmationDialogFactoryTest.kt @@ -17,34 +17,48 @@ package com.android.systemui.controls.management +import android.content.Context import android.content.DialogInterface import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase +import com.android.systemui.res.R import com.android.systemui.statusbar.phone.SystemUIDialog +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.mock import com.google.common.truth.Truth.assertThat +import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mock import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations +import org.mockito.Mockito.`when` as whenever @SmallTest @RunWith(AndroidTestingRunner::class) class PanelConfirmationDialogFactoryTest : SysuiTestCase() { + @Mock private lateinit var mockDialog : SystemUIDialog + @Mock private lateinit var mockDialogFactory : SystemUIDialog.Factory + private lateinit var factory : PanelConfirmationDialogFactory + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + + whenever(mockDialogFactory.create(any(Context::class.java))).thenReturn(mockDialog) + whenever(mockDialog.context).thenReturn(mContext) + factory = PanelConfirmationDialogFactory(mockDialogFactory) + } + @Test fun testDialogHasCorrectInfo() { - val mockDialog: SystemUIDialog = mock() { `when`(context).thenReturn(mContext) } - val factory = PanelConfirmationDialogFactory { mockDialog } val appName = "appName" - factory.createConfirmationDialog(context, appName) {} + factory.createConfirmationDialog(mContext, appName) {} verify(mockDialog).setCanceledOnTouchOutside(true) verify(mockDialog) @@ -55,12 +69,9 @@ class PanelConfirmationDialogFactoryTest : SysuiTestCase() { @Test fun testDialogPositiveButton() { - val mockDialog: SystemUIDialog = mock() { `when`(context).thenReturn(mContext) } - val factory = PanelConfirmationDialogFactory { mockDialog } - var response: Boolean? = null - factory.createConfirmationDialog(context, "") { response = it } + factory.createConfirmationDialog(mContext,"") { response = it } val captor: ArgumentCaptor<DialogInterface.OnClickListener> = argumentCaptor() verify(mockDialog).setPositiveButton(eq(R.string.controls_dialog_ok), capture(captor)) @@ -72,12 +83,9 @@ class PanelConfirmationDialogFactoryTest : SysuiTestCase() { @Test fun testDialogNeutralButton() { - val mockDialog: SystemUIDialog = mock() { `when`(context).thenReturn(mContext) } - val factory = PanelConfirmationDialogFactory { mockDialog } - var response: Boolean? = null - factory.createConfirmationDialog(context, "") { response = it } + factory.createConfirmationDialog(mContext, "") { response = it } val captor: ArgumentCaptor<DialogInterface.OnClickListener> = argumentCaptor() verify(mockDialog).setNeutralButton(eq(R.string.cancel), capture(captor)) @@ -89,12 +97,9 @@ class PanelConfirmationDialogFactoryTest : SysuiTestCase() { @Test fun testDialogCancel() { - val mockDialog: SystemUIDialog = mock() { `when`(context).thenReturn(mContext) } - val factory = PanelConfirmationDialogFactory { mockDialog } - var response: Boolean? = null - factory.createConfirmationDialog(context, "") { response = it } + factory.createConfirmationDialog(mContext, "") { response = it } val captor: ArgumentCaptor<DialogInterface.OnCancelListener> = argumentCaptor() verify(mockDialog).setOnCancelListener(capture(captor)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt index 8f65fc8c3930..bcef67e76ea1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt @@ -24,19 +24,28 @@ import android.content.Intent import android.content.IntentFilter import android.content.pm.ApplicationInfo import android.content.pm.ServiceInfo +import android.os.UserHandle import android.os.UserManager import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.common.data.repository.fakePackageChangeRepository +import com.android.systemui.common.data.repository.packageChangeRepository +import com.android.systemui.common.data.shared.model.PackageChangeModel import com.android.systemui.controls.ControlsServiceInfo import com.android.systemui.controls.controller.ControlsController import com.android.systemui.controls.dagger.ControlsComponent import com.android.systemui.controls.management.ControlsListingController import com.android.systemui.controls.panels.AuthorizedPanelsRepository import com.android.systemui.controls.panels.FakeSelectedComponentRepository +import com.android.systemui.controls.panels.SelectedComponentRepository import com.android.systemui.controls.ui.SelectedItem +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope import com.android.systemui.settings.UserTracker +import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor @@ -48,6 +57,9 @@ import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import java.util.Optional +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -61,10 +73,13 @@ import org.mockito.Mockito.verifyZeroInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidTestingRunner::class) class ControlsStartableTest : SysuiTestCase() { + private val kosmos = testKosmos() + @Mock private lateinit var controlsController: ControlsController @Mock private lateinit var controlsListingController: ControlsListingController @Mock private lateinit var userTracker: UserTracker @@ -72,7 +87,7 @@ class ControlsStartableTest : SysuiTestCase() { @Mock private lateinit var userManager: UserManager @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher - private val preferredPanelsRepository = FakeSelectedComponentRepository() + private lateinit var preferredPanelsRepository: FakeSelectedComponentRepository private lateinit var fakeExecutor: FakeExecutor @@ -81,8 +96,10 @@ class ControlsStartableTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) whenever(authorizedPanelsRepository.getPreferredPackages()).thenReturn(setOf()) whenever(userManager.isUserUnlocked(anyInt())).thenReturn(true) + whenever(userTracker.userHandle).thenReturn(UserHandle.of(1)) fakeExecutor = FakeExecutor(FakeSystemClock()) + preferredPanelsRepository = FakeSelectedComponentRepository() } @Test @@ -306,6 +323,100 @@ class ControlsStartableTest : SysuiTestCase() { verify(controlsController, never()).setPreferredSelection(any()) } + @Test + fun testSelectedComponentIsUninstalled() = + with(kosmos) { + testScope.runTest { + val selectedComponent = + SelectedComponentRepository.SelectedComponent( + "panel", + TEST_COMPONENT_PANEL, + isPanel = true + ) + preferredPanelsRepository.setSelectedComponent(selectedComponent) + val activeUser = UserHandle.of(100) + whenever(userTracker.userHandle).thenReturn(activeUser) + + createStartable(enabled = true).onBootCompleted() + fakeExecutor.runAllReady() + runCurrent() + + assertThat(preferredPanelsRepository.getSelectedComponent()) + .isEqualTo(selectedComponent) + fakePackageChangeRepository.notifyChange( + PackageChangeModel.Uninstalled( + packageName = TEST_PACKAGE_PANEL, + packageUid = UserHandle.getUid(100, 1) + ) + ) + runCurrent() + + assertThat(preferredPanelsRepository.getSelectedComponent()).isNull() + } + } + + @Test + fun testSelectedComponentIsChanged() = + with(kosmos) { + testScope.runTest { + val selectedComponent = + SelectedComponentRepository.SelectedComponent( + "panel", + TEST_COMPONENT_PANEL, + isPanel = true + ) + preferredPanelsRepository.setSelectedComponent(selectedComponent) + val activeUser = UserHandle.of(100) + whenever(userTracker.userHandle).thenReturn(activeUser) + + createStartable(enabled = true).onBootCompleted() + fakeExecutor.runAllReady() + runCurrent() + + fakePackageChangeRepository.notifyChange( + PackageChangeModel.Changed( + packageName = TEST_PACKAGE_PANEL, + packageUid = UserHandle.getUid(100, 1) + ) + ) + runCurrent() + + assertThat(preferredPanelsRepository.getSelectedComponent()) + .isEqualTo(selectedComponent) + } + } + + @Test + fun testOtherPackageIsUninstalled() = + with(kosmos) { + testScope.runTest { + val selectedComponent = + SelectedComponentRepository.SelectedComponent( + "panel", + TEST_COMPONENT_PANEL, + isPanel = true + ) + preferredPanelsRepository.setSelectedComponent(selectedComponent) + val activeUser = UserHandle.of(100) + whenever(userTracker.userHandle).thenReturn(activeUser) + + createStartable(enabled = true).onBootCompleted() + fakeExecutor.runAllReady() + runCurrent() + + fakePackageChangeRepository.notifyChange( + PackageChangeModel.Uninstalled( + packageName = TEST_PACKAGE, + packageUid = UserHandle.getUid(100, 1) + ) + ) + runCurrent() + + assertThat(preferredPanelsRepository.getSelectedComponent()) + .isEqualTo(selectedComponent) + } + } + private fun setUpControlsListingControls(listings: List<ControlsServiceInfo>) { doAnswer { doReturn(listings).`when`(controlsListingController).getCurrentServices() } .`when`(controlsListingController) @@ -326,11 +437,14 @@ class ControlsStartableTest : SysuiTestCase() { } } return ControlsStartable( + kosmos.applicationCoroutineScope, + kosmos.testDispatcher, fakeExecutor, component, userTracker, authorizedPanelsRepository, preferredPanelsRepository, + kosmos.packageChangeRepository, userManager, broadcastDispatcher, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsDialogsFactoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsDialogsFactoryTest.kt index 8eebceebe874..38c6a0e236ed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsDialogsFactoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsDialogsFactoryTest.kt @@ -17,17 +17,23 @@ package com.android.systemui.controls.ui +import android.content.Context import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.res.R import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.util.FakeSystemUIDialogController +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.any import org.mockito.Mockito.eq import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidTestingRunner::class) @@ -37,18 +43,24 @@ class ControlsDialogsFactoryTest : SysuiTestCase() { const val APP_NAME = "Test App" } - private val fakeDialogController = FakeSystemUIDialogController() + @Mock + private lateinit var mockDialogFactory : SystemUIDialog.Factory + + private val fakeDialogController = FakeSystemUIDialogController(mContext) private lateinit var underTest: ControlsDialogsFactory @Before fun setup() { - underTest = ControlsDialogsFactory { fakeDialogController.dialog } + MockitoAnnotations.initMocks(this) + whenever(mockDialogFactory.create(any(Context::class.java))) + .thenReturn(fakeDialogController.dialog) + underTest = ControlsDialogsFactory(mockDialogFactory) } @Test fun testCreatesRemoveAppDialog() { - val dialog = underTest.createRemoveAppDialog(context, APP_NAME) {} + val dialog = underTest.createRemoveAppDialog(mContext, APP_NAME) {} verify(dialog) .setTitle( @@ -60,7 +72,7 @@ class ControlsDialogsFactoryTest : SysuiTestCase() { @Test fun testPositiveClickRemoveAppDialogWorks() { var dialogResult: Boolean? = null - underTest.createRemoveAppDialog(context, APP_NAME) { dialogResult = it } + underTest.createRemoveAppDialog(mContext, APP_NAME) { dialogResult = it } fakeDialogController.clickPositive() @@ -70,7 +82,7 @@ class ControlsDialogsFactoryTest : SysuiTestCase() { @Test fun testNeutralClickRemoveAppDialogWorks() { var dialogResult: Boolean? = null - underTest.createRemoveAppDialog(context, APP_NAME) { dialogResult = it } + underTest.createRemoveAppDialog(mContext, APP_NAME) { dialogResult = it } fakeDialogController.clickNeutral() @@ -80,7 +92,7 @@ class ControlsDialogsFactoryTest : SysuiTestCase() { @Test fun testCancelRemoveAppDialogWorks() { var dialogResult: Boolean? = null - underTest.createRemoveAppDialog(context, APP_NAME) { dialogResult = it } + underTest.createRemoveAppDialog(mContext, APP_NAME) { dialogResult = it } fakeDialogController.cancel() diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsUiControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsUiControllerImplTest.kt index 11bd9cb240a5..36ae0c740c48 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsUiControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsUiControllerImplTest.kt @@ -51,6 +51,7 @@ import com.android.systemui.flags.FeatureFlags import com.android.systemui.plugins.ActivityStarter import com.android.systemui.res.R import com.android.systemui.settings.UserTracker +import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSystemUIDialogController import com.android.systemui.util.concurrency.FakeExecutor @@ -97,9 +98,10 @@ class ControlsUiControllerImplTest : SysuiTestCase() { @Mock lateinit var authorizedPanelsRepository: AuthorizedPanelsRepository @Mock lateinit var featureFlags: FeatureFlags @Mock lateinit var packageManager: PackageManager + @Mock lateinit var systemUIDialogFactory: SystemUIDialog.Factory private val preferredPanelRepository = FakeSelectedComponentRepository() - private val fakeDialogController = FakeSystemUIDialogController() + private lateinit var fakeDialogController: FakeSystemUIDialogController private val uiExecutor = FakeExecutor(FakeSystemClock()) private val bgExecutor = FakeExecutor(FakeSystemClock()) @@ -114,6 +116,9 @@ class ControlsUiControllerImplTest : SysuiTestCase() { fun setup() { MockitoAnnotations.initMocks(this) + fakeDialogController = FakeSystemUIDialogController(mContext) + whenever(systemUIDialogFactory.create(any(Context::class.java))) + .thenReturn(fakeDialogController.dialog) controlsSettingsRepository = FakeControlsSettingsRepository() // This way, it won't be cloned every time `LayoutInflater.fromContext` is called, but we @@ -146,10 +151,7 @@ class ControlsUiControllerImplTest : SysuiTestCase() { authorizedPanelsRepository, preferredPanelRepository, featureFlags, - ControlsDialogsFactory { - isRemoveAppDialogCreated = true - fakeDialogController.dialog - }, + ControlsDialogsFactory(systemUIDialogFactory), dumpManager, ) `when`(userTracker.userId).thenReturn(0) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelTest.kt index d4210040faf3..1b4573dafe5e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelTest.kt @@ -34,6 +34,7 @@ import com.android.systemui.plugins.clocks.ClockController import com.android.systemui.plugins.clocks.ClockFaceConfig import com.android.systemui.plugins.clocks.ClockFaceController import com.android.systemui.shared.clocks.ClockRegistry +import com.android.systemui.statusbar.policy.SplitShadeStateController import com.android.systemui.util.mockito.whenever import com.android.systemui.util.settings.FakeSettings import com.google.common.truth.Truth.assertThat @@ -66,6 +67,8 @@ class KeyguardClockViewModelTest : SysuiTestCase() { @Mock private lateinit var largeClock: ClockFaceController @Mock private lateinit var clockFaceConfig: ClockFaceConfig @Mock private lateinit var eventController: ClockEventController + @Mock private lateinit var splitShadeStateController: SplitShadeStateController + @Before fun setup() { MockitoAnnotations.initMocks(this) @@ -92,6 +95,7 @@ class KeyguardClockViewModelTest : SysuiTestCase() { keyguardInteractor, keyguardClockInteractor, scope.backgroundScope, + splitShadeStateController, ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java index 6248bb1009dc..1a303b08b396 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java @@ -55,6 +55,7 @@ import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.settings.UserTracker; +import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.util.NotificationChannels; import com.android.systemui.util.settings.FakeGlobalSettings; @@ -77,7 +78,6 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { public static final String FORMATTED_45M = "0h 45m"; public static final String FORMATTED_HOUR = "1h 0m"; private final NotificationManager mMockNotificationManager = mock(NotificationManager.class); - private final GlobalSettings mGlobalSettings = new FakeGlobalSettings(); private PowerNotificationWarnings mPowerNotificationWarnings; @Mock @@ -90,6 +90,10 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { private UserTracker mUserTracker; @Mock private View mView; + @Mock + private SystemUIDialog.Factory mSystemUIDialogFactory; + @Mock + private SystemUIDialog mSystemUIDialog; private BroadcastReceiver mReceiver; @@ -113,9 +117,16 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser()); when(mUserTracker.getUserHandle()).thenReturn( UserHandle.of(ActivityManager.getCurrentUser())); - mPowerNotificationWarnings = new PowerNotificationWarnings(wrapper, starter, - broadcastSender, () -> mBatteryController, mDialogLaunchAnimator, mUiEventLogger, - mGlobalSettings, mUserTracker); + when(mSystemUIDialogFactory.create()).thenReturn(mSystemUIDialog); + mPowerNotificationWarnings = new PowerNotificationWarnings( + wrapper, + starter, + broadcastSender, + () -> mBatteryController, + mDialogLaunchAnimator, + mUiEventLogger, + mUserTracker, + mSystemUIDialogFactory); BatteryStateSnapshot snapshot = new BatteryStateSnapshot(100, false, false, 1, BatteryManager.BATTERY_HEALTH_GOOD, 5, 15); mPowerNotificationWarnings.updateSnapshot(snapshot); @@ -251,7 +262,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { verify(mDialogLaunchAnimator, never()).showFromView(any(), any()); - assertThat(mPowerNotificationWarnings.getSaverConfirmationDialog().isShowing()).isTrue(); + verify(mPowerNotificationWarnings.getSaverConfirmationDialog()).show(); mPowerNotificationWarnings.getSaverConfirmationDialog().dismiss(); } @@ -266,7 +277,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { verify(mDialogLaunchAnimator, never()).showFromView(any(), any()); - assertThat(mPowerNotificationWarnings.getSaverConfirmationDialog().isShowing()).isTrue(); + verify(mPowerNotificationWarnings.getSaverConfirmationDialog()).show(); mPowerNotificationWarnings.getSaverConfirmationDialog().dismiss(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java index f5a3becc7017..698868d67071 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.app.IForegroundServiceObserver; @@ -53,6 +54,7 @@ import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dump.DumpManager; import com.android.systemui.settings.UserTracker; +import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.util.DeviceConfigProxyFake; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -95,6 +97,10 @@ public class FgsManagerControllerTest extends SysuiTestCase { BroadcastDispatcher mBroadcastDispatcher; @Mock DumpManager mDumpManager; + @Mock + SystemUIDialog.Factory mSystemUIDialogFactory; + @Mock + SystemUIDialog mSystemUIDialog; private FgsManagerController mFmc; @@ -114,6 +120,7 @@ public class FgsManagerControllerTest extends SysuiTestCase { mSystemClock = new FakeSystemClock(); mMainExecutor = new FakeExecutor(mSystemClock); mBackgroundExecutor = new FakeExecutor(mSystemClock); + when(mSystemUIDialogFactory.create()).thenReturn(mSystemUIDialog); mUserProfiles = new ArrayList<>(); Mockito.doReturn(mUserProfiles).when(mUserTracker).getUserProfiles(); @@ -325,7 +332,8 @@ public class FgsManagerControllerTest extends SysuiTestCase { mDeviceConfigProxyFake, mDialogLaunchAnimator, mBroadcastDispatcher, - mDumpManager + mDumpManager, + mSystemUIDialogFactory ); fmc.init(); Assert.assertTrue(fmc.getIncludesUserVisibleJobs()); @@ -351,7 +359,8 @@ public class FgsManagerControllerTest extends SysuiTestCase { mDeviceConfigProxyFake, mDialogLaunchAnimator, mBroadcastDispatcher, - mDumpManager + mDumpManager, + mSystemUIDialogFactory ); fmc.init(); Assert.assertFalse(fmc.getIncludesUserVisibleJobs()); @@ -457,7 +466,8 @@ public class FgsManagerControllerTest extends SysuiTestCase { mDeviceConfigProxyFake, mDialogLaunchAnimator, mBroadcastDispatcher, - mDumpManager + mDumpManager, + mSystemUIDialogFactory ); result.init(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt index 51e95be3611b..c109a1e95f66 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt @@ -32,7 +32,9 @@ import com.android.systemui.qs.QSHost import com.android.systemui.qs.QsEventLogger import com.android.systemui.qs.logging.QSLogger import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.policy.DataSaverController +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before @@ -49,8 +51,6 @@ class DataSaverTileTest : SysuiTestCase() { @Mock private lateinit var mHost: QSHost @Mock private lateinit var mMetricsLogger: MetricsLogger - @Mock private lateinit var mStatusBarStateController: StatusBarStateController - @Mock private lateinit var mActivityStarter: ActivityStarter @Mock private lateinit var mQsLogger: QSLogger private val falsingManager = FalsingManagerFake() @Mock private lateinit var statusBarStateController: StatusBarStateController @@ -58,6 +58,8 @@ class DataSaverTileTest : SysuiTestCase() { @Mock private lateinit var dataSaverController: DataSaverController @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator @Mock private lateinit var uiEventLogger: QsEventLogger + @Mock private lateinit var systemUIDialogFactory: SystemUIDialog.Factory + @Mock private lateinit var systemUIDialog: SystemUIDialog private lateinit var testableLooper: TestableLooper private lateinit var tile: DataSaverTile @@ -67,7 +69,8 @@ class DataSaverTileTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) testableLooper = TestableLooper.get(this) - Mockito.`when`(mHost.context).thenReturn(mContext) + whenever(mHost.context).thenReturn(mContext) + whenever(systemUIDialogFactory.create()).thenReturn(systemUIDialog) tile = DataSaverTile( @@ -81,7 +84,8 @@ class DataSaverTileTest : SysuiTestCase() { activityStarter, mQsLogger, dataSaverController, - dialogLaunchAnimator + dialogLaunchAnimator, + systemUIDialogFactory ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt index 02d40da1c124..ea2b22c0a746 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt @@ -115,7 +115,7 @@ class QSTileViewModelImplTest : SysuiTestCase() { .isEqualTo( "test_spec:\n" + " QSTileState(" + - "icon=() -> com.android.systemui.common.shared.model.Icon, " + + "icon=() -> com.android.systemui.common.shared.model.Icon?, " + "label=test_data, " + "activationState=INACTIVE, " + "secondaryLabel=null, " + diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt index 0a34810f4d3f..945490f1983d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt @@ -36,6 +36,7 @@ import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -56,6 +57,8 @@ import org.mockito.MockitoAnnotations class UserSwitchDialogControllerTest : SysuiTestCase() { @Mock + private lateinit var dialogFactory: SystemUIDialog.Factory + @Mock private lateinit var dialog: SystemUIDialog @Mock private lateinit var falsingManager: FalsingManager @@ -80,7 +83,8 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) - `when`(dialog.context).thenReturn(mContext) + whenever(dialog.context).thenReturn(mContext) + whenever(dialogFactory.create()).thenReturn(dialog) controller = UserSwitchDialogController( { userDetailViewAdapter }, @@ -88,7 +92,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { falsingManager, dialogLaunchAnimator, uiEventLogger, - { dialog } + dialogFactory ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java index 273ce85f89f5..35bf7753358e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java @@ -18,25 +18,42 @@ package com.android.systemui.reardisplay; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotSame; -import static junit.framework.Assert.assertTrue; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.res.Configuration; +import android.content.res.Resources; import android.hardware.devicestate.DeviceStateManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; +import android.view.LayoutInflater; +import android.view.View; import android.widget.TextView; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.res.R; +import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.flags.Flags; +import com.android.systemui.model.SysUiState; +import com.android.systemui.res.R; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -45,24 +62,49 @@ public class RearDisplayDialogControllerTest extends SysuiTestCase { @Mock private CommandQueue mCommandQueue; + @Mock + private SystemUIDialog.Factory mSystemUIDialogFactory; + @Mock + private SystemUIDialog mSystemUIDialog; + private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); + @Mock + private SysUiState mSysUiState; + @Mock + private Resources mResources; - private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); + LayoutInflater mLayoutInflater = LayoutInflater.from(mContext); + private final FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); private static final int CLOSED_BASE_STATE = 0; private static final int OPEN_BASE_STATE = 1; + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + + mFeatureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM, true); + when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState); + when(mSystemUIDialogFactory.create()).thenReturn(mSystemUIDialog); + when(mSystemUIDialog.getContext()).thenReturn(mContext); + } @Test public void testClosedDialogIsShown() { - RearDisplayDialogController controller = new RearDisplayDialogController(mContext, - mCommandQueue, mFakeExecutor); + RearDisplayDialogController controller = new RearDisplayDialogController( + mCommandQueue, + mFakeExecutor, + mResources, + mLayoutInflater, + mSystemUIDialogFactory); controller.setDeviceStateManagerCallback(new TestDeviceStateManagerCallback()); controller.setFoldedStates(new int[]{0}); controller.setAnimationRepeatCount(0); controller.showRearDisplayDialog(CLOSED_BASE_STATE); - assertTrue(controller.mRearDisplayEducationDialog.isShowing()); - TextView deviceClosedTitleTextView = controller.mRearDisplayEducationDialog.findViewById( + verify(mSystemUIDialog).show(); + + View container = getDialogViewContainer(); + TextView deviceClosedTitleTextView = container.findViewById( R.id.rear_display_title_text_view); assertEquals(deviceClosedTitleTextView.getText().toString(), getContext().getResources().getString( @@ -71,20 +113,28 @@ public class RearDisplayDialogControllerTest extends SysuiTestCase { @Test public void testClosedDialogIsRefreshedOnConfigurationChange() { - RearDisplayDialogController controller = new RearDisplayDialogController(mContext, - mCommandQueue, mFakeExecutor); + RearDisplayDialogController controller = new RearDisplayDialogController( + mCommandQueue, + mFakeExecutor, + mResources, + mLayoutInflater, + mSystemUIDialogFactory); controller.setDeviceStateManagerCallback(new TestDeviceStateManagerCallback()); controller.setFoldedStates(new int[]{0}); controller.setAnimationRepeatCount(0); controller.showRearDisplayDialog(CLOSED_BASE_STATE); - assertTrue(controller.mRearDisplayEducationDialog.isShowing()); - TextView deviceClosedTitleTextView = controller.mRearDisplayEducationDialog.findViewById( + verify(mSystemUIDialog).show(); + View container = getDialogViewContainer(); + TextView deviceClosedTitleTextView = container.findViewById( R.id.rear_display_title_text_view); + reset(mSystemUIDialog); + when(mSystemUIDialog.isShowing()).thenReturn(true); + when(mSystemUIDialog.getContext()).thenReturn(mContext); + controller.onConfigChanged(new Configuration()); - assertTrue(controller.mRearDisplayEducationDialog.isShowing()); - TextView deviceClosedTitleTextView2 = controller.mRearDisplayEducationDialog.findViewById( + TextView deviceClosedTitleTextView2 = container.findViewById( R.id.rear_display_title_text_view); assertNotSame(deviceClosedTitleTextView, deviceClosedTitleTextView2); @@ -92,22 +142,33 @@ public class RearDisplayDialogControllerTest extends SysuiTestCase { @Test public void testOpenDialogIsShown() { - RearDisplayDialogController controller = new RearDisplayDialogController(mContext, - mCommandQueue, mFakeExecutor); + RearDisplayDialogController controller = new RearDisplayDialogController( + mCommandQueue, + mFakeExecutor, + mResources, + mLayoutInflater, + mSystemUIDialogFactory); controller.setDeviceStateManagerCallback(new TestDeviceStateManagerCallback()); controller.setFoldedStates(new int[]{0}); controller.setAnimationRepeatCount(0); controller.showRearDisplayDialog(OPEN_BASE_STATE); - assertTrue(controller.mRearDisplayEducationDialog.isShowing()); - TextView deviceClosedTitleTextView = controller.mRearDisplayEducationDialog.findViewById( + verify(mSystemUIDialog).show(); + View container = getDialogViewContainer(); + TextView deviceClosedTitleTextView = container.findViewById( R.id.rear_display_title_text_view); assertEquals(deviceClosedTitleTextView.getText().toString(), getContext().getResources().getString( R.string.rear_display_unfolded_bottom_sheet_title)); } + private View getDialogViewContainer() { + ArgumentCaptor<View> viewCaptor = ArgumentCaptor.forClass(View.class); + verify(mSystemUIDialog).setView(viewCaptor.capture()); + + return viewCaptor.getValue(); + } /** * Empty device state manager callbacks, so we can verify that the correct * dialogs are being created regardless of device state of the test device. diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index 48baeb3aa9d6..22207565a7b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -341,7 +341,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock private JavaAdapter mJavaAdapter; @Mock private CastController mCastController; @Mock private SharedNotificationContainerInteractor mSharedNotificationContainerInteractor; - @Mock private ActiveNotificationsInteractor mActiveNotificationsInteractor; + @Mock protected ActiveNotificationsInteractor mActiveNotificationsInteractor; @Mock private KeyguardClockPositionAlgorithm mKeyguardClockPositionAlgorithm; @Mock private NaturalScrollingSettingObserver mNaturalScrollingSettingObserver; diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 28fe8e4e8d3a..3cbb9bb2df97 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -456,11 +456,13 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo enableSplitShade(/* enabled= */ true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mNotificationPanelViewController.updateResources(); assertThat(getConstraintSetLayout(R.id.keyguard_status_view).endToEnd) .isEqualTo(R.id.qs_edge_guideline); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); mNotificationPanelViewController.updateResources(); assertThat(getConstraintSetLayout(R.id.keyguard_status_view).endToEnd) .isEqualTo(ConstraintSet.PARENT_ID); @@ -469,6 +471,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_splitShade_dozing_alwaysDozingOn_isCentered() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -480,6 +483,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_splitShade_dozing_alwaysDozingOff_isNotCentered() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -491,6 +495,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_splitShade_notDozing_alwaysDozingOn_isNotCentered() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -502,6 +507,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_splitShade_pulsing_isNotCentered() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); when(mNotificationListContainer.hasPulsingNotifications()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -514,6 +520,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_splitShade_notPulsing_isNotCentered() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); when(mNotificationListContainer.hasPulsingNotifications()).thenReturn(false); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -529,6 +536,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo // The conditions below would make the clock NOT be centered on split shade. // On single shade it should always be centered though. when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); when(mNotificationListContainer.hasPulsingNotifications()).thenReturn(false); mStatusBarStateController.setState(KEYGUARD); setDozing(/* dozing= */ false, /* dozingAlwaysOn= */ false); @@ -539,6 +547,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_willPlayDelayedDoze_isCentered_thenNot() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -553,6 +562,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_willPlayDelayedDoze_notifiesKeyguardMediaController() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -564,6 +574,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo @Test public void keyguardStatusView_willPlayDelayedDoze_isCentered_thenStillCenteredIfNoNotifs() { when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); mStatusBarStateController.setState(KEYGUARD); enableSplitShade(/* enabled= */ true); @@ -700,10 +711,12 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo mStatusBarStateController.setState(KEYGUARD); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController).displayClock(LARGE, /* animate */ true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController).displayClock(SMALL, /* animate */ true); } @@ -715,10 +728,12 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo clearInvocations(mKeyguardStatusViewController); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController).displayClock(LARGE, /* animate */ true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController, times(2)) .displayClock(LARGE, /* animate */ true); @@ -730,6 +745,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo public void testHasNotifications_switchesToLargeClockWhenEnteringSplitShade() { mStatusBarStateController.setState(KEYGUARD); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); enableSplitShade(/* enabled= */ true); @@ -740,6 +756,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo public void testNoNotifications_switchesToLargeClockWhenEnteringSplitShade() { mStatusBarStateController.setState(KEYGUARD); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); enableSplitShade(/* enabled= */ true); @@ -752,6 +769,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo enableSplitShade(/* enabled= */ true); clearInvocations(mKeyguardStatusViewController); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); enableSplitShade(/* enabled= */ false); @@ -764,6 +782,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo enableSplitShade(/* enabled= */ true); clearInvocations(mKeyguardStatusViewController); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); enableSplitShade(/* enabled= */ false); @@ -777,6 +796,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo enableSplitShade(/* enabled= */ true); when(mMediaDataManager.hasActiveMediaOrRecommendation()).thenReturn(true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); clearInvocations(mKeyguardStatusViewController); mNotificationPanelViewController.setDozing(/* dozing= */ true, /* animate= */ false); @@ -791,6 +811,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo enableSplitShade(/* enabled= */ true); when(mMediaDataManager.hasActiveMediaOrRecommendation()).thenReturn(true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); clearInvocations(mKeyguardStatusViewController); mNotificationPanelViewController.setDozing(/* dozing= */ true, /* animate= */ false); @@ -847,6 +868,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo clearInvocations(mKeyguardStatusViewController); when(mMediaDataManager.hasActiveMedia()).thenReturn(true); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); mNotificationPanelViewController.setDozing(true, false); @@ -863,6 +885,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo when(mResources.getBoolean(R.bool.force_small_clock_on_lockscreen)).thenReturn(true); when(mMediaDataManager.hasActiveMedia()).thenReturn(false); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); clearInvocations(mKeyguardStatusViewController); enableSplitShade(/* enabled= */ true); @@ -881,6 +904,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo when(mResources.getBoolean(R.bool.force_small_clock_on_lockscreen)).thenReturn(true); when(mMediaDataManager.hasActiveMedia()).thenReturn(false); when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); clearInvocations(mKeyguardStatusViewController); enableSplitShade(/* enabled= */ true); @@ -898,11 +922,13 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo // one notification + media player visible when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(true); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController).displayClock(SMALL, /* animate */ true); // only media player visible when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0); + when(mActiveNotificationsInteractor.getAreAnyNotificationsPresentValue()).thenReturn(false); triggerPositionClockAndNotifications(); verify(mKeyguardStatusViewController, times(2)).displayClock(SMALL, true); verify(mKeyguardStatusViewController, never()).displayClock(LARGE, /* animate */ true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java index 0c6f456b1e80..757f16cac227 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java @@ -598,6 +598,17 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { @Test @EnableFlags(FLAG_KEYGUARD_PRIVATE_NOTIFICATIONS) + public void testEarlyUserSwitch() { + mLockscreenUserManager = + new TestNotificationLockscreenUserManager(mContext); + mBackgroundExecutor.runAllReady(); + mLockscreenUserManager.mUserChangedCallback.onUserChanging( + mCurrentUser.id, mContext); + // no crash! + } + + @Test + @EnableFlags(FLAG_KEYGUARD_PRIVATE_NOTIFICATIONS) public void testKeyguardManager_noPrivateNotifications() { Mockito.clearInvocations(mDevicePolicyManager); // User allows notifications diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt index 255cf6fbed63..9b4a100a1d64 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStackC import com.android.systemui.statusbar.notification.collection.render.NotifStats import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor import com.android.systemui.statusbar.notification.domain.interactor.RenderNotificationListInteractor +import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor import com.android.systemui.statusbar.notification.stack.BUCKET_ALERTING import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT @@ -80,7 +81,7 @@ class StackCoordinatorTest : SysuiTestCase() { } @Test - @DisableFlags(NotificationIconContainerRefactor.FLAG_NAME) + @DisableFlags(NotificationIconContainerRefactor.FLAG_NAME, FooterViewRefactor.FLAG_NAME) fun testUpdateNotificationIcons() { afterRenderListListener.onAfterRenderList(listOf(entry), stackController) verify(notificationIconAreaController).updateNotificationIcons(eq(listOf(entry))) diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/DisplaySwitchLatencyTrackerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/DisplaySwitchLatencyTrackerTest.kt new file mode 100644 index 000000000000..ee2e5addd0e6 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/DisplaySwitchLatencyTrackerTest.kt @@ -0,0 +1,324 @@ +/* + * 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.unfold + +import android.content.Context +import android.content.res.Resources +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.internal.R +import com.android.systemui.SysuiTestCase +import com.android.systemui.display.data.repository.DeviceStateRepository +import com.android.systemui.display.data.repository.DeviceStateRepository.DeviceState +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor +import com.android.systemui.power.domain.interactor.PowerInteractor +import com.android.systemui.power.shared.model.ScreenPowerState +import com.android.systemui.power.shared.model.WakeSleepReason +import com.android.systemui.power.shared.model.WakefulnessModel +import com.android.systemui.power.shared.model.WakefulnessState +import com.android.systemui.shared.system.SysUiStatsLog +import com.android.systemui.unfold.DisplaySwitchLatencyTracker.Companion.FOLDABLE_DEVICE_STATE_CLOSED +import com.android.systemui.unfold.DisplaySwitchLatencyTracker.Companion.FOLDABLE_DEVICE_STATE_HALF_OPEN +import com.android.systemui.unfold.DisplaySwitchLatencyTracker.DisplaySwitchLatencyEvent +import com.android.systemui.unfold.data.repository.UnfoldTransitionRepositoryImpl +import com.android.systemui.unfold.domain.interactor.UnfoldTransitionInteractorImpl +import com.android.systemui.util.animation.data.repository.AnimationStatusRepository +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.time.FakeSystemClock +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.asExecutor +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Captor +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` as whenever +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidTestingRunner::class) +@SmallTest +class DisplaySwitchLatencyTrackerTest : SysuiTestCase() { + private lateinit var displaySwitchLatencyTracker: DisplaySwitchLatencyTracker + @Captor private lateinit var loggerArgumentCaptor: ArgumentCaptor<DisplaySwitchLatencyEvent> + + private val mockContext = mock<Context>() + private val resources = mock<Resources>() + private val foldStateRepository = mock<DeviceStateRepository>() + private val powerInteractor = mock<PowerInteractor>() + private val animationStatusRepository = mock<AnimationStatusRepository>() + private val keyguardInteractor = mock<KeyguardInteractor>() + private val displaySwitchLatencyLogger = mock<DisplaySwitchLatencyLogger>() + + private val nonEmptyClosedDeviceStatesArray: IntArray = IntArray(2) { 0 } + private val testDispatcher: TestDispatcher = StandardTestDispatcher() + private val testScope: TestScope = TestScope(testDispatcher) + private val isAsleep = MutableStateFlow(false) + private val isAodAvailable = MutableStateFlow(false) + private val deviceState = MutableStateFlow(DeviceState.UNFOLDED) + private val screenPowerState = MutableStateFlow(ScreenPowerState.SCREEN_ON) + private val areAnimationEnabled = MutableStateFlow(true) + private val lastWakefulnessEvent = MutableStateFlow(WakefulnessModel()) + private val systemClock = FakeSystemClock() + private val unfoldTransitionProgressProvider = TestUnfoldTransitionProvider() + private val unfoldTransitionRepository = + UnfoldTransitionRepositoryImpl(Optional.of(unfoldTransitionProgressProvider)) + private val unfoldTransitionInteractor = + UnfoldTransitionInteractorImpl(unfoldTransitionRepository) + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + whenever(mockContext.resources).thenReturn(resources) + whenever(resources.getIntArray(R.array.config_foldedDeviceStates)) + .thenReturn(nonEmptyClosedDeviceStatesArray) + whenever(foldStateRepository.state).thenReturn(deviceState) + whenever(powerInteractor.isAsleep).thenReturn(isAsleep) + whenever(animationStatusRepository.areAnimationsEnabled()).thenReturn(areAnimationEnabled) + whenever(powerInteractor.screenPowerState).thenReturn(screenPowerState) + whenever(keyguardInteractor.isAodAvailable).thenReturn(isAodAvailable) + whenever(powerInteractor.detailedWakefulness).thenReturn(lastWakefulnessEvent) + + displaySwitchLatencyTracker = + DisplaySwitchLatencyTracker( + mockContext, + foldStateRepository, + powerInteractor, + unfoldTransitionInteractor, + animationStatusRepository, + keyguardInteractor, + testDispatcher.asExecutor(), + testScope.backgroundScope, + displaySwitchLatencyLogger, + systemClock + ) + } + + @Test + fun unfold_logsLatencyTillTransitionStarted() { + testScope.runTest { + areAnimationEnabled.emit(true) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.FOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.HALF_FOLDED) + runCurrent() + systemClock.advanceTime(50) + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + systemClock.advanceTime(200) + unfoldTransitionProgressProvider.onTransitionStarted() + runCurrent() + deviceState.emit(DeviceState.UNFOLDED) + + verify(displaySwitchLatencyLogger).log(capture(loggerArgumentCaptor)) + val loggedEvent = loggerArgumentCaptor.value + val expectedLoggedEvent = + DisplaySwitchLatencyEvent( + latencyMs = 250, + fromFoldableDeviceState = FOLDABLE_DEVICE_STATE_CLOSED, + toFoldableDeviceState = FOLDABLE_DEVICE_STATE_HALF_OPEN + ) + assertThat(loggedEvent).isEqualTo(expectedLoggedEvent) + } + } + + @Test + fun unfold_progressUnavailable_logsLatencyTillScreenTurnedOn() { + testScope.runTest { + val unfoldTransitionInteractorWithEmptyProgressProvider = + UnfoldTransitionInteractorImpl(UnfoldTransitionRepositoryImpl(Optional.empty())) + displaySwitchLatencyTracker = + DisplaySwitchLatencyTracker( + mockContext, + foldStateRepository, + powerInteractor, + unfoldTransitionInteractorWithEmptyProgressProvider, + animationStatusRepository, + keyguardInteractor, + testDispatcher.asExecutor(), + testScope.backgroundScope, + displaySwitchLatencyLogger, + systemClock + ) + areAnimationEnabled.emit(true) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.FOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.HALF_FOLDED) + systemClock.advanceTime(50) + runCurrent() + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + systemClock.advanceTime(50) + runCurrent() + systemClock.advanceTime(200) + unfoldTransitionProgressProvider.onTransitionStarted() + runCurrent() + deviceState.emit(DeviceState.UNFOLDED) + + verify(displaySwitchLatencyLogger).log(capture(loggerArgumentCaptor)) + val loggedEvent = loggerArgumentCaptor.value + val expectedLoggedEvent = + DisplaySwitchLatencyEvent( + latencyMs = 50, + fromFoldableDeviceState = FOLDABLE_DEVICE_STATE_CLOSED, + toFoldableDeviceState = FOLDABLE_DEVICE_STATE_HALF_OPEN + ) + assertThat(loggedEvent).isEqualTo(expectedLoggedEvent) + } + } + + @Test + fun unfold_animationDisabled_logsLatencyTillScreenTurnedOn() { + testScope.runTest { + areAnimationEnabled.emit(false) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.FOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.HALF_FOLDED) + systemClock.advanceTime(50) + runCurrent() + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + systemClock.advanceTime(50) + runCurrent() + unfoldTransitionProgressProvider.onTransitionStarted() + systemClock.advanceTime(200) + runCurrent() + deviceState.emit(DeviceState.UNFOLDED) + + verify(displaySwitchLatencyLogger).log(capture(loggerArgumentCaptor)) + val loggedEvent = loggerArgumentCaptor.value + val expectedLoggedEvent = + DisplaySwitchLatencyEvent( + latencyMs = 50, + fromFoldableDeviceState = FOLDABLE_DEVICE_STATE_CLOSED, + toFoldableDeviceState = FOLDABLE_DEVICE_STATE_HALF_OPEN + ) + assertThat(loggedEvent).isEqualTo(expectedLoggedEvent) + } + } + + @Test + fun foldWhileStayingAwake_logsLatency() { + testScope.runTest { + areAnimationEnabled.emit(true) + deviceState.emit(DeviceState.UNFOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.HALF_FOLDED) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.FOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + runCurrent() + systemClock.advanceTime(200) + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + runCurrent() + + verify(displaySwitchLatencyLogger).log(capture(loggerArgumentCaptor)) + val loggedEvent = loggerArgumentCaptor.value + val expectedLoggedEvent = + DisplaySwitchLatencyEvent( + latencyMs = 200, + fromFoldableDeviceState = FOLDABLE_DEVICE_STATE_HALF_OPEN, + toFoldableDeviceState = FOLDABLE_DEVICE_STATE_CLOSED + ) + assertThat(loggedEvent).isEqualTo(expectedLoggedEvent) + } + } + + @Test + fun foldToAod_capturesToStateAsAod() { + testScope.runTest { + areAnimationEnabled.emit(true) + deviceState.emit(DeviceState.UNFOLDED) + isAodAvailable.emit(true) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.HALF_FOLDED) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.FOLDED) + lastWakefulnessEvent.emit( + WakefulnessModel( + internalWakefulnessState = WakefulnessState.ASLEEP, + lastSleepReason = WakeSleepReason.FOLD + ) + ) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + runCurrent() + systemClock.advanceTime(200) + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + runCurrent() + + verify(displaySwitchLatencyLogger).log(capture(loggerArgumentCaptor)) + val loggedEvent = loggerArgumentCaptor.value + val expectedLoggedEvent = + DisplaySwitchLatencyEvent( + latencyMs = 200, + fromFoldableDeviceState = FOLDABLE_DEVICE_STATE_HALF_OPEN, + toFoldableDeviceState = FOLDABLE_DEVICE_STATE_CLOSED, + toState = SysUiStatsLog.DISPLAY_SWITCH_LATENCY_TRACKED__TO_STATE__AOD + ) + assertThat(loggedEvent).isEqualTo(expectedLoggedEvent) + } + } + + @Test + fun fold_notAFoldable_shouldNotLogLatency() { + testScope.runTest { + areAnimationEnabled.emit(true) + deviceState.emit(DeviceState.UNFOLDED) + whenever(resources.getIntArray(R.array.config_foldedDeviceStates)) + .thenReturn(IntArray(0)) + + displaySwitchLatencyTracker.start() + deviceState.emit(DeviceState.HALF_FOLDED) + systemClock.advanceTime(50) + runCurrent() + deviceState.emit(DeviceState.FOLDED) + screenPowerState.emit(ScreenPowerState.SCREEN_OFF) + runCurrent() + systemClock.advanceTime(200) + screenPowerState.emit(ScreenPowerState.SCREEN_ON) + runCurrent() + + verify(displaySwitchLatencyLogger, never()).log(any()) + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/updates/FoldStateRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldStateRepositoryTest.kt index 065132300564..ab779a75518e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/updates/FoldStateRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/FoldStateRepositoryTest.kt @@ -13,13 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.unfold.updates +package com.android.systemui.unfold import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.unfold.updates.FoldStateRepository.FoldUpdate +import com.android.systemui.unfold.data.repository.FoldStateRepository.FoldUpdate +import com.android.systemui.unfold.data.repository.FoldStateRepositoryImpl +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_CLOSED +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_FULL_OPEN +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_HALF_OPEN +import com.android.systemui.unfold.updates.FOLD_UPDATE_START_CLOSING +import com.android.systemui.unfold.updates.FOLD_UPDATE_START_OPENING +import com.android.systemui.unfold.updates.FoldStateProvider import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.mock diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java index 29e737eac99b..d23dae9c762c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java @@ -33,6 +33,7 @@ import android.testing.TestWithLooperRule; import android.testing.TestableLooper; import android.util.Log; +import androidx.annotation.NonNull; import androidx.core.animation.AndroidXAnimatorIsolationRule; import androidx.test.InstrumentationRegistry; import androidx.test.uiautomator.UiDevice; @@ -68,8 +69,20 @@ public abstract class SysuiTestCase { public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT); @Rule - public SysuiTestableContext mContext = new SysuiTestableContext( - InstrumentationRegistry.getContext(), getLeakCheck()); + public SysuiTestableContext mContext = createTestableContext(); + + @NonNull + private SysuiTestableContext createTestableContext() { + SysuiTestableContext context = new SysuiTestableContext( + InstrumentationRegistry.getContext(), getLeakCheck()); + if (isRobolectricTest()) { + // Manually associate a Display to context for Robolectric test. Similar to b/214297409 + return context.createDefaultDisplayContext(); + } else { + return context; + } + } + @Rule public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule = new DexmakerShareClassLoaderRule(); @@ -84,10 +97,6 @@ public abstract class SysuiTestCase { @Before public void SysuiSetup() throws Exception { - // Manually associate a Display to context for Robolectric test. Similar to b/214297409 - if (isRobolectricTest()) { - mContext = mContext.createDefaultDisplayContext(); - } mSysuiDependency = new SysuiTestDependency(mContext, shouldFailOnLeakedReceiver()); mDependency = mSysuiDependency.install(); mRealInstrumentation = InstrumentationRegistry.getInstrumentation(); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/FakePackageChangeRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/FakePackageChangeRepository.kt new file mode 100644 index 000000000000..60f0448e89b3 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/FakePackageChangeRepository.kt @@ -0,0 +1,36 @@ +/* + * 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.common.data.repository + +import android.os.UserHandle +import com.android.systemui.common.data.shared.model.PackageChangeModel +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.filter + +class FakePackageChangeRepository : PackageChangeRepository { + + private var _packageChanged = MutableSharedFlow<PackageChangeModel>() + + override fun packageChanged(user: UserHandle) = + _packageChanged.filter { + user == UserHandle.ALL || user == UserHandle.getUserHandleForUid(it.packageUid) + } + + suspend fun notifyChange(model: PackageChangeModel) { + _packageChanged.emit(model) + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/PackageChangeRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/PackageChangeRepositoryKosmos.kt new file mode 100644 index 000000000000..adc05e0ae6a2 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/common/data/repository/PackageChangeRepositoryKosmos.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.common.data.repository + +import com.android.systemui.kosmos.Kosmos + +var Kosmos.packageChangeRepository: PackageChangeRepository by + Kosmos.Fixture { fakePackageChangeRepository } +val Kosmos.fakePackageChangeRepository by Kosmos.Fixture { FakePackageChangeRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt index 4200f05ad64b..975db3b179ac 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardRepository.kt @@ -80,7 +80,7 @@ class FakeKeyguardRepository @Inject constructor() : KeyguardRepository { override val lastDozeTapToWakePosition = _lastDozeTapToWakePosition.asStateFlow() private val _isAodAvailable = MutableStateFlow(false) - override val isAodAvailable: Flow<Boolean> = _isAodAvailable + override val isAodAvailable: StateFlow<Boolean> = _isAodAvailable private val _isDreaming = MutableStateFlow(false) override val isDreaming: Flow<Boolean> = _isDreaming diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelKosmos.kt index d8786830f536..5ca0439c1313 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelKosmos.kt @@ -20,6 +20,7 @@ import com.android.systemui.keyguard.domain.interactor.keyguardClockInteractor import com.android.systemui.keyguard.domain.interactor.keyguardInteractor import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.statusbar.policy.splitShadeStateController val Kosmos.keyguardClockViewModel by Kosmos.Fixture { @@ -27,5 +28,6 @@ val Kosmos.keyguardClockViewModel by keyguardInteractor = keyguardInteractor, keyguardClockInteractor = keyguardClockInteractor, applicationScope = applicationCoroutineScope, + splitShadeStateController = splitShadeStateController, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/CustomTileKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/CustomTileKosmos.kt index d70524840145..14f28fedc5e4 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/CustomTileKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/CustomTileKosmos.kt @@ -33,6 +33,7 @@ val Kosmos.customTileStatePersister: FakeCustomTileStatePersister by val Kosmos.customTileRepository: FakeCustomTileRepository by Kosmos.Fixture { FakeCustomTileRepository( + tileSpec, customTileStatePersister, packageManagerAdapterFacade, testScope.testScheduler, @@ -46,4 +47,4 @@ val Kosmos.customTilePackagesUpdatesRepository: FakeCustomTilePackageUpdatesRepo Kosmos.Fixture { FakeCustomTilePackageUpdatesRepository() } val Kosmos.packageManagerAdapterFacade: FakePackageManagerAdapterFacade by - Kosmos.Fixture { FakePackageManagerAdapterFacade(tileSpec) } + Kosmos.Fixture { FakePackageManagerAdapterFacade(tileSpec.componentName) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakeCustomTileRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakeCustomTileRepository.kt index ba803d8baef0..c110da057a4e 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakeCustomTileRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakeCustomTileRepository.kt @@ -19,11 +19,13 @@ package com.android.systemui.qs.tiles.impl.custom.data.repository import android.os.UserHandle import android.service.quicksettings.Tile import com.android.systemui.qs.external.FakeCustomTileStatePersister +import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.flow.Flow class FakeCustomTileRepository( + tileSpec: TileSpec.CustomTileSpec, customTileStatePersister: FakeCustomTileStatePersister, private val packageManagerAdapterFacade: FakePackageManagerAdapterFacade, testBackgroundContext: CoroutineContext, @@ -31,12 +33,16 @@ class FakeCustomTileRepository( private val realDelegate: CustomTileRepository = CustomTileRepositoryImpl( - packageManagerAdapterFacade.tileSpec, + tileSpec, customTileStatePersister, packageManagerAdapterFacade.packageManagerAdapter, testBackgroundContext, ) + init { + require(tileSpec.componentName == packageManagerAdapterFacade.componentName) + } + override suspend fun restoreForTheUserIfNeeded(user: UserHandle, isPersistable: Boolean) = realDelegate.restoreForTheUserIfNeeded(user, isPersistable) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakePackageManagerAdapterFacade.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakePackageManagerAdapterFacade.kt index c9a7655b5571..634d121a556c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakePackageManagerAdapterFacade.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/data/repository/FakePackageManagerAdapterFacade.kt @@ -16,17 +16,27 @@ package com.android.systemui.qs.tiles.impl.custom.data.repository +import android.content.ComponentName import android.content.pm.ServiceInfo import android.os.Bundle import com.android.systemui.qs.external.PackageManagerAdapter -import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +/** + * Facade for [PackageManagerAdapter] to provide a fake-like behaviour. You can create this class + * and then get [packageManagerAdapter] to use in your test code. + * + * This allows to mock [PackageManagerAdapter] to provide a custom behaviour for + * [CustomTileRepository.isTileActive], [CustomTileRepository.isTileToggleable], + * [com.android.systemui.qs.external.TileServiceManager.isToggleableTile] or + * [com.android.systemui.qs.external.TileServiceManager.isActiveTile] when the real objects are + * used. + */ class FakePackageManagerAdapterFacade( - val tileSpec: TileSpec.CustomTileSpec, + val componentName: ComponentName, val packageManagerAdapter: PackageManagerAdapter = mock {}, ) { @@ -34,22 +44,21 @@ class FakePackageManagerAdapterFacade( private var isActive: Boolean = false init { - whenever(packageManagerAdapter.getServiceInfo(eq(tileSpec.componentName), any())) - .thenAnswer { - ServiceInfo().apply { - metaData = - Bundle().apply { - putBoolean( - android.service.quicksettings.TileService.META_DATA_TOGGLEABLE_TILE, - isToggleable - ) - putBoolean( - android.service.quicksettings.TileService.META_DATA_ACTIVE_TILE, - isActive - ) - } - } + whenever(packageManagerAdapter.getServiceInfo(eq(componentName), any())).thenAnswer { + ServiceInfo().apply { + metaData = + Bundle().apply { + putBoolean( + android.service.quicksettings.TileService.META_DATA_TOGGLEABLE_TILE, + isToggleable + ) + putBoolean( + android.service.quicksettings.TileService.META_DATA_ACTIVE_TILE, + isActive + ) + } } + } } fun setIsActive(isActive: Boolean) { diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/util/FakeSystemUIDialogController.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/util/FakeSystemUIDialogController.kt index 0c9ce0f145f1..697b5087a865 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/util/FakeSystemUIDialogController.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/util/FakeSystemUIDialogController.kt @@ -17,6 +17,7 @@ package com.android.systemui.util +import android.content.Context import android.content.DialogInterface import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.util.mockito.any @@ -27,13 +28,15 @@ import org.mockito.Mockito.doAnswer import org.mockito.Mockito.verify import org.mockito.stubbing.Stubber -class FakeSystemUIDialogController { +class FakeSystemUIDialogController(context: Context) { val dialog: SystemUIDialog = mock() + private val clickListeners: MutableMap<Int, DialogInterface.OnClickListener> = mutableMapOf() init { + whenever(dialog.context).thenReturn(context) saveListener(DialogInterface.BUTTON_POSITIVE) .whenever(dialog) .setPositiveButton(any(), any()) diff --git a/packages/SystemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt b/packages/SystemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt index f7fb01465a40..1b7e71a42c22 100644 --- a/packages/SystemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt +++ b/packages/SystemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt @@ -27,8 +27,6 @@ import com.android.systemui.unfold.progress.PhysicsBasedUnfoldTransitionProgress import com.android.systemui.unfold.progress.UnfoldTransitionProgressForwarder import com.android.systemui.unfold.updates.DeviceFoldStateProvider import com.android.systemui.unfold.updates.FoldStateProvider -import com.android.systemui.unfold.updates.FoldStateRepository -import com.android.systemui.unfold.updates.FoldStateRepositoryImpl import com.android.systemui.unfold.updates.RotationChangeProvider import com.android.systemui.unfold.updates.hinge.EmptyHingeAngleProvider import com.android.systemui.unfold.updates.hinge.HingeAngleProvider @@ -68,10 +66,6 @@ class UnfoldSharedModule { fun unfoldKeyguardVisibilityManager( impl: UnfoldKeyguardVisibilityManagerImpl ): UnfoldKeyguardVisibilityManager = impl - - @Provides - @Singleton - fun foldStateRepository(impl: FoldStateRepositoryImpl): FoldStateRepository = impl } @Module diff --git a/services/Android.bp b/services/Android.bp index 5cb8ec628c38..0b484f473d36 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -148,6 +148,9 @@ filegroup { java_library { name: "Slogf", srcs: ["core/java/com/android/server/utils/Slogf.java"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } // merge all required services into one jar @@ -220,6 +223,9 @@ java_library { required: [ "libukey2_jni_shared", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, // Uncomment to enable output of certain warnings (deprecated, unchecked) //javacflags: ["-Xlint"], diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp index e2488a51bba1..a3546716d5ca 100644 --- a/services/accessibility/Android.bp +++ b/services/accessibility/Android.bp @@ -21,6 +21,7 @@ java_library_static { ], lint: { error_checks: ["MissingPermissionAnnotation"], + baseline_filename: "lint-baseline.xml", }, srcs: [ ":services.accessibility-sources", @@ -49,6 +50,9 @@ java_library_static { libs: [ "androidx.annotation_annotation", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } aconfig_declarations { diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig index a19920f4fc02..993b2544f110 100644 --- a/services/accessibility/accessibility.aconfig +++ b/services/accessibility/accessibility.aconfig @@ -59,13 +59,6 @@ flag { } flag { - name: "reduce_touch_exploration_sensitivity" - namespace: "accessibility" - description: "Reduces touch exploration sensitivity by only sending a hover event when the ifnger has moved the amount of pixels defined by the system's touch slop." - bug: "303677860" -} - -flag { name: "scan_packages_without_lock" namespace: "accessibility" description: "Scans packages for accessibility service/activity info without holding the A11yMS lock" diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java index fc8d4f89e6a7..c4184854e690 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java @@ -882,22 +882,10 @@ public class TouchExplorer extends BaseEventStreamTransformation final int pointerIndex = event.findPointerIndex(pointerId); switch (event.getPointerCount()) { case 1: - // Touch exploration. + // Touch exploration. sendTouchExplorationGestureStartAndHoverEnterIfNeeded(policyFlags); - if (Flags.reduceTouchExplorationSensitivity() - && mState.getLastInjectedHoverEvent() != null) { - final MotionEvent lastEvent = mState.getLastInjectedHoverEvent(); - final float deltaX = lastEvent.getX() - rawEvent.getX(); - final float deltaY = lastEvent.getY() - rawEvent.getY(); - final double moveDelta = Math.hypot(deltaX, deltaY); - if (moveDelta > mTouchSlop) { - mDispatcher.sendMotionEvent( - event, ACTION_HOVER_MOVE, rawEvent, pointerIdBits, policyFlags); - } - } else { - mDispatcher.sendMotionEvent( - event, ACTION_HOVER_MOVE, rawEvent, pointerIdBits, policyFlags); - } + mDispatcher.sendMotionEvent( + event, ACTION_HOVER_MOVE, rawEvent, pointerIdBits, policyFlags); break; case 2: if (mGestureDetector.isMultiFingerGesturesEnabled() diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 0185c22c5c7c..b7feca585fee 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -163,7 +163,7 @@ public class SettingsToPropertiesMapper { "pixel_audio_android", "pixel_bluetooth", "pixel_system_sw_touch", - "pixel_system_sw_usb", + "pixel_system_sw_video", "pixel_watch", "platform_security", "power", diff --git a/services/core/java/com/android/server/display/config/DisplayBrightnessMappingConfig.java b/services/core/java/com/android/server/display/config/DisplayBrightnessMappingConfig.java index 6978686faa12..544f490913e2 100644 --- a/services/core/java/com/android/server/display/config/DisplayBrightnessMappingConfig.java +++ b/services/core/java/com/android/server/display/config/DisplayBrightnessMappingConfig.java @@ -118,8 +118,13 @@ public class DisplayBrightnessMappingConfig { "The first lux value in the display brightness mapping must be 0"); } - String key = (mapping.getMode() == null ? "default" : mapping.getMode()) + "_" - + (mapping.getSetting() == null ? "normal" : mapping.getSetting()); + String key = (mapping.getMode() == null + ? AutoBrightnessModeName._default.getRawName() + : mapping.getMode().getRawName()) + + "_" + + (mapping.getSetting() == null + ? AutoBrightnessSettingName.normal.getRawName() + : mapping.getSetting().getRawName()); if (mBrightnessLevelsMap.containsKey(key) || mBrightnessLevelsLuxMap.containsKey(key)) { throw new IllegalArgumentException( diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 087c52573118..36dac8316e54 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -48,6 +48,7 @@ import android.hardware.input.IInputDevicesChangedListener; import android.hardware.input.IInputManager; import android.hardware.input.IInputSensorEventListener; import android.hardware.input.IKeyboardBacklightListener; +import android.hardware.input.IStickyModifierStateListener; import android.hardware.input.ITabletModeChangedListener; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; @@ -319,6 +320,9 @@ public class InputManagerService extends IInputManager.Stub // Manages Keyboard backlight private final KeyboardBacklightControllerInterface mKeyboardBacklightController; + // Manages Sticky modifier state + private final StickyModifierStateController mStickyModifierStateController; + // Manages Keyboard modifier keys remapping private final KeyRemapper mKeyRemapper; @@ -464,6 +468,7 @@ public class InputManagerService extends IInputManager.Stub ? new KeyboardBacklightController(mContext, mNative, mDataStore, injector.getLooper(), injector.getUEventManager()) : new KeyboardBacklightControllerInterface() {}; + mStickyModifierStateController = new StickyModifierStateController(); mKeyRemapper = new KeyRemapper(mContext, mNative, mDataStore, injector.getLooper()); mUseDevInputEventForAudioJack = @@ -2827,6 +2832,33 @@ public class InputManagerService extends IInputManager.Stub yPosition)).sendToTarget(); } + @Override + @EnforcePermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + public void registerStickyModifierStateListener( + @NonNull IStickyModifierStateListener listener) { + super.registerStickyModifierStateListener_enforcePermission(); + Objects.requireNonNull(listener); + mStickyModifierStateController.registerStickyModifierStateListener(listener, + Binder.getCallingPid()); + } + + @Override + @EnforcePermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE) + public void unregisterStickyModifierStateListener( + @NonNull IStickyModifierStateListener listener) { + super.unregisterStickyModifierStateListener_enforcePermission(); + Objects.requireNonNull(listener); + mStickyModifierStateController.unregisterStickyModifierStateListener(listener, + Binder.getCallingPid()); + } + + // Native callback + @SuppressWarnings("unused") + void notifyStickyModifierStateChanged(int modifierState, int lockedModifierState) { + mStickyModifierStateController.notifyStickyModifierStateChanged(modifierState, + lockedModifierState); + } + // Native callback. @SuppressWarnings("unused") boolean isInputMethodConnectionActive() { diff --git a/services/core/java/com/android/server/input/StickyModifierStateController.java b/services/core/java/com/android/server/input/StickyModifierStateController.java new file mode 100644 index 000000000000..5a22c107db56 --- /dev/null +++ b/services/core/java/com/android/server/input/StickyModifierStateController.java @@ -0,0 +1,133 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import android.annotation.BinderThread; +import android.hardware.input.IStickyModifierStateListener; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; +import android.util.Slog; +import android.util.SparseArray; + +import com.android.internal.annotations.GuardedBy; + +/** + * A thread-safe component of {@link InputManagerService} responsible for managing the sticky + * modifier state for A11y Sticky keys feature. + */ +final class StickyModifierStateController { + + private static final String TAG = "ModifierStateController"; + + // To enable these logs, run: + // 'adb shell setprop log.tag.ModifierStateController DEBUG' (requires restart) + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + // List of currently registered sticky modifier state listeners + @GuardedBy("mStickyModifierStateListenerRecords") + private final SparseArray<StickyModifierStateListenerRecord> + mStickyModifierStateListenerRecords = new SparseArray<>(); + + public void notifyStickyModifierStateChanged(int modifierState, int lockedModifierState) { + if (DEBUG) { + Slog.d(TAG, "Sticky modifier state changed, modifierState = " + modifierState + + ", lockedModifierState = " + lockedModifierState); + } + + synchronized (mStickyModifierStateListenerRecords) { + for (int i = 0; i < mStickyModifierStateListenerRecords.size(); i++) { + mStickyModifierStateListenerRecords.valueAt(i).notifyStickyModifierStateChanged( + modifierState, lockedModifierState); + } + } + } + + /** Register the sticky modifier state listener for a process. */ + @BinderThread + public void registerStickyModifierStateListener(IStickyModifierStateListener listener, + int pid) { + synchronized (mStickyModifierStateListenerRecords) { + if (mStickyModifierStateListenerRecords.get(pid) != null) { + throw new IllegalStateException("The calling process has already registered " + + "a StickyModifierStateListener."); + } + StickyModifierStateListenerRecord record = new StickyModifierStateListenerRecord(pid, + listener); + try { + listener.asBinder().linkToDeath(record, 0); + } catch (RemoteException ex) { + throw new RuntimeException(ex); + } + mStickyModifierStateListenerRecords.put(pid, record); + } + } + + /** Unregister the sticky modifier state listener for a process. */ + @BinderThread + public void unregisterStickyModifierStateListener(IStickyModifierStateListener listener, + int pid) { + synchronized (mStickyModifierStateListenerRecords) { + StickyModifierStateListenerRecord record = mStickyModifierStateListenerRecords.get(pid); + if (record == null) { + throw new IllegalStateException("The calling process has no registered " + + "StickyModifierStateListener."); + } + if (record.mListener.asBinder() != listener.asBinder()) { + throw new IllegalStateException("The calling process has a different registered " + + "StickyModifierStateListener."); + } + record.mListener.asBinder().unlinkToDeath(record, 0); + mStickyModifierStateListenerRecords.remove(pid); + } + } + + private void onStickyModifierStateListenerDied(int pid) { + synchronized (mStickyModifierStateListenerRecords) { + mStickyModifierStateListenerRecords.remove(pid); + } + } + + // A record of a registered sticky modifier state listener from one process. + private class StickyModifierStateListenerRecord implements IBinder.DeathRecipient { + public final int mPid; + public final IStickyModifierStateListener mListener; + + StickyModifierStateListenerRecord(int pid, IStickyModifierStateListener listener) { + mPid = pid; + mListener = listener; + } + + @Override + public void binderDied() { + if (DEBUG) { + Slog.d(TAG, "Sticky modifier state listener for pid " + mPid + " died."); + } + onStickyModifierStateListenerDied(mPid); + } + + public void notifyStickyModifierStateChanged(int modifierState, int lockedModifierState) { + try { + mListener.onStickyModifierStateChanged(modifierState, lockedModifierState); + } catch (RemoteException ex) { + Slog.w(TAG, "Failed to notify process " + mPid + + " that sticky modifier state changed, assuming it died.", ex); + binderDied(); + } + } + } +} diff --git a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java index 66807aeb6629..f96bb8fb6c6f 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java @@ -52,6 +52,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.OptionalInt; +import java.util.function.IntConsumer; // TODO(b/210039666): See if we can make this class thread-safe. final class HandwritingModeController { @@ -84,14 +85,14 @@ final class HandwritingModeController { private boolean mDelegatorFromDefaultHomePackage; private Runnable mDelegationIdleTimeoutRunnable; private Handler mDelegationIdleTimeoutHandler; - + private IntConsumer mPointerToolTypeConsumer; private HandwritingEventReceiverSurface mHandwritingSurface; private int mCurrentRequestId; @AnyThread HandwritingModeController(Context context, Looper uiThreadLooper, - Runnable inkWindowInitRunnable) { + Runnable inkWindowInitRunnable, IntConsumer toolTypeConsumer) { mContext = context; mLooper = uiThreadLooper; mCurrentDisplayId = Display.INVALID_DISPLAY; @@ -100,6 +101,7 @@ final class HandwritingModeController { mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); mCurrentRequestId = 0; mInkWindowInitRunnable = inkWindowInitRunnable; + mPointerToolTypeConsumer = toolTypeConsumer; } /** @@ -355,6 +357,11 @@ final class HandwritingModeController { return false; } final MotionEvent event = (MotionEvent) ev; + if (mPointerToolTypeConsumer != null && event.getAction() == MotionEvent.ACTION_DOWN) { + int toolType = event.getToolType(event.getActionIndex()); + // notify IME of change in tool type. + mPointerToolTypeConsumer.accept(toolType); + } if (!event.isStylusPointer()) { return false; } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 4f998ee2cfa2..24bcb4ece7aa 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -124,6 +124,7 @@ import android.view.WindowManager.DisplayImePolicy; import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams.SoftInputModeFlags; import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.Flags; import android.view.inputmethod.ImeTracker; import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputConnection; @@ -206,6 +207,7 @@ import java.util.WeakHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.IntConsumer; /** * This class provides a system service that manages input methods. @@ -1713,8 +1715,11 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub com.android.internal.R.bool.config_preventImeStartupUnlessTextEditor); mNonPreemptibleInputMethods = mRes.getStringArray( com.android.internal.R.array.config_nonPreemptibleInputMethods); + IntConsumer toolTypeConsumer = + Flags.useHandwritingListenerForTooltype() + ? toolType -> onUpdateEditorToolType(toolType) : null; mHwController = new HandwritingModeController(mContext, thread.getLooper(), - new InkWindowInitializer()); + new InkWindowInitializer(), toolTypeConsumer); registerDeviceListenerAndCheckStylusSupport(); } @@ -1735,6 +1740,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } } + private void onUpdateEditorToolType(int toolType) { + synchronized (ImfLock.class) { + IInputMethodInvoker curMethod = getCurMethodLocked(); + if (curMethod != null) { + curMethod.updateEditorToolType(toolType); + } + } + } + @GuardedBy("ImfLock.class") private void resetDefaultImeLocked(Context context) { // Do not reset the default (current) IME when it is a 3rd-party IME @@ -3525,7 +3539,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_SERVER_HAS_IME); mCurStatsToken = null; - if (lastClickToolType != MotionEvent.TOOL_TYPE_UNKNOWN) { + if (!Flags.useHandwritingListenerForTooltype() + && lastClickToolType != MotionEvent.TOOL_TYPE_UNKNOWN) { curMethod.updateEditorToolType(lastClickToolType); } mVisibilityApplier.performShowIme(windowToken, statsToken, diff --git a/services/core/java/com/android/server/notification/ZenAdapters.java b/services/core/java/com/android/server/notification/ZenAdapters.java index 2a65aff7f28d..91df04c4f2cb 100644 --- a/services/core/java/com/android/server/notification/ZenAdapters.java +++ b/services/core/java/com/android/server/notification/ZenAdapters.java @@ -16,6 +16,7 @@ package com.android.server.notification; +import android.app.Flags; import android.app.NotificationManager.Policy; import android.service.notification.ZenModeConfig; import android.service.notification.ZenPolicy; @@ -57,6 +58,12 @@ class ZenAdapters { .showStatusBarIcons(policy.showStatusBarIcons()); } + if (Flags.modesApi()) { + zenPolicyBuilder.allowChannels( + policy.allowPriorityChannels() + ? ZenPolicy.CHANNEL_TYPE_PRIORITY : ZenPolicy.CHANNEL_TYPE_NONE); + } + return zenPolicyBuilder.build(); } diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 3cb2420cd223..0555d90779e9 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -78,6 +78,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.AuxiliaryResolveInfo; import android.content.pm.ComponentInfo; +import android.content.pm.Flags; import android.content.pm.InstallSourceInfo; import android.content.pm.InstantAppRequest; import android.content.pm.InstantAppResolveInfo; @@ -1511,6 +1512,13 @@ public class ComputerEngine implements Computer { packageInfo.packageName = packageInfo.applicationInfo.packageName = resolveExternalPackageName(p); + if (Flags.provideInfoOfApkInApex()) { + final String apexModuleName = ps.getApexModuleName(); + if (apexModuleName != null) { + packageInfo.setApexPackageName( + mApexManager.getActivePackageNameForApexModuleName(apexModuleName)); + } + } return packageInfo; } else if ((flags & (MATCH_UNINSTALLED_PACKAGES | MATCH_ARCHIVED_PACKAGES)) != 0 && PackageUserStateUtils.isAvailable(state, flags)) { diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index b638d306544c..1b5e78919da9 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -3264,9 +3264,9 @@ final class InstallPackageHelper { Slog.e(TAG, "updateAllSharedLibrariesLPw failed: " + e.getMessage()); } } - mAppDataHelper.prepareAppDataAfterInstallLIF(pkg); - setPackageInstalledForSystemPackage(pkg, allUserHandles, origUserHandles, writeSettings); + + mAppDataHelper.prepareAppDataAfterInstallLIF(pkg); } private void setPackageInstalledForSystemPackage(@NonNull AndroidPackage pkg, diff --git a/services/core/java/com/android/server/pm/ModuleInfoProvider.java b/services/core/java/com/android/server/pm/ModuleInfoProvider.java index 230f5558b37d..6561d462e716 100644 --- a/services/core/java/com/android/server/pm/ModuleInfoProvider.java +++ b/services/core/java/com/android/server/pm/ModuleInfoProvider.java @@ -18,6 +18,7 @@ package com.android.server.pm; import android.annotation.NonNull; import android.content.Context; +import android.content.pm.Flags; import android.content.pm.IPackageManager; import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; @@ -165,6 +166,10 @@ public class ModuleInfoProvider { mi.setApexModuleName( mApexManager.getApexModuleNameForPackageName(modulePackageName)); + if (Flags.provideInfoOfApkInApex()) { + mi.setApkInApexPackageNames(mApexManager.getApksInApex(modulePackageName)); + } + mModuleInfo.put(modulePackageName, mi); } } catch (XmlPullParserException | IOException e) { diff --git a/services/core/java/com/android/server/utils/AnrTimer.java b/services/core/java/com/android/server/utils/AnrTimer.java index 7b5192c4bd6b..e3aba0f6bc6f 100644 --- a/services/core/java/com/android/server/utils/AnrTimer.java +++ b/services/core/java/com/android/server/utils/AnrTimer.java @@ -16,21 +16,30 @@ package com.android.server.utils; +import static android.text.TextUtils.formatSimple; + import android.annotation.NonNull; import android.os.Handler; import android.os.Message; import android.os.SystemClock; import android.os.Trace; +import android.text.TextUtils; import android.text.format.TimeMigrationUtils; +import android.util.ArrayMap; import android.util.IndentingPrintWriter; import android.util.Log; +import android.util.LongSparseArray; +import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.Keep; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.RingBuffer; +import java.lang.ref.WeakReference; import java.io.PrintWriter; import java.util.Arrays; +import java.util.ArrayList; import java.util.Objects; /** @@ -60,9 +69,14 @@ import java.util.Objects; * is restarted with the extension timeout. If extensions are disabled or if the extension is zero, * the client process is notified of the expiration. * + * <p>Instances use native resources but not system resources when the feature is enabled. + * Instances should be explicitly closed unless they are being closed as part of process + * exit. (So, instances in system server generally need not be explicitly closed since they are + * created during process start and will last until process exit.) + * * @hide */ -public class AnrTimer<V> { +public class AnrTimer<V> implements AutoCloseable { /** * The log tag. @@ -87,6 +101,12 @@ public class AnrTimer<V> { private static final long TRACE_TAG = Trace.TRACE_TAG_ACTIVITY_MANAGER; /** + * Enable tracing from the time a timer expires until it is accepted or discarded. This is + * used to diagnose long latencies in the client. + */ + private static final boolean ENABLE_TRACING = false; + + /** * Return true if the feature is enabled. By default, the value is take from the Flags class * but it can be changed for local testing. */ @@ -103,6 +123,9 @@ public class AnrTimer<V> { } } + /** The default injector. */ + private static final Injector sDefaultInjector = new Injector(); + /** * An error is defined by its issue, the operation that detected the error, the tag of the * affected service, a short stack of the bad call, and the stringified arg associated with @@ -160,41 +183,46 @@ public class AnrTimer<V> { /** A lock for the AnrTimer instance. */ private final Object mLock = new Object(); - /** - * The total number of timers started. - */ + /** The map from client argument to the associated timer ID. */ + @GuardedBy("mLock") + private final ArrayMap<V, Integer> mTimerIdMap = new ArrayMap<>(); + + /** Reverse map from timer ID to client argument. */ + @GuardedBy("mLock") + private final SparseArray<V> mTimerArgMap = new SparseArray<>(); + + /** The highwater mark of started, but not closed, timers. */ + @GuardedBy("mLock") + private int mMaxStarted = 0; + + /** The total number of timers started. */ @GuardedBy("mLock") private int mTotalStarted = 0; - /** - * The total number of errors detected. - */ + /** The total number of errors detected. */ @GuardedBy("mLock") private int mTotalErrors = 0; - /** - * The handler for messages sent from this instance. - */ + /** The total number of timers that have expired. */ + @GuardedBy("mLock") + private int mTotalExpired = 0; + + /** The handler for messages sent from this instance. */ private final Handler mHandler; - /** - * The message type for messages sent from this interface. - */ + /** The message type for messages sent from this interface. */ private final int mWhat; - /** - * A label that identifies the AnrTimer associated with a Timer in log messages. - */ + /** A label that identifies the AnrTimer associated with a Timer in log messages. */ private final String mLabel; - /** - * Whether this timer instance supports extending timeouts. - */ + /** Whether this timer instance supports extending timeouts. */ private final boolean mExtend; - /** - * The top-level switch for the feature enabled or disabled. - */ + /** The injector used to create this instance. This is only used for testing. */ + private final Injector mInjector; + + /** The top-level switch for the feature enabled or disabled. */ private final FeatureSwitch mFeature; /** @@ -223,7 +251,27 @@ public class AnrTimer<V> { mWhat = what; mLabel = label; mExtend = extend; - mFeature = new FeatureDisabled(); + mInjector = injector; + boolean enabled = mInjector.anrTimerServiceEnabled() && nativeTimersSupported(); + mFeature = createFeatureSwitch(enabled); + } + + // Return the correct feature. FeatureEnabled is returned if and only if the feature is + // flag-enabled and if the native shadow was successfully created. Otherwise, FeatureDisabled + // is returned. + private FeatureSwitch createFeatureSwitch(boolean enabled) { + if (!enabled) { + return new FeatureDisabled(); + } else { + try { + return new FeatureEnabled(); + } catch (RuntimeException e) { + // Something went wrong in the native layer. Log the error and fall back on the + // feature-disabled logic. + Log.e(TAG, e.toString()); + return new FeatureDisabled(); + } + } } /** @@ -245,7 +293,7 @@ public class AnrTimer<V> { * @param extend A flag to indicate if expired timers can be granted extensions. */ public AnrTimer(@NonNull Handler handler, int what, @NonNull String label, boolean extend) { - this(handler, what, label, extend, new Injector()); + this(handler, what, label, extend, sDefaultInjector); } /** @@ -272,19 +320,44 @@ public class AnrTimer<V> { } /** + * Start a trace on the timer. The trace is laid down in the AnrTimerTrack. + */ + private void traceBegin(int timerId, int pid, int uid, String what) { + if (ENABLE_TRACING) { + final String label = formatSimple("%s(%d,%d,%s)", what, pid, uid, mLabel); + final int cookie = timerId; + Trace.asyncTraceForTrackBegin(TRACE_TAG, TRACK, label, cookie); + } + } + + /** + * End a trace on the timer. + */ + private void traceEnd(int timerId) { + if (ENABLE_TRACING) { + final int cookie = timerId; + Trace.asyncTraceForTrackEnd(TRACE_TAG, TRACK, cookie); + } + } + + /** * The FeatureSwitch class provides a quick switch between feature-enabled behavior and * feature-disabled behavior. */ private abstract class FeatureSwitch { abstract void start(@NonNull V arg, int pid, int uid, long timeoutMs); - abstract void cancel(@NonNull V arg); + abstract boolean cancel(@NonNull V arg); - abstract void accept(@NonNull V arg); + abstract boolean accept(@NonNull V arg); - abstract void discard(@NonNull V arg); + abstract boolean discard(@NonNull V arg); abstract boolean enabled(); + + abstract void dump(PrintWriter pw, boolean verbose); + + abstract void close(); } /** @@ -301,18 +374,21 @@ public class AnrTimer<V> { /** Cancel a timer by removing the message from the client's handler. */ @Override - void cancel(@NonNull V arg) { + boolean cancel(@NonNull V arg) { mHandler.removeMessages(mWhat, arg); + return true; } /** accept() is a no-op when the feature is disabled. */ @Override - void accept(@NonNull V arg) { + boolean accept(@NonNull V arg) { + return true; } /** discard() is a no-op when the feature is disabled. */ @Override - void discard(@NonNull V arg) { + boolean discard(@NonNull V arg) { + return true; } /** The feature is not enabled. */ @@ -320,12 +396,179 @@ public class AnrTimer<V> { boolean enabled() { return false; } + + /** dump() is a no-op when the feature is disabled. */ + @Override + void dump(PrintWriter pw, boolean verbose) { + } + + /** close() is a no-op when the feature is disabled. */ + @Override + void close() { + } + } + + /** + * A static list of AnrTimer instances. The list is traversed by dumpsys. Only instances + * using native resources are included. + */ + @GuardedBy("sAnrTimerList") + private static final LongSparseArray<WeakReference<AnrTimer>> sAnrTimerList = + new LongSparseArray<>(); + + /** + * The FeatureEnabled class enables the AnrTimer logic. It is used when the AnrTimer service + * is enabled via Flags.anrTimerServiceEnabled. + */ + private class FeatureEnabled extends FeatureSwitch { + + /** + * The native timer that supports this instance. The value is set to non-zero when the + * native timer is created and it is set back to zero when the native timer is freed. + */ + private long mNative = 0; + + /** Fetch the native tag (an integer) for the given label. */ + FeatureEnabled() { + mNative = nativeAnrTimerCreate(mLabel); + if (mNative == 0) throw new IllegalArgumentException("unable to create native timer"); + synchronized (sAnrTimerList) { + sAnrTimerList.put(mNative, new WeakReference(AnrTimer.this)); + } + } + + /** + * Start a timer. + */ + @Override + void start(@NonNull V arg, int pid, int uid, long timeoutMs) { + synchronized (mLock) { + if (mTimerIdMap.containsKey(arg)) { + // There is an existing timer. Cancel it. + cancel(arg); + } + int timerId = nativeAnrTimerStart(mNative, pid, uid, timeoutMs, mExtend); + if (timerId > 0) { + mTimerIdMap.put(arg, timerId); + mTimerArgMap.put(timerId, arg); + mTotalStarted++; + mMaxStarted = Math.max(mMaxStarted, mTimerIdMap.size()); + } else { + throw new RuntimeException("unable to start timer"); + } + } + } + + /** + * Cancel a timer. No error is reported if the timer is not found because some clients + * cancel timers from common code that runs even if a timer was never started. + */ + @Override + boolean cancel(@NonNull V arg) { + synchronized (mLock) { + Integer timer = removeLocked(arg); + if (timer == null) { + return false; + } + if (!nativeAnrTimerCancel(mNative, timer)) { + // There may be an expiration message in flight. Cancel it. + mHandler.removeMessages(mWhat, arg); + return false; + } + return true; + } + } + + /** + * Accept a timer in the framework-level handler. The timeout has been accepted and the + * timeout handler is executing. + */ + @Override + boolean accept(@NonNull V arg) { + synchronized (mLock) { + Integer timer = removeLocked(arg); + if (timer == null) { + notFoundLocked("accept", arg); + return false; + } + nativeAnrTimerAccept(mNative, timer); + traceEnd(timer); + return true; + } + } + + /** + * Discard a timer in the framework-level handler. For whatever reason, the timer is no + * longer interesting. No statistics are collected. Return false if the time was not + * found. + */ + @Override + boolean discard(@NonNull V arg) { + synchronized (mLock) { + Integer timer = removeLocked(arg); + if (timer == null) { + notFoundLocked("discard", arg); + return false; + } + nativeAnrTimerDiscard(mNative, timer); + traceEnd(timer); + return true; + } + } + + /** The feature is enabled. */ + @Override + boolean enabled() { + return true; + } + + /** Dump statistics from the native layer. */ + @Override + void dump(PrintWriter pw, boolean verbose) { + synchronized (mLock) { + if (mNative != 0) { + nativeAnrTimerDump(mNative, verbose); + } else { + pw.println("closed"); + } + } + } + + /** Free native resources. */ + @Override + void close() { + // Remove self from the list of active timers. + synchronized (sAnrTimerList) { + sAnrTimerList.remove(mNative); + } + synchronized (mLock) { + if (mNative != 0) nativeAnrTimerClose(mNative); + mNative = 0; + } + } + + /** + * Delete the entries associated with arg from the maps and return the ID of the timer, if + * any. + */ + @GuardedBy("mLock") + private Integer removeLocked(V arg) { + Integer r = mTimerIdMap.remove(arg); + if (r != null) { + synchronized (mTimerArgMap) { + mTimerArgMap.remove(r); + } + } + return r; + } } /** * Start a timer associated with arg. The same object must be used to cancel, accept, or * discard a timer later. If a timer already exists with the same arg, then the existing timer - * is canceled and a new timer is created. + * is canceled and a new timer is created. The timeout is signed but negative delays are + * nonsensical. Rather than throw an exception, timeouts less than 0ms are forced to 0ms. This + * allows a client to deliver an immediate timeout via the AnrTimer. * * @param arg The key by which the timer is known. This is never examined or modified. * @param pid The Linux process ID of the target being timed. @@ -333,25 +576,39 @@ public class AnrTimer<V> { * @param timeoutMs The timer timeout, in milliseconds. */ public void start(@NonNull V arg, int pid, int uid, long timeoutMs) { + if (timeoutMs < 0) timeoutMs = 0; mFeature.start(arg, pid, uid, timeoutMs); } /** * Cancel the running timer associated with arg. The timer is forgotten. If the timer has - * expired, the call is treated as a discard. No errors are reported if the timer does not - * exist or if the timer has expired. + * expired, the call is treated as a discard. The function returns true if a running timer was + * found, and false if an expired timer was found or if no timer was found. After this call, + * the timer does not exist. + * + * Note: the return value is always true if the feature is not enabled. + * + * @param arg The key by which the timer is known. This is never examined or modified. + * @return True if a running timer was canceled. */ - public void cancel(@NonNull V arg) { - mFeature.cancel(arg); + public boolean cancel(@NonNull V arg) { + return mFeature.cancel(arg); } /** * Accept the expired timer associated with arg. This indicates that the caller considers the - * timer expiration to be a true ANR. (See {@link #discard} for an alternate response.) It is - * an error to accept a running timer, however the running timer will be canceled. + * timer expiration to be a true ANR. (See {@link #discard} for an alternate response.) The + * function returns true if an expired timer was found and false if a running timer was found or + * if no timer was found. After this call, the timer does not exist. It is an error to accept + * a running timer, however, the running timer will be canceled. + * + * Note: the return value is always true if the feature is not enabled. + * + * @param arg The key by which the timer is known. This is never examined or modified. + * @return True if an expired timer was accepted. */ - public void accept(@NonNull V arg) { - mFeature.accept(arg); + public boolean accept(@NonNull V arg) { + return mFeature.accept(arg); } /** @@ -359,11 +616,57 @@ public class AnrTimer<V> { * timer expiration to be a false ANR. ((See {@link #accept} for an alternate response.) One * reason to discard an expired timer is if the process being timed was also being debugged: * such a process could be stopped at a breakpoint and its failure to respond would not be an - * error. It is an error to discard a running timer, however the running timer will be - * canceled. + * error. After this call thie timer does not exist. It is an error to discard a running timer, + * however the running timer will be canceled. + * + * Note: the return value is always true if the feature is not enabled. + * + * @param arg The key by which the timer is known. This is never examined or modified. + * @return True if an expired timer was discarded. + */ + public boolean discard(@NonNull V arg) { + return mFeature.discard(arg); + } + + /** + * The notifier that a timer has fired. The timerId and original pid/uid are supplied. This + * method is called from native code. This method takes mLock so that a timer cannot expire + * in the middle of another operation (like start or cancel). + */ + @Keep + private boolean expire(int timerId, int pid, int uid) { + traceBegin(timerId, pid, uid, "expired"); + V arg = null; + synchronized (mLock) { + arg = mTimerArgMap.get(timerId); + if (arg == null) { + Log.e(TAG, formatSimple("failed to expire timer %s:%d : arg not found", + mLabel, timerId)); + mTotalErrors++; + return false; + } + mTotalExpired++; + } + mHandler.sendMessage(Message.obtain(mHandler, mWhat, arg)); + return true; + } + + /** + * Close the object and free any native resources. */ - public void discard(@NonNull V arg) { - mFeature.discard(arg); + public void close() { + mFeature.close(); + } + + /** + * Ensure any native resources are freed when the object is GC'ed. Best practice is to close + * the object explicitly, but overriding finalize() avoids accidental leaks. + */ + @SuppressWarnings("Finalize") + @Override + protected void finalize() throws Throwable { + close(); + super.finalize(); } /** @@ -373,8 +676,11 @@ public class AnrTimer<V> { synchronized (mLock) { pw.format("timer: %s\n", mLabel); pw.increaseIndent(); - pw.format("started=%d errors=%d\n", mTotalStarted, mTotalErrors); + pw.format("started=%d maxStarted=%d running=%d expired=%d errors=%d\n", + mTotalStarted, mMaxStarted, mTimerIdMap.size(), + mTotalExpired, mTotalErrors); pw.decreaseIndent(); + mFeature.dump(pw, false); } } @@ -386,6 +692,13 @@ public class AnrTimer<V> { } /** + * The current time in milliseconds. + */ + private static long now() { + return SystemClock.uptimeMillis(); + } + + /** * Dump all errors to the output stream. */ private static void dumpErrors(IndentingPrintWriter ipw) { @@ -422,23 +735,89 @@ public class AnrTimer<V> { mTotalErrors++; } - /** - * Log an error about a timer not found. - */ + /** Record an error about a timer not found. */ @GuardedBy("mLock") private void notFoundLocked(String operation, Object arg) { recordErrorLocked(operation, "notFound", arg); } - /** - * Dumpsys output. - */ - public static void dump(@NonNull PrintWriter pw, boolean verbose) { + /** Dumpsys output, allowing for overrides. */ + @VisibleForTesting + static void dump(@NonNull PrintWriter pw, boolean verbose, @NonNull Injector injector) { + if (!injector.anrTimerServiceEnabled()) return; + final IndentingPrintWriter ipw = new IndentingPrintWriter(pw); ipw.println("AnrTimer statistics"); ipw.increaseIndent(); + synchronized (sAnrTimerList) { + final int size = sAnrTimerList.size(); + ipw.println("reporting " + size + " timers"); + for (int i = 0; i < size; i++) { + AnrTimer a = sAnrTimerList.valueAt(i).get(); + if (a != null) a.dump(ipw); + } + } if (verbose) dumpErrors(ipw); ipw.format("AnrTimerEnd\n"); ipw.decreaseIndent(); } + + /** Dumpsys output. There is no output if the feature is not enabled. */ + public static void dump(@NonNull PrintWriter pw, boolean verbose) { + dump(pw, verbose, sDefaultInjector); + } + + /** + * Return true if the native timers are supported. Native timers are supported if the method + * nativeAnrTimerSupported() can be executed and it returns true. + */ + private static boolean nativeTimersSupported() { + try { + return nativeAnrTimerSupported(); + } catch (java.lang.UnsatisfiedLinkError e) { + return false; + } + } + + /** + * Native methods + */ + + /** Return true if the native AnrTimer code is operational. */ + private static native boolean nativeAnrTimerSupported(); + + /** + * Create a new native timer with the given key and name. The key is not used by the native + * code but it is returned to the Java layer in the expiration handler. The name is only for + * logging. Unlike the other methods, this is an instance method: the "this" parameter is + * passed into the native layer. + */ + private native long nativeAnrTimerCreate(String name); + + /** Release the native resources. No further operations are premitted. */ + private static native int nativeAnrTimerClose(long service); + + /** Start a timer and return its ID. Zero is returned on error. */ + private static native int nativeAnrTimerStart(long service, int pid, int uid, long timeoutMs, + boolean extend); + + /** + * Cancel a timer by ID. Return true if the timer was running and canceled. Return false if + * the timer was not found or if the timer had already expired. + */ + private static native boolean nativeAnrTimerCancel(long service, int timerId); + + /** Accept an expired timer by ID. Return true if the timer was found. */ + private static native boolean nativeAnrTimerAccept(long service, int timerId); + + /** Discard an expired timer by ID. Return true if the timer was found. */ + private static native boolean nativeAnrTimerDiscard(long service, int timerId); + + /** Prod the native library to log a few statistics. */ + private static native void nativeAnrTimerDump(long service, boolean verbose); + + // This is not a native method but it is a native interface, in the sense that it is called from + // the native layer to report timer expiration. The function must return true if the expiration + // message is delivered to the upper layers and false if it could not be delivered. + // private boolean expire(int timerId, int pid, int uid); } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index b8a92bbb059b..febcc052064e 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -183,6 +183,8 @@ import static com.android.server.wm.ActivityRecordProto.PROVIDES_MAX_BOUNDS; import static com.android.server.wm.ActivityRecordProto.REPORTED_DRAWN; import static com.android.server.wm.ActivityRecordProto.REPORTED_VISIBLE; import static com.android.server.wm.ActivityRecordProto.SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT; +import static com.android.server.wm.ActivityRecordProto.SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP; +import static com.android.server.wm.ActivityRecordProto.SHOULD_OVERRIDE_FORCE_RESIZE_APP; import static com.android.server.wm.ActivityRecordProto.SHOULD_OVERRIDE_MIN_ASPECT_RATIO; import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT; import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT; @@ -2492,14 +2494,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Creating SnapshotStartingData"); mStartingData = new SnapshotStartingData(mWmService, snapshot, typeParams); - if ((!mStyleFillsParent && task.getChildCount() > 1) - || task.forAllLeafTaskFragments(TaskFragment::isEmbedded)) { - // Case 1: - // If it is moving a Task{[0]=main activity, [1]=translucent activity} to front, use - // shared starting window so that the transition doesn't need to wait for the activity - // behind the translucent activity. Also, onFirstWindowDrawn will check all visible - // activities are drawn in the task to remove the snapshot starting window. - // Case 2: + if (task.forAllLeafTaskFragments(TaskFragment::isEmbedded)) { // Associate with the task so if this activity is resized by task fragment later, the // starting window can keep the same bounds as the task. associateStartingDataWithTask(); @@ -10337,6 +10332,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mLetterboxUiController.shouldRefreshActivityViaPauseForCameraCompat()); proto.write(SHOULD_OVERRIDE_MIN_ASPECT_RATIO, mLetterboxUiController.shouldOverrideMinAspectRatio()); + proto.write(SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP, + mLetterboxUiController.shouldIgnoreOrientationRequestLoop()); + proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP, + mLetterboxUiController.shouldOverrideForceResizeApp()); } @Override @@ -10622,13 +10621,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Override boolean isSyncFinished(BLASTSyncEngine.SyncGroup group) { - if (task != null && task.mSharedStartingData != null) { - final WindowState startingWin = task.topStartingWindow(); - if (startingWin != null && startingWin.isSyncFinished(group)) { - // The sync is ready if a drawn starting window covered the task. - return true; - } - } if (!super.isSyncFinished(group)) return false; if (mDisplayContent != null && mDisplayContent.mUnknownAppVisibilityController .isVisibilityUnknown(this)) { diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index f43c1b01e87c..3959a5e54cbf 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3691,19 +3691,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return false; } - // If the app is using legacy-entry (not auto-enter), then we will get a client-request - // that was actually a server-request (via pause(userLeaving=true)). This happens when - // the app is PAUSING, so detect that case here. - boolean originallyFromClient = fromClient - && (!r.isState(PAUSING) || params.isAutoEnterEnabled()); - - // If PiP2 flag is on and client-request to enter PiP came via onUserLeaveHint(), - // we request a direct transition from Shell to TRANSIT_PIP_LEGACY to get the startWct - // with the right entry bounds. - if (isPip2ExperimentEnabled() && !originallyFromClient && !params.isAutoEnterEnabled()) { + // If PiP2 flag is on and client-request to enter PiP comes in, + // we request a direct transition from Shell to TRANSIT_PIP to get the startWct + // with the right entry bounds. So PiP activity isn't moved to a pinned task until after + // Shell calls back into Core with the entry bounds passed through. + if (isPip2ExperimentEnabled()) { final Transition legacyEnterPipTransition = new Transition(TRANSIT_PIP, - 0 /* flags */, getTransitionController(), - mWindowManager.mSyncEngine); + 0 /* flags */, getTransitionController(), mWindowManager.mSyncEngine); legacyEnterPipTransition.setPipActivity(r); getTransitionController().startCollectOrQueue(legacyEnterPipTransition, (deferred) -> { getTransitionController().requestStartTransition(legacyEnterPipTransition, @@ -3712,6 +3706,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return true; } + // If the app is using legacy-entry (not auto-enter), then we will get a client-request + // that was actually a server-request (via pause(userLeaving=true)). This happens when + // the app is PAUSING, so detect that case here. + boolean originallyFromClient = fromClient + && (!r.isState(PAUSING) || params.isAutoEnterEnabled()); + // Create a transition only for this pip entry if it is coming from the app without the // system requesting that the app enter-pip. If the system requested it, that means it // should be part of that transition if possible. diff --git a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java index eed46fee1ae1..fc3a33883de6 100644 --- a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java +++ b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java @@ -61,6 +61,7 @@ import android.widget.Toast; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.FrameworkStatsLog; +import com.android.internal.util.Preconditions; import com.android.server.UiThread; import com.android.server.am.PendingIntentRecord; import com.android.window.flags.Flags; @@ -219,6 +220,9 @@ public class BackgroundActivityStartController { private final WindowProcessController mCallerApp; private final WindowProcessController mRealCallerApp; private final boolean mIsCallForResult; + private final ActivityOptions mCheckedOptions; + private BalVerdict mResultForCaller; + private BalVerdict mResultForRealCaller; private BalState(int callingUid, int callingPid, final String callingPackage, int realCallingUid, int realCallingPid, @@ -239,6 +243,7 @@ public class BackgroundActivityStartController { mIntent = intent; mRealCallingPackage = mService.getPackageNameIfUnique(realCallingUid, realCallingPid); mIsCallForResult = resultRecord != null; + mCheckedOptions = checkedOptions; if (balRequireOptInByPendingIntentCreator() // auto-opt in introduced with this feature && (originatingPendingIntent == null // not a PendingIntent || mIsCallForResult) // sent for result @@ -369,8 +374,19 @@ public class BackgroundActivityStartController { return mCallingUid == mRealCallingUid; } - private String dump(BalVerdict resultIfPiCreatorAllowsBal, - BalVerdict resultIfPiSenderAllowsBal) { + public void setResultForCaller(BalVerdict resultForCaller) { + Preconditions.checkState(mResultForCaller == null, + "mResultForCaller can only be set once"); + this.mResultForCaller = resultForCaller; + } + + public void setResultForRealCaller(BalVerdict resultForRealCaller) { + Preconditions.checkState(mResultForRealCaller == null, + "mResultForRealCaller can only be set once"); + this.mResultForRealCaller = resultForRealCaller; + } + + private String dump() { StringBuilder sb = new StringBuilder(2048); sb.append("[callingPackage: ") .append(getDebugPackageName(mCallingPackage, mCallingUid)); @@ -392,7 +408,7 @@ public class BackgroundActivityStartController { sb.append("; balAllowedByPiCreator: ").append(mBalAllowedByPiCreator); sb.append("; balAllowedByPiCreatorWithHardening: ") .append(mBalAllowedByPiCreatorWithHardening); - sb.append("; resultIfPiCreatorAllowsBal: ").append(resultIfPiCreatorAllowsBal); + sb.append("; resultIfPiCreatorAllowsBal: ").append(mResultForCaller); sb.append("; hasRealCaller: ").append(hasRealCaller()); sb.append("; isCallForResult: ").append(mIsCallForResult); sb.append("; isPendingIntent: ").append(isPendingIntent()); @@ -416,7 +432,7 @@ public class BackgroundActivityStartController { .append(mRealCallerApp.hasActivityInVisibleTask()); } sb.append("; balAllowedByPiSender: ").append(mBalAllowedByPiSender); - sb.append("; resultIfPiSenderAllowsBal: ").append(resultIfPiSenderAllowsBal); + sb.append("; resultIfPiSenderAllowsBal: ").append(mResultForRealCaller); } sb.append("]"); return sb.toString(); @@ -559,23 +575,25 @@ public class BackgroundActivityStartController { // realCallingSdkSandboxUidToAppUid should probably just be used instead (or in addition // to realCallingUid when calculating resultForRealCaller below. if (mService.hasActiveVisibleWindow(realCallingSdkSandboxUidToAppUid)) { - BalVerdict balVerdict = new BalVerdict(BAL_ALLOW_SDK_SANDBOX, /*background*/ false, - "uid in SDK sandbox has visible (non-toast) window"); - return statsLog(balVerdict, state); + state.setResultForRealCaller(new BalVerdict(BAL_ALLOW_SDK_SANDBOX, + /*background*/ false, + "uid in SDK sandbox has visible (non-toast) window")); + return allowBasedOnRealCaller(state); } } BalVerdict resultForCaller = checkBackgroundActivityStartAllowedByCaller(state); + state.setResultForCaller(resultForCaller); if (!state.hasRealCaller()) { if (resultForCaller.allows()) { if (DEBUG_ACTIVITY_STARTS) { Slog.d(TAG, "Background activity start allowed. " - + state.dump(resultForCaller, resultForCaller)); + + state.dump()); } - return statsLog(resultForCaller, state); + return allowBasedOnCaller(state); } - return abortLaunch(state, resultForCaller, resultForCaller); + return abortLaunch(state); } // The realCaller result is only calculated for PendingIntents (indicated by a valid @@ -589,6 +607,8 @@ public class BackgroundActivityStartController { ? resultForCaller : checkBackgroundActivityStartAllowedBySender(state, checkedOptions) .setBasedOnRealCaller(); + state.setResultForRealCaller(resultForRealCaller); + if (state.isPendingIntent()) { resultForCaller.setOnlyCreatorAllows( resultForCaller.allows() && resultForRealCaller.blocks()); @@ -600,18 +620,18 @@ public class BackgroundActivityStartController { == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) { if (DEBUG_ACTIVITY_STARTS) { Slog.d(TAG, "Activity start explicitly allowed by caller. " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); } - return statsLog(resultForCaller, state); + return allowBasedOnCaller(state); } if (resultForRealCaller.allows() && checkedOptions.getPendingIntentBackgroundActivityStartMode() == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) { if (DEBUG_ACTIVITY_STARTS) { Slog.d(TAG, "Activity start explicitly allowed by real caller. " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); } - return statsLog(resultForRealCaller, state); + return allowBasedOnRealCaller(state); } // Handle PendingIntent cases with default behavior next boolean callerCanAllow = resultForCaller.allows() @@ -626,26 +646,24 @@ public class BackgroundActivityStartController { // Will be allowed even with BAL hardening. if (DEBUG_ACTIVITY_STARTS) { Slog.d(TAG, "Activity start allowed by caller. " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); } - // return the realCaller result for backwards compatibility - return statsLog(resultForRealCaller, state); + return allowBasedOnCaller(state); } if (state.mBalAllowedByPiCreator.allowsBackgroundActivityStarts()) { Slog.wtf(TAG, "With Android 15 BAL hardening this activity start may be blocked" + " if the PI creator upgrades target_sdk to 35+" + " AND the PI sender upgrades target_sdk to 34+! " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); showBalRiskToast(); - // return the realCaller result for backwards compatibility - return statsLog(resultForRealCaller, state); + return allowBasedOnCaller(state); } Slog.wtf(TAG, "Without Android 15 BAL hardening this activity start would be allowed" + " (missing opt in by PI creator or sender)! " - + state.dump(resultForCaller, resultForRealCaller)); - return abortLaunch(state, resultForCaller, resultForRealCaller); + + state.dump()); + return abortLaunch(state); } if (callerCanAllow) { // Allowed before V by creator @@ -653,24 +671,24 @@ public class BackgroundActivityStartController { // Will be allowed even with BAL hardening. if (DEBUG_ACTIVITY_STARTS) { Slog.d(TAG, "Activity start allowed by caller. " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); } - return statsLog(resultForCaller, state); + return allowBasedOnCaller(state); } if (state.mBalAllowedByPiCreator.allowsBackgroundActivityStarts()) { Slog.wtf(TAG, "With Android 15 BAL hardening this activity start may be blocked" + " if the PI creator upgrades target_sdk to 35+! " + " (missing opt in by PI creator)! " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); showBalRiskToast(); - return statsLog(resultForCaller, state); + return allowBasedOnCaller(state); } Slog.wtf(TAG, "Without Android 15 BAL hardening this activity start would be allowed" + " (missing opt in by PI creator)! " - + state.dump(resultForCaller, resultForRealCaller)); - return abortLaunch(state, resultForCaller, resultForRealCaller); + + state.dump()); + return abortLaunch(state); } if (realCallerCanAllow) { // Allowed before U by sender @@ -679,23 +697,38 @@ public class BackgroundActivityStartController { "With Android 14 BAL hardening this activity start will be blocked" + " if the PI sender upgrades target_sdk to 34+! " + " (missing opt in by PI sender)! " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); showBalRiskToast(); - return statsLog(resultForRealCaller, state); + return allowBasedOnRealCaller(state); } Slog.wtf(TAG, "Without Android 14 BAL hardening this activity start would be allowed" + " (missing opt in by PI sender)! " - + state.dump(resultForCaller, resultForRealCaller)); - return abortLaunch(state, resultForCaller, resultForRealCaller); + + state.dump()); + return abortLaunch(state); } // neither the caller not the realCaller can allow or have explicitly opted out - return abortLaunch(state, resultForCaller, resultForRealCaller); + return abortLaunch(state); + } + + private BalVerdict allowBasedOnCaller(BalState state) { + if (DEBUG_ACTIVITY_STARTS) { + Slog.d(TAG, "Background activity launch allowed based on caller. " + + state.dump()); + } + return statsLog(state.mResultForCaller, state); } - private BalVerdict abortLaunch(BalState state, BalVerdict resultForCaller, - BalVerdict resultForRealCaller) { + private BalVerdict allowBasedOnRealCaller(BalState state) { + if (DEBUG_ACTIVITY_STARTS) { + Slog.d(TAG, "Background activity launch allowed based on real caller. " + + state.dump()); + } + return statsLog(state.mResultForRealCaller, state); + } + + private BalVerdict abortLaunch(BalState state) { Slog.w(TAG, "Background activity launch blocked! " - + state.dump(resultForCaller, resultForRealCaller)); + + state.dump()); showBalBlockedToast(); return statsLog(BalVerdict.BLOCK, state); } @@ -1471,24 +1504,36 @@ public class BackgroundActivityStartController { && (callingUid == Process.SYSTEM_UID || realCallingUid == Process.SYSTEM_UID)) { String activityName = intent != null ? requireNonNull(intent.getComponent()).flattenToShortString() : ""; - FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, - activityName, - BAL_ALLOW_PENDING_INTENT, - callingUid, - realCallingUid); + writeBalAllowedLog(activityName, BAL_ALLOW_PENDING_INTENT, + state); } if (code == BAL_ALLOW_PERMISSION || code == BAL_ALLOW_FOREGROUND - || code == BAL_ALLOW_SAW_PERMISSION) { + || code == BAL_ALLOW_SAW_PERMISSION) { // We don't need to know which activity in this case. - FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, - /*activityName*/ "", - code, - callingUid, - realCallingUid); + writeBalAllowedLog("", code, state); + } return finalVerdict; } + private static void writeBalAllowedLog(String activityName, int code, BalState state) { + FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, + activityName, + code, + state.mCallingUid, + state.mRealCallingUid, + state.mResultForCaller == null ? BAL_BLOCK : state.mResultForCaller.getRawCode(), + state.mBalAllowedByPiCreator.allowsBackgroundActivityStarts(), + state.mCheckedOptions.getPendingIntentCreatorBackgroundActivityStartMode() + != ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED, + state.mResultForRealCaller == null ? BAL_BLOCK + : state.mResultForRealCaller.getRawCode(), + state.mBalAllowedByPiSender.allowsBackgroundActivityStarts(), + state.mCheckedOptions.getPendingIntentBackgroundActivityStartMode() + != ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED + ); + } + /** * Called whenever an activity finishes. Stores the record, so it can be used by ASM grace * period checks. diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index 68bd326448d4..47972b37d836 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -513,7 +513,6 @@ final class LetterboxUiController { * timer and activity is not letterboxed for fixed orientation * </ul> */ - @VisibleForTesting boolean shouldIgnoreOrientationRequestLoop() { if (!shouldEnableWithOptInOverrideAndOptOutProperty( /* gatingCondition */ mLetterboxConfiguration diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 3b0634311501..d556f095ae50 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1411,13 +1411,12 @@ class Task extends TaskFragment { return isUidPresent; } - WindowState topStartingWindow() { - return getWindow(w -> w.mAttrs.type == TYPE_APPLICATION_STARTING); - } - ActivityRecord topActivityContainsStartingWindow() { - final WindowState startingWindow = topStartingWindow(); - return startingWindow != null ? startingWindow.mActivityRecord : null; + if (getParent() == null) { + return null; + } + return getActivity((r) -> r.getWindow(window -> + window.getBaseType() == TYPE_APPLICATION_STARTING) != null); } /** diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 93cce2aa3fd0..f51bd1be158c 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.Manifest.permission.MANAGE_ACTIVITY_TASKS; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; @@ -57,6 +58,7 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITC import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TRANSITION; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME; +import static com.android.server.wm.ActivityTaskManagerService.checkPermission; import static com.android.server.wm.ActivityTaskSupervisor.printThisActivity; import static com.android.server.wm.IdentifierProto.HASH_CODE; import static com.android.server.wm.IdentifierProto.TITLE; @@ -80,7 +82,9 @@ import android.app.servertransaction.ClientTransaction; import android.app.servertransaction.NewIntentItem; import android.app.servertransaction.PauseActivityItem; import android.app.servertransaction.ResumeActivityItem; +import android.content.PermissionChecker; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; @@ -744,7 +748,17 @@ class TaskFragment extends WindowContainer<WindowContainer> { // The system is trusted to embed other apps securely and for all users. return UserHandle.getAppId(uid) == SYSTEM_UID // Activities from the same UID can be embedded freely by the host. - || a.isUid(uid); + || a.isUid(uid) + // Apps which have the signature MANAGE_ACTIVITY_TASK permission are trusted. + || hasManageTaskPermission(uid); + } + + /** + * Checks if a particular app uid has the {@link MANAGE_ACTIVITY_TASKS} permission. + */ + private static boolean hasManageTaskPermission(int uid) { + return checkPermission(MANAGE_ACTIVITY_TASKS, PermissionChecker.PID_UNKNOWN, uid) + == PackageManager.PERMISSION_GRANTED; } /** diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index b19f3d813985..dfa9dcecfbb5 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -79,6 +79,7 @@ cc_library_static { ":lib_cachedAppOptimizer_native", ":lib_gameManagerService_native", ":lib_oomConnection_native", + ":lib_anrTimer_native", ], include_dirs: [ @@ -246,3 +247,10 @@ filegroup { name: "lib_oomConnection_native", srcs: ["com_android_server_am_OomConnection.cpp"], } + +filegroup { + name: "lib_anrTimer_native", + srcs: [ + "com_android_server_utils_AnrTimer.cpp", + ], +} diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 9ba0a2aae02c..afb0b20650f8 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -114,6 +114,7 @@ static struct { jmethodID notifyFocusChanged; jmethodID notifySensorEvent; jmethodID notifySensorAccuracy; + jmethodID notifyStickyModifierStateChanged; jmethodID notifyStylusGestureStarted; jmethodID isInputMethodConnectionActive; jmethodID notifyVibratorState; @@ -270,7 +271,8 @@ static std::string getStringElementFromJavaArray(JNIEnv* env, jobjectArray array class NativeInputManager : public virtual InputReaderPolicyInterface, public virtual InputDispatcherPolicyInterface, public virtual PointerControllerPolicyInterface, - public virtual PointerChoreographerPolicyInterface { + public virtual PointerChoreographerPolicyInterface, + public virtual InputFilterPolicyInterface { protected: virtual ~NativeInputManager(); @@ -388,6 +390,10 @@ public: PointerControllerInterface::ControllerType type) override; void notifyPointerDisplayIdChanged(int32_t displayId, const FloatPoint& position) override; + /* --- InputFilterPolicyInterface implementation --- */ + void notifyStickyModifierStateChanged(uint32_t modifierState, + uint32_t lockedModifierState) override; + private: sp<InputManagerInterface> mInputManager; @@ -477,7 +483,7 @@ NativeInputManager::NativeInputManager(jobject serviceObj, const sp<Looper>& loo mServiceObj = env->NewGlobalRef(serviceObj); - InputManager* im = new InputManager(this, *this, *this); + InputManager* im = new InputManager(this, *this, *this, *this); mInputManager = im; defaultServiceManager()->addService(String16("inputflinger"), im); } @@ -806,6 +812,14 @@ void NativeInputManager::notifyPointerDisplayIdChanged(int32_t pointerDisplayId, checkAndClearExceptionFromCallback(env, "onPointerDisplayIdChanged"); } +void NativeInputManager::notifyStickyModifierStateChanged(uint32_t modifierState, + uint32_t lockedModifierState) { + JNIEnv* env = jniEnv(); + env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyStickyModifierStateChanged, + modifierState, lockedModifierState); + checkAndClearExceptionFromCallback(env, "notifyStickyModifierStateChanged"); +} + sp<SurfaceControl> NativeInputManager::getParentSurfaceForPointers(int displayId) { JNIEnv* env = jniEnv(); jlong nativeSurfaceControlPtr = @@ -2957,6 +2971,9 @@ int register_android_server_InputManager(JNIEnv* env) { GET_METHOD_ID(gServiceClassInfo.onPointerDisplayIdChanged, clazz, "onPointerDisplayIdChanged", "(IFF)V"); + GET_METHOD_ID(gServiceClassInfo.notifyStickyModifierStateChanged, clazz, + "notifyStickyModifierStateChanged", "(II)V"); + GET_METHOD_ID(gServiceClassInfo.onPointerDownOutsideFocus, clazz, "onPointerDownOutsideFocus", "(Landroid/os/IBinder;)V"); diff --git a/services/core/jni/com_android_server_utils_AnrTimer.cpp b/services/core/jni/com_android_server_utils_AnrTimer.cpp new file mode 100644 index 000000000000..97b18fac91f4 --- /dev/null +++ b/services/core/jni/com_android_server_utils_AnrTimer.cpp @@ -0,0 +1,918 @@ +/* + * 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. + */ + +#include <time.h> +#include <pthread.h> +#include <sys/timerfd.h> +#include <inttypes.h> + +#include <algorithm> +#include <list> +#include <memory> +#include <set> +#include <string> +#include <vector> + +#define LOG_TAG "AnrTimerService" + +#include <jni.h> +#include <nativehelper/JNIHelp.h> +#include "android_runtime/AndroidRuntime.h" +#include "core_jni_helpers.h" + +#include <utils/Mutex.h> +#include <utils/Timers.h> + +#include <utils/Log.h> +#include <utils/Timers.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> +#include <android-base/unique_fd.h> + +using ::android::base::StringPrintf; + + +// Native support is unavailable on WIN32 platforms. This macro preemptively disables it. +#ifdef _WIN32 +#define NATIVE_SUPPORT 0 +#else +#define NATIVE_SUPPORT 1 +#endif + +namespace android { + +// using namespace android; + +// Almost nothing in this module needs to be in the android namespace. +namespace { + +// If not on a Posix system, create stub timerfd methods. These are defined to allow +// compilation. They are not functional. Also, they do not leak outside this compilation unit. +#ifdef _WIN32 +int timer_create() { + return -1; +} +int timer_settime(int, int, void const *, void *) { + return -1; +} +#else +int timer_create() { + return timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); +} +int timer_settime(int fd, int flags, const struct itimerspec *new_value, + struct itimerspec *_Nullable old_value) { + return timerfd_settime(fd, flags, new_value, old_value); +} +#endif + +// A local debug flag that gates a set of log messages for debug only. This is normally const +// false so the debug statements are not included in the image. The flag can be set true in a +// unit test image to debug test failures. +const bool DEBUG = false; + +// Return the current time in nanoseconds. This time is relative to system boot. +nsecs_t now() { + return systemTime(SYSTEM_TIME_MONOTONIC); +} + +/** + * This class encapsulates the anr timer service. The service manages a list of individual + * timers. A timer is either Running or Expired. Once started, a timer may be canceled or + * accepted. Both actions collect statistics about the timer and then delete it. An expired + * timer may also be discarded, which deletes the timer without collecting any statistics. + * + * All public methods in this class are thread-safe. + */ +class AnrTimerService { + private: + class ProcessStats; + class Timer; + + public: + + // The class that actually runs the clock. + class Ticker; + + // A timer is identified by a timer_id_t. Timer IDs are unique in the moment. + using timer_id_t = uint32_t; + + // A manifest constant. No timer is ever created with this ID. + static const timer_id_t NOTIMER = 0; + + // A notifier is called with a timer ID, the timer's tag, and the client's cookie. The pid + // and uid that were originally assigned to the timer are passed as well. + using notifier_t = bool (*)(timer_id_t, int pid, int uid, void* cookie, jweak object); + + enum Status { + Invalid, + Running, + Expired, + Canceled + }; + + /** + * Create a timer service. The service is initialized with a name used for logging. The + * constructor is also given the notifier callback, and two cookies for the callback: the + * traditional void* and an int. + */ + AnrTimerService(char const* label, notifier_t notifier, void* cookie, jweak jtimer, Ticker*); + + // Delete the service and clean up memory. + ~AnrTimerService(); + + // Start a timer and return the associated timer ID. It does not matter if the same pid/uid + // are already in the running list. Once start() is called, one of cancel(), accept(), or + // discard() must be called to clean up the internal data structures. + timer_id_t start(int pid, int uid, nsecs_t timeout, bool extend); + + // Cancel a timer and remove it from all lists. This is called when the event being timed + // has occurred. If the timer was Running, the function returns true. The other + // possibilities are that the timer was Expired or non-existent; in both cases, the function + // returns false. + bool cancel(timer_id_t timerId); + + // Accept a timer and remove it from all lists. This is called when the upper layers accept + // that a timer has expired. If the timer was Expired, the function returns true. The + // other possibilities are tha the timer was Running or non-existing; in both cases, the + // function returns false. + bool accept(timer_id_t timerId); + + // Discard a timer without collecting any statistics. This is called when the upper layers + // recognize that a timer expired but decide the expiration is not significant. If the + // timer was Expired, the function returns true. The other possibilities are tha the timer + // was Running or non-existing; in both cases, the function returns false. + bool discard(timer_id_t timerId); + + // A timer has expired. + void expire(timer_id_t); + + // Dump a small amount of state to the log file. + void dump(bool verbose) const; + + // Return the Java object associated with this instance. + jweak jtimer() const { + return notifierObject_; + } + + private: + // The service cannot be copied. + AnrTimerService(AnrTimerService const &) = delete; + + // Insert a timer into the running list. The lock must be held by the caller. + void insert(const Timer&); + + // Remove a timer from the lists and return it. The lock must be held by the caller. + Timer remove(timer_id_t timerId); + + // Return a string representation of a status value. + static char const *statusString(Status); + + // The name of this service, for logging. + std::string const label_; + + // The callback that is invoked when a timer expires. + notifier_t const notifier_; + + // The two cookies passed to the notifier. + void* notifierCookie_; + jweak notifierObject_; + + // The global lock + mutable Mutex lock_; + + // The list of all timers that are still running. This is sorted by ID for fast lookup. + std::set<Timer> running_; + + // The maximum number of active timers. + size_t maxActive_; + + // Simple counters + struct Counters { + // The number of timers started, canceled, accepted, discarded, and expired. + size_t started; + size_t canceled; + size_t accepted; + size_t discarded; + size_t expired; + + // The number of times there were zero active timers. + size_t drained; + + // The number of times a protocol error was seen. + size_t error; + }; + + Counters counters_; + + // The clock used by this AnrTimerService. + Ticker *ticker_; +}; + +class AnrTimerService::ProcessStats { + public: + nsecs_t cpu_time; + nsecs_t cpu_delay; + + ProcessStats() : + cpu_time(0), + cpu_delay(0) { + } + + // Collect all statistics for a process. Return true if the fill succeeded and false if it + // did not. If there is any problem, the statistics are zeroed. + bool fill(int pid) { + cpu_time = 0; + cpu_delay = 0; + + char path[PATH_MAX]; + snprintf(path, sizeof(path), "/proc/%u/schedstat", pid); + ::android::base::unique_fd fd(open(path, O_RDONLY | O_CLOEXEC)); + if (!fd.ok()) { + return false; + } + char buffer[128]; + ssize_t len = read(fd, buffer, sizeof(buffer)); + if (len <= 0) { + return false; + } + if (len >= sizeof(buffer)) { + ALOGE("proc file too big: %s", path); + return false; + } + buffer[len] = 0; + unsigned long t1; + unsigned long t2; + if (sscanf(buffer, "%lu %lu", &t1, &t2) != 2) { + return false; + } + cpu_time = t1; + cpu_delay = t2; + return true; + } +}; + +class AnrTimerService::Timer { + public: + // A unique ID assigned when the Timer is created. + timer_id_t const id; + + // The creation parameters. The timeout is the original, relative timeout. + int const pid; + int const uid; + nsecs_t const timeout; + bool const extend; + + // The state of this timer. + Status status; + + // The scheduled timeout. This is an absolute time. It may be extended. + nsecs_t scheduled; + + // True if this timer has been extended. + bool extended; + + // Bookkeeping for extensions. The initial state of the process. This is collected only if + // the timer is extensible. + ProcessStats initial; + + // The default constructor is used to create timers that are Invalid, representing the "not + // found" condition when a collection is searched. + Timer() : + id(NOTIMER), + pid(0), + uid(0), + timeout(0), + extend(false), + status(Invalid), + scheduled(0), + extended(false) { + } + + // This constructor creates a timer with the specified id. This can be used as the argument + // to find(). + Timer(timer_id_t id) : + id(id), + pid(0), + uid(0), + timeout(0), + extend(false), + status(Invalid), + scheduled(0), + extended(false) { + } + + // Create a new timer. This starts the timer. + Timer(int pid, int uid, nsecs_t timeout, bool extend) : + id(nextId()), + pid(pid), + uid(uid), + timeout(timeout), + extend(extend), + status(Running), + scheduled(now() + timeout), + extended(false) { + if (extend && pid != 0) { + initial.fill(pid); + } + } + + // Cancel a timer. Return the headroom (which may be negative). This does not, as yet, + // account for extensions. + void cancel() { + ALOGW_IF(DEBUG && status != Running, "cancel %s", toString().c_str()); + status = Canceled; + } + + // Expire a timer. Return true if the timer is expired and false otherwise. The function + // returns false if the timer is eligible for extension. If the function returns false, the + // scheduled time is updated. + bool expire() { + ALOGI_IF(DEBUG, "expire %s", toString().c_str()); + nsecs_t extension = 0; + if (extend && !extended) { + // Only one extension is permitted. + extended = true; + ProcessStats current; + current.fill(pid); + extension = current.cpu_delay - initial.cpu_delay; + if (extension < 0) extension = 0; + if (extension > timeout) extension = timeout; + } + if (extension == 0) { + status = Expired; + } else { + scheduled += extension; + } + return status == Expired; + } + + // Accept a timeout. + void accept() { + } + + // Discard a timeout. + void discard() { + } + + // Timers are sorted by id, which is unique. This provides fast lookups. + bool operator<(Timer const &r) const { + return id < r.id; + } + + bool operator==(timer_id_t r) const { + return id == r; + } + + std::string toString() const { + return StringPrintf("timer id=%d pid=%d status=%s", id, pid, statusString(status)); + } + + std::string toString(nsecs_t now) const { + uint32_t ms = nanoseconds_to_milliseconds(now - scheduled); + return StringPrintf("timer id=%d pid=%d status=%s scheduled=%ums", + id, pid, statusString(status), -ms); + } + + static int maxId() { + return idGen; + } + + private: + // Get the next free ID. NOTIMER is never returned. + static timer_id_t nextId() { + timer_id_t id = idGen.fetch_add(1); + while (id == NOTIMER) { + id = idGen.fetch_add(1); + } + return id; + } + + // IDs start at 1. A zero ID is invalid. + static std::atomic<timer_id_t> idGen; +}; + +// IDs start at 1. +std::atomic<AnrTimerService::timer_id_t> AnrTimerService::Timer::idGen(1); + +/** + * Manage a set of timers and notify clients when there is a timeout. + */ +class AnrTimerService::Ticker { + private: + struct Entry { + const nsecs_t scheduled; + const timer_id_t id; + AnrTimerService* const service; + + Entry(nsecs_t scheduled, timer_id_t id, AnrTimerService* service) : + scheduled(scheduled), id(id), service(service) {}; + + bool operator<(const Entry &r) const { + return scheduled == r.scheduled ? id < r.id : scheduled < r.scheduled; + } + }; + + public: + + // Construct the ticker. This creates the timerfd file descriptor and starts the monitor + // thread. The monitor thread is given a unique name. + Ticker() { + timerFd_ = timer_create(); + if (timerFd_ < 0) { + ALOGE("failed to create timerFd: %s", strerror(errno)); + return; + } + + if (pthread_create(&watcher_, 0, run, this) != 0) { + ALOGE("failed to start thread: %s", strerror(errno)); + watcher_ = 0; + ::close(timerFd_); + return; + } + + // 16 is a magic number from the kernel. Thread names may not be longer than this many + // bytes, including the terminating null. The snprintf() method will truncate properly. + char name[16]; + snprintf(name, sizeof(name), "AnrTimerService"); + pthread_setname_np(watcher_, name); + + ready_ = true; + } + + ~Ticker() { + // Closing the file descriptor will close the monitor process, if any. + if (timerFd_ >= 0) ::close(timerFd_); + timerFd_ = -1; + watcher_ = 0; + } + + // Insert a timer. Unless canceled, the timer will expire at the scheduled time. If it + // expires, the service will be notified with the id. + void insert(nsecs_t scheduled, timer_id_t id, AnrTimerService *service) { + Entry e(scheduled, id, service); + AutoMutex _l(lock_); + timer_id_t front = headTimerId(); + running_.insert(e); + if (front != headTimerId()) restartLocked(); + maxRunning_ = std::max(maxRunning_, running_.size()); + } + + // Remove a timer. The timer is identified by its scheduled timeout and id. Technically, + // the id is sufficient (because timer IDs are unique) but using the timeout is more + // efficient. + void remove(nsecs_t scheduled, timer_id_t id) { + Entry key(scheduled, id, 0); + AutoMutex _l(lock_); + timer_id_t front = headTimerId(); + auto found = running_.find(key); + if (found != running_.end()) running_.erase(found); + if (front != headTimerId()) restartLocked(); + } + + // Remove every timer associated with the service. + void remove(AnrTimerService const* service) { + AutoMutex _l(lock_); + timer_id_t front = headTimerId(); + for (auto i = running_.begin(); i != running_.end(); i++) { + if (i->service == service) { + running_.erase(i); + } + } + if (front != headTimerId()) restartLocked(); + } + + // Return the number of timers still running. + size_t running() const { + AutoMutex _l(lock_); + return running_.size(); + } + + // Return the high-water mark of timers running. + size_t maxRunning() const { + AutoMutex _l(lock_); + return maxRunning_; + } + + private: + + // Return the head of the running list. The lock must be held by the caller. + timer_id_t headTimerId() { + return running_.empty() ? NOTIMER : running_.cbegin()->id; + } + + // A simple wrapper that meets the requirements of pthread_create. + static void* run(void* arg) { + reinterpret_cast<Ticker*>(arg)->monitor(); + ALOGI("monitor exited"); + return 0; + } + + // Loop (almost) forever. Whenever the timerfd expires, expire as many entries as + // possible. The loop terminates when the read fails; this generally indicates that the + // file descriptor has been closed and the thread can exit. + void monitor() { + uint64_t token = 0; + while (read(timerFd_, &token, sizeof(token)) == sizeof(token)) { + // Move expired timers into the local ready list. This is done inside + // the lock. Then, outside the lock, expire them. + nsecs_t current = now(); + std::vector<Entry> ready; + { + AutoMutex _l(lock_); + while (!running_.empty()) { + Entry timer = *(running_.begin()); + if (timer.scheduled <= current) { + ready.push_back(timer); + running_.erase(running_.cbegin()); + } else { + break; + } + } + restartLocked(); + } + // Call the notifiers outside the lock. Calling the notifiers with the lock held + // can lead to deadlock, if the Java-side handler also takes a lock. Note that the + // timerfd is already running. + for (auto i = ready.begin(); i != ready.end(); i++) { + Entry e = *i; + e.service->expire(e.id); + } + } + } + + // Restart the ticker. The caller must be holding the lock. This method updates the + // timerFd_ to expire at the time of the first Entry in the running list. This method does + // not check to see if the currently programmed expiration time is different from the + // scheduled expiration time of the first entry. + void restartLocked() { + if (!running_.empty()) { + Entry const x = *(running_.cbegin()); + nsecs_t delay = x.scheduled - now(); + // Force a minimum timeout of 10ns. + if (delay < 10) delay = 10; + time_t sec = nanoseconds_to_seconds(delay); + time_t ns = delay - seconds_to_nanoseconds(sec); + struct itimerspec setting = { + .it_interval = { 0, 0 }, + .it_value = { sec, ns }, + }; + timer_settime(timerFd_, 0, &setting, nullptr); + restarted_++; + ALOGI_IF(DEBUG, "restarted timerfd for %ld.%09ld", sec, ns); + } else { + const struct itimerspec setting = { + .it_interval = { 0, 0 }, + .it_value = { 0, 0 }, + }; + timer_settime(timerFd_, 0, &setting, nullptr); + drained_++; + ALOGI_IF(DEBUG, "drained timer list"); + } + } + + // The usual lock. + mutable Mutex lock_; + + // True if the object was initialized properly. Android does not support throwing C++ + // exceptions, so clients should check this flag after constructing the object. This is + // effectively const after the instance has been created. + bool ready_ = false; + + // The file descriptor of the timer. + int timerFd_ = -1; + + // The thread that monitors the timer. + pthread_t watcher_ = 0; + + // The number of times the timer was restarted. + size_t restarted_ = 0; + + // The number of times the timer list was exhausted. + size_t drained_ = 0; + + // The highwater mark of timers that are running. + size_t maxRunning_ = 0; + + // The list of timers that are scheduled. This set is sorted by timeout and then by timer + // ID. A set is sufficient (as opposed to a multiset) because timer IDs are unique. + std::set<Entry> running_; +}; + + +AnrTimerService::AnrTimerService(char const* label, + notifier_t notifier, void* cookie, jweak jtimer, Ticker* ticker) : + label_(label), + notifier_(notifier), + notifierCookie_(cookie), + notifierObject_(jtimer), + ticker_(ticker) { + + // Zero the statistics + maxActive_ = 0; + memset(&counters_, 0, sizeof(counters_)); + + ALOGI_IF(DEBUG, "initialized %s", label); +} + +AnrTimerService::~AnrTimerService() { + AutoMutex _l(lock_); + ticker_->remove(this); +} + +char const *AnrTimerService::statusString(Status s) { + switch (s) { + case Invalid: return "invalid"; + case Running: return "running"; + case Expired: return "expired"; + case Canceled: return "canceled"; + } + return "unknown"; +} + +AnrTimerService::timer_id_t AnrTimerService::start(int pid, int uid, + nsecs_t timeout, bool extend) { + ALOGI_IF(DEBUG, "starting"); + AutoMutex _l(lock_); + Timer t(pid, uid, timeout, extend); + insert(t); + counters_.started++; + + ALOGI_IF(DEBUG, "started timer %u timeout=%zu", t.id, static_cast<size_t>(timeout)); + return t.id; +} + +bool AnrTimerService::cancel(timer_id_t timerId) { + ALOGI_IF(DEBUG, "canceling %u", timerId); + if (timerId == NOTIMER) return false; + AutoMutex _l(lock_); + Timer timer = remove(timerId); + + bool result = timer.status == Running; + if (timer.status != Invalid) { + timer.cancel(); + } else { + counters_.error++; + } + counters_.canceled++; + ALOGI_IF(DEBUG, "canceled timer %u", timerId); + return result; +} + +bool AnrTimerService::accept(timer_id_t timerId) { + ALOGI_IF(DEBUG, "accepting %u", timerId); + if (timerId == NOTIMER) return false; + AutoMutex _l(lock_); + Timer timer = remove(timerId); + + bool result = timer.status == Expired; + if (timer.status == Expired) { + timer.accept(); + } else { + counters_.error++; + } + counters_.accepted++; + ALOGI_IF(DEBUG, "accepted timer %u", timerId); + return result; +} + +bool AnrTimerService::discard(timer_id_t timerId) { + ALOGI_IF(DEBUG, "discarding %u", timerId); + if (timerId == NOTIMER) return false; + AutoMutex _l(lock_); + Timer timer = remove(timerId); + + bool result = timer.status == Expired; + if (timer.status == Expired) { + timer.discard(); + } else { + counters_.error++; + } + counters_.discarded++; + ALOGI_IF(DEBUG, "discarded timer %u", timerId); + return result; +} + +// Hold the lock in order to manage the running list. +// the listener. +void AnrTimerService::expire(timer_id_t timerId) { + ALOGI_IF(DEBUG, "expiring %u", timerId); + // Save the timer attributes for the notification + int pid = 0; + int uid = 0; + bool expired = false; + { + AutoMutex _l(lock_); + Timer t = remove(timerId); + expired = t.expire(); + if (t.status == Invalid) { + ALOGW_IF(DEBUG, "error: expired invalid timer %u", timerId); + return; + } else { + // The timer is either Running (because it was extended) or expired (and is awaiting an + // accept or discard). + insert(t); + } + } + + // Deliver the notification outside of the lock. + if (expired) { + if (!notifier_(timerId, pid, uid, notifierCookie_, notifierObject_)) { + AutoMutex _l(lock_); + // Notification failed, which means the listener will never call accept() or + // discard(). Do not reinsert the timer. + remove(timerId); + } + } + ALOGI_IF(DEBUG, "expired timer %u", timerId); +} + +void AnrTimerService::insert(const Timer& t) { + running_.insert(t); + if (t.status == Running) { + // Only forward running timers to the ticker. Expired timers are handled separately. + ticker_->insert(t.scheduled, t.id, this); + maxActive_ = std::max(maxActive_, running_.size()); + } +} + +AnrTimerService::Timer AnrTimerService::remove(timer_id_t timerId) { + Timer key(timerId); + auto found = running_.find(key); + if (found != running_.end()) { + Timer result = *found; + running_.erase(found); + ticker_->remove(result.scheduled, result.id); + return result; + } + return Timer(); +} + +void AnrTimerService::dump(bool verbose) const { + AutoMutex _l(lock_); + ALOGI("timer %s ops started=%zu canceled=%zu accepted=%zu discarded=%zu expired=%zu", + label_.c_str(), + counters_.started, counters_.canceled, counters_.accepted, + counters_.discarded, counters_.expired); + ALOGI("timer %s stats max-active=%zu/%zu running=%zu/%zu errors=%zu", + label_.c_str(), + maxActive_, ticker_->maxRunning(), running_.size(), ticker_->running(), + counters_.error); + + if (verbose) { + nsecs_t time = now(); + for (auto i = running_.begin(); i != running_.end(); i++) { + Timer t = *i; + ALOGI(" running %s", t.toString(time).c_str()); + } + } +} + +/** + * True if the native methods are supported in this process. Native methods are supported only + * if the initialization succeeds. + */ +bool nativeSupportEnabled = false; + +/** + * Singleton/globals for the anr timer. Among other things, this includes a Ticker* and a use + * count. The JNI layer creates a single Ticker for all operational AnrTimers. The Ticker is + * created when the first AnrTimer is created, and is deleted when the last AnrTimer is closed. + */ +static Mutex gAnrLock; +struct AnrArgs { + jclass clazz = NULL; + jmethodID func = NULL; + JavaVM* vm = NULL; + AnrTimerService::Ticker* ticker = nullptr; + int tickerUseCount = 0;; +}; +static AnrArgs gAnrArgs; + +// The cookie is the address of the AnrArgs object to which the notification should be sent. +static bool anrNotify(AnrTimerService::timer_id_t timerId, int pid, int uid, + void* cookie, jweak jtimer) { + AutoMutex _l(gAnrLock); + AnrArgs* target = reinterpret_cast<AnrArgs* >(cookie); + JNIEnv *env; + if (target->vm->AttachCurrentThread(&env, 0) != JNI_OK) { + ALOGE("failed to attach thread to JavaVM"); + return false; + } + jboolean r = false; + jobject timer = env->NewGlobalRef(jtimer); + if (timer != nullptr) { + r = env->CallBooleanMethod(timer, target->func, timerId, pid, uid); + env->DeleteGlobalRef(timer); + } + target->vm->DetachCurrentThread(); + return r; +} + +jboolean anrTimerSupported(JNIEnv* env, jclass) { + return nativeSupportEnabled; +} + +jlong anrTimerCreate(JNIEnv* env, jobject jtimer, jstring jname) { + if (!nativeSupportEnabled) return 0; + AutoMutex _l(gAnrLock); + if (!gAnrArgs.ticker) { + gAnrArgs.ticker = new AnrTimerService::Ticker(); + } + gAnrArgs.tickerUseCount++; + + ScopedUtfChars name(env, jname); + jobject timer = env->NewWeakGlobalRef(jtimer); + AnrTimerService* service = + new AnrTimerService(name.c_str(), anrNotify, &gAnrArgs, timer, gAnrArgs.ticker); + return reinterpret_cast<jlong>(service); +} + +AnrTimerService *toService(jlong pointer) { + return reinterpret_cast<AnrTimerService*>(pointer); +} + +jint anrTimerClose(JNIEnv* env, jclass, jlong ptr) { + if (!nativeSupportEnabled) return -1; + if (ptr == 0) return -1; + AutoMutex _l(gAnrLock); + AnrTimerService *s = toService(ptr); + env->DeleteWeakGlobalRef(s->jtimer()); + delete s; + if (--gAnrArgs.tickerUseCount <= 0) { + delete gAnrArgs.ticker; + gAnrArgs.ticker = nullptr; + } + return 0; +} + +jint anrTimerStart(JNIEnv* env, jclass, jlong ptr, + jint pid, jint uid, jlong timeout, jboolean extend) { + if (!nativeSupportEnabled) return 0; + // On the Java side, timeouts are expressed in milliseconds and must be converted to + // nanoseconds before being passed to the library code. + return toService(ptr)->start(pid, uid, milliseconds_to_nanoseconds(timeout), extend); +} + +jboolean anrTimerCancel(JNIEnv* env, jclass, jlong ptr, jint timerId) { + if (!nativeSupportEnabled) return false; + return toService(ptr)->cancel(timerId); +} + +jboolean anrTimerAccept(JNIEnv* env, jclass, jlong ptr, jint timerId) { + if (!nativeSupportEnabled) return false; + return toService(ptr)->accept(timerId); +} + +jboolean anrTimerDiscard(JNIEnv* env, jclass, jlong ptr, jint timerId) { + if (!nativeSupportEnabled) return false; + return toService(ptr)->discard(timerId); +} + +jint anrTimerDump(JNIEnv *env, jclass, jlong ptr, jboolean verbose) { + if (!nativeSupportEnabled) return -1; + toService(ptr)->dump(verbose); + return 0; +} + +static const JNINativeMethod methods[] = { + {"nativeAnrTimerSupported", "()Z", (void*) anrTimerSupported}, + {"nativeAnrTimerCreate", "(Ljava/lang/String;)J", (void*) anrTimerCreate}, + {"nativeAnrTimerClose", "(J)I", (void*) anrTimerClose}, + {"nativeAnrTimerStart", "(JIIJZ)I", (void*) anrTimerStart}, + {"nativeAnrTimerCancel", "(JI)Z", (void*) anrTimerCancel}, + {"nativeAnrTimerAccept", "(JI)Z", (void*) anrTimerAccept}, + {"nativeAnrTimerDiscard", "(JI)Z", (void*) anrTimerDiscard}, + {"nativeAnrTimerDump", "(JZ)V", (void*) anrTimerDump}, +}; + +} // anonymous namespace + +int register_android_server_utils_AnrTimer(JNIEnv* env) +{ + static const char *className = "com/android/server/utils/AnrTimer"; + jniRegisterNativeMethods(env, className, methods, NELEM(methods)); + + jclass service = FindClassOrDie(env, className); + gAnrArgs.clazz = MakeGlobalRefOrDie(env, service); + gAnrArgs.func = env->GetMethodID(gAnrArgs.clazz, "expire", "(III)Z"); + env->GetJavaVM(&gAnrArgs.vm); + + nativeSupportEnabled = NATIVE_SUPPORT; + + return 0; +} + +} // namespace android diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 11734da5b1ac..f3158d11b9a4 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -52,6 +52,7 @@ int register_android_server_Watchdog(JNIEnv* env); int register_android_server_HardwarePropertiesManagerService(JNIEnv* env); int register_android_server_SyntheticPasswordManager(JNIEnv* env); int register_android_hardware_display_DisplayViewport(JNIEnv* env); +int register_android_server_utils_AnrTimer(JNIEnv *env); int register_android_server_am_OomConnection(JNIEnv* env); int register_android_server_am_CachedAppOptimizer(JNIEnv* env); int register_android_server_am_LowMemDetector(JNIEnv* env); @@ -113,6 +114,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_storage_AppFuse(env); register_android_server_SyntheticPasswordManager(env); register_android_hardware_display_DisplayViewport(env); + register_android_server_utils_AnrTimer(env); register_android_server_am_OomConnection(env); register_android_server_am_CachedAppOptimizer(env); register_android_server_am_LowMemDetector(env); diff --git a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java index 6899ad48b813..31409ab1de4b 100644 --- a/services/credentials/java/com/android/server/credentials/CreateRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/CreateRequestSession.java @@ -109,7 +109,7 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(), Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS), /*defaultProviderId=*/flattenedPrimaryProviders), - providerDataList); + providerDataList, /*isRequestForAllOptions=*/ false); mClientCallback.onPendingIntent(mPendingIntent); } catch (RemoteException e) { mRequestSessionMetric.collectUiReturnedFinalPhase(/*uiReturned=*/ false); diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java index 3c190bf7ad11..f092dccbcfd1 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java @@ -150,9 +150,12 @@ public class CredentialManagerUi { * * @param requestInfo the information about the request * @param providerDataList the list of provider data from remote providers + * @param isRequestForAllOptions whether the bottom sheet should directly navigate to the + * all options page */ public PendingIntent createPendingIntent( - RequestInfo requestInfo, ArrayList<ProviderData> providerDataList) { + RequestInfo requestInfo, ArrayList<ProviderData> providerDataList, + boolean isRequestForAllOptions) { List<CredentialProviderInfo> allProviders = CredentialProviderInfoFactory.getCredentialProviderServices( mContext, @@ -168,7 +171,8 @@ public class CredentialManagerUi { disabledProvider.getComponentName().flattenToString())).toList(); Intent intent = IntentFactory.createCredentialSelectorIntent(requestInfo, providerDataList, - new ArrayList<>(disabledProviderDataList), mResultReceiver) + new ArrayList<>(disabledProviderDataList), mResultReceiver, + isRequestForAllOptions) .setAction(UUID.randomUUID().toString()); //TODO: Create unique pending intent using request code and cancel any pre-existing pending // intents diff --git a/services/credentials/java/com/android/server/credentials/GetCandidateRequestSession.java b/services/credentials/java/com/android/server/credentials/GetCandidateRequestSession.java index ca5600e2049a..d1651713fe03 100644 --- a/services/credentials/java/com/android/server/credentials/GetCandidateRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/GetCandidateRequestSession.java @@ -106,7 +106,8 @@ public class GetCandidateRequestSession extends RequestSession<GetCredentialRequ mRequestId, mClientRequest, mClientAppInfo.getPackageName(), PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(), Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)), - providerDataList); + providerDataList, + /*isRequestForAllOptions=*/ true); List<GetCredentialProviderData> candidateProviderDataList = new ArrayList<>(); for (ProviderData providerData : providerDataList) { diff --git a/services/credentials/java/com/android/server/credentials/GetRequestSession.java b/services/credentials/java/com/android/server/credentials/GetRequestSession.java index c9e691e199c7..3f57c804cba0 100644 --- a/services/credentials/java/com/android/server/credentials/GetRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/GetRequestSession.java @@ -99,21 +99,24 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, protected void launchUiWithProviderData(ArrayList<ProviderData> providerDataList) { mRequestSessionMetric.collectUiCallStartTime(System.nanoTime()); mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.USER_INTERACTION); - Binder.withCleanCallingIdentity(()-> { - try { + Binder.withCleanCallingIdentity(() -> { + try { cancelExistingPendingIntent(); - mPendingIntent = mCredentialManagerUi.createPendingIntent( - RequestInfo.newGetRequestInfo( - mRequestId, mClientRequest, mClientAppInfo.getPackageName(), - PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(), - Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)), - providerDataList); - mClientCallback.onPendingIntent(mPendingIntent); - } catch (RemoteException e) { - mRequestSessionMetric.collectUiReturnedFinalPhase(/*uiReturned=*/ false); - mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.TERMINATED); - String exception = GetCredentialException.TYPE_UNKNOWN; - mRequestSessionMetric.collectFrameworkException(exception); + mPendingIntent = mCredentialManagerUi.createPendingIntent( + RequestInfo.newGetRequestInfo( + mRequestId, mClientRequest, mClientAppInfo.getPackageName(), + PermissionUtils.hasPermission(mContext, + mClientAppInfo.getPackageName(), + Manifest.permission + .CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)), + providerDataList, + /*isRequestForAllOptions=*/ false); + mClientCallback.onPendingIntent(mPendingIntent); + } catch (RemoteException e) { + mRequestSessionMetric.collectUiReturnedFinalPhase(/*uiReturned=*/ false); + mCredentialManagerUi.setStatus(CredentialManagerUi.UiStatus.TERMINATED); + String exception = GetCredentialException.TYPE_UNKNOWN; + mRequestSessionMetric.collectFrameworkException(exception); respondToClientWithErrorAndFinish(exception, "Unable to instantiate selector"); } }); diff --git a/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java b/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java index f447c1fd277e..fbfc9caf0205 100644 --- a/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java +++ b/services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java @@ -192,7 +192,7 @@ public class PrepareGetRequestSession extends GetRequestSession { mRequestId, mClientRequest, mClientAppInfo.getPackageName(), PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(), Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)), - providerDataList); + providerDataList, /*isRequestForAllOptions=*/ false); } else { return null; } diff --git a/services/print/Android.bp b/services/print/Android.bp index 5b4349a92692..0dfceaa3a9d9 100644 --- a/services/print/Android.bp +++ b/services/print/Android.bp @@ -19,4 +19,7 @@ java_library_static { defaults: ["platform_service_defaults"], srcs: [":services.print-sources"], libs: ["services.core"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java index 7a84406f1b08..e370f5501865 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -759,6 +759,15 @@ public final class DisplayDeviceConfigTest { AUTO_BRIGHTNESS_MODE_DEFAULT, Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_DIM), SMALL_DELTA); + assertArrayEquals(new float[]{0.0f, 80}, + mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux( + AUTO_BRIGHTNESS_MODE_DEFAULT, + Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_BRIGHT), ZERO_DELTA); + assertArrayEquals(new float[]{0.6f, 0.7f}, + mDisplayDeviceConfig.getAutoBrightnessBrighteningLevels( + AUTO_BRIGHTNESS_MODE_DEFAULT, + Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_BRIGHT), SMALL_DELTA); + assertArrayEquals(new float[]{0.0f, 95}, mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux( AUTO_BRIGHTNESS_MODE_DOZE, @@ -1197,6 +1206,20 @@ public final class DisplayDeviceConfigTest { + "</map>\n" + "</luxToBrightnessMapping>\n" + "<luxToBrightnessMapping>\n" + + "<mode>default</mode>\n" + + "<setting>bright</setting>\n" + + "<map>\n" + + "<point>\n" + + "<first>0</first>\n" + + "<second>0.6</second>\n" + + "</point>\n" + + "<point>\n" + + "<first>80</first>\n" + + "<second>0.7</second>\n" + + "</point>\n" + + "</map>\n" + + "</luxToBrightnessMapping>\n" + + "<luxToBrightnessMapping>\n" + "<mode>doze</mode>\n" + "<map>\n" + "<point>\n" diff --git a/services/tests/servicestests/jni/Android.bp b/services/tests/servicestests/jni/Android.bp index 174beb81d3eb..c30e4eb666b4 100644 --- a/services/tests/servicestests/jni/Android.bp +++ b/services/tests/servicestests/jni/Android.bp @@ -23,6 +23,7 @@ cc_library_shared { ":lib_cachedAppOptimizer_native", ":lib_gameManagerService_native", ":lib_oomConnection_native", + ":lib_anrTimer_native", "onload.cpp", ], @@ -55,4 +56,4 @@ cc_library_shared { "android.hardware.graphics.mapper@4.0", "android.hidl.token@1.0-utils", ], -}
\ No newline at end of file +} diff --git a/services/tests/servicestests/jni/onload.cpp b/services/tests/servicestests/jni/onload.cpp index f160b3d97367..25487c5aabbe 100644 --- a/services/tests/servicestests/jni/onload.cpp +++ b/services/tests/servicestests/jni/onload.cpp @@ -27,6 +27,7 @@ namespace android { int register_android_server_am_CachedAppOptimizer(JNIEnv* env); int register_android_server_app_GameManagerService(JNIEnv* env); int register_android_server_am_OomConnection(JNIEnv* env); +int register_android_server_utils_AnrTimer(JNIEnv *env); }; using namespace android; @@ -44,5 +45,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_am_CachedAppOptimizer(env); register_android_server_app_GameManagerService(env); register_android_server_am_OomConnection(env); + register_android_server_utils_AnrTimer(env); return JNI_VERSION_1_4; } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/gestures/TouchExplorerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/gestures/TouchExplorerTest.java index efcdbd488a39..1cd61e90126e 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/gestures/TouchExplorerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/gestures/TouchExplorerTest.java @@ -44,10 +44,6 @@ import android.content.Context; import android.graphics.PointF; import android.os.Looper; import android.os.SystemClock; -import android.platform.test.annotations.RequiresFlagsDisabled; -import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.testing.DexmakerShareClassLoaderRule; import android.view.InputDevice; import android.view.MotionEvent; @@ -60,7 +56,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.accessibility.AccessibilityManagerService; import com.android.server.accessibility.AccessibilityTraceManager; import com.android.server.accessibility.EventStreamTransformation; -import com.android.server.accessibility.Flags; import com.android.server.accessibility.utils.GestureLogParser; import com.android.server.testutils.OffsettableClock; @@ -81,7 +76,6 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; - @RunWith(AndroidJUnit4.class) public class TouchExplorerTest { @@ -125,9 +119,6 @@ public class TouchExplorerTest { public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule = new DexmakerShareClassLoaderRule(); - @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); - /** * {@link TouchExplorer#sendDownForAllNotInjectedPointers} injecting events with the same object * is resulting {@link ArgumentCaptor} to capture events with last state. Before implementation @@ -170,42 +161,11 @@ public class TouchExplorerTest { goFromStateClearTo(STATE_TOUCH_EXPLORING_1FINGER); // Wait for transiting to touch exploring state. mHandler.fastForward(2 * USER_INTENT_TIMEOUT); - assertState(STATE_TOUCH_EXPLORING); - // Manually construct the next move event. Using moveEachPointers() will batch the move - // event which produces zero movement for some reason. - float[] x = new float[1]; - float[] y = new float[1]; - x[0] = mLastEvent.getX(0) + mTouchSlop; - y[0] = mLastEvent.getY(0) + mTouchSlop; - send(manyPointerEvent(ACTION_MOVE, x, y)); - goToStateClearFrom(STATE_TOUCH_EXPLORING_1FINGER); - assertCapturedEvents(ACTION_HOVER_ENTER, ACTION_HOVER_MOVE, ACTION_HOVER_EXIT); - } - - /** - * Test the case where ACTION_DOWN is followed by a number of ACTION_MOVE events that do not - * change the coordinates. - */ - @Test - @RequiresFlagsEnabled(Flags.FLAG_REDUCE_TOUCH_EXPLORATION_SENSITIVITY) - public void testOneFingerMoveWithExtraMoveEvents_generatesOneMoveEvent() { - goFromStateClearTo(STATE_TOUCH_EXPLORING_1FINGER); - // Inject a set of move events that have the same coordinates as the down event. - moveEachPointers(mLastEvent, p(0, 0)); - send(mLastEvent); - // Wait for transition to touch exploring state. - mHandler.fastForward(2 * USER_INTENT_TIMEOUT); - // Now move for real. - moveAtLeastTouchSlop(mLastEvent); - send(mLastEvent); - // One more move event with no change. - moveEachPointers(mLastEvent, p(0, 0)); + moveEachPointers(mLastEvent, p(10, 10)); send(mLastEvent); goToStateClearFrom(STATE_TOUCH_EXPLORING_1FINGER); - assertCapturedEvents( - ACTION_HOVER_ENTER, - ACTION_HOVER_MOVE, - ACTION_HOVER_EXIT); + assertCapturedEvents(ACTION_HOVER_ENTER, ACTION_HOVER_MOVE, ACTION_HOVER_EXIT); + assertState(STATE_TOUCH_EXPLORING); } /** @@ -213,8 +173,7 @@ public class TouchExplorerTest { * change the coordinates. */ @Test - @RequiresFlagsDisabled(Flags.FLAG_REDUCE_TOUCH_EXPLORATION_SENSITIVITY) - public void testOneFingerMoveWithExtraMoveEvents_generatesThreeMoveEvent() { + public void testOneFingerMoveWithExtraMoveEvents() { goFromStateClearTo(STATE_TOUCH_EXPLORING_1FINGER); // Inject a set of move events that have the same coordinates as the down event. moveEachPointers(mLastEvent, p(0, 0)); @@ -222,7 +181,7 @@ public class TouchExplorerTest { // Wait for transition to touch exploring state. mHandler.fastForward(2 * USER_INTENT_TIMEOUT); // Now move for real. - moveAtLeastTouchSlop(mLastEvent); + moveEachPointers(mLastEvent, p(10, 10)); send(mLastEvent); // One more move event with no change. moveEachPointers(mLastEvent, p(0, 0)); @@ -283,7 +242,7 @@ public class TouchExplorerTest { moveEachPointers(mLastEvent, p(0, 0), p(0, 0)); send(mLastEvent); // Now move for real. - moveEachPointers(mLastEvent, p(mTouchSlop, mTouchSlop), p(mTouchSlop, mTouchSlop)); + moveEachPointers(mLastEvent, p(10, 10), p(10, 10)); send(mLastEvent); goToStateClearFrom(STATE_DRAGGING_2FINGERS); assertCapturedEvents(ACTION_DOWN, ACTION_MOVE, ACTION_MOVE, ACTION_MOVE, ACTION_UP); @@ -292,7 +251,7 @@ public class TouchExplorerTest { @Test public void testUpEvent_OneFingerMove_clearStateAndInjectHoverEvents() { goFromStateClearTo(STATE_TOUCH_EXPLORING_1FINGER); - moveAtLeastTouchSlop(mLastEvent); + moveEachPointers(mLastEvent, p(10, 10)); send(mLastEvent); // Wait 10 ms to make sure that hover enter and exit are not scheduled for the same moment. mHandler.fastForward(10); @@ -318,7 +277,7 @@ public class TouchExplorerTest { // Wait for the finger moving to the second view. mHandler.fastForward(oneThirdUserIntentTimeout); - moveAtLeastTouchSlop(mLastEvent); + moveEachPointers(mLastEvent, p(10, 10)); send(mLastEvent); // Wait for the finger lifting from the second view. @@ -443,6 +402,7 @@ public class TouchExplorerTest { // Manually construct the next move event. Using moveEachPointers() will batch the move // event onto the pointer up event which will mean that the move event still has a pointer // count of 3. + // Todo: refactor to avoid using batching as there is no special reason to do it that way. float[] x = new float[2]; float[] y = new float[2]; x[0] = mLastEvent.getX(0) + 100; @@ -774,9 +734,6 @@ public class TouchExplorerTest { } } - private void moveAtLeastTouchSlop(MotionEvent event) { - moveEachPointers(event, p(2 * mTouchSlop, 0)); - } /** * A {@link android.os.Handler} that doesn't process messages until {@link #fastForward(int)} is * invoked. diff --git a/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java b/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java index 861d14a2cf66..6c085e085f4e 100644 --- a/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java +++ b/services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java @@ -23,17 +23,21 @@ import static org.junit.Assert.assertTrue; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.util.Log; import android.platform.test.annotations.Presubmit; import androidx.test.filters.SmallTest; import com.android.internal.annotations.GuardedBy; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -45,6 +49,9 @@ import java.util.concurrent.TimeUnit; @RunWith(Parameterized.class) public class AnrTimerTest { + // A log tag. + private static final String TAG = "AnrTimerTest"; + // The commonly used message timeout key. private static final int MSG_TIMEOUT = 1; @@ -63,9 +70,7 @@ public class AnrTimerTest { } } - /** - * The test handler is a self-contained object for a single test. - */ + /** The test helper is a self-contained object for a single test. */ private static class Helper { final Object mLock = new Object(); @@ -114,7 +119,7 @@ public class AnrTimerTest { /** * Force AnrTimer to use the test parameter for the feature flag. */ - class TestInjector extends AnrTimer.Injector { + private class TestInjector extends AnrTimer.Injector { @Override boolean anrTimerServiceEnabled() { return mEnabled; @@ -124,9 +129,9 @@ public class AnrTimerTest { /** * An instrumented AnrTimer. */ - private static class TestAnrTimer extends AnrTimer<TestArg> { + private class TestAnrTimer extends AnrTimer<TestArg> { private TestAnrTimer(Handler h, int key, String tag) { - super(h, key, tag); + super(h, key, tag, false, new TestInjector()); } TestAnrTimer(Helper helper) { @@ -173,35 +178,103 @@ public class AnrTimerTest { @Test public void testSimpleTimeout() throws Exception { Helper helper = new Helper(1); - TestAnrTimer timer = new TestAnrTimer(helper); - TestArg t = new TestArg(1, 1); - timer.start(t, 10); - // Delivery is immediate but occurs on a different thread. - assertTrue(helper.await(5000)); - TestArg[] result = helper.messages(1); - validate(t, result[0]); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + // One-time check that the injector is working as expected. + assertEquals(mEnabled, timer.serviceEnabled()); + TestArg t = new TestArg(1, 1); + timer.start(t, 10); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(1); + validate(t, result[0]); + } } /** - * Verify that if three timers are scheduled, they are delivered in time order. + * Verify that a restarted timer is delivered exactly once. The initial timer value is very + * large, to ensure it does not expire before the timer can be restarted. + */ + @Test + public void testTimerRestart() throws Exception { + Helper helper = new Helper(1); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + TestArg t = new TestArg(1, 1); + timer.start(t, 10000); + // Briefly pause. + assertFalse(helper.await(10)); + timer.start(t, 10); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(1); + validate(t, result[0]); + } + } + + /** + * Verify that a restarted timer is delivered exactly once. The initial timer value is very + * large, to ensure it does not expire before the timer can be restarted. + */ + @Test + public void testTimerZero() throws Exception { + Helper helper = new Helper(1); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + TestArg t = new TestArg(1, 1); + timer.start(t, 0); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(1); + validate(t, result[0]); + } + } + + /** + * Verify that if three timers are scheduled on a single AnrTimer, they are delivered in time + * order. */ @Test public void testMultipleTimers() throws Exception { // Expect three messages. Helper helper = new Helper(3); - TestAnrTimer timer = new TestAnrTimer(helper); TestArg t1 = new TestArg(1, 1); TestArg t2 = new TestArg(1, 2); TestArg t3 = new TestArg(1, 3); - timer.start(t1, 50); - timer.start(t2, 60); - timer.start(t3, 40); - // Delivery is immediate but occurs on a different thread. - assertTrue(helper.await(5000)); - TestArg[] result = helper.messages(3); - validate(t3, result[0]); - validate(t1, result[1]); - validate(t2, result[2]); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + timer.start(t1, 50); + timer.start(t2, 60); + timer.start(t3, 40); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(3); + validate(t3, result[0]); + validate(t1, result[1]); + validate(t2, result[2]); + } + } + + /** + * Verify that if three timers are scheduled on three separate AnrTimers, they are delivered + * in time order. + */ + @Test + public void testMultipleServices() throws Exception { + // Expect three messages. + Helper helper = new Helper(3); + TestArg t1 = new TestArg(1, 1); + TestArg t2 = new TestArg(1, 2); + TestArg t3 = new TestArg(1, 3); + try (TestAnrTimer x1 = new TestAnrTimer(helper); + TestAnrTimer x2 = new TestAnrTimer(helper); + TestAnrTimer x3 = new TestAnrTimer(helper)) { + x1.start(t1, 50); + x2.start(t2, 60); + x3.start(t3, 40); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(3); + validate(t3, result[0]); + validate(t1, result[1]); + validate(t2, result[2]); + } } /** @@ -211,20 +284,109 @@ public class AnrTimerTest { public void testCancelTimer() throws Exception { // Expect two messages. Helper helper = new Helper(2); - TestAnrTimer timer = new TestAnrTimer(helper); TestArg t1 = new TestArg(1, 1); TestArg t2 = new TestArg(1, 2); TestArg t3 = new TestArg(1, 3); - timer.start(t1, 50); - timer.start(t2, 60); - timer.start(t3, 40); - // Briefly pause. - assertFalse(helper.await(10)); - timer.cancel(t1); - // Delivery is immediate but occurs on a different thread. - assertTrue(helper.await(5000)); - TestArg[] result = helper.messages(2); - validate(t3, result[0]); - validate(t2, result[1]); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + timer.start(t1, 50); + timer.start(t2, 60); + timer.start(t3, 40); + // Briefly pause. + assertFalse(helper.await(10)); + timer.cancel(t1); + // Delivery is immediate but occurs on a different thread. + assertTrue(helper.await(5000)); + TestArg[] result = helper.messages(2); + validate(t3, result[0]); + validate(t2, result[1]); + } + } + + /** + * Return the dump string. + */ + private String getDumpOutput() { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + AnrTimer.dump(pw, true, new TestInjector()); + pw.close(); + return sw.getBuffer().toString(); + } + + /** + * Verify the dump output. + */ + @Test + public void testDumpOutput() throws Exception { + String r1 = getDumpOutput(); + assertEquals(false, r1.contains("timer:")); + + Helper helper = new Helper(2); + TestArg t1 = new TestArg(1, 1); + TestArg t2 = new TestArg(1, 2); + TestArg t3 = new TestArg(1, 3); + try (TestAnrTimer timer = new TestAnrTimer(helper)) { + timer.start(t1, 5000); + timer.start(t2, 5000); + timer.start(t3, 5000); + + String r2 = getDumpOutput(); + // There are timers in the list if and only if the feature is enabled. + final boolean expected = mEnabled; + assertEquals(expected, r2.contains("timer:")); + } + + String r3 = getDumpOutput(); + assertEquals(false, r3.contains("timer:")); + } + + /** + * Verify that GC works as expected. This test will almost certainly be flaky, since it + * relies on the finalizers running, which is a best-effort on the part of the JVM. + * Therefore, the test is marked @Ignore. Remove that annotation to run the test locally. + */ + @Ignore + @Test + public void testGarbageCollection() throws Exception { + if (!mEnabled) return; + + String r1 = getDumpOutput(); + assertEquals(false, r1.contains("timer:")); + + Helper helper = new Helper(2); + TestArg t1 = new TestArg(1, 1); + TestArg t2 = new TestArg(1, 2); + TestArg t3 = new TestArg(1, 3); + // The timer is explicitly not closed. It is, however, scoped to the next block. + { + TestAnrTimer timer = new TestAnrTimer(helper); + timer.start(t1, 5000); + timer.start(t2, 5000); + timer.start(t3, 5000); + + String r2 = getDumpOutput(); + // There are timers in the list if and only if the feature is enabled. + final boolean expected = mEnabled; + assertEquals(expected, r2.contains("timer:")); + } + + // Try to make finalizers run. The timer object above should be a candidate. Finalizers + // are run on their own thread, so pause this thread to give that thread some time. + String r3 = getDumpOutput(); + for (int i = 0; i < 10 && r3.contains("timer:"); i++) { + Log.i(TAG, "requesting finalization " + i); + System.gc(); + System.runFinalization(); + Thread.sleep(4 * 1000); + r3 = getDumpOutput(); + } + + // The timer was not explicitly closed but it should have been implicitly closed by GC. + assertEquals(false, r3.contains("timer:")); + } + + // TODO: [b/302724778] Remove manual JNI load + static { + System.loadLibrary("servicestestjni"); } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java index 6cc1c4365fca..08af09c20de5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenAdaptersTest.java @@ -20,7 +20,11 @@ import static com.android.server.notification.ZenAdapters.notificationPolicyToZe import static com.google.common.truth.Truth.assertThat; +import android.app.Flags; import android.app.NotificationManager.Policy; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; import android.service.notification.ZenPolicy; import androidx.test.filters.SmallTest; @@ -28,6 +32,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.UiServiceTestCase; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +40,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class ZenAdaptersTest extends UiServiceTestCase { + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + @Test public void notificationPolicyToZenPolicy_allCallers() { Policy policy = new Policy(Policy.PRIORITY_CATEGORY_CALLS, Policy.PRIORITY_SENDERS_ANY, 0); @@ -127,4 +135,35 @@ public class ZenAdaptersTest extends UiServiceTestCase { assertThat(zenPolicy.getVisualEffectPeek()).isEqualTo(ZenPolicy.STATE_UNSET); assertThat(zenPolicy.getVisualEffectStatusBar()).isEqualTo(ZenPolicy.STATE_UNSET); } + + @Test + @EnableFlags(Flags.FLAG_MODES_API) + public void notificationPolicyToZenPolicy_modesApi_priorityChannels() { + Policy policy = new Policy(0, 0, 0, 0, + Policy.policyState(false, true), 0); + + ZenPolicy zenPolicy = notificationPolicyToZenPolicy(policy); + assertThat(zenPolicy.getAllowedChannels()).isEqualTo(ZenPolicy.CHANNEL_TYPE_PRIORITY); + + Policy notAllowed = new Policy(0, 0, 0, 0, + Policy.policyState(false, false), 0); + ZenPolicy zenPolicyNotAllowed = notificationPolicyToZenPolicy(notAllowed); + assertThat(zenPolicyNotAllowed.getAllowedChannels()).isEqualTo(ZenPolicy.CHANNEL_TYPE_NONE); + } + + @Test + @DisableFlags(Flags.FLAG_MODES_API) + public void notificationPolicyToZenPolicy_noModesApi_priorityChannelsUnset() { + Policy policy = new Policy(0, 0, 0, 0, + Policy.policyState(false, true), 0); + + ZenPolicy zenPolicy = notificationPolicyToZenPolicy(policy); + assertThat(zenPolicy.getAllowedChannels()).isEqualTo(ZenPolicy.CHANNEL_TYPE_UNSET); + + Policy notAllowed = new Policy(0, 0, 0, 0, + Policy.policyState(false, false), 0); + ZenPolicy zenPolicyNotAllowed = notificationPolicyToZenPolicy(notAllowed); + assertThat(zenPolicyNotAllowed.getAllowedChannels()) + .isEqualTo(ZenPolicy.CHANNEL_TYPE_UNSET); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 25c0cd9fae25..f84d8e95e426 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -3876,6 +3876,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { .allowCalls(PEOPLE_TYPE_CONTACTS) .allowConversations(CONVERSATION_SENDERS_IMPORTANT) .hideAllVisualEffects() + .allowChannels(ZenPolicy.CHANNEL_TYPE_PRIORITY) .build(); assertThat(mZenModeHelper.mConfig.automaticRules.values()) .comparingElementsUsing(IGNORE_TIMESTAMPS) @@ -3907,6 +3908,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { .allowCalls(PEOPLE_TYPE_STARRED) .allowConversations(CONVERSATION_SENDERS_IMPORTANT) .hideAllVisualEffects() + .allowChannels(ZenPolicy.CHANNEL_TYPE_PRIORITY) .build(); assertThat(mZenModeHelper.mConfig.automaticRules.values()) .comparingElementsUsing(IGNORE_TIMESTAMPS) diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 8a9c05d07b26..c82f7513e347 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -88,6 +88,7 @@ import static org.mockito.ArgumentMatchers.notNull; import android.app.ActivityOptions; import android.app.AppOpsManager; import android.app.BackgroundStartPrivileges; +import android.app.ComponentOptions.BackgroundActivityStartMode; import android.app.IApplicationThread; import android.app.PictureInPictureParams; import android.content.ComponentName; @@ -914,24 +915,78 @@ public class ActivityStarterTests extends WindowTestsBase { .mockStatic(FrameworkStatsLog.class) .strictness(Strictness.LENIENT) .startMocking(); - doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission( - eq(START_ACTIVITIES_FROM_BACKGROUND), - anyInt(), anyInt())); - runAndVerifyBackgroundActivityStartsSubtest( - "allowed_notAborted", false, - UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP, - UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP, - false, true, false, false, false, false, false, false); - verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, - "", // activity name - BackgroundActivityStartController.BAL_ALLOW_PERMISSION, - UNIMPORTANT_UID, - UNIMPORTANT_UID2)); - mockingSession.finishMocking(); + try { + doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission( + eq(START_ACTIVITIES_FROM_BACKGROUND), + anyInt(), anyInt())); + runAndVerifyBackgroundActivityStartsSubtest( + "allowed_notAborted", false, + UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP, + UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP, + false, true, false, false, false, false, false, false); + verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, + "", // activity name + BackgroundActivityStartController.BAL_ALLOW_PERMISSION, + UNIMPORTANT_UID, + UNIMPORTANT_UID2, + BackgroundActivityStartController.BAL_ALLOW_PERMISSION, + true, // opt in + false, // but no explicit opt in + BackgroundActivityStartController.BAL_BLOCK, + true, // opt in + false // but no explicit opt in + )); + } finally { + mockingSession.finishMocking(); + } + } + + /** + * This test ensures proper logging for BAL_ALLOW_PENDING_INTENT, when the PendingIntent sender + * is the only reason BAL is allowed. + */ + @Test + public void testBackgroundActivityStartsAllowed_loggingOnlyPendingIntentAllowed() { + doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled(); + MockitoSession mockingSession = mockitoSession() + .mockStatic(ActivityTaskManagerService.class) + .mockStatic(FrameworkStatsLog.class) + .mockStatic(PendingIntentRecord.class) + .strictness(Strictness.LENIENT) + .startMocking(); + try { + doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission( + eq(START_ACTIVITIES_FROM_BACKGROUND), + anyInt(), anyInt())); + doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when( + () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller( + anyObject(), anyInt(), anyObject())); + runAndVerifyBackgroundActivityStartsSubtest( + "allowed_notAborted", false, + UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP, + Process.SYSTEM_UID, true, PROCESS_STATE_BOUND_TOP, + false, true, false, false, false, false, false, false, + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED); + verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, + DEFAULT_COMPONENT_PACKAGE_NAME + "/" + DEFAULT_COMPONENT_PACKAGE_NAME, + BackgroundActivityStartController.BAL_ALLOW_PENDING_INTENT, + UNIMPORTANT_UID, + Process.SYSTEM_UID, + BackgroundActivityStartController.BAL_ALLOW_PERMISSION, + false, // opt in + true, // explicit opt out + BackgroundActivityStartController.BAL_ALLOW_VISIBLE_WINDOW, + true, // opt in + false // but no explicit opt in + )); + } finally { + mockingSession.finishMocking(); + } } /** - * This test ensures proper logging for BAL_ALLOW_PENDING_INTENT. + * This test ensures proper logging for BAL_ALLOW_PENDING_INTENT, when the PendingIntent sender + * is not the primary reason to allow BAL (but the creator). */ @Test public void testBackgroundActivityStartsAllowed_loggingPendingIntentAllowed() { @@ -942,23 +997,34 @@ public class ActivityStarterTests extends WindowTestsBase { .mockStatic(PendingIntentRecord.class) .strictness(Strictness.LENIENT) .startMocking(); - doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission( - eq(START_ACTIVITIES_FROM_BACKGROUND), - anyInt(), anyInt())); - doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when( - () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller( - anyObject(), anyInt(), anyObject())); - runAndVerifyBackgroundActivityStartsSubtest( - "allowed_notAborted", false, - UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP, - Process.SYSTEM_UID, true, PROCESS_STATE_BOUND_TOP, - false, true, false, false, false, false, false, false); - verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, - DEFAULT_COMPONENT_PACKAGE_NAME + "/" + DEFAULT_COMPONENT_PACKAGE_NAME, - BackgroundActivityStartController.BAL_ALLOW_PENDING_INTENT, - UNIMPORTANT_UID, - Process.SYSTEM_UID)); - mockingSession.finishMocking(); + try { + doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission( + eq(START_ACTIVITIES_FROM_BACKGROUND), + anyInt(), anyInt())); + doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when( + () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller( + anyObject(), anyInt(), anyObject())); + runAndVerifyBackgroundActivityStartsSubtest( + "allowed_notAborted", false, + UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP, + Process.SYSTEM_UID, true, PROCESS_STATE_BOUND_TOP, + false, true, false, false, false, false, false, false, + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED, + "", + BackgroundActivityStartController.BAL_ALLOW_PERMISSION, + UNIMPORTANT_UID, + Process.SYSTEM_UID, + BackgroundActivityStartController.BAL_ALLOW_PERMISSION, + true, // opt in + true, // explicit opt in + BackgroundActivityStartController.BAL_ALLOW_VISIBLE_WINDOW, + true, // opt in + false // but no explicit opt in + )); + } finally { + mockingSession.finishMocking(); + } } private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted, @@ -971,6 +1037,27 @@ public class ActivityStarterTests extends WindowTestsBase { boolean isCallingUidAffiliatedProfileOwner, boolean isPinnedSingleInstance, boolean hasSystemExemptAppOp) { + runAndVerifyBackgroundActivityStartsSubtest(name, shouldHaveAborted, callingUid, + callingUidHasVisibleWindow, callingUidProcState, realCallingUid, + realCallingUidHasVisibleWindow, realCallingUidProcState, hasForegroundActivities, + callerIsRecents, callerIsTempAllowed, + callerIsInstrumentingWithBackgroundActivityStartPrivileges, + isCallingUidDeviceOwner, isCallingUidAffiliatedProfileOwner, isPinnedSingleInstance, + hasSystemExemptAppOp, + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED); + } + + private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted, + int callingUid, boolean callingUidHasVisibleWindow, int callingUidProcState, + int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState, + boolean hasForegroundActivities, boolean callerIsRecents, + boolean callerIsTempAllowed, + boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges, + boolean isCallingUidDeviceOwner, + boolean isCallingUidAffiliatedProfileOwner, + boolean isPinnedSingleInstance, + boolean hasSystemExemptAppOp, + @BackgroundActivityStartMode int pendingIntentCreatorBackgroundActivityStartMode) { // window visibility doReturn(callingUidHasVisibleWindow).when(mAtm).hasActiveVisibleWindow(callingUid); doReturn(realCallingUidHasVisibleWindow).when(mAtm).hasActiveVisibleWindow(realCallingUid); @@ -1022,7 +1109,10 @@ public class ActivityStarterTests extends WindowTestsBase { launchMode = LAUNCH_SINGLE_INSTANCE; } - final ActivityOptions options = spy(ActivityOptions.makeBasic()); + ActivityOptions rawOptions = ActivityOptions.makeBasic() + .setPendingIntentCreatorBackgroundActivityStartMode( + pendingIntentCreatorBackgroundActivityStartMode); + final ActivityOptions options = spy(rawOptions); ActivityRecord[] outActivity = new ActivityRecord[1]; ActivityStarter starter = prepareStarter( FLAG_ACTIVITY_NEW_TASK, true, launchMode) diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 6497ee9cb1f2..782d89cdcd29 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -115,6 +115,9 @@ import android.os.Binder; import android.os.RemoteException; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; +import android.platform.test.annotations.RequiresFlagsDisabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.util.ArraySet; import android.util.DisplayMetrics; import android.view.Display; @@ -146,6 +149,7 @@ import com.android.server.LocalServices; import com.android.server.policy.WindowManagerPolicy; import com.android.server.wm.utils.WmDisplayCutout; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -172,6 +176,10 @@ import java.util.concurrent.TimeoutException; @RunWith(WindowTestRunner.class) public class DisplayContentTests extends WindowTestsBase { + @Rule + public final CheckFlagsRule mCheckFlagsRule = + DeviceFlagsValueProvider.createCheckFlagsRule(); + @SetupWindows(addAllCommonWindows = true) @Test public void testForAllWindows() { @@ -508,6 +516,7 @@ public class DisplayContentTests extends WindowTestsBase { * Tests tapping on a root task in different display results in window gaining focus. */ @Test + @RequiresFlagsDisabled(com.android.input.flags.Flags.FLAG_REMOVE_POINTER_EVENT_TRACKING_IN_WM) public void testInputEventBringsCorrectDisplayInFocus() { DisplayContent dc0 = mWm.getDefaultDisplayContentLocked(); // Create a second display diff --git a/services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java b/services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java index 0f1e4d1e928f..810cbe8f8080 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java @@ -16,7 +16,6 @@ package com.android.server.wm; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -138,25 +137,6 @@ public class SyncEngineTests extends WindowTestsBase { } @Test - public void testFinishSyncByStartingWindow() { - final ActivityRecord taskRoot = new ActivityBuilder(mAtm).setCreateTask(true).build(); - final Task task = taskRoot.getTask(); - final ActivityRecord translucentTop = new ActivityBuilder(mAtm).setTask(task) - .setActivityTheme(android.R.style.Theme_Translucent).build(); - createWindow(null, TYPE_BASE_APPLICATION, taskRoot, "win"); - final WindowState startingWindow = createWindow(null, TYPE_APPLICATION_STARTING, - translucentTop, "starting"); - startingWindow.mStartingData = new SnapshotStartingData(mWm, null, 0); - task.mSharedStartingData = startingWindow.mStartingData; - task.prepareSync(); - - final BLASTSyncEngine.SyncGroup group = mock(BLASTSyncEngine.SyncGroup.class); - assertFalse(task.isSyncFinished(group)); - startingWindow.onSyncFinishedDrawing(); - assertTrue(task.isSyncFinished(group)); - } - - @Test public void testInvisibleSyncCallback() { TestWindowContainer mockWC = new TestWindowContainer(mWm, true /* waiter */); diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index df349f89fbf8..c958aba1d758 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -563,7 +563,10 @@ public final class SmsManager { * raw pdu of the status report is in the extended data ("pdu"). * * @throws IllegalArgumentException if destinationAddress or text are empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendTextMessage( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent) { @@ -581,8 +584,11 @@ public final class SmsManager { * Used for logging and diagnostics purposes. The id may be 0. * * @throws IllegalArgumentException if destinationAddress or text are empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendTextMessage( @NonNull String destinationAddress, @Nullable String scAddress, @NonNull String text, @Nullable PendingIntent sentIntent, @Nullable PendingIntent deliveryIntent, @@ -788,12 +794,16 @@ public final class SmsManager { * </p> * * @see #sendTextMessage(String, String, String, PendingIntent, PendingIntent) + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(allOf = { android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.SEND_SMS }) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendTextMessageWithoutPersisting( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent) { @@ -908,7 +918,10 @@ public final class SmsManager { * {@link #RESULT_REMOTE_EXCEPTION} for error. * * @throws IllegalArgumentException if the format is invalid. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void injectSmsPdu( byte[] pdu, @SmsMessage.Format String format, PendingIntent receivedIntent) { if (!format.equals(SmsMessage.FORMAT_3GPP) && !format.equals(SmsMessage.FORMAT_3GPP2)) { @@ -940,6 +953,7 @@ public final class SmsManager { * @return an <code>ArrayList</code> of strings that, in order, comprise the original message. * @throws IllegalArgumentException if text is null. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public ArrayList<String> divideMessage(String text) { if (null == text) { throw new IllegalArgumentException("text is null"); @@ -1046,7 +1060,10 @@ public final class SmsManager { * extended data ("pdu"). * * @throws IllegalArgumentException if destinationAddress or data are empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultipartTextMessage( String destinationAddress, String scAddress, ArrayList<String> parts, ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents) { @@ -1062,8 +1079,10 @@ public final class SmsManager { * Used for logging and diagnostics purposes. The id may be 0. * * @throws IllegalArgumentException if destinationAddress or data are empty - * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultipartTextMessage( @NonNull String destinationAddress, @Nullable String scAddress, @NonNull List<String> parts, @Nullable List<PendingIntent> sentIntents, @@ -1089,7 +1108,11 @@ public final class SmsManager { * * @param packageName serves as the default package name if the package name that is * associated with the user id is null. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultipartTextMessage( @NonNull String destinationAddress, @Nullable String scAddress, @NonNull List<String> parts, @Nullable List<PendingIntent> sentIntents, @@ -1191,10 +1214,14 @@ public final class SmsManager { * </p> * * @see #sendMultipartTextMessage(String, String, ArrayList, ArrayList, ArrayList) + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide **/ @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultipartTextMessageWithoutPersisting( String destinationAddress, String scAddress, List<String> parts, List<PendingIntent> sentIntents, List<PendingIntent> deliveryIntents) { @@ -1498,7 +1525,10 @@ public final class SmsManager { * raw pdu of the status report is in the extended data ("pdu"). * * @throws IllegalArgumentException if destinationAddress or data are empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendDataMessage( String destinationAddress, String scAddress, short destinationPort, byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) { @@ -1609,6 +1639,7 @@ public final class SmsManager { * .{@link #createForSubscriptionId createForSubscriptionId(subId)} instead */ @Deprecated + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public static SmsManager getSmsManagerForSubscriptionId(int subId) { return getSmsManagerForContextAndSubscriptionId(null, subId); } @@ -1626,6 +1657,7 @@ public final class SmsManager { * @see SubscriptionManager#getActiveSubscriptionInfoList() * @see SubscriptionManager#getDefaultSmsSubscriptionId() */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public @NonNull SmsManager createForSubscriptionId(int subId) { return getSmsManagerForContextAndSubscriptionId(mContext, subId); } @@ -1651,7 +1683,11 @@ public final class SmsManager { * @return associated subscription ID or {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} if * the default subscription id cannot be determined or the device has multiple active * subscriptions and and no default is set ("ask every time") by the user. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public int getSubscriptionId() { try { return (mSubId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) @@ -2018,10 +2054,14 @@ public final class SmsManager { * * @throws IllegalArgumentException if endMessageId < startMessageId * @deprecated Use {@link TelephonyManager#setCellBroadcastIdRanges} instead. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * {@hide} */ @Deprecated @SystemApi + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, @android.telephony.SmsCbMessage.MessageFormat int ranType) { boolean success = false; @@ -2079,11 +2119,15 @@ public final class SmsManager { * @see #enableCellBroadcastRange(int, int, int) * * @throws IllegalArgumentException if endMessageId < startMessageId + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. + * * @deprecated Use {@link TelephonyManager#setCellBroadcastIdRanges} instead. * {@hide} */ @Deprecated @SystemApi + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, @android.telephony.SmsCbMessage.MessageFormat int ranType) { boolean success = false; @@ -2223,7 +2267,11 @@ public final class SmsManager { * @return the user-defined default SMS subscription id, or the active subscription id if * there's only one active subscription available, otherwise * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public static int getDefaultSmsSubscriptionId() { try { return getISmsService().getPreferredSmsSubscription(); @@ -2271,10 +2319,14 @@ public final class SmsManager { * </p> * * @return the total number of SMS records which can be stored on the SIM card. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ @RequiresPermission(anyOf = {android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE}) @IntRange(from = 0) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public int getSmsCapacityOnIcc() { int ret = 0; try { @@ -2819,7 +2871,10 @@ public final class SmsManager { * <code>MMS_ERROR_DATA_DISABLED</code><br> * <code>MMS_ERROR_MMS_DISABLED_BY_CARRIER</code><br> * @throws IllegalArgumentException if contentUri is empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultimediaMessage(Context context, Uri contentUri, String locationUrl, Bundle configOverrides, PendingIntent sentIntent) { sendMultimediaMessage(context, contentUri, locationUrl, configOverrides, sentIntent, @@ -2863,7 +2918,10 @@ public final class SmsManager { * @param messageId an id that uniquely identifies the message requested to be sent. * Used for logging and diagnostics purposes. The id may be 0. * @throws IllegalArgumentException if contentUri is empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void sendMultimediaMessage(@NonNull Context context, @NonNull Uri contentUri, @Nullable String locationUrl, @SuppressWarnings("NullableCollection") @Nullable Bundle configOverrides, @@ -2922,7 +2980,10 @@ public final class SmsManager { * <code>MMS_ERROR_DATA_DISABLED</code><br> * <code>MMS_ERROR_MMS_DISABLED_BY_CARRIER</code><br> * @throws IllegalArgumentException if locationUrl or contentUri is empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void downloadMultimediaMessage(Context context, String locationUrl, Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent) { downloadMultimediaMessage(context, locationUrl, contentUri, configOverrides, @@ -2968,7 +3029,10 @@ public final class SmsManager { * @param messageId an id that uniquely identifies the message requested to be downloaded. * Used for logging and diagnostics purposes. The id may be 0. * @throws IllegalArgumentException if locationUrl or contentUri is empty + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void downloadMultimediaMessage(@NonNull Context context, @NonNull String locationUrl, @NonNull Uri contentUri, @SuppressWarnings("NullableCollection") @Nullable Bundle configOverrides, @@ -3079,7 +3143,11 @@ public final class SmsManager { * * @return the bundle key/values pairs that contains MMS configuration values * or an empty Bundle if they cannot be found. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) @NonNull public Bundle getCarrierConfigValues() { try { ISms iSms = getISmsService(); @@ -3115,7 +3183,11 @@ public final class SmsManager { * * @return Token to include in an SMS message. The token will be 11 characters long. * @see android.provider.Telephony.Sms.Intents#getMessagesFromIntent + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public String createAppSpecificSmsToken(PendingIntent intent) { try { ISms iccSms = getISmsServiceOrThrow(); @@ -3233,7 +3305,11 @@ public final class SmsManager { * message. * @param intent this intent is sent when the matching SMS message is received. * @return Token to include in an SMS message. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) @Nullable public String createAppSpecificSmsTokenWithPackageInfo( @Nullable String prefixes, @NonNull PendingIntent intent) { @@ -3393,9 +3469,13 @@ public final class SmsManager { * </p> * * @return the SMSC address string, null if failed. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ @SuppressAutoDoc // for carrier privileges and default SMS application. @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) @Nullable public String getSmscAddress() { String smsc = null; @@ -3430,9 +3510,13 @@ public final class SmsManager { * * @param smsc the SMSC address string. * @return true for success, false otherwise. Failure can be due modem returning an error. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ @SuppressAutoDoc // for carrier privileges and default SMS application. @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public boolean setSmscAddress(@NonNull String smsc) { try { ISms iSms = getISmsService(); @@ -3455,10 +3539,14 @@ public final class SmsManager { * {@link SmsManager#PREMIUM_SMS_CONSENT_ASK_USER}, * {@link SmsManager#PREMIUM_SMS_CONSENT_NEVER_ALLOW}, or * {@link SmsManager#PREMIUM_SMS_CONSENT_ALWAYS_ALLOW} + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @SystemApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public @PremiumSmsConsent int getPremiumSmsConsent(@NonNull String packageName) { int permission = 0; try { @@ -3479,10 +3567,14 @@ public final class SmsManager { * @param permission one of {@link SmsManager#PREMIUM_SMS_CONSENT_ASK_USER}, * {@link SmsManager#PREMIUM_SMS_CONSENT_NEVER_ALLOW}, or * {@link SmsManager#PREMIUM_SMS_CONSENT_ALWAYS_ALLOW} + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void setPremiumSmsConsent( @NonNull String packageName, @PremiumSmsConsent int permission) { try { @@ -3498,11 +3590,15 @@ public final class SmsManager { /** * Reset all cell broadcast ranges. Previously enabled ranges will become invalid after this. * @deprecated Use {@link TelephonyManager#setCellBroadcastIdRanges} with empty list instead + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @Deprecated @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_CELL_BROADCASTS) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING) public void resetAllCellBroadcastRanges() { try { ISms iSms = getISmsService(); @@ -3530,6 +3626,8 @@ public final class SmsManager { * available. * @throws SecurityException if the caller does not have the required permission/privileges. * @throws IllegalStateException in case of telephony service is not available. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @NonNull diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 6c8663a8eb14..56156024fbab 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1757,6 +1757,9 @@ public class SubscriptionManager { * * @param subId The unique SubscriptionInfo key in database. * @return SubscriptionInfo, maybe null if its not active. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @@ -1790,6 +1793,8 @@ public class SubscriptionManager { * @param iccId the IccId of SIM card * @return SubscriptionInfo, maybe null if its not active * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @@ -1826,6 +1831,9 @@ public class SubscriptionManager { * * @param slotIndex the slot which the subscription is inserted * @return SubscriptionInfo, maybe null if its not active + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @@ -1870,6 +1878,8 @@ public class SubscriptionManager { * {@link SubscriptionInfo#getSubscriptionId()}. * * @throws SecurityException if callers do not hold the required permission. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @NonNull @RequiresPermission(anyOf = { @@ -1929,6 +1939,9 @@ public class SubscriptionManager { * then by {@link SubscriptionInfo#getSubscriptionId}. * </li> * </ul> + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) // @RequiresPermission(TODO(b/308809058)) @@ -1972,6 +1985,8 @@ public class SubscriptionManager { * This is similar to {@link #getActiveSubscriptionInfoList} except that it will return * both active and hidden SubscriptionInfos. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ public @NonNull List<SubscriptionInfo> getCompleteActiveSubscriptionInfoList() { List<SubscriptionInfo> completeList = getActiveSubscriptionInfoList( @@ -2056,6 +2071,9 @@ public class SubscriptionManager { * <p> * Permissions android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE is required * for #getAvailableSubscriptionInfoList to be invoked. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2097,6 +2115,9 @@ public class SubscriptionManager { * if the list is non-empty the list is sorted by {@link SubscriptionInfo#getSimSlotIndex} * then by {@link SubscriptionInfo#getSubscriptionId}. * </ul> + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. */ public List<SubscriptionInfo> getAccessibleSubscriptionInfoList() { List<SubscriptionInfo> result = null; @@ -2125,6 +2146,8 @@ public class SubscriptionManager { * * @see TelephonyManager#getCardIdForDefaultEuicc() for more information on the card ID. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. * @hide */ @SystemApi @@ -2155,6 +2178,8 @@ public class SubscriptionManager { * * @see TelephonyManager#getCardIdForDefaultEuicc() for more information on the card ID. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. * @hide */ @SystemApi @@ -2177,6 +2202,9 @@ public class SubscriptionManager { * @return The current number of active subscriptions. * * @see #getActiveSubscriptionInfoList() + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) // @RequiresPermission(TODO(b/308809058)) @@ -2247,6 +2275,9 @@ public class SubscriptionManager { * @param slotIndex the slot assigned to this subscription. It is ignored for subscriptionType * of {@link #SUBSCRIPTION_TYPE_REMOTE_SIM}. * @param subscriptionType the {@link #SUBSCRIPTION_TYPE} + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @@ -2289,6 +2320,8 @@ public class SubscriptionManager { * @throws NullPointerException if {@code uniqueId} is {@code null}. * @throws SecurityException if callers do not hold the required permission. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @@ -2435,6 +2468,7 @@ public class SubscriptionManager { * @deprecated Use {@link #getSubscriptionId(int)} instead. * @hide */ + @Deprecated public static int[] getSubId(int slotIndex) { if (!isValidSlotIndex(slotIndex)) { return null; @@ -2489,6 +2523,9 @@ public class SubscriptionManager { * On a data only device or on error, will return INVALID_SUBSCRIPTION_ID. * * @return the default voice subscription Id. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ public static int getDefaultVoiceSubscriptionId() { int subId = INVALID_SUBSCRIPTION_ID; @@ -2516,6 +2553,9 @@ public class SubscriptionManager { * * @param subscriptionId A valid subscription ID to set as the system default, or * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2535,6 +2575,9 @@ public class SubscriptionManager { /** * Same as {@link #setDefaultVoiceSubscriptionId(int)}, but preserved for backwards * compatibility. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ public void setDefaultVoiceSubId(int subId) { @@ -2578,6 +2621,8 @@ public class SubscriptionManager { * * @param subscriptionId the supplied subscription ID * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2612,6 +2657,8 @@ public class SubscriptionManager { * * @param subscriptionId the supplied subscription ID * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2634,6 +2681,9 @@ public class SubscriptionManager { * Will return null on voice only devices, or on error. * * @return the SubscriptionInfo for the default data subscription. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @UnsupportedAppUsage @@ -2720,6 +2770,9 @@ public class SubscriptionManager { * * @return the list of subId's that are active, * is never null but the length may be 0. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2738,6 +2791,9 @@ public class SubscriptionManager { * * @return the list of subId's that are active, * is never null but the length may be 0. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -2987,6 +3043,9 @@ public class SubscriptionManager { * @param context Context object * @param subId Subscription Id of Subscription whose resources are required * @return Resources associated with Subscription. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @NonNull @@ -3069,6 +3128,9 @@ public class SubscriptionManager { * @return {@code true} if the supplied subscription ID corresponds to an active subscription; * {@code false} if it does not correspond to an active subscription; or throw a * SecurityException if the caller hasn't got the right permission. + *i + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isActiveSubscriptionId(int subscriptionId) { @@ -3377,6 +3439,8 @@ public class SubscriptionManager { * * @throws IllegalStateException when subscription manager service is not available. * @throws SecurityException when clients do not have MODIFY_PHONE_STATE permission. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -3454,6 +3518,9 @@ public class SubscriptionManager { * {@link TelephonyManager#hasCarrierPrivileges}). * * @return the list of opportunistic subscription info. If none exists, an empty list. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @@ -3489,8 +3556,12 @@ public class SubscriptionManager { * PendingIntent)} and does not support Multiple Enabled Profile(MEP). Apps should use * {@link EuiccManager#switchToSubscription(int, PendingIntent)} or * {@link EuiccManager#switchToSubscription(int, int, PendingIntent)} instead. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. */ @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) + @RequiresFeature(PackageManager.FEATURE_TELEPHONY_EUICC) @Deprecated public void switchToSubscription(int subId, @NonNull PendingIntent callbackIntent) { Preconditions.checkNotNull(callbackIntent, "callbackIntent cannot be null"); @@ -3518,6 +3589,9 @@ public class SubscriptionManager { * @param opportunistic whether it’s opportunistic subscription. * @param subId the unique SubscriptionInfo index in database * @return {@code true} if the operation is succeed, {@code false} otherwise. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @@ -3554,6 +3628,8 @@ public class SubscriptionManager { * outlined above. * @throws IllegalArgumentException if any of the subscriptions in the list doesn't exist. * @throws IllegalStateException if Telephony service is in bad state. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @param subIdList list of subId that will be in the same group * @return groupUUID a UUID assigned to the subscription group. @@ -3598,6 +3674,8 @@ public class SubscriptionManager { * outlined above. * @throws IllegalArgumentException if the some subscriptions in the list doesn't exist. * @throws IllegalStateException if Telephony service is in bad state. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @param subIdList list of subId that need adding into the group * @param groupUuid the groupUuid the subscriptions are being added to. @@ -3647,6 +3725,8 @@ public class SubscriptionManager { * @throws IllegalArgumentException if the some subscriptions in the list doesn't belong the * specified group. * @throws IllegalStateException if Telephony service is in bad state. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @see #createSubscriptionGroup(List) */ @@ -3696,6 +3776,8 @@ public class SubscriptionManager { * @throws IllegalStateException if Telephony service is in bad state. * @throws SecurityException if the caller doesn't meet the requirements * outlined above. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @param groupUuid of which list of subInfo will be returned. * @return list of subscriptionInfo that belong to the same group, including the given @@ -3785,9 +3867,9 @@ public class SubscriptionManager { Map<ParcelUuid, SubscriptionInfo> groupMap = new HashMap<>(); for (SubscriptionInfo info : availableList) { - // Opportunistic subscriptions are considered invisible + // Grouped opportunistic subscriptions are considered invisible // to users so they should never be returned. - if (!isSubscriptionVisible(info)) continue; + if (info.getGroupUuid() != null && info.isOpportunistic()) continue; ParcelUuid groupUuid = info.getGroupUuid(); if (groupUuid == null) { @@ -3817,6 +3899,8 @@ public class SubscriptionManager { * * @return whether the operation is successful. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -3844,6 +3928,9 @@ public class SubscriptionManager { * * @param subscriptionId which subscription to operate on. * @param enabled whether uicc applications are enabled or disabled. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -3872,6 +3959,8 @@ public class SubscriptionManager { * * @return whether can disable subscriptions on physical SIMs. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -3897,6 +3986,8 @@ public class SubscriptionManager { * * @param subscriptionId The subscription id. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -3923,6 +4014,8 @@ public class SubscriptionManager { * @param sharing The status sharing preference. * * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingPreference(int subscriptionId, @@ -3941,6 +4034,8 @@ public class SubscriptionManager { * @return The device to device status sharing preference * * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ public @DeviceToDeviceStatusSharingPreference int getDeviceToDeviceStatusSharingPreference( int subscriptionId) { @@ -3960,6 +4055,8 @@ public class SubscriptionManager { * @param contacts The list of contacts that allow device to device status sharing. * * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(int subscriptionId, @@ -3980,6 +4077,9 @@ public class SubscriptionManager { * @param subscriptionId Subscription id. * * @return The list of contacts that allow device to device status sharing. + * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ public @NonNull List<Uri> getDeviceToDeviceStatusSharingContacts(int subscriptionId) { String result = getStringSubscriptionProperty(mContext, subscriptionId, @@ -4012,6 +4112,8 @@ public class SubscriptionManager { * * @throws IllegalArgumentException if the provided slot index is invalid. * @throws SecurityException if callers do not hold the required permission. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @hide */ @@ -4152,6 +4254,8 @@ public class SubscriptionManager { * * @param data with the sim specific configs to be backed up. * + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * @hide */ @SystemApi @@ -4206,6 +4310,8 @@ public class SubscriptionManager { * @throws IllegalArgumentException if {@code source} is invalid. * @throws IllegalStateException if the telephony process is not currently available. * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @see #PHONE_NUMBER_SOURCE_UICC * @see #PHONE_NUMBER_SOURCE_CARRIER @@ -4266,6 +4372,8 @@ public class SubscriptionManager { * * @throws IllegalStateException if the telephony process is not currently available. * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. * * @see #getPhoneNumber(int, int) */ @@ -4309,6 +4417,8 @@ public class SubscriptionManager { * @throws IllegalStateException if the telephony process is not currently available. * @throws NullPointerException if {@code number} is {@code null}. * @throws SecurityException if the caller doesn't have permissions required. + * @throws UnsupportedOperationException If the device does not have + * {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}. */ @RequiresPermission("carrier privileges") public void setCarrierPhoneNumber(int subscriptionId, @NonNull String number) { diff --git a/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/GraphicsActivity.java b/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/GraphicsActivity.java index 60b5ce75e2f7..80c1e5be3a32 100644 --- a/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/GraphicsActivity.java +++ b/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/GraphicsActivity.java @@ -810,6 +810,7 @@ public class GraphicsActivity extends Activity { private FpsRange convertCategory(int category) { switch (category) { + case Surface.FRAME_RATE_CATEGORY_HIGH_HINT: case Surface.FRAME_RATE_CATEGORY_HIGH: return FRAME_RATE_CATEGORY_HIGH; case Surface.FRAME_RATE_CATEGORY_NORMAL: diff --git a/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/SurfaceControlTest.java b/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/SurfaceControlTest.java index 4b56c107cf22..caaee634c57a 100644 --- a/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/SurfaceControlTest.java +++ b/tests/CtsSurfaceControlTestsStaging/src/main/java/android/view/surfacecontroltests/SurfaceControlTest.java @@ -93,6 +93,12 @@ public class SurfaceControlTest { } @Test + public void testSurfaceControlFrameRateCategoryHighHint() throws InterruptedException { + GraphicsActivity activity = mActivityRule.getActivity(); + activity.testSurfaceControlFrameRateCategory(Surface.FRAME_RATE_CATEGORY_HIGH_HINT); + } + + @Test public void testSurfaceControlFrameRateCategoryNormal() throws InterruptedException { GraphicsActivity activity = mActivityRule.getActivity(); activity.testSurfaceControlFrameRateCategory(Surface.FRAME_RATE_CATEGORY_NORMAL); diff --git a/tests/Input/src/android/hardware/input/StickyModifierStateListenerTest.kt b/tests/Input/src/android/hardware/input/StickyModifierStateListenerTest.kt new file mode 100644 index 000000000000..e2b0c36ae694 --- /dev/null +++ b/tests/Input/src/android/hardware/input/StickyModifierStateListenerTest.kt @@ -0,0 +1,215 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.input + +import android.content.Context +import android.content.ContextWrapper +import android.os.Handler +import android.os.HandlerExecutor +import android.os.test.TestLooper +import android.platform.test.annotations.Presubmit +import android.platform.test.flag.junit.SetFlagsRule +import android.view.KeyEvent +import androidx.test.core.app.ApplicationProvider +import com.android.server.testutils.any +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.doAnswer +import org.mockito.Mockito.`when` +import org.mockito.junit.MockitoJUnitRunner +import kotlin.test.assertEquals +import kotlin.test.assertNotNull +import kotlin.test.assertNull +import kotlin.test.assertTrue +import kotlin.test.fail + +/** + * Tests for [InputManager.StickyModifierStateListener]. + * + * Build/Install/Run: + * atest InputTests:StickyModifierStateListenerTest + */ +@Presubmit +@RunWith(MockitoJUnitRunner::class) +class StickyModifierStateListenerTest { + + @get:Rule + val rule = SetFlagsRule() + + private val testLooper = TestLooper() + private val executor = HandlerExecutor(Handler(testLooper.looper)) + private var registeredListener: IStickyModifierStateListener? = null + private lateinit var context: Context + private lateinit var inputManager: InputManager + private lateinit var inputManagerGlobalSession: InputManagerGlobal.TestSession + + @Mock + private lateinit var iInputManagerMock: IInputManager + + @Before + fun setUp() { + // Enable Sticky keys feature + rule.enableFlags(com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG) + rule.enableFlags(com.android.input.flags.Flags.FLAG_ENABLE_INPUT_FILTER_RUST_IMPL) + + context = Mockito.spy(ContextWrapper(ApplicationProvider.getApplicationContext())) + inputManagerGlobalSession = InputManagerGlobal.createTestSession(iInputManagerMock) + inputManager = InputManager(context) + `when`(context.getSystemService(Mockito.eq(Context.INPUT_SERVICE))) + .thenReturn(inputManager) + + // Handle sticky modifier state listener registration. + doAnswer { + val listener = it.getArgument(0) as IStickyModifierStateListener + if (registeredListener != null && + registeredListener!!.asBinder() != listener.asBinder()) { + // There can only be one registered sticky modifier state listener per process. + fail("Trying to register a new listener when one already exists") + } + registeredListener = listener + null + }.`when`(iInputManagerMock).registerStickyModifierStateListener(any()) + + // Handle sticky modifier state listener being unregistered. + doAnswer { + val listener = it.getArgument(0) as IStickyModifierStateListener + if (registeredListener == null || + registeredListener!!.asBinder() != listener.asBinder()) { + fail("Trying to unregister a listener that is not registered") + } + registeredListener = null + null + }.`when`(iInputManagerMock).unregisterStickyModifierStateListener(any()) + } + + @After + fun tearDown() { + if (this::inputManagerGlobalSession.isInitialized) { + inputManagerGlobalSession.close() + } + } + + private fun notifyStickyModifierStateChanged(modifierState: Int, lockedModifierState: Int) { + registeredListener!!.onStickyModifierStateChanged(modifierState, lockedModifierState) + } + + @Test + fun testListenerIsNotifiedOnModifierStateChanged() { + var callbackCount = 0 + + // Add a sticky modifier state listener + inputManager.registerStickyModifierStateListener(executor) { + callbackCount++ + } + + // Notifying sticky modifier state change will notify the listener. + notifyStickyModifierStateChanged(0, 0) + testLooper.dispatchNext() + assertEquals(1, callbackCount) + } + + @Test + fun testListenerHasCorrectModifierStateNotified() { + // Add a sticky modifier state listener + inputManager.registerStickyModifierStateListener(executor) { + state: StickyModifierState -> + assertTrue(state.isAltModifierOn) + assertTrue(state.isAltModifierLocked) + assertTrue(state.isShiftModifierOn) + assertTrue(!state.isShiftModifierLocked) + assertTrue(!state.isCtrlModifierOn) + assertTrue(!state.isCtrlModifierLocked) + assertTrue(!state.isMetaModifierOn) + assertTrue(!state.isMetaModifierLocked) + assertTrue(!state.isAltGrModifierOn) + assertTrue(!state.isAltGrModifierLocked) + } + + // Notifying sticky modifier state change will notify the listener. + notifyStickyModifierStateChanged( + KeyEvent.META_ALT_ON or KeyEvent.META_ALT_LEFT_ON or + KeyEvent.META_SHIFT_ON or KeyEvent.META_SHIFT_LEFT_ON, + KeyEvent.META_ALT_ON or KeyEvent.META_ALT_LEFT_ON + ) + testLooper.dispatchNext() + } + + @Test + fun testAddingListenersRegistersInternalCallbackListener() { + // Set up two callbacks. + val callback1 = InputManager.StickyModifierStateListener {} + val callback2 = InputManager.StickyModifierStateListener {} + + assertNull(registeredListener) + + // Adding the listener should register the callback with InputManagerService. + inputManager.registerStickyModifierStateListener(executor, callback1) + assertNotNull(registeredListener) + + // Adding another listener should not register new internal listener. + val currListener = registeredListener + inputManager.registerStickyModifierStateListener(executor, callback2) + assertEquals(currListener, registeredListener) + } + + @Test + fun testRemovingListenersUnregistersInternalCallbackListener() { + // Set up two callbacks. + val callback1 = InputManager.StickyModifierStateListener {} + val callback2 = InputManager.StickyModifierStateListener {} + + inputManager.registerStickyModifierStateListener(executor, callback1) + inputManager.registerStickyModifierStateListener(executor, callback2) + + // Only removing all listeners should remove the internal callback + inputManager.unregisterStickyModifierStateListener(callback1) + assertNotNull(registeredListener) + inputManager.unregisterStickyModifierStateListener(callback2) + assertNull(registeredListener) + } + + @Test + fun testMultipleListeners() { + // Set up two callbacks. + var callbackCount1 = 0 + var callbackCount2 = 0 + val callback1 = InputManager.StickyModifierStateListener { _ -> callbackCount1++ } + val callback2 = InputManager.StickyModifierStateListener { _ -> callbackCount2++ } + + // Add both sticky modifier state listeners + inputManager.registerStickyModifierStateListener(executor, callback1) + inputManager.registerStickyModifierStateListener(executor, callback2) + + // Notifying sticky modifier state change trigger the both callbacks. + notifyStickyModifierStateChanged(0, 0) + testLooper.dispatchAll() + assertEquals(1, callbackCount1) + assertEquals(1, callbackCount2) + + inputManager.unregisterStickyModifierStateListener(callback2) + // Notifying sticky modifier state change should still trigger callback1 but not callback2. + notifyStickyModifierStateChanged(0, 0) + testLooper.dispatchAll() + assertEquals(2, callbackCount1) + assertEquals(1, callbackCount2) + } +} |