diff options
718 files changed, 16052 insertions, 7548 deletions
diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java index 067a4c3c047e..a34a50c4b7b0 100644 --- a/core/java/android/app/WallpaperColors.java +++ b/core/java/android/app/WallpaperColors.java @@ -27,6 +27,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; +import android.os.SystemProperties; import android.util.Log; import android.util.MathUtils; import android.util.Size; @@ -101,11 +102,13 @@ public final class WallpaperColors implements Parcelable { // Decides when dark theme is optimal for this wallpaper private static final float DARK_THEME_MEAN_LUMINANCE = 0.3f; // Minimum mean luminosity that an image needs to have to support dark text - private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = 0.7f; + private static final float BRIGHT_IMAGE_MEAN_LUMINANCE = SystemProperties.getInt( + "persist.wallpapercolors.threshold", 70) / 100f; // We also check if the image has dark pixels in it, // to avoid bright images with some dark spots. private static final float DARK_PIXEL_CONTRAST = 5.5f; - private static final float MAX_DARK_AREA = 0.05f; + private static final float MAX_DARK_AREA = SystemProperties.getInt( + "persist.wallpapercolors.max_dark_area", 5) / 100f; private final List<Color> mMainColors; private final Map<Integer, Integer> mAllColors; diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 2e3b5d286138..80cea55111ba 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -1187,6 +1187,79 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { @Overridable public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L; + // Compat framework that per-app overrides rely on only supports booleans. That's why we have + // multiple OVERRIDE_*_ORIENTATION_* change ids below instead of just one override with + // the integer value. + + /** + * Enables {@link #SCREEN_ORIENTATION_PORTRAIT}. Unless OVERRIDE_ANY_ORIENTATION + * is enabled, this override is used only when no other fixed orientation was specified by the + * activity. + * @hide + */ + @ChangeId + @Disabled + @Overridable + public static final long OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT = 265452344L; + + /** + * Enables {@link #SCREEN_ORIENTATION_NOSENSOR}. Unless OVERRIDE_ANY_ORIENTATION + * is enabled, this override is used only when no other fixed orientation was specified by the + * activity. + * @hide + */ + @ChangeId + @Disabled + @Overridable + public static final long OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR = 265451093L; + + /** + * Enables {@link #SCREEN_ORIENTATION_REVERSE_LANDSCAPE}. Unless OVERRIDE_ANY_ORIENTATION + * is enabled, this override is used only when activity specify landscape orientation. + * This can help apps that assume that landscape display orientation corresponds to {@link + * android.view.Surface#ROTATION_90}, while on some devices it can be {@link + * android.view.Surface#ROTATION_270}. + * @hide + */ + @ChangeId + @Disabled + @Overridable + public static final long OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE = 266124927L; + + /** + * When enabled, allows OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE, + * OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR and OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT + * to override any orientation requested by the activity. + * @hide + */ + @ChangeId + @Disabled + @Overridable + public static final long OVERRIDE_ANY_ORIENTATION = 265464455L; + + /** + * This override fixes display orientation to landscape natural orientation when a task is + * fullscreen. While display rotation is fixed to landscape, the orientation requested by the + * activity will be still respected by bounds resolution logic. For instance, if an activity + * requests portrait orientation and this override is set, then activity will appear in the + * letterbox mode for fixed orientation with the display rotated to the lanscape natural + * orientation. + * + * <p>This override is applicable only when natural orientation of the device is + * landscape and display ignores orientation requestes. + * + * <p>Main use case for this override are camera-using activities that are portrait-only and + * assume alignment with natural device orientation. Such activities can automatically be + * rotated with com.android.server.wm.DisplayRotationCompatPolicy but not all of them can + * handle dynamic rotation and thus can benefit from this override. + * + * @hide + */ + @ChangeId + @Disabled + @Overridable + public static final long OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION = 255940284L; + /** * Compares activity window layout min width/height with require space for multi window to * determine if it can be put into multi window mode. @@ -1405,8 +1478,19 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * @hide */ public boolean isFixedOrientation() { - return isFixedOrientationLandscape() || isFixedOrientationPortrait() - || screenOrientation == SCREEN_ORIENTATION_LOCKED; + return isFixedOrientation(screenOrientation); + } + + /** + * Returns true if the passed activity's orientation is fixed. + * @hide + */ + public static boolean isFixedOrientation(@ScreenOrientation int orientation) { + return orientation == SCREEN_ORIENTATION_LOCKED + // Orientation is fixed to natural display orientation + || orientation == SCREEN_ORIENTATION_NOSENSOR + || isFixedOrientationLandscape(orientation) + || isFixedOrientationPortrait(orientation); } /** diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index df1c0d7c63bc..e5243ee3ff21 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -878,8 +878,8 @@ public abstract class CameraDevice implements AutoCloseable { * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV / PRIV}</td><td id="rb">{@code s1440p}</td><td id="rb">{@code VIDEO_CALL}</td> <td colspan="3" id="rb"></td> <td>Preview with video call</td> </tr> * <tr> <td>{@code YUV / PRIV}</td><td id="rb">{@code s1440p}</td><td id="rb">{@code PREVIEW_VIDEO_STILL}</td> <td>{@code YUV / JPEG}</td><td id="rb">{@code MAXIMUM}</td><td id="rb">{@code STILL_CAPTURE}</td> <td colspan="3" id="rb"></td> <td>Multi-purpose stream with JPEG or YUV still capture</td> </tr> * <tr> <td>{@code YUV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code STILL_CAPTURE}</td> <td>{@code JPEG}</td><td id="rb">{@code MAXIMUM}</td><td id="rb">{@code STILL_CAPTURE}</td> <td colspan="3" id="rb"></td> <td>YUV and JPEG concurrent still image capture (for testing)</td> </tr> - * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV / PRIV}</td><td id="rb">{@code RECORD}</td><td id="rb">{@code VIDEO_RECORD}</td> <td>{@code YUV / JPEG}</td><td id="rb">{@code RECORD}</td><td id="rb">{@code STILL_CAPTURE}</td> <td>Preview, video record and JPEG or YUV video snapshot</td> </tr> - * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV / JPEG}</td><td id="rb">{@code MAXIMUM}</td><td id="rb">{@code STILL_CAPTURE}</td> <td>Preview, in-application image processing, and JPEG or YUV still image capture</td> </tr> + * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV / PRIV}</td><td id="rb">{@code RECORD}</td><td id="rb">{@code VIDEO_RECORD}</td> <td>{@code JPEG}</td><td id="rb">{@code RECORD}</td><td id="rb">{@code STILL_CAPTURE}</td> <td>Preview, video record and JPEG video snapshot</td> </tr> + * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code PREVIEW}</td> <td>{@code JPEG}</td><td id="rb">{@code MAXIMUM}</td><td id="rb">{@code STILL_CAPTURE}</td> <td>Preview, in-application image processing, and JPEG still image capture</td> </tr> * </table><br> * </p> * diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 4dc6e9310220..32cf0a755de9 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -2353,6 +2353,15 @@ public final class CameraManager { final AvailabilityCallback callback = mCallbackMap.keyAt(i); postSingleUpdate(callback, executor, id, null /*physicalId*/, status); + + // Send the NOT_PRESENT state for unavailable physical cameras + if (isAvailable(status) && mUnavailablePhysicalDevices.containsKey(id)) { + ArrayList<String> unavailableIds = mUnavailablePhysicalDevices.get(id); + for (String unavailableId : unavailableIds) { + postSingleUpdate(callback, executor, id, unavailableId, + ICameraServiceListener.STATUS_NOT_PRESENT); + } + } } } // onStatusChangedLocked @@ -2372,9 +2381,8 @@ public final class CameraManager { } //TODO: Do we need to treat this as error? - if (!mDeviceStatus.containsKey(id) || !isAvailable(mDeviceStatus.get(id)) - || !mUnavailablePhysicalDevices.containsKey(id)) { - Log.e(TAG, String.format("Camera %s is not available. Ignore physical camera " + if (!mDeviceStatus.containsKey(id) || !mUnavailablePhysicalDevices.containsKey(id)) { + Log.e(TAG, String.format("Camera %s is not present. Ignore physical camera " + "status change", id)); return; } @@ -2399,6 +2407,12 @@ public final class CameraManager { return; } + if (!isAvailable(mDeviceStatus.get(id))) { + Log.i(TAG, String.format("Camera %s is not available. Ignore physical camera " + + "status change callback(s)", id)); + return; + } + final int callbackCount = mCallbackMap.size(); for (int i = 0; i < callbackCount; i++) { Executor executor = mCallbackMap.valueAt(i); diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java index e5b9cdb74d3b..754472f07d47 100644 --- a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java +++ b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java @@ -1223,14 +1223,6 @@ public final class MandatoryStreamCombination { new StreamCombinationTemplate(new StreamTemplate [] { new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW, STREAM_USE_CASE_PREVIEW), - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.RECORD, - STREAM_USE_CASE_RECORD), - new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD, - STREAM_USE_CASE_STILL_CAPTURE)}, - "Preview, video record and YUV video snapshot"), - new StreamCombinationTemplate(new StreamTemplate [] { - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW, - STREAM_USE_CASE_PREVIEW), new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD, STREAM_USE_CASE_RECORD), new StreamTemplate(ImageFormat.JPEG, SizeThreshold.RECORD, @@ -1239,27 +1231,11 @@ public final class MandatoryStreamCombination { new StreamCombinationTemplate(new StreamTemplate [] { new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW, STREAM_USE_CASE_PREVIEW), - new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD, - STREAM_USE_CASE_RECORD), - new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD, - STREAM_USE_CASE_STILL_CAPTURE)}, - "Preview, in-application video processing and YUV video snapshot"), - new StreamCombinationTemplate(new StreamTemplate [] { - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW, - STREAM_USE_CASE_PREVIEW), new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW, STREAM_USE_CASE_PREVIEW), new StreamTemplate(ImageFormat.JPEG, SizeThreshold.MAXIMUM, STREAM_USE_CASE_STILL_CAPTURE)}, "Preview, in-application image processing, and JPEG still image capture"), - new StreamCombinationTemplate(new StreamTemplate [] { - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW, - STREAM_USE_CASE_PREVIEW), - new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW, - STREAM_USE_CASE_PREVIEW), - new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.MAXIMUM, - STREAM_USE_CASE_STILL_CAPTURE)}, - "Preview, in-application image processing, and YUV still image capture"), }; private static StreamCombinationTemplate sPreviewStabilizedStreamCombinations[] = { diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index ac2156e9e46e..ca3433764308 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -109,7 +109,8 @@ public final class Trace { public static final long TRACE_TAG_THERMAL = 1L << 27; private static final long TRACE_TAG_NOT_READY = 1L << 63; - private static final int MAX_SECTION_NAME_LEN = 127; + /** @hide **/ + public static final int MAX_SECTION_NAME_LEN = 127; // Must be volatile to avoid word tearing. // This is only kept in case any apps get this by reflection but do not diff --git a/core/java/android/service/dreams/DreamOverlayService.java b/core/java/android/service/dreams/DreamOverlayService.java index bf5b970311d0..6e4535b7218a 100644 --- a/core/java/android/service/dreams/DreamOverlayService.java +++ b/core/java/android/service/dreams/DreamOverlayService.java @@ -36,38 +36,100 @@ import android.view.WindowManager; public abstract class DreamOverlayService extends Service { private static final String TAG = "DreamOverlayService"; private static final boolean DEBUG = false; - private boolean mShowComplications; - private ComponentName mDreamComponent; - private IDreamOverlay mDreamOverlay = new IDreamOverlay.Stub() { + // The last client that started dreaming and hasn't ended + private OverlayClient mCurrentClient; + + // An {@link IDreamOverlayClient} implementation that identifies itself when forwarding + // requests to the {@link DreamOverlayService} + private static class OverlayClient extends IDreamOverlayClient.Stub { + private final DreamOverlayService mService; + private boolean mShowComplications; + private ComponentName mDreamComponent; + IDreamOverlayCallback mDreamOverlayCallback; + + OverlayClient(DreamOverlayService service) { + mService = service; + } + @Override - public void startDream(WindowManager.LayoutParams layoutParams, - IDreamOverlayCallback callback, String dreamComponent, - boolean shouldShowComplications) { - mDreamOverlayCallback = callback; + public void startDream(WindowManager.LayoutParams params, IDreamOverlayCallback callback, + String dreamComponent, boolean shouldShowComplications) throws RemoteException { mDreamComponent = ComponentName.unflattenFromString(dreamComponent); mShowComplications = shouldShowComplications; - onStartDream(layoutParams); + mDreamOverlayCallback = callback; + mService.startDream(this, params); } - @Override - public void endDream() { - onEndDream(); - } + @Override public void wakeUp() { - onWakeUp(() -> { + mService.wakeUp(this, () -> { try { mDreamOverlayCallback.onWakeUpComplete(); } catch (RemoteException e) { - Log.e(TAG, "Could not notify dream of wakeUp:" + e); + Log.e(TAG, "Could not notify dream of wakeUp", e); } }); } - }; - IDreamOverlayCallback mDreamOverlayCallback; + @Override + public void endDream() { + mService.endDream(this); + } + + private void onExitRequested() { + try { + mDreamOverlayCallback.onExitRequested(); + } catch (RemoteException e) { + Log.e(TAG, "Could not request exit:" + e); + } + } + + private boolean shouldShowComplications() { + return mShowComplications; + } + + private ComponentName getComponent() { + return mDreamComponent; + } + } + + private void startDream(OverlayClient client, WindowManager.LayoutParams params) { + endDream(mCurrentClient); + mCurrentClient = client; + onStartDream(params); + } + + private void endDream(OverlayClient client) { + if (client == null || client != mCurrentClient) { + return; + } + + onEndDream(); + mCurrentClient = null; + } + + private void wakeUp(OverlayClient client, Runnable callback) { + if (mCurrentClient != client) { + return; + } + + onWakeUp(callback); + } + + private IDreamOverlay mDreamOverlay = new IDreamOverlay.Stub() { + @Override + public void getClient(IDreamOverlayClientCallback callback) { + try { + callback.onDreamOverlayClient( + new OverlayClient(DreamOverlayService.this)); + } catch (RemoteException e) { + Log.e(TAG, "could not send client to callback", e); + } + } + }; public DreamOverlayService() { } @@ -110,18 +172,23 @@ public abstract class DreamOverlayService extends Service { * This method is invoked to request the dream exit. */ public final void requestExit() { - try { - mDreamOverlayCallback.onExitRequested(); - } catch (RemoteException e) { - Log.e(TAG, "Could not request exit:" + e); + if (mCurrentClient == null) { + throw new IllegalStateException("requested exit with no dream present"); } + + mCurrentClient.onExitRequested(); } /** * Returns whether to show complications on the dream overlay. */ public final boolean shouldShowComplications() { - return mShowComplications; + if (mCurrentClient == null) { + throw new IllegalStateException( + "requested if should show complication when no dream active"); + } + + return mCurrentClient.shouldShowComplications(); } /** @@ -129,6 +196,10 @@ public abstract class DreamOverlayService extends Service { * @hide */ public final ComponentName getDreamComponent() { - return mDreamComponent; + if (mCurrentClient == null) { + throw new IllegalStateException("requested dream component when no dream active"); + } + + return mCurrentClient.getComponent(); } } diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index d3788862b6c0..6a4710f9475a 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -248,25 +248,39 @@ public class DreamService extends Service implements Window.Callback { private OverlayConnection mOverlayConnection; private static class OverlayConnection extends PersistentServiceConnection<IDreamOverlay> { - // Overlay set during onBind. - private IDreamOverlay mOverlay; + // Retrieved Client + private IDreamOverlayClient mClient; + // A list of pending requests to execute on the overlay. - private final ArrayList<Consumer<IDreamOverlay>> mConsumers = new ArrayList<>(); + private final ArrayList<Consumer<IDreamOverlayClient>> mConsumers = new ArrayList<>(); + + private final IDreamOverlayClientCallback mClientCallback = + new IDreamOverlayClientCallback.Stub() { + @Override + public void onDreamOverlayClient(IDreamOverlayClient client) { + mClient = client; + + for (Consumer<IDreamOverlayClient> consumer : mConsumers) { + consumer.accept(mClient); + } + } + }; private final Callback<IDreamOverlay> mCallback = new Callback<IDreamOverlay>() { @Override public void onConnected(ObservableServiceConnection<IDreamOverlay> connection, IDreamOverlay service) { - mOverlay = service; - for (Consumer<IDreamOverlay> consumer : mConsumers) { - consumer.accept(mOverlay); + try { + service.getClient(mClientCallback); + } catch (RemoteException e) { + Log.e(TAG, "could not get DreamOverlayClient", e); } } @Override public void onDisconnected(ObservableServiceConnection<IDreamOverlay> connection, int reason) { - mOverlay = null; + mClient = null; } }; @@ -296,16 +310,16 @@ public class DreamService extends Service implements Window.Callback { super.unbind(); } - public void addConsumer(Consumer<IDreamOverlay> consumer) { + public void addConsumer(Consumer<IDreamOverlayClient> consumer) { execute(() -> { mConsumers.add(consumer); - if (mOverlay != null) { - consumer.accept(mOverlay); + if (mClient != null) { + consumer.accept(mClient); } }); } - public void removeConsumer(Consumer<IDreamOverlay> consumer) { + public void removeConsumer(Consumer<IDreamOverlayClient> consumer) { execute(() -> mConsumers.remove(consumer)); } @@ -1050,6 +1064,24 @@ public class DreamService extends Service implements Window.Callback { * </p> */ public final void finish() { + // If there is an active overlay connection, signal that the dream is ending before + // continuing. Note that the overlay cannot rely on the unbound state, since another dream + // might have bound to it in the meantime. + if (mOverlayConnection != null) { + mOverlayConnection.addConsumer(overlay -> { + try { + overlay.endDream(); + mOverlayConnection.unbind(); + mOverlayConnection = null; + finish(); + } catch (RemoteException e) { + Log.e(mTag, "could not inform overlay of dream end:" + e); + } + }); + mOverlayConnection.clearConsumers(); + return; + } + if (mDebug) Slog.v(mTag, "finish(): mFinished=" + mFinished); Activity activity = mActivity; @@ -1066,10 +1098,6 @@ public class DreamService extends Service implements Window.Callback { } mFinished = true; - if (mOverlayConnection != null) { - mOverlayConnection.unbind(); - } - if (mDreamToken == null) { if (mDebug) Slog.v(mTag, "finish() called when not attached."); stopSelf(); @@ -1365,7 +1393,7 @@ public class DreamService extends Service implements Window.Callback { mWindow.getDecorView().addOnAttachStateChangeListener( new View.OnAttachStateChangeListener() { - private Consumer<IDreamOverlay> mDreamStartOverlayConsumer; + private Consumer<IDreamOverlayClient> mDreamStartOverlayConsumer; @Override public void onViewAttachedToWindow(View v) { @@ -1389,17 +1417,6 @@ public class DreamService extends Service implements Window.Callback { @Override public void onViewDetachedFromWindow(View v) { - if (mOverlayConnection != null) { - mOverlayConnection.addConsumer(overlay -> { - try { - overlay.endDream(); - } catch (RemoteException e) { - Log.e(mTag, "could not inform overlay of dream end:" + e); - } - }); - mOverlayConnection.clearConsumers(); - } - if (mActivity == null || !mActivity.isChangingConfigurations()) { // Only stop the dream if the view is not detached by relaunching // activity for configuration changes. It is important to also clear @@ -1408,6 +1425,10 @@ public class DreamService extends Service implements Window.Callback { mActivity = null; finish(); } + + if (mOverlayConnection != null && mDreamStartOverlayConsumer != null) { + mOverlayConnection.removeConsumer(mDreamStartOverlayConsumer); + } } }); } diff --git a/core/java/android/service/dreams/IDreamOverlay.aidl b/core/java/android/service/dreams/IDreamOverlay.aidl index 0e4bd3bd547b..7ec75a50ed00 100644 --- a/core/java/android/service/dreams/IDreamOverlay.aidl +++ b/core/java/android/service/dreams/IDreamOverlay.aidl @@ -16,8 +16,7 @@ package android.service.dreams; -import android.service.dreams.IDreamOverlayCallback; -import android.view.WindowManager.LayoutParams; +import android.service.dreams.IDreamOverlayClientCallback; /** * {@link IDreamOverlay} provides a way for a component to annotate a dream with additional view @@ -28,20 +27,7 @@ import android.view.WindowManager.LayoutParams; */ interface IDreamOverlay { /** - * @param params The {@link LayoutParams} for the associated DreamWindow, including the window - token of the Dream Activity. - * @param callback The {@link IDreamOverlayCallback} for requesting actions such as exiting the - * dream. - * @param dreamComponent The component name of the dream service requesting overlay. - * @param shouldShowComplications Whether the dream overlay should show complications, e.g. clock - * and weather. + * Retrieves a client the caller can use to interact with the dream overlay. */ - void startDream(in LayoutParams params, in IDreamOverlayCallback callback, - in String dreamComponent, in boolean shouldShowComplications); - - /** Called when the dream is waking, to do any exit animations */ - void wakeUp(); - - /** Called when the dream has ended. */ - void endDream(); + void getClient(in IDreamOverlayClientCallback callback); } diff --git a/core/java/android/service/dreams/IDreamOverlayClient.aidl b/core/java/android/service/dreams/IDreamOverlayClient.aidl new file mode 100644 index 000000000000..78b7280ae652 --- /dev/null +++ b/core/java/android/service/dreams/IDreamOverlayClient.aidl @@ -0,0 +1,45 @@ +/** + * Copyright (c) 2023, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.dreams; + +import android.service.dreams.IDreamOverlayCallback; +import android.view.WindowManager.LayoutParams; + +/** +* {@link IDreamOverlayClient} allows {@link DreamService} instances to act upon the dream overlay. +* +* @hide +*/ +interface IDreamOverlayClient { + /** + * @param params The {@link LayoutParams} for the associated DreamWindow, including the window + token of the Dream Activity. + * @param callback The {@link IDreamOverlayCallback} for requesting actions such as exiting the + * dream. + * @param dreamComponent The component name of the dream service requesting overlay. + * @param shouldShowComplications Whether the dream overlay should show complications, e.g. clock + * and weather. + */ + void startDream(in LayoutParams params, in IDreamOverlayCallback callback, + in String dreamComponent, in boolean shouldShowComplications); + + /** Called when the dream is waking, to do any exit animations */ + void wakeUp(); + + /** Called when the dream has ended. */ + void endDream(); +} diff --git a/core/java/android/service/dreams/IDreamOverlayClientCallback.aidl b/core/java/android/service/dreams/IDreamOverlayClientCallback.aidl new file mode 100644 index 000000000000..244d999c623b --- /dev/null +++ b/core/java/android/service/dreams/IDreamOverlayClientCallback.aidl @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2023, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.dreams; + +import android.service.dreams.IDreamOverlayClient; + +/** +* {@link IDreamOverlayClientCallback} allows receiving a requested {@link IDreamOverlayClient}. +* @hide +*/ +interface IDreamOverlayClientCallback { + /** + * Called with a unique {@link IDreamOverlayClient}. + */ + void onDreamOverlayClient(in IDreamOverlayClient client); +} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 333efad2c4c8..d7480e5037f4 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -17,6 +17,7 @@ package android.view; import static android.content.res.Resources.ID_NULL; +import static android.os.Trace.TRACE_TAG_APP; import static android.view.ContentInfo.SOURCE_DRAG_AND_DROP; import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED; import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_INVALID_BOUNDS; @@ -985,6 +986,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private static boolean sAcceptZeroSizeDragShadow; /** + * When true, measure and layout passes of all the newly attached views will be logged with + * {@link Trace}, so we can better debug jank due to complex view hierarchies. + */ + private static boolean sTraceLayoutSteps; + + /** + * When not null, emits a {@link Trace} instant event and the stacktrace every time a relayout + * of a class having this name happens. + */ + private static String sTraceRequestLayoutClass; + + /** Used to avoid computing the full strings each time when layout tracing is enabled. */ + @Nullable + private ViewTraversalTracingStrings mTracingStrings; + + /** * Prior to R, {@link #dispatchApplyWindowInsets} had an issue: * <p>The modified insets changed by {@link #onApplyWindowInsets} were passed to the * entire view hierarchy in prefix order, including siblings as well as siblings of parents @@ -3532,6 +3549,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * 1 PFLAG4_HAS_TRANSLATION_TRANSIENT_STATE * 1 PFLAG4_DRAG_A11Y_STARTED * 1 PFLAG4_AUTO_HANDWRITING_INITIATION_ENABLED + * 1 PFLAG4_TRAVERSAL_TRACING_ENABLED + * 1 PFLAG4_RELAYOUT_TRACING_ENABLED * |-------|-------|-------|-------| */ @@ -3612,6 +3631,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Indicates that the view enables auto handwriting initiation. */ private static final int PFLAG4_AUTO_HANDWRITING_ENABLED = 0x000010000; + + /** + * When set, measure and layout passes of this view will be logged with {@link Trace}, so we + * can better debug jank due to complex view hierarchies. + */ + private static final int PFLAG4_TRAVERSAL_TRACING_ENABLED = 0x000040000; + + /** + * When set, emits a {@link Trace} instant event and stacktrace every time a requestLayout of + * this class happens. + */ + private static final int PFLAG4_RELAYOUT_TRACING_ENABLED = 0x000080000; + /* End of masks for mPrivateFlags4 */ /** @hide */ @@ -6537,6 +6569,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, out.append(mRight); out.append(','); out.append(mBottom); + appendId(out); + if (mAutofillId != null) { + out.append(" aid="); out.append(mAutofillId); + } + out.append("}"); + return out.toString(); + } + + void appendId(StringBuilder out) { final int id = getId(); if (id != NO_ID) { out.append(" #"); @@ -6568,11 +6609,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } } - if (mAutofillId != null) { - out.append(" aid="); out.append(mAutofillId); - } - out.append("}"); - return out.toString(); } /** @@ -20767,6 +20803,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (isFocused()) { notifyFocusChangeToImeFocusController(true /* hasFocus */); } + + if (sTraceLayoutSteps) { + setTraversalTracingEnabled(true); + } + if (sTraceRequestLayoutClass != null + && sTraceRequestLayoutClass.equals(getClass().getSimpleName())) { + setRelayoutTracingEnabled(true); + } } /** @@ -23666,6 +23710,30 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return o instanceof ViewGroup && ((ViewGroup) o).isLayoutModeOptical(); } + /** + * Enable measure/layout debugging on traces. + * + * @see Trace + * @hide + */ + public static void setTraceLayoutSteps(boolean traceLayoutSteps) { + sTraceLayoutSteps = traceLayoutSteps; + } + + /** + * Enable request layout tracing classes with {@code s} simple name. + * <p> + * When set, a {@link Trace} instant event and a log with the stacktrace is emitted every + * time a requestLayout of a class matching {@code s} name happens. + * This applies only to views attached from this point onwards. + * + * @see Trace#instant(long, String) + * @hide + */ + public static void setTracedRequestLayoutClassClass(String s) { + sTraceRequestLayoutClass = s; + } + private boolean setOpticalFrame(int left, int top, int right, int bottom) { Insets parentInsets = mParent instanceof View ? ((View) mParent).getOpticalInsets() : Insets.NONE; @@ -23700,7 +23768,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @SuppressWarnings({"unchecked"}) public void layout(int l, int t, int r, int b) { if ((mPrivateFlags3 & PFLAG3_MEASURE_NEEDED_BEFORE_LAYOUT) != 0) { + if (isTraversalTracingEnabled()) { + Trace.beginSection(mTracingStrings.onMeasureBeforeLayout); + } onMeasure(mOldWidthMeasureSpec, mOldHeightMeasureSpec); + if (isTraversalTracingEnabled()) { + Trace.endSection(); + } mPrivateFlags3 &= ~PFLAG3_MEASURE_NEEDED_BEFORE_LAYOUT; } @@ -23713,7 +23787,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, setOpticalFrame(l, t, r, b) : setFrame(l, t, r, b); if (changed || (mPrivateFlags & PFLAG_LAYOUT_REQUIRED) == PFLAG_LAYOUT_REQUIRED) { + if (isTraversalTracingEnabled()) { + Trace.beginSection(mTracingStrings.onLayout); + } onLayout(changed, l, t, r, b); + if (isTraversalTracingEnabled()) { + Trace.endSection(); + } if (shouldDrawRoundScrollbar()) { if(mRoundScrollbarRenderer == null) { @@ -26270,6 +26350,25 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return (viewRoot != null && viewRoot.isInLayout()); } + /** To be used only for debugging purposes. */ + private void printStackStrace(String name) { + Log.d(VIEW_LOG_TAG, "---- ST:" + name); + + StringBuilder sb = new StringBuilder(); + StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); + int startIndex = 1; + int endIndex = Math.min(stackTraceElements.length, startIndex + 20); // max 20 entries. + for (int i = startIndex; i < endIndex; i++) { + StackTraceElement s = stackTraceElements[i]; + sb.append(s.getMethodName()) + .append("(") + .append(s.getFileName()) + .append(":") + .append(s.getLineNumber()) + .append(") <- "); + } + Log.d(VIEW_LOG_TAG, name + ": " + sb); + } /** * Call this when something has changed which has invalidated the * layout of this view. This will schedule a layout pass of the view @@ -26283,6 +26382,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ @CallSuper public void requestLayout() { + if (isRelayoutTracingEnabled()) { + Trace.instantForTrack(TRACE_TAG_APP, "requestLayoutTracing", + mTracingStrings.classSimpleName); + printStackStrace(mTracingStrings.requestLayoutStacktracePrefix); + } + if (mMeasureCache != null) mMeasureCache.clear(); if (mAttachInfo != null && mAttachInfo.mViewRequestingLayout == null) { @@ -26376,8 +26481,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, int cacheIndex = forceLayout ? -1 : mMeasureCache.indexOfKey(key); if (cacheIndex < 0 || sIgnoreMeasureCache) { + if (isTraversalTracingEnabled()) { + Trace.beginSection(mTracingStrings.onMeasure); + } // measure ourselves, this should set the measured dimension flag back onMeasure(widthMeasureSpec, heightMeasureSpec); + if (isTraversalTracingEnabled()) { + Trace.endSection(); + } mPrivateFlags3 &= ~PFLAG3_MEASURE_NEEDED_BEFORE_LAYOUT; } else { long value = mMeasureCache.valueAt(cacheIndex); @@ -31547,6 +31658,38 @@ public class View implements Drawable.Callback, KeyEvent.Callback, == PFLAG4_AUTO_HANDWRITING_ENABLED; } + private void setTraversalTracingEnabled(boolean enabled) { + if (enabled) { + if (mTracingStrings == null) { + mTracingStrings = new ViewTraversalTracingStrings(this); + } + mPrivateFlags4 |= PFLAG4_TRAVERSAL_TRACING_ENABLED; + } else { + mPrivateFlags4 &= ~PFLAG4_TRAVERSAL_TRACING_ENABLED; + } + } + + private boolean isTraversalTracingEnabled() { + return (mPrivateFlags4 & PFLAG4_TRAVERSAL_TRACING_ENABLED) + == PFLAG4_TRAVERSAL_TRACING_ENABLED; + } + + private void setRelayoutTracingEnabled(boolean enabled) { + if (enabled) { + if (mTracingStrings == null) { + mTracingStrings = new ViewTraversalTracingStrings(this); + } + mPrivateFlags4 |= PFLAG4_RELAYOUT_TRACING_ENABLED; + } else { + mPrivateFlags4 &= ~PFLAG4_RELAYOUT_TRACING_ENABLED; + } + } + + private boolean isRelayoutTracingEnabled() { + return (mPrivateFlags4 & PFLAG4_RELAYOUT_TRACING_ENABLED) + == PFLAG4_RELAYOUT_TRACING_ENABLED; + } + /** * Collects a {@link ViewTranslationRequest} which represents the content to be translated in * the view. diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 43bbcfb1e94a..c8e1131dd1da 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -78,7 +78,6 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; -import static android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL; import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; @@ -712,6 +711,7 @@ public final class ViewRootImpl implements ViewParent, // These are accessed by multiple threads. final Rect mWinFrame; // frame given by window manager. + private final Rect mLastLayoutFrame; Rect mOverrideInsetsFrame; final Rect mPendingBackDropFrame = new Rect(); @@ -932,6 +932,7 @@ public final class ViewRootImpl implements ViewParent, mHeight = -1; mDirty = new Rect(); mWinFrame = new Rect(); + mLastLayoutFrame = new Rect(); mWindow = new W(this); mLeashToken = new Binder(); mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion; @@ -1113,6 +1114,8 @@ public final class ViewRootImpl implements ViewParent, // Update the last resource config in case the resource configuration was changed while // activity relaunched. updateLastConfigurationFromResources(getConfiguration()); + // Make sure to report the completion of draw for relaunch with preserved window. + reportNextDraw("rebuilt"); } private Configuration getConfiguration() { @@ -1303,7 +1306,7 @@ public final class ViewRootImpl implements ViewParent, UNSPECIFIED_LENGTH, UNSPECIFIED_LENGTH, mInsetsController.getRequestedVisibilities(), 1f /* compactScale */, mTmpFrames); - setFrame(mTmpFrames.frame); + setFrame(mTmpFrames.frame, true /* withinRelayout */); registerBackCallbackOnWindow(); if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { // For apps requesting legacy back behavior, we add a compat callback that @@ -1824,7 +1827,7 @@ public final class ViewRootImpl implements ViewParent, onMovedToDisplay(displayId, mLastConfigurationFromResources); } - setFrame(frame); + setFrame(frame, false /* withinRelayout */); mTmpFrames.displayFrame.set(displayFrame); if (mTmpFrames.attachedFrame != null && attachedFrame != null) { mTmpFrames.attachedFrame.set(attachedFrame); @@ -5740,7 +5743,7 @@ public final class ViewRootImpl implements ViewParent, mTmpFrames.frame.right = l + w; mTmpFrames.frame.top = t; mTmpFrames.frame.bottom = t + h; - setFrame(mTmpFrames.frame); + setFrame(mTmpFrames.frame, false /* withinRelayout */); maybeHandleWindowMove(mWinFrame); } break; @@ -8210,7 +8213,7 @@ public final class ViewRootImpl implements ViewParent, // If the position and the size of the frame are both changed, it will trigger a BLAST // sync, and we still need to call relayout to obtain the syncSeqId. Otherwise, we just // need to send attributes via relayoutAsync. - final Rect oldFrame = mWinFrame; + final Rect oldFrame = mLastLayoutFrame; final Rect newFrame = mTmpFrames.frame; final boolean positionChanged = newFrame.top != oldFrame.top || newFrame.left != oldFrame.left; @@ -8340,7 +8343,7 @@ public final class ViewRootImpl implements ViewParent, params.restore(); } - setFrame(mTmpFrames.frame); + setFrame(mTmpFrames.frame, true /* withinRelayout */); return relayoutResult; } @@ -8375,8 +8378,18 @@ public final class ViewRootImpl implements ViewParent, mIsSurfaceOpaque = opaque; } - private void setFrame(Rect frame) { + /** + * Set the mWinFrame of this window. + * @param frame the new frame of this window. + * @param withinRelayout {@code true} if this setting is within the relayout, or is the initial + * setting. That will make sure in the relayout process, we always compare + * the window frame with the last processed window frame. + */ + private void setFrame(Rect frame, boolean withinRelayout) { mWinFrame.set(frame); + if (withinRelayout) { + mLastLayoutFrame.set(frame); + } final WindowConfiguration winConfig = getCompatWindowConfiguration(); mPendingBackDropFrame.set(mPendingDragResizing && !winConfig.useWindowFrameForBackdrop() diff --git a/core/java/android/view/ViewTraversalTracingStrings.java b/core/java/android/view/ViewTraversalTracingStrings.java new file mode 100644 index 000000000000..7dde87bad26e --- /dev/null +++ b/core/java/android/view/ViewTraversalTracingStrings.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view; + +import android.os.Trace; + +/** + * Keeps and caches strings used to trace {@link View} traversals. + * <p> + * This is done to avoid expensive computations of them every time, which can improve performance. + */ +class ViewTraversalTracingStrings { + + /** {@link Trace} tag used to mark {@link View#onMeasure(int, int)}. */ + public final String onMeasure; + + /** {@link Trace} tag used to mark {@link View#onLayout(boolean, int, int, int, int)}. */ + public final String onLayout; + + /** Caches the view simple name to avoid re-computations. */ + public final String classSimpleName; + + /** Prefix for request layout stacktraces output in logs. */ + public final String requestLayoutStacktracePrefix; + + /** {@link Trace} tag used to mark {@link View#onMeasure(int, int)} happening before layout. */ + public final String onMeasureBeforeLayout; + + /** + * @param v {@link View} from where to get the class name. + */ + ViewTraversalTracingStrings(View v) { + String className = v.getClass().getSimpleName(); + classSimpleName = className; + onMeasureBeforeLayout = getTraceName("onMeasureBeforeLayout", className, v); + onMeasure = getTraceName("onMeasure", className, v); + onLayout = getTraceName("onLayout", className, v); + requestLayoutStacktracePrefix = "requestLayout " + className; + } + + private String getTraceName(String sectionName, String className, View v) { + StringBuilder out = new StringBuilder(); + out.append(sectionName); + out.append(" "); + out.append(className); + v.appendId(out); + return out.substring(0, Math.min(out.length() - 1, Trace.MAX_SECTION_NAME_LEN - 1)); + } +} diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index a37c24499aff..17df585e424a 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -814,8 +814,8 @@ public interface WindowManager extends ViewManager { } /** - * Activity level {@link android.content.pm.PackageManager.Property PackageManager - * .Property} for an app to inform the system that the activity can be opted-in or opted-out + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the app can be opted-in or opted-out * from the compatibility treatment that avoids {@link * android.app.Activity#setRequestedOrientation} loops. The loop can be trigerred by * ignoreRequestedOrientation display setting enabled on the device or by the landscape natural @@ -833,17 +833,17 @@ public interface WindowManager extends ViewManager { * <li>Camera compatibility force rotation treatment is active for the package. * </ul> * - * <p>Setting this property to {@code false} informs the system that the activity must be + * <p>Setting this property to {@code false} informs the system that the app must be * opted-out from the compatibility treatment even if the device manufacturer has opted the app * into the treatment. * * <p><b>Syntax:</b> * <pre> - * <activity> + * <application> * <property * android:name="android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION" * android:value="true|false"/> - * </activity> + * </application> * </pre> * * @hide @@ -853,8 +853,45 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION"; /** - * Activity level {@link android.content.pm.PackageManager.Property PackageManager - * .Property} for an app to inform the system that the activity should be excluded from the + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the application can be opted-in or opted-out + * from the compatibility treatment that enables sending a fake focus event for unfocused + * resumed split screen activities. This is needed because some game engines wait to get + * focus before drawing the content of the app which isn't guaranteed by default in multi-window + * modes. + * + * <p>Device manufacturers can enable this treatment using their discretion on a per-device + * basis to improve display compatibility. The treatment also needs to be specifically enabled + * on a per-app basis afterwards. This can either be done by device manufacturers or developers. + * + * <p>With this property set to {@code true}, the system will apply the treatment only if the + * device manufacturer had previously enabled it on the device. A fake focus event will be sent + * to the app after it is resumed only if the app is in split-screen. + * + * <p>Setting this property to {@code false} informs the system that the activity must be + * opted-out from the compatibility treatment even if the device manufacturer has opted the app + * into the treatment. + * + * <p>If the property remains unset the system will apply the treatment only if it had + * previously been enabled both at the device and app level by the device manufacturer. + * + * <p><b>Syntax:</b> + * <pre> + * <application> + * <property + * android:name="android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS" + * android:value="true|false"/> + * </application> + * </pre> + * + * @hide + */ + // TODO(b/263984287): Make this public API. + String PROPERTY_COMPAT_ENABLE_FAKE_FOCUS = "android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS"; + + /** + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the app should be excluded from the * camera compatibility force rotation treatment. * * <p>The camera compatibility treatment aligns orientations of portrait app window and natural @@ -879,11 +916,11 @@ public interface WindowManager extends ViewManager { * * <p><b>Syntax:</b> * <pre> - * <activity> + * <application> * <property * android:name="android.window.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION" * android:value="true|false"/> - * </activity> + * </application> * </pre> * * @hide @@ -893,8 +930,8 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION"; /** - * Activity level {@link android.content.pm.PackageManager.Property PackageManager - * .Property} for an app to inform the system that the activity should be excluded + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the app should be excluded * from the activity "refresh" after the camera compatibility force rotation treatment. * * <p>The camera compatibility treatment aligns orientations of portrait app window and natural @@ -926,11 +963,11 @@ public interface WindowManager extends ViewManager { * * <p><b>Syntax:</b> * <pre> - * <activity> + * <application> * <property * android:name="android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH" * android:value="true|false"/> - * </activity> + * </application> * </pre> * * @hide @@ -940,7 +977,7 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH"; /** - * Activity level {@link android.content.pm.PackageManager.Property PackageManager + * Application level {@link android.content.pm.PackageManager.Property PackageManager * .Property} for an app to inform the system that the activity should be or shouldn't be * "refreshed" after the camera compatibility force rotation treatment using "paused -> * resumed" cycle rather than "stopped -> resumed". @@ -976,11 +1013,11 @@ public interface WindowManager extends ViewManager { * * <p><b>Syntax:</b> * <pre> - * <activity> + * <application> * <property * android:name="android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE" * android:value="true|false"/> - * </activity> + * </application> * </pre> * * @hide @@ -990,6 +1027,77 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE"; /** + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the app should be excluded from the + * compatibility override for orientation set by the device manufacturer. + * + * <p>With this property set to {@code true} or unset, device manufacturers can override + * orientation for the app using their discretion to improve display compatibility. + * + * <p>With this property set to {@code false}, device manufactured per-app override for + * orientation won't be applied. + * + * <p><b>Syntax:</b> + * <pre> + * <application> + * <property + * android:name="android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE" + * android:value="true|false"/> + * </application> + * </pre> + * + * @hide + */ + // TODO(b/263984287): Make this public API. + String PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE = + "android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE"; + + /** + * Application level {@link android.content.pm.PackageManager.Property PackageManager + * .Property} for an app to inform the system that the app should be opted-out from the + * compatibility override that fixes display orientation to landscape natural orientation when + * an activity is fullscreen. + * + * <p>When this compat override is enabled and while display is fixed to the landscape natural + * orientation, the orientation requested by the activity will be still respected by bounds + * resolution logic. For instance, if an activity requests portrait orientation, then activity + * will appear in the letterbox mode for fixed orientation with the display rotated to the + * lanscape natural orientation. + * + * <p>The treatment is disabled by default but device manufacturers can enable the treatment + * using their discretion to improve display compatibility on the displays that have + * ignoreOrientationRequest display setting enabled (enables compatibility mode for fixed + * orientation, see <a href="https://developer.android.com/guide/practices/enhanced-letterboxing">Enhanced letterboxing</a> + * for more details). + * + * <p>With this property set to {@code true} or unset, the system wiil use landscape display + * orientation when the following conditions are met: + * <ul> + * <li>Natural orientation of the display is landscape + * <li>ignoreOrientationRequest display setting is enabled + * <li>Activity is fullscreen. + * <li>Device manufacturer enabled the treatment. + * </ul> + * + * <p>With this property set to {@code false}, device manufactured per-app override for + * display orientation won't be applied. + * + * <p><b>Syntax:</b> + * <pre> + * <application> + * <property + * android:name="android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE" + * android:value="true|false"/> + * </application> + * </pre> + * + * @hide + */ + // TODO(b/263984287): Make this public API. + String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE = + "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE"; + + /** * @hide */ public static final String PARCEL_KEY_SHORTCUTS_ARRAY = "shortcuts_array"; diff --git a/core/java/com/android/internal/app/ChooserActivityLoggerImpl.java b/core/java/com/android/internal/app/ChooserActivityLoggerImpl.java index e3cc4f12fcc6..d0b581158614 100644 --- a/core/java/com/android/internal/app/ChooserActivityLoggerImpl.java +++ b/core/java/com/android/internal/app/ChooserActivityLoggerImpl.java @@ -47,7 +47,9 @@ public class ChooserActivityLoggerImpl implements ChooserActivityLogger { /* num_app_provided_app_targets = 6 */ appProvidedApp, /* is_workprofile = 7 */ isWorkprofile, /* previewType = 8 */ typeFromPreviewInt(previewType), - /* intentType = 9 */ typeFromIntentString(intent)); + /* intentType = 9 */ typeFromIntentString(intent), + /* num_provided_custom_actions = 10 */ 0, + /* reselection_action_provided = 11 */ false); } @Override diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 4f7f8ba2b45c..b9373be76b9a 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -567,11 +567,6 @@ public final class SystemUiDeviceConfigFlags { public static final String VOLUME_SEPARATE_NOTIFICATION = "volume_separate_notification"; /** - * (boolean) Whether the clipboard overlay is enabled. - */ - public static final String CLIPBOARD_OVERLAY_ENABLED = "clipboard_overlay_enabled"; - - /** * (boolean) Whether widget provider info would be saved to / loaded from system persistence * layer as opposed to individual manifests in respective apps. */ diff --git a/core/java/com/android/internal/util/ScreenshotRequest.java b/core/java/com/android/internal/util/ScreenshotRequest.java index 1902f80bd384..c8b7defb5276 100644 --- a/core/java/com/android/internal/util/ScreenshotRequest.java +++ b/core/java/com/android/internal/util/ScreenshotRequest.java @@ -173,6 +173,9 @@ public class ScreenshotRequest implements Parcelable { public Builder( @WindowManager.ScreenshotType int type, @WindowManager.ScreenshotSource int source) { + if (type != TAKE_SCREENSHOT_FULLSCREEN && type != TAKE_SCREENSHOT_PROVIDED_IMAGE) { + throw new IllegalArgumentException("Invalid screenshot type requested!"); + } mType = type; mSource = source; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6a80d1cb62a7..31903e25f8fd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -315,6 +315,7 @@ <protected-broadcast android:name="android.media.MASTER_BALANCE_CHANGED_ACTION" /> <protected-broadcast android:name="android.media.SCO_AUDIO_STATE_CHANGED" /> <protected-broadcast android:name="android.media.ACTION_SCO_AUDIO_STATE_UPDATED" /> + <protected-broadcast android:name="com.android.server.audio.action.CHECK_MUSIC_ACTIVE" /> <protected-broadcast android:name="android.intent.action.MEDIA_REMOVED" /> <protected-broadcast android:name="android.intent.action.MEDIA_UNMOUNTED" /> @@ -3893,7 +3894,7 @@ <p>Should only be requested by the System, should be required by TileService declarations.--> <permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE" - android:protectionLevel="signature" /> + android:protectionLevel="signature|recents" /> <!-- Allows SystemUI to request third party controls. <p>Should only be requested by the System and required by diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index b49f8c2dd46b..ef746fab4aef 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Bekyk tans volskerm"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Swiep van bo na onder as jy wil uitgaan."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Het dit"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Klaar"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Ure se sirkelglyer"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minute se sirkelglyer"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index d5d8fe5a38d5..89039a6ff779 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ሙሉ ገጽ በማሳየት ላይ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ለመውጣት፣ ከላይ ወደታች ጠረግ ያድርጉ።"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ገባኝ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ተከናውኗል"</string> <string name="hour_picker_description" msgid="5153757582093524635">"የሰዓታት ክብ ተንሸራታች"</string> <string name="minute_picker_description" msgid="9029797023621927294">"የደቂቃዎች ክብ ተንሸራታች"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index cbf18251287c..b04af913f56a 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1844,6 +1844,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"جارٍ العرض بملء الشاشة"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"للخروج، مرر بسرعة من أعلى إلى أسفل."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"حسنًا"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"تم"</string> <string name="hour_picker_description" msgid="5153757582093524635">"شريط التمرير الدائري للساعات"</string> <string name="minute_picker_description" msgid="9029797023621927294">"شريط التمرير الدائري للدقائق"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index e544de5eda0d..cd693145222e 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"স্ক্ৰীন পূৰ্ণৰূপত চাই আছে"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"বাহিৰ হ\'বলৈ ওপৰৰপৰা তললৈ ছোৱাইপ কৰক।"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"বুজি পালোঁ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"সম্পন্ন কৰা হ’ল"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ঘড়ীৰ বৃত্তাকাৰ শ্লাইডাৰ"</string> <string name="minute_picker_description" msgid="9029797023621927294">"মিনিটৰ বৃত্তাকাৰ শ্লাইডাৰ"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 9a4e5cef1882..5abd2b64dbb7 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Tam ekrana baxış"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Çıxmaq üçün yuxarıdan aşağı sürüşdürün."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Anladım"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Hazırdır"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Dairəvi saat slayderi"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Dairəvi dəqiqə slayderi"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index c183da8efb83..4a7a235c2fc6 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1841,6 +1841,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Prikazuje se ceo ekran"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Da biste izašli, prevucite nadole odozgo."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Važi"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Rotirajte radi boljeg prikaza"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Izađite iz podeljenog ekrana radi boljeg prikaza"</string> <string name="done_label" msgid="7283767013231718521">"Gotovo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kružni klizač za sate"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kružni klizač za minute"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 2d8f21d5c62c..fa0ebc12658b 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Прагляд у поўнаэкранным рэжыме"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Для выхаду правядзіце зверху ўніз."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Зразумела"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Гатова"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Кругавы паўзунок гадзін"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Кругавы паўзунок хвілін"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index d418409a2125..ba4466fd90f5 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Изглед на цял екран"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"За изход плъзнете пръст надолу от горната част."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Разбрах"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Готово"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Кръгов плъзгач за часовете"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Кръгов плъзгач за минутите"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index c8ec80f9f476..ef513843e786 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"পূর্ণ স্ক্রিনে দেখা হচ্ছে"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"প্রস্থান করতে উপর থেকে নিচের দিকে সোয়াইপ করুন"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"বুঝেছি"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"সম্পন্ন হয়েছে"</string> <string name="hour_picker_description" msgid="5153757582093524635">"বৃত্তাকার ঘণ্টা নির্বাচকের স্লাইডার"</string> <string name="minute_picker_description" msgid="9029797023621927294">"বৃত্তাকার মিনিট নির্বাচকের স্লাইডার"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 46b3f6cb22e2..fd5cd642e757 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Prikazuje se cijeli ekran"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Da izađete, prevucite odozgo nadolje."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Razumijem"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Gotovo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kružni klizač za odabir sata"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kružni klizač za minute"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index f7745f099bc8..153f4305a0f8 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Mode de pantalla completa"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Per sortir, llisca cap avall des de la part superior."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entesos"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Fet"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Control circular de les hores"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Control circular dels minuts"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ea61feaab93a..24617d08e249 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Zobrazení celé obrazovky"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Režim ukončíte přejetím prstem shora dolů."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Rozumím"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Hotovo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kruhový posuvník hodin"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kruhový posuvník minut"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index ca619b30a700..bcc7d50344bc 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visning i fuld skærm"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Stryg ned fra toppen for at afslutte."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK, det er forstået"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Udfør"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Cirkulær timevælger"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Cirkulær minutvælger"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 876d3a17aae3..0df4fc6de74b 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Vollbildmodus wird aktiviert"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Zum Beenden von oben nach unten wischen"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ok"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Fertig"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kreisförmiger Schieberegler für Stunden"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kreisförmiger Schieberegler für Minuten"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 172365f825b2..8c354fb8fafa 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Προβολή σε πλήρη οθόνη"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Για έξοδο, σύρετε προς τα κάτω από το επάνω μέρος."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Το κατάλαβα"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Τέλος"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Κυκλικό ρυθμιστικό ωρών"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Κυκλικό ρυθμιστικό λεπτών"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index f42a577009c1..fc37786d66dc 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Got it"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Done"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Hours circular slider"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutes circular slider"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 76ca7cf957c5..7d455c7a31e4 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1840,6 +1840,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Got it"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Rotate for a better view"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Exit split screen for a better view"</string> <string name="done_label" msgid="7283767013231718521">"Done"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Hours circular slider"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutes circular slider"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index e6277647d586..7bc59d77954a 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Got it"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Done"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Hours circular slider"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutes circular slider"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 565cbd9a5137..997929db4543 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Got it"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Done"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Hours circular slider"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutes circular slider"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 2718d425c4e6..b8767b7bcca3 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -1840,6 +1840,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Got it"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Rotate for a better view"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Exit split screen for a better view"</string> <string name="done_label" msgid="7283767013231718521">"Done"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Hours circular slider"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutes circular slider"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 4e5c8f72b0fe..884b767374c2 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visualización en pantalla completa"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para salir, desliza el dedo hacia abajo desde la parte superior."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entendido"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Listo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Control deslizante circular de horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Control deslizante circular de minutos"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 54e22d37d09c..b26ee6a46202 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Modo de pantalla completa"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para salir, desliza el dedo de arriba abajo."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entendido"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Hecho"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Control deslizante circular de horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Control deslizante circular de minutos"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index c72713713bba..0c9559183840 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Kuvamine täisekraanil"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Väljumiseks pühkige ülevalt alla."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Selge"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Valmis"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Ringikujuline tunniliugur"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Ringikujuline minutiliugur"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index bba9c9cd06a4..0dffb903ae2d 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Pantaila osoko ikuspegia"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Irteteko, pasatu hatza goitik behera."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ados"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Eginda"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Ordua aukeratzeko ikuspegi zirkularra"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minutuak aukeratzeko ikuspegi zirkularra"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index f9fa48d386ee..20b67450682f 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -575,7 +575,7 @@ <string name="permdesc_mediaLocation" msgid="597912899423578138">"به برنامه اجازه میدهد مکانها را از مجموعه رسانهتان بخواند."</string> <string name="biometric_app_setting_name" msgid="3339209978734534457">"استفاده از زیستسنجشی"</string> <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"استفاده از زیستسنجشی یا قفل صفحه"</string> - <string name="biometric_dialog_default_title" msgid="55026799173208210">"تأیید کنید این شما هستید"</string> + <string name="biometric_dialog_default_title" msgid="55026799173208210">"تأیید کنید این شمایید"</string> <string name="biometric_dialog_default_subtitle" msgid="8457232339298571992">"برای ادامه، از زیستسنجشی استفاده کنید"</string> <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"برای ادامه، از زیستسنجشی یا قفل صفحه استفاده کنید"</string> <string name="biometric_error_hw_unavailable" msgid="2494077380540615216">"سختافزار زیستسنجی دردسترس نیست"</string> @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"مشاهده در حالت تمام صفحه"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"برای خروج، انگشتتان را از بالای صفحه به پایین بکشید."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"متوجه شدم"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"تمام"</string> <string name="hour_picker_description" msgid="5153757582093524635">"لغزنده دایرهای ساعت"</string> <string name="minute_picker_description" msgid="9029797023621927294">"لغزنده دایرهای دقیقه"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index c81bf0034a60..5f27e36d7e18 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1840,6 +1840,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Koko ruudun tilassa"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Sulje palkki pyyhkäisemällä alas ruudun ylälaidasta."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Selvä"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Kierrä, niin saat paremman näkymän"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Poistu jaetulta näytöltä, niin saat paremman näkymän"</string> <string name="done_label" msgid="7283767013231718521">"Valmis"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Tuntien ympyränmuotoinen liukusäädin"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minuuttien ympyränmuotoinen liukusäädin"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 40b265af02db..eb8a77874ee2 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Affichage plein écran"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Pour quitter, balayez vers le bas à partir du haut."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Terminé"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Curseur circulaire des heures"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Curseur circulaire des minutes"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index c2a84607706d..480a7b50030c 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Affichage en plein écran"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Pour quitter, balayez l\'écran du haut vers le bas."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"OK"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Curseur circulaire des heures"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Curseur circulaire des minutes"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 9353cf8d90e1..1e8063a0fb36 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Vendo pantalla completa"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para saír, pasa o dedo cara abaixo desde a parte superior."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entendido"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Feito"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Control desprazable circular das horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Control desprazable circular dos minutos"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index ad006c6b42a5..45f12d7b4dbd 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"પૂર્ણ સ્ક્રીન પર જુઓ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"બહાર નીકળવા માટે, ટોચ પરથી નીચે સ્વાઇપ કરો."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"સમજાઈ ગયું"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"થઈ ગયું"</string> <string name="hour_picker_description" msgid="5153757582093524635">"કલાકનું વર્તુળાકાર સ્લાઇડર"</string> <string name="minute_picker_description" msgid="9029797023621927294">"મિનિટનું વર્તુળાકાર સ્લાઇડર"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 2a472f803ade..f145a4cc1674 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"आप पूरे स्क्रीन पर देख रहे हैं"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"बाहर निकलने के लिए, ऊपर से नीचे स्वाइप करें."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ठीक है"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"हो गया"</string> <string name="hour_picker_description" msgid="5153757582093524635">"घंटो का चक्राकार स्लाइडर"</string> <string name="minute_picker_description" msgid="9029797023621927294">"मिनटों का चक्राकार स्लाइडर"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 72480a4054c5..e12694147e87 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Gledanje preko cijelog zaslona"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Za izlaz prijeđite prstom od vrha prema dolje."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Shvaćam"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Gotovo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kružni klizač sati"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kružni klizač minuta"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index f9a93a8fbf0f..a529352a3038 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Megtekintése teljes képernyőn"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Kilépéshez csúsztassa ujját fentről lefelé."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Értem"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Kész"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Óra kör alakú csúszkája"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Perc kör alakú csúszkája"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 138d810e7ad5..825924c158ef 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Լիաէկրան դիտում"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Դուրս գալու համար վերևից սահահարվածեք դեպի ներքև:"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Պարզ է"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Պատրաստ է"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Ժամերի ընտրություն թվատախտակից"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Րոպեների ընտրություն թվատախտակից"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index b02345ac9945..8768e4d6ff97 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Melihat layar penuh"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Untuk keluar, geser layar ke bawah dari atas."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Mengerti"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Selesai"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Penggeser putar jam"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Penggeser putar menit"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 77df3312fc8d..9a27d8dc5c7d 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Notar allan skjáinn"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Strjúktu niður frá efri brún til að hætta."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ég skil"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Lokið"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Valskífa fyrir klukkustundir"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Valskífa fyrir mínútur"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 13f265e56770..8a6ef85975a5 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visualizzazione a schermo intero"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Per uscire, scorri dall\'alto verso il basso."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Fine"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Dispositivo di scorrimento circolare per le ore"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Dispositivo di scorrimento circolare per i minuti"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 30426c9b34f2..4ad7c2c2ad1b 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"צפייה במסך מלא"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"כדי לצאת, פשוט מחליקים אצבע מלמעלה למטה."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"הבנתי"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"סיום"</string> <string name="hour_picker_description" msgid="5153757582093524635">"מחוון שעות מעגלי"</string> <string name="minute_picker_description" msgid="9029797023621927294">"מחוון דקות מעגלי"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 2700f02278f1..917f91146fa8 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"全画面表示"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"終了するには、上から下にスワイプします。"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"完了"</string> <string name="hour_picker_description" msgid="5153757582093524635">"円形スライダー（時）"</string> <string name="minute_picker_description" msgid="9029797023621927294">"円形スライダー（分）"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 760819989871..e8b84e24cd73 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"სრულ ეკრანზე ნახვა"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"გამოსვლისათვის, გაასრიალეთ ზემოდან ქვემოთ."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"გასაგებია"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"დასრულდა"</string> <string name="hour_picker_description" msgid="5153757582093524635">"საათების წრიული სლაიდერი"</string> <string name="minute_picker_description" msgid="9029797023621927294">"წუთების წრიული სლაიდერი"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 4dba2d16a4b0..306af3ac1ccb 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Толық экранда көру"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Шығу үшін жоғарыдан төмен қарай сырғытыңыз."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Түсінікті"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Дайын"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Сағаттар айналымының қозғалтқышы"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Минут айналымын қозғалтқыш"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 430493c2652e..2f4b516e41f9 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"កំពុងមើលពេញអេក្រង់"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ដើម្បីចាកចេញ សូមអូសពីលើចុះក្រោម។"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"យល់ហើយ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"រួចរាល់"</string> <string name="hour_picker_description" msgid="5153757582093524635">"គ្រាប់រំកិលរង្វង់ម៉ោង"</string> <string name="minute_picker_description" msgid="9029797023621927294">"គ្រាប់រំកិលរង្វង់នាទី"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index d9239373ad34..a04faa5148e3 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ಪೂರ್ಣ ಪರದೆಯನ್ನು ವೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ನಿರ್ಗಮಿಸಲು, ಮೇಲಿನಿಂದ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ತಿಳಿಯಿತು"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ಮುಗಿದಿದೆ"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ಗಂಟೆಗಳ ವೃತ್ತಾಕಾರ ಸ್ಲೈಡರ್"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ನಿಮಿಷಗಳ ವೃತ್ತಾಕಾರ ಸ್ಲೈಡರ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 4df03228c9b2..4974f9546ff1 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"전체 화면 모드"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"종료하려면 위에서 아래로 스와이프합니다."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"확인"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"완료"</string> <string name="hour_picker_description" msgid="5153757582093524635">"시간 원형 슬라이더"</string> <string name="minute_picker_description" msgid="9029797023621927294">"분 원형 슬라이더"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 521c998ef985..cbc29dc04fb2 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Толук экран режими"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Чыгуу үчүн экранды ылдый сүрүп коюңуз."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Түшүндүм"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Даяр"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Саат жебеси"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Мүнөт жебеси"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index a172576284b5..09b8bfc99827 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ການເບິ່ງເຕັມໜ້າຈໍ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ຫາກຕ້ອງການອອກ, ໃຫ້ຮູດຈາກທາງເທິງລົງມາທາງລຸ່ມ."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ໄດ້ແລ້ວ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ແລ້ວໆ"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ໂຕໝຸນປັບຊົ່ວໂມງ"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ໂຕໝຸນປັບນາທີ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 6da22edba445..8f5e7fba720a 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1842,6 +1842,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Peržiūrima viso ekrano režimu"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Jei norite išeiti, perbraukite žemyn iš viršaus."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Supratau"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Pasukite, kad geriau matytumėte vaizdą"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Išeikite iš išskaidyto ekrano režimo, kad geriau matytumėte vaizdą"</string> <string name="done_label" msgid="7283767013231718521">"Atlikta"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Apskritas valandų šliaužiklis"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Apskritas minučių šliaužiklis"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index aeb89a29884a..4edf9682a230 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Skatīšanās pilnekrāna režīmā"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Lai izietu, no augšdaļas velciet lejup."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Labi"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Gatavs"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Stundu apļveida slīdnis"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Minūšu apļveida slīdnis"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 44b8e4647b65..dbbd58554401 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Се прикажува на цел екран"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"За да излезете, повлечете одозгора надолу."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Сфатив"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Готово"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Приказ на часови во кружно движење"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Приказ на минути во кружно движење"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 1b7daec70c33..b59c32200d61 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"പൂർണ്ണ സ്ക്രീനിൽ കാണുന്നു"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"അവസാനിപ്പിക്കാൻ, മുകളിൽ നിന്ന് താഴോട്ട് സ്വൈപ്പ് ചെയ്യുക."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"മനസ്സിലായി"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"പൂർത്തിയാക്കി"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ചാക്രികമായി മണിക്കൂറുകൾ ദൃശ്യമാകുന്ന സ്ലൈഡർ"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ചാക്രികമായി മിനിറ്റുകൾ ദൃശ്യമാകുന്ന സ്ലൈഡർ"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index dd6b40d1da38..029358b14d13 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Бүтэн дэлгэцээр үзэж байна"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Гарахаар бол дээрээс нь доош нь чирнэ үү."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ойлголоо"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Дууссан"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Цаг гүйлгэгч"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Минут гүйлгэгч"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 6be015aaa3c6..ad224693220a 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"पूर्ण स्क्रीनवर पाहत आहात"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"बाहेर पडण्यासाठी, वरून खाली स्वाइप करा."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"समजले"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"पूर्ण झाले"</string> <string name="hour_picker_description" msgid="5153757582093524635">"तास परिपत्रक स्लायडर"</string> <string name="minute_picker_description" msgid="9029797023621927294">"मिनिटे परिपत्रक स्लायडर"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 8ac73734752c..c038505f61b1 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Melihat skrin penuh"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Untuk keluar, leret dari atas ke bawah."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Faham"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Selesai"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Penggelangsar bulatan jam"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Penggelangsar bulatan minit"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 8603b280e058..badd048647c4 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"မျက်နှာပြင်အပြည့် ကြည့်နေသည်"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ထွက်ရန် အပေါ်မှ အောက်သို့ ဆွဲချပါ။"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ရပါပြီ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ပြီးပါပြီ"</string> <string name="hour_picker_description" msgid="5153757582093524635">"နာရီရွေးချက်စရာ"</string> <string name="minute_picker_description" msgid="9029797023621927294">"မိနစ်လှည့်သော ရွေ့လျားတန်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index fe9f9155688a..023e48f753c3 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visning i fullskjerm"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Sveip ned fra toppen for å avslutte."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Skjønner"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Ferdig"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Sirkulær glidebryter for timer"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Sirkulær glidebryter for minutter"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index edeb116bca93..f789ed616eba 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"पूरा पर्दा हेर्दै"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"बाहिर निस्कन, माथिबाट तल स्वाइप गर्नुहोस्।"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"बुझेँ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"भयो"</string> <string name="hour_picker_description" msgid="5153757582093524635">"घन्टा गोलाकार स्लाइडर"</string> <string name="minute_picker_description" msgid="9029797023621927294">"मिनेट गोलाकार स्लाइडर"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 6028b9158edb..7cc02fed175a 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Volledig scherm wordt getoond"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Swipe omlaag vanaf de bovenkant van het scherm om af te sluiten."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ik snap het"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Klaar"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Ronde schuifregelaar voor uren"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Ronde schuifregelaar voor minuten"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 83cb868fb17f..b8f017ed465c 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -1077,13 +1077,13 @@ <string name="menu_space_shortcut_label" msgid="5949311515646872071">"ସ୍ପେସ୍"</string> <string name="menu_enter_shortcut_label" msgid="6709499510082897320">"ଏଣ୍ଟର୍"</string> <string name="menu_delete_shortcut_label" msgid="4365787714477739080">"ଡିଲିଟ୍ କରନ୍ତୁ"</string> - <string name="search_go" msgid="2141477624421347086">"ସନ୍ଧାନ କରନ୍ତୁ"</string> - <string name="search_hint" msgid="455364685740251925">"ସନ୍ଧାନ…"</string> - <string name="searchview_description_search" msgid="1045552007537359343">"ସନ୍ଧାନ କରନ୍ତୁ"</string> + <string name="search_go" msgid="2141477624421347086">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> + <string name="search_hint" msgid="455364685740251925">"ସର୍ଚ୍ଚ କରନ୍ତୁ…"</string> + <string name="searchview_description_search" msgid="1045552007537359343">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="searchview_description_query" msgid="7430242366971716338">"କ୍ୱେରୀ ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="searchview_description_clear" msgid="1989371719192982900">"କ୍ୱେରୀ ଖାଲି କରନ୍ତୁ"</string> <string name="searchview_description_submit" msgid="6771060386117334686">"କ୍ୱେରୀ ଦାଖଲ କରନ୍ତୁ"</string> - <string name="searchview_description_voice" msgid="42360159504884679">"ଭଏସ୍ ସର୍ଚ୍ଚ"</string> + <string name="searchview_description_voice" msgid="42360159504884679">"ଭଏସ ସର୍ଚ୍ଚ"</string> <string name="enable_explore_by_touch_warning_title" msgid="5095399706284943314">"’ସ୍ପର୍ଶ କରି ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ’ ସକ୍ଷମ କରିବେ?"</string> <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="1037295476738940824">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ’ସ୍ପର୍ଶ କରି ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ’ ସକ୍ଷମ କରିବାକୁ ଚାହେଁ। ’ସ୍ପର୍ଶ କରି ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ’ ଅନ୍ ଥିବାବେଳେ, ଆପଣଙ୍କ ଆଙ୍ଗୁଠି ତଳେ କ’ଣ ଅଛି, ତାହାର ବ୍ୟାଖ୍ୟା ଦେଖିପାରିବେ କିମ୍ବା ଟାବ୍ଲେଟ୍ ସହ କଥାବାର୍ତ୍ତା କରିବାକୁ ଜେଶ୍ଚର୍ କରିପାରିବେ।"</string> <string name="enable_explore_by_touch_warning_message" product="default" msgid="4312979647356179250">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ’ସ୍ପର୍ଶ କରି ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ’ ସକ୍ଷମ କରିବାକୁ ଚାହେଁ। ’ସ୍ପର୍ଶ କରି ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ’ ଅନ୍ ଥିବାବେଳେ, ଆପଣଙ୍କ ଆଙ୍ଗୁଠି ତଳେ କ’ଣ ଅଛି, ତାହାର ବ୍ୟାଖ୍ୟା ଦେଖିପାରିବେ କିମ୍ବା ଫୋନ୍ ସହ କଥାବାର୍ତ୍ତା କରିବାକୁ ଜେଶ୍ଚର୍ କରିପାରିବେ।"</string> @@ -1463,7 +1463,7 @@ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1842872462124648678">"ଜୁମ୍ ନିୟନ୍ତ୍ରଣ ପାଇଁ ଦୁଇଥର ଟାପ୍ କରନ୍ତୁ"</string> <string name="gadget_host_error_inflating" msgid="2449961590495198720">"ୱିଜେଟ୍ ଯୋଡ଼ିପାରିବ ନାହିଁ।"</string> <string name="ime_action_go" msgid="5536744546326495436">"ଯାଆନ୍ତୁ"</string> - <string name="ime_action_search" msgid="4501435960587287668">"ସନ୍ଧାନ କରନ୍ତୁ"</string> + <string name="ime_action_search" msgid="4501435960587287668">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="ime_action_send" msgid="8456843745664334138">"ପଠାନ୍ତୁ"</string> <string name="ime_action_next" msgid="4169702997635728543">"ପରବର୍ତ୍ତୀ"</string> <string name="ime_action_done" msgid="6299921014822891569">"ହୋଇଗଲା"</string> @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରୀନରେ ଦେଖାଯାଉଛି"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ବାହାରିବା ପାଇଁ, ଉପରୁ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ବୁଝିଗଲି"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ହୋଇଗଲା"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ଘଣ୍ଟା ସର୍କୁଲାର୍ ସ୍ଲାଇଡର୍"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ମିନିଟ୍ସ ସର୍କୁଲାର୍ ସ୍ଲାଇଡର୍"</string> @@ -1931,7 +1935,7 @@ <string name="language_picker_regions_section_suggested" msgid="6080131515268225316">"ପ୍ରସ୍ତାବିତ"</string> <string name="language_picker_section_all" msgid="1985809075777564284">"ସମସ୍ତ ଭାଷା"</string> <string name="region_picker_section_all" msgid="756441309928774155">"ସମସ୍ତ ଅଞ୍ଚଳ"</string> - <string name="locale_search_menu" msgid="6258090710176422934">"ସନ୍ଧାନ କରନ୍ତୁ"</string> + <string name="locale_search_menu" msgid="6258090710176422934">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="app_suspended_title" msgid="888873445010322650">"ଆପ୍ ଉପଲବ୍ଧ ନାହିଁ"</string> <string name="app_suspended_default_message" msgid="6451215678552004172">"ବର୍ତ୍ତମାନ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ଉପଲବ୍ଧ ନାହିଁ। ଏହା <xliff:g id="APP_NAME_1">%2$s</xliff:g> ଦ୍ଵାରା ପରିଚାଳିତ ହେଉଛି।"</string> <string name="app_suspended_more_details" msgid="211260942831587014">"ଅଧିକ ଜାଣନ୍ତୁ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index d78c6fce3c78..66aca4fd8836 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ਪੂਰੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦੇਖੋ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ਬਾਹਰ ਜਾਣ ਲਈ, ਉਪਰੋਂ ਹੇਠਾਂ ਸਵਾਈਪ ਕਰੋ।"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ਸਮਝ ਲਿਆ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ਹੋ ਗਿਆ"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ਘੰਟੇ ਸਰਕੁਲਰ ਸਲਾਈਡਰ"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ਮਿੰਟ ਸਰਕੁਲਰ ਸਲਾਈਡਰ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index a2c06b787bfb..61e3217f2669 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Włączony pełny ekran"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Aby wyjść, przesuń palcem z góry na dół."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Gotowe"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kołowy suwak godzin"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kołowy suwak minut"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 9768208e5171..91f0a0720f3a 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visualização em tela cheia"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para sair, deslize de cima para baixo."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entendi"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Concluído"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Controle deslizante circular das horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Controle deslizante circular dos minutos"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 6d7f3915a7a1..03bc7057fa93 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visualização de ecrã inteiro"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para sair, deslize rapidamente para baixo a partir da parte superior."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Concluído"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Controlo de deslize circular das horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Controlo de deslize circular dos minutos"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 9768208e5171..91f0a0720f3a 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visualização em tela cheia"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Para sair, deslize de cima para baixo."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Entendi"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Concluído"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Controle deslizante circular das horas"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Controle deslizante circular dos minutos"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 83fba3f85538..38ba48dd62c5 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1841,6 +1841,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Vizualizare pe ecran complet"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Pentru a ieși, glisează de sus în jos."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Am înțeles"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Terminat"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Selector circular pentru ore"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Selector circular pentru minute"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 713e67da475a..93cbae2f7fcd 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Полноэкранный режим"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Чтобы выйти, проведите по экрану сверху вниз."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"ОК"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Готово"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Выбор часов на циферблате"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Выбор минут на циферблате"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 8605c679d55b..d79d0b8fbe2a 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"මුළු තිරය බලමින්"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"ඉවත් වීමට, ඉහළ සිට පහළට ස්වයිප් කරන්න"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"වැටහුණි"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"අවසන්"</string> <string name="hour_picker_description" msgid="5153757582093524635">"පැය කවාකාර සර්පනය"</string> <string name="minute_picker_description" msgid="9029797023621927294">"මිනිත්තු කවාකාර සර්පනය"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 63ff006e8105..092827f30fa8 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Zobrazenie na celú obrazovku"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Ukončíte potiahnutím zhora nadol."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Dobre"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Hotovo"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kruhový posúvač hodín"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kruhový posúvač minút"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index e0026a689768..f5578237ab41 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Vklopljen je celozaslonski način"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Zaprete ga tako, da z vrha s prstom povlečete navzdol."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Razumem"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Dokončano"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Okrogli drsnik za ure"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Okrogli drsnik za minute"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 47e208d679ff..7875ea25d26a 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Po shikon ekranin e plotë"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Për të dalë, rrëshqit nga lart poshtë."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"E kuptova"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"U krye"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Rrëshqitësi rrethor i orëve"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Rrëshqitësi rrethor i minutave"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index f606c8f2c907..bf8c0f76d5ee 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1841,6 +1841,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Приказује се цео екран"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Да бисте изашли, превуците надоле одозго."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Важи"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Ротирајте ради бољег приказа"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Изађите из подељеног екрана ради бољег приказа"</string> <string name="done_label" msgid="7283767013231718521">"Готово"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Кружни клизач за сате"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Кружни клизач за минуте"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index d79049c4331a..7e920d8b3500 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Visar på fullskärm"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Svep nedåt från skärmens överkant för att avsluta."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Klart"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Cirkelreglage för timmar"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Cirkelreglage för minuter"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 180293f84809..d380436066ef 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Unatazama skrini nzima"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Ili kuondoka, telezesha kidole kutoka juu hadi chini."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Nimeelewa"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Imekamilika"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Kitelezi cha mviringo wa saa"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Kitelezi cha mviringo wa dakika"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 92f0b0a0f025..aee945de527a 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"முழுத் திரையில் காட்டுகிறது"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"வெளியேற, மேலிருந்து கீழே ஸ்வைப் செய்யவும்"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"புரிந்தது"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"முடிந்தது"</string> <string name="hour_picker_description" msgid="5153757582093524635">"மணிநேர வட்ட வடிவ ஸ்லைடர்"</string> <string name="minute_picker_description" msgid="9029797023621927294">"நிமிடங்களுக்கான வட்டவடிவ ஸ்லைடர்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 4e287c196516..7d6b3cd221f7 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"ఫుల్-స్క్రీన్లో వీక్షిస్తున్నారు"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"నిష్క్రమించడానికి, పై నుండి క్రిందికి స్వైప్ చేయండి."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"అర్థమైంది"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"పూర్తయింది"</string> <string name="hour_picker_description" msgid="5153757582093524635">"గంటల వృత్తాకార స్లయిడర్"</string> <string name="minute_picker_description" msgid="9029797023621927294">"నిమిషాల వృత్తాకార స్లయిడర్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index a14b5742481d..852aef06b2dd 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"กำลังดูแบบเต็มหน้าจอ"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"หากต้องการออก ให้เลื่อนลงจากด้านบน"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"รับทราบ"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"เสร็จสิ้น"</string> <string name="hour_picker_description" msgid="5153757582093524635">"ตัวเลื่อนหมุนระบุชั่วโมง"</string> <string name="minute_picker_description" msgid="9029797023621927294">"ตัวเลื่อนหมุนระบุนาที"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 349a39b7f662..7540fcdbb0ce 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Panonood sa full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Upang lumabas, mag-swipe mula sa itaas pababa."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Nakuha ko"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Tapos na"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Pabilog na slider ng mga oras"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Pabilog na slider ng mga minuto"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 4e8c5ef7b5dd..10501d661581 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Tam ekran olarak görüntüleme"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Çıkmak için yukarıdan aşağıya doğru hızlıca kaydırın."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Anladım"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Bitti"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Saat kaydırma çemberi"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Dakika kaydırma çemberi"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index b62e4a34958c..eecc6e28535d 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1842,6 +1842,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Перегляд на весь екран"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Щоб вийти, проведіть пальцем зверху вниз."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Готово"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Вибір годин на циферблаті"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Вибір хвилин на циферблаті"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index e3783c32af4a..feea70c2a2dd 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"پوری اسکرین میں دیکھ رہے ہیں"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"خارج ہونے کیلئے اوپر سے نیچے سوائپ کریں۔"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"سمجھ آ گئی"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"ہو گیا"</string> <string name="hour_picker_description" msgid="5153757582093524635">"گھنٹوں کا سرکلر سلائیڈر"</string> <string name="minute_picker_description" msgid="9029797023621927294">"منٹس سرکلر سلائیڈر"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 4a23c25827f9..8d3bedf9e860 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1840,6 +1840,8 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Butun ekranli rejim"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Chiqish uchun tepadan pastga torting."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <string name="display_rotation_camera_compat_toast_after_rotation" msgid="7600891546249829854">"Yaxshiroq koʻrish uchun kamerani buring"</string> + <string name="display_rotation_camera_compat_toast_in_split_screen" msgid="8393302456336805466">"Yaxshiroq koʻrish uchun ajratilgan ekran rejimidan chiqing"</string> <string name="done_label" msgid="7283767013231718521">"Tayyor"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Doiradan soatni tanlang"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Doiradan daqiqani tanlang"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index e27495ff2ccb..05acca683c89 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Xem toàn màn hình"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Để thoát, hãy vuốt từ trên cùng xuống dưới."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"OK"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Xong"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Thanh trượt giờ hình tròn"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Thanh trượt phút hình tròn"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 1c419fc9c0bf..604e09a226da 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"目前处于全屏模式"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"要退出，请从顶部向下滑动。"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"知道了"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"完成"</string> <string name="hour_picker_description" msgid="5153757582093524635">"小时转盘"</string> <string name="minute_picker_description" msgid="9029797023621927294">"分钟转盘"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index cc4d15e339dd..85124a4a93be 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"開啟全螢幕"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"由頂部向下滑動即可退出。"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"知道了"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"完成"</string> <string name="hour_picker_description" msgid="5153757582093524635">"小時環形滑桿"</string> <string name="minute_picker_description" msgid="9029797023621927294">"分鐘環形滑桿"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index b4b6c3b5c1eb..9207ce2c84ed 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"以全螢幕檢視"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"如要退出，請從畫面頂端向下滑動。"</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"知道了"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"完成"</string> <string name="hour_picker_description" msgid="5153757582093524635">"小時數環狀滑桿"</string> <string name="minute_picker_description" msgid="9029797023621927294">"分鐘數環狀滑桿"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index d40fd0a19787..5d5d14c15bb7 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1840,6 +1840,10 @@ <string name="immersive_cling_title" msgid="2307034298721541791">"Ukubuka isikrini esigcwele"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"Ukuze uphume, swayiphela phansi kusuka phezulu."</string> <string name="immersive_cling_positive" msgid="7047498036346489883">"Ngiyitholile"</string> + <!-- no translation found for display_rotation_camera_compat_toast_after_rotation (7600891546249829854) --> + <skip /> + <!-- no translation found for display_rotation_camera_compat_toast_in_split_screen (8393302456336805466) --> + <skip /> <string name="done_label" msgid="7283767013231718521">"Kwenziwe"</string> <string name="hour_picker_description" msgid="5153757582093524635">"Amahora weslayidi esiyindingilizi"</string> <string name="minute_picker_description" msgid="9029797023621927294">"Amaminithi weslayidi esiyindingilizi"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d4b151dd8220..87ece556a0ee 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -984,6 +984,15 @@ <!-- Boolean indicating whether light mode is allowed when DWB is turned on. --> <bool name="config_displayWhiteBalanceLightModeAllowed">true</bool> + <!-- Duration, in milliseconds, of the display white balance animated transitions. --> + <integer name="config_displayWhiteBalanceTransitionTime">3000</integer> + + <!-- Device states where the sensor based rotation values should be reversed around the Z axis + for the default display. + TODO(b/265312193): Remove this workaround when this bug is fixed.--> + <integer-array name="config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis"> + </integer-array> + <!-- Indicate available ColorDisplayManager.COLOR_MODE_xxx. --> <integer-array name="config_availableColorModes"> <!-- Example: diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9410e0682106..ba541839ee0c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5154,6 +5154,14 @@ <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] --> <string name="immersive_cling_positive">Got it</string> + <!-- Text on a toast shown after the system rotates the screen for camera app + compatibility. [CHAR LIMIT=NONE] --> + <string name="display_rotation_camera_compat_toast_after_rotation">Rotate for a better view</string> + + <!-- Text on a toast shown when a camera view is started within the app that may not be able + to display the camera preview correctly while in split screen. [CHAR LIMIT=NONE] --> + <string name="display_rotation_camera_compat_toast_in_split_screen">Exit split screen for a better view</string> + <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] --> <string name="done_label">Done</string> <!-- diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f95b9cf022de..a74c787fdab1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3435,6 +3435,12 @@ <java-symbol type="array" name="config_displayWhiteBalanceDisplayPrimaries" /> <java-symbol type="array" name="config_displayWhiteBalanceDisplayNominalWhite" /> <java-symbol type="bool" name="config_displayWhiteBalanceLightModeAllowed" /> + <java-symbol type="integer" name="config_displayWhiteBalanceTransitionTime" /> + + <!-- Device states where the sensor based rotation values should be reversed around the Z axis + for the default display. + TODO(b/265312193): Remove this workaround when this bug is fixed.--> + <java-symbol type="array" name="config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis" /> <!-- Default first user restrictions --> <java-symbol type="array" name="config_defaultFirstUserRestrictions" /> diff --git a/core/tests/screenshothelpertests/src/com/android/internal/util/ScreenshotRequestTest.java b/core/tests/screenshothelpertests/src/com/android/internal/util/ScreenshotRequestTest.java index 30540a5f013b..89acbc7986fb 100644 --- a/core/tests/screenshothelpertests/src/com/android/internal/util/ScreenshotRequestTest.java +++ b/core/tests/screenshothelpertests/src/com/android/internal/util/ScreenshotRequestTest.java @@ -131,6 +131,12 @@ public final class ScreenshotRequestTest { assertEquals(Insets.NONE, out.getInsets()); } + @Test + public void testInvalidType() { + assertThrows(IllegalArgumentException.class, + () -> new ScreenshotRequest.Builder(5, 2).build()); + } + private Bitmap makeHardwareBitmap(int width, int height) { HardwareBuffer buffer = HardwareBuffer.create( width, height, HardwareBuffer.RGBA_8888, 1, HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE); diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index f47d9c6e0c2d..1cf819af7a24 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -3331,6 +3331,12 @@ "group": "WM_DEBUG_STATES", "at": "com\/android\/server\/wm\/TaskFragment.java" }, + "1015746067": { + "message": "Display id=%d is ignoring orientation request for %d, return %d following a per-app override for %s", + "level": "VERBOSE", + "group": "WM_DEBUG_ORIENTATION", + "at": "com\/android\/server\/wm\/DisplayContent.java" + }, "1022095595": { "message": "TaskFragment info changed name=%s", "level": "VERBOSE", diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index f615ad6e671b..0f4521951e3d 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -47,6 +47,7 @@ filegroup { "src/com/android/wm/shell/sysui/ShellSharedConstants.java", "src/com/android/wm/shell/common/TransactionPool.java", "src/com/android/wm/shell/animation/Interpolators.java", + "src/com/android/wm/shell/pip/PipContentOverlay.java", "src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java", ], path: "src", diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index 3d50d2262bb8..33e6aa6e487a 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dubbeltik buite ’n program om dit te herposisioneer"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Het dit"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Vou uit vir meer inligting."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Herbegin vir ’n beter aansig?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Jy kan die app herbegin sodat dit beter op jou skerm lyk, maar jy sal dalk jou vordering of enige ongestoorde veranderinge verloor"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Kanselleer"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Herbegin"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Moenie weer wys nie"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimeer"</string> <string name="minimize_button_text" msgid="271592547935841753">"Maak klein"</string> <string name="close_button_text" msgid="2913281996024033299">"Maak toe"</string> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index 70304aa9f562..b6b99e52c660 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ቦታውን ለመቀየር ከመተግበሪያው ውጪ ሁለቴ መታ ያድርጉ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ገባኝ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ለተጨማሪ መረጃ ይዘርጉ።"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"አስፋ"</string> <string name="minimize_button_text" msgid="271592547935841753">"አሳንስ"</string> <string name="close_button_text" msgid="2913281996024033299">"ዝጋ"</string> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index 0f74aab78924..7b2adedd32bc 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"انقر مرّتين خارج تطبيق لتغيير موضعه."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"حسنًا"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"التوسيع للحصول على مزيد من المعلومات"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"تكبير"</string> <string name="minimize_button_text" msgid="271592547935841753">"تصغير"</string> <string name="close_button_text" msgid="2913281996024033299">"إغلاق"</string> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index a0213f42b125..11a7e321b16f 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"এপ্টোৰ স্থান সলনি কৰিবলৈ ইয়াৰ বাহিৰত দুবাৰ টিপক"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"বুজি পালোঁ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"অধিক তথ্যৰ বাবে বিস্তাৰ কৰক।"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"সৰ্বাধিক মাত্ৰালৈ বঢ়াওক"</string> <string name="minimize_button_text" msgid="271592547935841753">"মিনিমাইজ কৰক"</string> <string name="close_button_text" msgid="2913281996024033299">"বন্ধ কৰক"</string> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index f842bfe13efc..10663ee30553 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tətbiqin yerini dəyişmək üçün kənarına iki dəfə toxunun"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Anladım"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ətraflı məlumat üçün genişləndirin."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Daha yaxşı görünüş üçün yenidən başladılsın?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Tətbiqi yenidən başlada bilərsiniz ki, ekranınızda daha yaxşı görünsün, lakin irəliləyişi və ya yadda saxlanmamış dəyişiklikləri itirə bilərsiniz"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Ləğv edin"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Yenidən başladın"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Yenidən göstərməyin"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Böyüdün"</string> <string name="minimize_button_text" msgid="271592547935841753">"Kiçildin"</string> <string name="close_button_text" msgid="2913281996024033299">"Bağlayın"</string> diff --git a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml index 540ae7ce6953..47e661c531a2 100644 --- a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml +++ b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da biste promenili njenu poziciju"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Važi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite za još informacija."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Želite li da restartujete radi boljeg prikaza?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Možete da restartujete aplikaciju da bi izgledala bolje na ekranu, s tim što možete da izgubite ono što ste uradili ili nesačuvane promene, ako ih ima"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Otkaži"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restartuj"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne prikazuj ponovo"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Uvećajte"</string> <string name="minimize_button_text" msgid="271592547935841753">"Umanjite"</string> <string name="close_button_text" msgid="2913281996024033299">"Zatvorite"</string> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index bea753837b7b..0961f3002042 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Двойчы націсніце экран па-за праграмай, каб перамясціць яе"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Зразумела"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Разгарнуць для дадатковай інфармацыі"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Разгарнуць"</string> <string name="minimize_button_text" msgid="271592547935841753">"Згарнуць"</string> <string name="close_button_text" msgid="2913281996024033299">"Закрыць"</string> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index 59915e6b2a6e..6a0648b87ad6 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Докоснете два пъти извън дадено приложение, за да промените позицията му"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Разбрах"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Разгъване за още информация."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Увеличаване"</string> <string name="minimize_button_text" msgid="271592547935841753">"Намаляване"</string> <string name="close_button_text" msgid="2913281996024033299">"Затваряне"</string> diff --git a/libs/WindowManager/Shell/res/values-bn/strings.xml b/libs/WindowManager/Shell/res/values-bn/strings.xml index 63c9684070b6..5e801044d835 100644 --- a/libs/WindowManager/Shell/res/values-bn/strings.xml +++ b/libs/WindowManager/Shell/res/values-bn/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"কোনও অ্যাপের স্থান পরিবর্তন করতে তার বাইরে ডবল ট্যাপ করুন"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"বুঝেছি"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"আরও তথ্যের জন্য বড় করুন।"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"বড় করুন"</string> <string name="minimize_button_text" msgid="271592547935841753">"ছোট করুন"</string> <string name="close_button_text" msgid="2913281996024033299">"বন্ধ করুন"</string> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index b725efea6e48..2405b2aa5180 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da promijenite njen položaj"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Razumijem"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite za više informacija."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Ponovo pokrenuti za bolji prikaz?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Možete ponovo pokrenuti aplikaciju da bolje izgleda na ekranu, ali možete izgubiti napredak ili izmjene koje nisu sačuvane"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Otkaži"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Ponovo pokreni"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne prikazuj ponovo"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimiziranje"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimiziranje"</string> <string name="close_button_text" msgid="2913281996024033299">"Zatvaranje"</string> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index 4383916f6597..3b070d86e241 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Fes doble toc fora d\'una aplicació per canviar-ne la posició"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entesos"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Desplega per obtenir més informació."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximitza"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimitza"</string> <string name="close_button_text" msgid="2913281996024033299">"Tanca"</string> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index e5cb26f3e3b4..3606eaa5c9c6 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvojitým klepnutím mimo aplikaci změníte její umístění"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Rozbalením zobrazíte další informace."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximalizovat"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalizovat"</string> <string name="close_button_text" msgid="2913281996024033299">"Zavřít"</string> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index 46f7c6985ec2..487d41225309 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tryk to gange uden for en app for at justere dens placering"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Udvid for at få flere oplysninger."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimér"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimer"</string> <string name="close_button_text" msgid="2913281996024033299">"Luk"</string> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index 1269d362903d..0ec59e7c5aa9 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Außerhalb einer App doppeltippen, um die Position zu ändern"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ok"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Für weitere Informationen maximieren."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximieren"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimieren"</string> <string name="close_button_text" msgid="2913281996024033299">"Schließen"</string> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index f8a69ef796b9..4f4265adfc32 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Πατήστε δύο φορές έξω από μια εφαρμογή για να αλλάξετε τη θέση της"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Το κατάλαβα"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ανάπτυξη για περισσότερες πληροφορίες."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Επανεκκίνηση για καλύτερη προβολή;"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Μπορείτε να επανεκκινήσετε την εφαρμογή για να προβάλλεται καλύτερα στην οθόνη σας, αλλά η πρόοδός σας και τυχόν μη αποθηκευμένες αλλαγές ενδέχεται να χαθούν."</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Ακύρωση"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Επανεκκίνηση"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Να μην εμφανιστεί ξανά"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Μεγιστοποίηση"</string> <string name="minimize_button_text" msgid="271592547935841753">"Ελαχιστοποίηση"</string> <string name="close_button_text" msgid="2913281996024033299">"Κλείσιμο"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml index 8e46c3e0999e..e29b01b392ba 100644 --- a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Restart for a better view?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"You can restart the app so that it looks better on your screen, but you may lose your progress or any unsaved changes"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Don\'t show again"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximise"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimise"</string> <string name="close_button_text" msgid="2913281996024033299">"Close"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml index 7cbbf64991cd..9228c59320f1 100644 --- a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Restart for a better view?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"You can restart the app so it looks better on your screen, but you may lose your progress or any unsaved changes"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Don’t show again"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximize"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimize"</string> <string name="close_button_text" msgid="2913281996024033299">"Close"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml index 8e46c3e0999e..e29b01b392ba 100644 --- a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Restart for a better view?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"You can restart the app so that it looks better on your screen, but you may lose your progress or any unsaved changes"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Don\'t show again"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximise"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimise"</string> <string name="close_button_text" msgid="2913281996024033299">"Close"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml index 8e46c3e0999e..e29b01b392ba 100644 --- a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Restart for a better view?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"You can restart the app so that it looks better on your screen, but you may lose your progress or any unsaved changes"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Don\'t show again"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximise"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimise"</string> <string name="close_button_text" msgid="2913281996024033299">"Close"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml index b2720be3d8a0..cf231145f906 100644 --- a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Double-tap outside an app to reposition it"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Got it"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expand for more information."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Restart for a better view?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"You can restart the app so it looks better on your screen, but you may lose your progress or any unsaved changes"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancel"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Don’t show again"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximize"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimize"</string> <string name="close_button_text" msgid="2913281996024033299">"Close"</string> diff --git a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml index 47445a7a0488..a147be3e48a5 100644 --- a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml +++ b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Presiona dos veces fuera de una app para cambiar su ubicación"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expande para obtener más información."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"¿Quieres reiniciar para que se vea mejor?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Puedes reiniciar la app para que se vea mejor en la pantalla, pero podrías perder tu progreso o cualquier cambio que no hayas guardado"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"No volver a mostrar"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Cerrar"</string> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 6c45231c3261..9c5aa926d732 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toca dos veces fuera de una aplicación para cambiarla de posición"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Mostrar más información"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Cerrar"</string> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index a8dc08cbbd27..f7eafbd05c63 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Topeltpuudutage rakendusest väljaspool, et selle asendit muuta"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Selge"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Laiendage lisateabe saamiseks."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimeeri"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimeeri"</string> <string name="close_button_text" msgid="2913281996024033299">"Sule"</string> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index 9fbf0a070019..a46095a35216 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Aplikazioaren posizioa aldatzeko, sakatu birritan haren kanpoaldea"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ados"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Informazio gehiago lortzeko, zabaldu hau."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Aplikazioa berrabiarazi nahi duzu itxura hobea izan dezan?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Aplikazioa berrabiarazi egin dezakezu itxura hobea izan dezan, baina agian garapena edo gorde gabeko aldaketak galduko dituzu"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Utzi"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Berrabiarazi"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ez erakutsi berriro"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizatu"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizatu"</string> <string name="close_button_text" msgid="2913281996024033299">"Itxi"</string> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index e7cb5f41a3ac..ea8fafea8780 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"برای جابهجا کردن برنامه، بیرون از آن دوضربه بزنید"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"متوجهام"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"برای اطلاعات بیشتر، گسترده کنید."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"بزرگ کردن"</string> <string name="minimize_button_text" msgid="271592547935841753">"کوچک کردن"</string> <string name="close_button_text" msgid="2913281996024033299">"بستن"</string> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index 86199f3cf092..298de6413f53 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Kaksoisnapauta sovelluksen ulkopuolella, jos haluat siirtää sitä"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Katso lisätietoja laajentamalla."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Suurenna"</string> <string name="minimize_button_text" msgid="271592547935841753">"Pienennä"</string> <string name="close_button_text" msgid="2913281996024033299">"Sulje"</string> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index 1f3ac9ecbcca..36b40bddd569 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Touchez deux fois à côté d\'une application pour la repositionner"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Développer pour en savoir plus."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Agrandir"</string> <string name="minimize_button_text" msgid="271592547935841753">"Réduire"</string> <string name="close_button_text" msgid="2913281996024033299">"Fermer"</string> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index f1dbb35dc7a7..7f3f9146ca0d 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Appuyez deux fois en dehors d\'une appli pour la repositionner"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Développez pour obtenir plus d\'informations"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Agrandir"</string> <string name="minimize_button_text" msgid="271592547935841753">"Réduire"</string> <string name="close_button_text" msgid="2913281996024033299">"Fermer"</string> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index 6e215a1f5b81..3d5265f18d9a 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toca dúas veces fóra da aplicación para cambiala de posición"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendido"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Despregar para obter máis información."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Pechar"</string> diff --git a/libs/WindowManager/Shell/res/values-gu/strings.xml b/libs/WindowManager/Shell/res/values-gu/strings.xml index ad086bb1f712..d2e5a82bb0aa 100644 --- a/libs/WindowManager/Shell/res/values-gu/strings.xml +++ b/libs/WindowManager/Shell/res/values-gu/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"કોઈ ઍપની જગ્યા બદલવા માટે, તેની બહાર બે વાર ટૅપ કરો"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"સમજાઈ ગયું"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"વધુ માહિતી માટે મોટું કરો."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"બહેતર વ્યૂ માટે ફરીથી શરૂ કરીએ?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"તમે ઍપને ફરીથી શરૂ કરી શકો છો, જેથી તે તમારી સ્ક્રીન પર વધુ સારી રીતે દેખાય, પરંતુ આમ કરવાથી તમે તમારી ઍપ પર કરી હોય એવી કોઈ પ્રક્રિયાની પ્રગતિ અથવા સાચવ્યા ન હોય એવો કોઈપણ ફેરફાર ગુમાવી શકો છો"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"રદ કરો"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"ફરી શરૂ કરો"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ફરીથી બતાવશો નહીં"</string> <string name="maximize_button_text" msgid="1650859196290301963">"મોટું કરો"</string> <string name="minimize_button_text" msgid="271592547935841753">"નાનું કરો"</string> <string name="close_button_text" msgid="2913281996024033299">"બંધ કરો"</string> diff --git a/libs/WindowManager/Shell/res/values-hi/strings.xml b/libs/WindowManager/Shell/res/values-hi/strings.xml index bed39fb77400..b217978a9898 100644 --- a/libs/WindowManager/Shell/res/values-hi/strings.xml +++ b/libs/WindowManager/Shell/res/values-hi/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"किसी ऐप्लिकेशन की जगह बदलने के लिए, उसके बाहर दो बार टैप करें"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ठीक है"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ज़्यादा जानकारी के लिए बड़ा करें."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"बड़ा करें"</string> <string name="minimize_button_text" msgid="271592547935841753">"विंडो छोटी करें"</string> <string name="close_button_text" msgid="2913281996024033299">"बंद करें"</string> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index 1446e70ecdfa..bbd95f7073ce 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvaput dodirnite izvan aplikacije da biste je premjestili"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Shvaćam"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Proširite da biste saznali više."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Želite li ponovno pokrenuti za bolji pregled?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Možete ponovno pokrenuti aplikaciju tako da bolje izgleda na zaslonu, no mogli biste izgubiti napredak ili sve nespremljene promjene"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Odustani"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Pokreni ponovno"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne prikazuj ponovno"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimiziraj"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimiziraj"</string> <string name="close_button_text" msgid="2913281996024033299">"Zatvori"</string> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 221c329020a0..1bb221344f4f 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Koppintson duplán az alkalmazáson kívül az áthelyezéséhez"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Értem"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Kibontással további információkhoz juthat."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Újraindítja a jobb megjelenítés érdekében?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Újraindíthatja az alkalmazást a képernyőn való jobb megjelenítés érdekében, de elveszítheti az előrehaladását és az esetleges nem mentett változásokat"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Mégse"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Újraindítás"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ne jelenjen meg többé"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Teljes méret"</string> <string name="minimize_button_text" msgid="271592547935841753">"Kis méret"</string> <string name="close_button_text" msgid="2913281996024033299">"Bezárás"</string> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index 7be9941d2a5e..7d556b263bd7 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Կրկնակի հպեք հավելվածի կողքին՝ այն տեղափոխելու համար"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Եղավ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Ծավալեք՝ ավելին իմանալու համար։"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Ծավալել"</string> <string name="minimize_button_text" msgid="271592547935841753">"Ծալել"</string> <string name="close_button_text" msgid="2913281996024033299">"Փակել"</string> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index 4e760ef6450c..b51dc006b2a5 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ketuk dua kali di luar aplikasi untuk mengubah posisinya"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Oke"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Luaskan untuk melihat informasi selengkapnya."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimalkan"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalkan"</string> <string name="close_button_text" msgid="2913281996024033299">"Tutup"</string> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index 50d4ee7faed6..d924c47352b2 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ýttu tvisvar utan við forrit til að færa það"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ég skil"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Stækka til að sjá frekari upplýsingar."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Stækka"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minnka"</string> <string name="close_button_text" msgid="2913281996024033299">"Loka"</string> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index d2595f7682d2..98d1b45c3a82 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tocca due volte fuori da un\'app per riposizionarla"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Espandi per avere ulteriori informazioni."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Vuoi riavviare per migliorare la visualizzazione?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Puoi riavviare l\'app affinché venga visualizzata meglio sullo schermo, ma potresti perdere i tuoi progressi o eventuali modifiche non salvate"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Annulla"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Riavvia"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Non mostrare più"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Ingrandisci"</string> <string name="minimize_button_text" msgid="271592547935841753">"Riduci a icona"</string> <string name="close_button_text" msgid="2913281996024033299">"Chiudi"</string> diff --git a/libs/WindowManager/Shell/res/values-iw/strings.xml b/libs/WindowManager/Shell/res/values-iw/strings.xml index 883596ebcd6f..d116257944d6 100644 --- a/libs/WindowManager/Shell/res/values-iw/strings.xml +++ b/libs/WindowManager/Shell/res/values-iw/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"צריך להקיש הקשה כפולה מחוץ לאפליקציה כדי למקם אותה מחדש"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"הבנתי"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"מרחיבים כדי לקבל מידע נוסף."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"הגדלה"</string> <string name="minimize_button_text" msgid="271592547935841753">"מזעור"</string> <string name="close_button_text" msgid="2913281996024033299">"סגירה"</string> diff --git a/libs/WindowManager/Shell/res/values-ja/strings.xml b/libs/WindowManager/Shell/res/values-ja/strings.xml index 6bb22a29e79b..548d63c50dc3 100644 --- a/libs/WindowManager/Shell/res/values-ja/strings.xml +++ b/libs/WindowManager/Shell/res/values-ja/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"位置を変えるにはアプリの外側をダブルタップしてください"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"開くと詳細が表示されます。"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"再起動して画面をすっきりさせますか？"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"アプリを再起動して画面をすっきりさせることはできますが、進捗状況が失われ、保存されていない変更が消える可能性があります"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"キャンセル"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"再起動"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"次回から表示しない"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"閉じる"</string> diff --git a/libs/WindowManager/Shell/res/values-ka/strings.xml b/libs/WindowManager/Shell/res/values-ka/strings.xml index 6cf7d7827ee9..1b359b39e63a 100644 --- a/libs/WindowManager/Shell/res/values-ka/strings.xml +++ b/libs/WindowManager/Shell/res/values-ka/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ორმაგად შეეხეთ აპის გარშემო სივრცეს, რათა ის სხვაგან გადაიტანოთ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"გასაგებია"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"დამატებითი ინფორმაციისთვის გააფართოეთ."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"გსურთ გადატვირთვა უკეთესი ხედისთვის?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"შეგიძლიათ გადატვირთოთ აპი იმისათვის, რომ თქვენს ეკრანზე უკეთესად გამოჩნდეს, თუმცა თქვენ მიერ შესრულებული მოქმედებები შეიძლება დაიკარგოს ან ცვლილებების შენახვა ვერ მოხერხდეს"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"გაუქმება"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"გადატვირთვა"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"აღარ გამოჩნდეს"</string> <string name="maximize_button_text" msgid="1650859196290301963">"მაქსიმალურად გაშლა"</string> <string name="minimize_button_text" msgid="271592547935841753">"ჩაკეცვა"</string> <string name="close_button_text" msgid="2913281996024033299">"დახურვა"</string> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 216619a232fc..02560caf1749 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Қолданбаның орнын өзгерту үшін одан тыс жерді екі рет түртіңіз."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Түсінікті"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Толығырақ ақпарат алу үшін терезені жайыңыз."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Жаю"</string> <string name="minimize_button_text" msgid="271592547935841753">"Кішірейту"</string> <string name="close_button_text" msgid="2913281996024033299">"Жабу"</string> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index 79aca620f348..32ca8e3cf949 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ចុចពីរដងនៅក្រៅកម្មវិធី ដើម្បីប្ដូរទីតាំងកម្មវិធីនោះ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"យល់ហើយ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ពង្រីកដើម្បីទទួលបានព័ត៌មានបន្ថែម។"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"ពង្រីក"</string> <string name="minimize_button_text" msgid="271592547935841753">"បង្រួម"</string> <string name="close_button_text" msgid="2913281996024033299">"បិទ"</string> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index 9e9333ea422c..9b47a00dcb4c 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ಆ್ಯಪ್ ಒಂದರ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಲು ಅದರ ಹೊರಗೆ ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ಸರಿ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ವಿಸ್ತೃತಗೊಳಿಸಿ."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"ಉತ್ತಮ ವೀಕ್ಷಣೆಗಾಗಿ ಆ್ಯಪ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬಹುದು, ಇದರಿಂದ ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ಆ್ಯಪ್ ಉತ್ತಮವಾಗಿ ಕಾಣಿಸುತ್ತದೆ, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯನ್ನು ಅಥವಾ ಯಾವುದೇ ಉಳಿಸದ ಬದಲಾವಣೆಗಳನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ರದ್ದುಮಾಡಿ"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ಮತ್ತೊಮ್ಮೆ ತೋರಿಸಬೇಡಿ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ಹಿಗ್ಗಿಸಿ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ಕುಗ್ಗಿಸಿ"</string> <string name="close_button_text" msgid="2913281996024033299">"ಮುಚ್ಚಿರಿ"</string> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index f9b495a38f4f..844a9fac00b4 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"앱 위치를 조정하려면 앱 외부를 두 번 탭합니다."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"확인"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"추가 정보는 펼쳐서 확인하세요."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"최대화"</string> <string name="minimize_button_text" msgid="271592547935841753">"최소화"</string> <string name="close_button_text" msgid="2913281996024033299">"닫기"</string> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index 0858cfc0a652..c2368d28d364 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Колдонмону жылдыруу үчүн сырт жагын эки жолу таптаңыз"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Түшүндүм"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Толук маалымат алуу үчүн жайып көрүңүз."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Жакшыраак көрүү үчүн өчүрүп күйгүзөсүзбү?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Экранда жакшыраак көрүү үчүн колдонмону өчүрүп күйгүзө аласыз, бирок аткарылган иш же сакталбаган өзгөрүүлөр өчүрүлүшү мүмкүн"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Токтотуу"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Өчүрүп күйгүзүү"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Экинчи көрүнбөсүн"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Чоңойтуу"</string> <string name="minimize_button_text" msgid="271592547935841753">"Кичирейтүү"</string> <string name="close_button_text" msgid="2913281996024033299">"Жабуу"</string> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index 8e42aa346669..f4ff5e52cc60 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ແຕະສອງເທື່ອໃສ່ນອກແອັບໃດໜຶ່ງເພື່ອຈັດຕຳແໜ່ງຂອງມັນຄືນໃໝ່"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ເຂົ້າໃຈແລ້ວ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ຂະຫຍາຍເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"ຣີສະຕາດເພື່ອໃຫ້ມີມຸມມອງທີ່ດີຂຶ້ນບໍ?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"ທ່ານສາມາດຣີສະຕາດແອັບໄດ້ເພື່ອໃຫ້ມັນເບິ່ງດີຂຶ້ນໃນໜ້າຈໍຂອງທ່ານ ແຕ່ທ່ານອາດຈະສູນເສຍຄວາມຄືບໜ້າ ຫຼື ການປ່ຽນແປງທີ່ບໍ່ໄດ້ບັນທຶກໄວ້"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ຍົກເລີກ"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"ຣີສະຕາດ"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ບໍ່ຕ້ອງສະແດງອີກ"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ຂະຫຍາຍໃຫຍ່ສຸດ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ຫຍໍ້ລົງ"</string> <string name="close_button_text" msgid="2913281996024033299">"ປິດ"</string> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index dc9969095cf5..0d276ecd37a1 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dukart palieskite už programos ribų, kad pakeistumėte jos poziciją"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Supratau"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Išskleiskite, jei reikia daugiau informacijos."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Paleisti iš naujo, kad būtų geresnis vaizdas?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Galite iš naujo paleisti programą, kad ji geriau atrodytų ekrane, bet galite prarasti eigą ir neišsaugotus pakeitimus"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Atšaukti"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Paleisti iš naujo"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Daugiau neberodyti"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Padidinti"</string> <string name="minimize_button_text" msgid="271592547935841753">"Sumažinti"</string> <string name="close_button_text" msgid="2913281996024033299">"Uždaryti"</string> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index bd2eef42690b..c6ccc27a024b 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Lai pārvietotu lietotni, veiciet dubultskārienu ārpus lietotnes"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Labi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Izvērsiet, lai iegūtu plašāku informāciju."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Vai restartēt, lai uzlabotu skatu?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Varat restartēt lietotni, lai tā labāk izskatītos ekrānā, taču, iespējams, zaudēsiet paveikto vai nesaglabātas izmaiņas (ja tādas ir)."</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Atcelt"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Restartēt"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Vairs nerādīt"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimizēt"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizēt"</string> <string name="close_button_text" msgid="2913281996024033299">"Aizvērt"</string> diff --git a/libs/WindowManager/Shell/res/values-mk/strings.xml b/libs/WindowManager/Shell/res/values-mk/strings.xml index d133654ba777..526093df490f 100644 --- a/libs/WindowManager/Shell/res/values-mk/strings.xml +++ b/libs/WindowManager/Shell/res/values-mk/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Допрете двапати надвор од некоја апликација за да ја преместите"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Сфатив"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Проширете за повеќе информации."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Да се рестартира за подобар приказ?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Може да ја рестартирате апликацијата за да изгледа подобро на екранот, но може да го изгубите напредокот или незачуваните промени"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Откажи"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Рестартирај"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Не прикажувај повторно"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Зголеми"</string> <string name="minimize_button_text" msgid="271592547935841753">"Минимизирај"</string> <string name="close_button_text" msgid="2913281996024033299">"Затвори"</string> diff --git a/libs/WindowManager/Shell/res/values-ml/strings.xml b/libs/WindowManager/Shell/res/values-ml/strings.xml index 16927bf19523..bd3d94ee4c21 100644 --- a/libs/WindowManager/Shell/res/values-ml/strings.xml +++ b/libs/WindowManager/Shell/res/values-ml/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ആപ്പിന്റെ സ്ഥാനം മാറ്റാൻ അതിന് പുറത്ത് ഡബിൾ ടാപ്പ് ചെയ്യുക"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"മനസ്സിലായി"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"കൂടുതൽ വിവരങ്ങൾക്ക് വികസിപ്പിക്കുക."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"മെച്ചപ്പെട്ട കാഴ്ചയ്ക്കായി റീസ്റ്റാർട്ട് ചെയ്യണോ?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"ആപ്പ് റീസ്റ്റാർട്ട് ചെയ്യുകയാണെങ്കിൽ ഇത് നിങ്ങളുടെ സ്ക്രീനിൽ മെച്ചപ്പെട്ടതായി കാണും, എന്നാൽ ഇതുവരെയുള്ള പുരോഗതിയും സംരക്ഷിക്കാത്ത മാറ്റങ്ങളും നിങ്ങൾക്ക് നഷ്ടമാകും"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"റദ്ദാക്കുക"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"റീസ്റ്റാർട്ട് ചെയ്യൂ"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"വീണ്ടും കാണിക്കരുത്"</string> <string name="maximize_button_text" msgid="1650859196290301963">"വലുതാക്കുക"</string> <string name="minimize_button_text" msgid="271592547935841753">"ചെറുതാക്കുക"</string> <string name="close_button_text" msgid="2913281996024033299">"അടയ്ക്കുക"</string> diff --git a/libs/WindowManager/Shell/res/values-mn/strings.xml b/libs/WindowManager/Shell/res/values-mn/strings.xml index 264f9a0a4db9..6c1c0b59953e 100644 --- a/libs/WindowManager/Shell/res/values-mn/strings.xml +++ b/libs/WindowManager/Shell/res/values-mn/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Аппыг дахин байрлуулахын тулд гадна талд нь хоёр товшино"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ойлголоо"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Нэмэлт мэдээлэл авах бол дэлгэнэ үү."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Томруулах"</string> <string name="minimize_button_text" msgid="271592547935841753">"Багасгах"</string> <string name="close_button_text" msgid="2913281996024033299">"Хаах"</string> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index 7a475edcd964..01bf9494fe39 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ॲपची स्थिती पुन्हा बदलण्यासाठी, त्याच्या बाहेर दोनदा टॅप करा"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"समजले"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"अधिक माहितीसाठी विस्तार करा."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"आणखी चांगल्या प्रकारे दिसावे यासाठी रीस्टार्ट करायचे आहे का?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"तुम्ही अॅप रीस्टार्ट करू शकता, जेणेकरून ते तुमच्या स्क्रीनवर आणखी चांगल्या प्रकारे दिसेल, पण तुमची प्रगती किंवा कोणतेही सेव्ह न केलेले बदल तुम्ही गमवाल"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"रद्द करा"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"रीस्टार्ट करा"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"पुन्हा दाखवू नका"</string> <string name="maximize_button_text" msgid="1650859196290301963">"मोठे करा"</string> <string name="minimize_button_text" msgid="271592547935841753">"लहान करा"</string> <string name="close_button_text" msgid="2913281996024033299">"बंद करा"</string> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index be1dc24ccfcb..80efab83fb94 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Ketik dua kali di luar apl untuk menempatkan semula apl itu"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Kembangkan untuk mendapatkan maklumat lanjut."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimumkan"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimumkan"</string> <string name="close_button_text" msgid="2913281996024033299">"Tutup"</string> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index 7b2b7c5dd01e..be0815ea088c 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"နေရာပြန်ချရန် အက်ပ်အပြင်ဘက်ကို နှစ်ချက်တို့ပါ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"နားလည်ပြီ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"နောက်ထပ်အချက်အလက်များအတွက် ချဲ့နိုင်သည်။"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"ချဲ့ရန်"</string> <string name="minimize_button_text" msgid="271592547935841753">"ချုံ့ရန်"</string> <string name="close_button_text" msgid="2913281996024033299">"ပိတ်ရန်"</string> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index 3e18b4968464..8d150869e406 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dobbelttrykk utenfor en app for å flytte den"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Greit"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Vis for å få mer informasjon."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimer"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimer"</string> <string name="close_button_text" msgid="2913281996024033299">"Lukk"</string> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index 4b10f5a1a886..f1997bee71da 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"तपाईं जुन एपको स्थिति मिलाउन चाहनुहुन्छ सोही एपको बाहिर डबल ट्याप गर्नुहोस्"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"बुझेँ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"थप जानकारी प्राप्त गर्न चाहनुहुन्छ भने एक्स्पान्ड गर्नुहोस्।"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"अझ राम्रोसँग देखिने बनाउन एप रिस्टार्ट गर्ने हो?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"यो एप तपाईंको स्क्रिनमा अझ राम्रोसँग देखियोस् भन्नाका लागि तपाईं सो एप रिस्टार्ट गर्न सक्नुहुन्छ तर तपाईंले अहिलेसम्म गरेका क्रियाकलाप वा सेभ गर्न बाँकी परिवर्तनहरू हट्न सक्छन्"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"रद्द गर्नुहोस्"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"रिस्टार्ट गर्नुहोस्"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"फेरि नदेखाइयोस्"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ठुलो बनाउनुहोस्"</string> <string name="minimize_button_text" msgid="271592547935841753">"मिनिमाइज गर्नुहोस्"</string> <string name="close_button_text" msgid="2913281996024033299">"बन्द गर्नुहोस्"</string> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index b056483e3b2d..ba37ca745ea6 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dubbeltik naast een app om deze opnieuw te positioneren"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Uitvouwen voor meer informatie."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Opnieuw opstarten voor een betere weergave?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Je kunt de app opnieuw opstarten zodat deze er beter uitziet op je scherm, maar je kunt je voortgang of niet-opgeslagen wijzigingen kwijtraken"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Annuleren"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Opnieuw opstarten"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Niet opnieuw tonen"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximaliseren"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimaliseren"</string> <string name="close_button_text" msgid="2913281996024033299">"Sluiten"</string> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index 5fd81f44bf0d..0a8882d7749d 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ଏକ ଆପକୁ ରିପୋଜିସନ କରିବା ପାଇଁ ଏହାର ବାହାରେ ଦୁଇଥର-ଟାପ କରନ୍ତୁ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ବୁଝିଗଲି"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ଅଧିକ ସୂଚନା ପାଇଁ ବିସ୍ତାର କରନ୍ତୁ।"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"ବଡ଼ କରନ୍ତୁ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ଛୋଟ କରନ୍ତୁ"</string> <string name="close_button_text" msgid="2913281996024033299">"ବନ୍ଦ କରନ୍ତୁ"</string> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index ada79d195df2..62f15bf856a6 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ਕਿਸੇ ਐਪ ਦੀ ਜਗ੍ਹਾ ਬਦਲਣ ਲਈ ਉਸ ਦੇ ਬਾਹਰ ਡਬਲ ਟੈਪ ਕਰੋ"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ਸਮਝ ਲਿਆ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵਿਸਤਾਰ ਕਰੋ।"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"ਵੱਡਾ ਕਰੋ"</string> <string name="minimize_button_text" msgid="271592547935841753">"ਛੋਟਾ ਕਰੋ"</string> <string name="close_button_text" msgid="2913281996024033299">"ਬੰਦ ਕਰੋ"</string> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index a97fd5c9ddb0..d82f60f67d6d 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Kliknij dwukrotnie poza aplikacją, aby ją przenieść"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Rozwiń, aby wyświetlić więcej informacji."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksymalizuj"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalizuj"</string> <string name="close_button_text" msgid="2913281996024033299">"Zamknij"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index 8edcddff14e2..a94d157f48aa 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de um app para reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Abra para ver mais informações."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Reiniciar para melhorar a visualização?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Você pode reiniciar o app para melhorar a visualização dele, mas talvez perca seu progresso ou mudanças não salvas"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Não mostrar novamente"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Fechar"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml index e0636d42d980..7435faf6a1a7 100644 --- a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de uma app para a reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Expandir para obter mais informações"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Fechar"</string> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index 8edcddff14e2..a94d157f48aa 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Toque duas vezes fora de um app para reposicionar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Entendi"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Abra para ver mais informações."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Reiniciar para melhorar a visualização?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Você pode reiniciar o app para melhorar a visualização dele, mas talvez perca seu progresso ou mudanças não salvas"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Cancelar"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reiniciar"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Não mostrar novamente"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizar"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizar"</string> <string name="close_button_text" msgid="2913281996024033299">"Fechar"</string> diff --git a/libs/WindowManager/Shell/res/values-ro/strings.xml b/libs/WindowManager/Shell/res/values-ro/strings.xml index 9227216ffc1f..fa9a07454b4f 100644 --- a/libs/WindowManager/Shell/res/values-ro/strings.xml +++ b/libs/WindowManager/Shell/res/values-ro/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Atinge de două ori lângă o aplicație pentru a o repoziționa"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Extinde pentru mai multe informații"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Repornești pentru o vizualizare mai bună?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Poți să repornești aplicația ca să arate mai bine pe ecran, dar este posibil să pierzi progresul sau modificările nesalvate"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Anulează"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Repornește"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Nu mai afișa"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximizează"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizează"</string> <string name="close_button_text" msgid="2913281996024033299">"Închide"</string> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index f5fa1a475886..b9c59514b939 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Чтобы переместить приложение, дважды нажмите рядом с ним."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ОК"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Развернуть, чтобы узнать больше."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Перезапустить приложение?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Вы можете перезапустить приложение, чтобы оно лучше смотрелось на экране. При этом ваш прогресс или несохраненные изменения могут быть утеряны."</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Отмена"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Перезапустить"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Больше не показывать"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Развернуть"</string> <string name="minimize_button_text" msgid="271592547935841753">"Свернуть"</string> <string name="close_button_text" msgid="2913281996024033299">"Закрыть"</string> diff --git a/libs/WindowManager/Shell/res/values-si/strings.xml b/libs/WindowManager/Shell/res/values-si/strings.xml index 53e52f28adcf..e408655690c8 100644 --- a/libs/WindowManager/Shell/res/values-si/strings.xml +++ b/libs/WindowManager/Shell/res/values-si/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"යෙදුමක් නැවත ස්ථානගත කිරීමට පිටතින් දෙවරක් තට්ටු කරන්න"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"තේරුණා"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"වැඩිදුර තොරතුරු සඳහා දිග හරින්න"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"විහිදන්න"</string> <string name="minimize_button_text" msgid="271592547935841753">"කුඩා කරන්න"</string> <string name="close_button_text" msgid="2913281996024033299">"වසන්න"</string> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index f004fd472adf..7bb415dc474c 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvojitým klepnutím mimo aplikácie zmeníte jej pozíciu"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Dobre"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Po rozbalení sa dozviete viac."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Chcete ju reštartovať, aby mala lepší vzhľad?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Aplikáciu môžete reštartovať, aby mala na obrazovke lepší vzhľad, ale môžete prísť o postup a všetky neuložené zmeny."</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Zrušiť"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Reštartovať"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Už nezobrazovať"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maximalizovať"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimalizovať"</string> <string name="close_button_text" msgid="2913281996024033299">"Zavrieť"</string> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index c4808059a0c4..ac9c2be9a1fd 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Dvakrat se dotaknite zunaj aplikacije, če jo želite prestaviti."</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"V redu"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Razširitev za več informacij"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimiraj"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimiraj"</string> <string name="close_button_text" msgid="2913281996024033299">"Zapri"</string> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index b59d4db6413e..f4fc5e75d6a4 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Trokit dy herë jashtë një aplikacioni për ta ripozicionuar"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"E kuptova"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Zgjeroje për më shumë informacion."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Rinis për një pamje më të mirë?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Mund të rinisësh aplikacionin në mënyrë që të duket më mirë në ekranin tënd, por mund të humbësh progresin ose çdo ndryshim të paruajtur"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Anulo"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Rinis"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Mos e shfaq përsëri"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Maksimizo"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimizo"</string> <string name="close_button_text" msgid="2913281996024033299">"Mbyll"</string> diff --git a/libs/WindowManager/Shell/res/values-sr/strings.xml b/libs/WindowManager/Shell/res/values-sr/strings.xml index 78d74d74ac3f..743f9a84a89e 100644 --- a/libs/WindowManager/Shell/res/values-sr/strings.xml +++ b/libs/WindowManager/Shell/res/values-sr/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Двапут додирните изван апликације да бисте променили њену позицију"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Важи"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Проширите за још информација."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Желите ли да рестартујете ради бољег приказа?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Можете да рестартујете апликацију да би изгледала боље на екрану, с тим што можете да изгубите оно што сте урадили или несачуване промене, ако их има"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Откажи"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Рестартуј"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Не приказуј поново"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Увећајте"</string> <string name="minimize_button_text" msgid="271592547935841753">"Умањите"</string> <string name="close_button_text" msgid="2913281996024033299">"Затворите"</string> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index cda3040dc056..ba5785120b58 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tryck snabbt två gånger utanför en app för att flytta den"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Utöka för mer information."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Utöka"</string> <string name="minimize_button_text" msgid="271592547935841753">"Minimera"</string> <string name="close_button_text" msgid="2913281996024033299">"Stäng"</string> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index fee34eb28725..43b415c38020 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Gusa mara mbili nje ya programu ili uihamishe"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Nimeelewa"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Panua ili upate maelezo zaidi."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Panua"</string> <string name="minimize_button_text" msgid="271592547935841753">"Punguza"</string> <string name="close_button_text" msgid="2913281996024033299">"Funga"</string> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index 49f128d4477b..3e65964ad6a2 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"ஆப்ஸை இடம் மாற்ற அதன் வெளியில் இருமுறை தட்டலாம்"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"சரி"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"கூடுதல் தகவல்களுக்கு விரிவாக்கலாம்."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"பெரிதாக்கும்"</string> <string name="minimize_button_text" msgid="271592547935841753">"சிறிதாக்கும்"</string> <string name="close_button_text" msgid="2913281996024033299">"மூடும்"</string> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index f0c8be5c5957..7d09fc41e27c 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"యాప్ స్థానాన్ని మార్చడానికి దాని వెలుపల డబుల్-ట్యాప్ చేయండి"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"అర్థమైంది"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"మరింత సమాచారం కోసం విస్తరించండి."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"గరిష్టీకరించండి"</string> <string name="minimize_button_text" msgid="271592547935841753">"కుదించండి"</string> <string name="close_button_text" msgid="2913281996024033299">"మూసివేయండి"</string> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index 2437e0377780..a9100e8a9453 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"แตะสองครั้งด้านนอกแอปเพื่อเปลี่ยนตำแหน่ง"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"รับทราบ"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"ขยายเพื่อดูข้อมูลเพิ่มเติม"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"รีสตาร์ทเพื่อรับมุมมองที่ดียิ่งขึ้นใช่ไหม"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"คุณรีสตาร์ทแอปเพื่อรับมุมมองที่ดียิ่งขึ้นบนหน้าจอได้ แต่ความคืบหน้าและการเปลี่ยนแปลงใดๆ ที่ไม่ได้บันทึกอาจหายไป"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"ยกเลิก"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"รีสตาร์ท"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"ไม่ต้องแสดงข้อความนี้อีก"</string> <string name="maximize_button_text" msgid="1650859196290301963">"ขยายใหญ่สุด"</string> <string name="minimize_button_text" msgid="271592547935841753">"ย่อ"</string> <string name="close_button_text" msgid="2913281996024033299">"ปิด"</string> diff --git a/libs/WindowManager/Shell/res/values-tl/strings.xml b/libs/WindowManager/Shell/res/values-tl/strings.xml index 86ef75718b77..7a4232cc15d6 100644 --- a/libs/WindowManager/Shell/res/values-tl/strings.xml +++ b/libs/WindowManager/Shell/res/values-tl/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Mag-double tap sa labas ng app para baguhin ang posisyon nito"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"I-expand para sa higit pang impormasyon."</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"I-restart para sa mas magandang hitsura?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Puwede mong i-restart ang app para maging mas maganda ang itsura nito sa iyong screen, pero posibleng mawala ang pag-usad mo o anumang hindi na-save na pagbabago"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Kanselahin"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"I-restart"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Huwag nang ipakita ulit"</string> <string name="maximize_button_text" msgid="1650859196290301963">"I-maximize"</string> <string name="minimize_button_text" msgid="271592547935841753">"I-minimize"</string> <string name="close_button_text" msgid="2913281996024033299">"Isara"</string> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index c4060cc795ab..015cfc83771d 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Yeniden konumlandırmak için uygulamanın dışına iki kez dokunun"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Anladım"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Daha fazla bilgi için genişletin."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Ekranı Kapla"</string> <string name="minimize_button_text" msgid="271592547935841753">"Küçült"</string> <string name="close_button_text" msgid="2913281996024033299">"Kapat"</string> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index 166041d6d6d8..1ed9069cae9a 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Щоб перемістити додаток, двічі торкніться області поза ним"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"ОK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Розгорніть, щоб дізнатися більше."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Збільшити"</string> <string name="minimize_button_text" msgid="271592547935841753">"Згорнути"</string> <string name="close_button_text" msgid="2913281996024033299">"Закрити"</string> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index ca6a93714cdd..8f818cb71d03 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"کسی ایپ کی پوزیشن تبدیل کرنے کے لیے اس ایپ کے باہر دو بار تھپتھپائیں"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"سمجھ آ گئی"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"مزید معلومات کے لیے پھیلائیں۔"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"بہتر منظر کے لیے ری سٹارٹ کریں؟"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"آپ ایپ کو ری سٹارٹ کر سکتے ہیں تاکہ یہ آپ کی اسکرین پر بہتر نظر آئے، تاہم آپ اپنی پیشرفت سے یا کسی غیر محفوظ شدہ تبدیلیوں سے محروم ہو سکتے ہیں"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"منسوخ کریں"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"ری اسٹارٹ کریں"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"دوبارہ نہ دکھائیں"</string> <string name="maximize_button_text" msgid="1650859196290301963">"بڑا کریں"</string> <string name="minimize_button_text" msgid="271592547935841753">"چھوٹا کریں"</string> <string name="close_button_text" msgid="2913281996024033299">"بند کریں"</string> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index 8f173d5d1e4b..0bbdf4fb90f9 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Qayta joylash uchun ilova tashqarisiga ikki marta bosing"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Batafsil axborot olish uchun kengaytiring."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Yoyish"</string> <string name="minimize_button_text" msgid="271592547935841753">"Kichraytirish"</string> <string name="close_button_text" msgid="2913281996024033299">"Yopish"</string> diff --git a/libs/WindowManager/Shell/res/values-vi/strings.xml b/libs/WindowManager/Shell/res/values-vi/strings.xml index 1d5b9d63ee5a..d8e131835881 100644 --- a/libs/WindowManager/Shell/res/values-vi/strings.xml +++ b/libs/WindowManager/Shell/res/values-vi/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Nhấn đúp bên ngoài ứng dụng để đặt lại vị trí"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Mở rộng để xem thêm thông tin."</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"Phóng to"</string> <string name="minimize_button_text" msgid="271592547935841753">"Thu nhỏ"</string> <string name="close_button_text" msgid="2913281996024033299">"Đóng"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index 87f2973aa618..88d6aa66395c 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -82,6 +82,16 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在某个应用外连续点按两次，即可调整它的位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展开即可了解详情。"</string> + <!-- no translation found for letterbox_restart_dialog_title (8543049527871033505) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_description (6096946078246557848) --> + <skip /> + <!-- no translation found for letterbox_restart_cancel (1342209132692537805) --> + <skip /> + <!-- no translation found for letterbox_restart_restart (8529976234412442973) --> + <skip /> + <!-- no translation found for letterbox_restart_dialog_checkbox_title (5252918008140768386) --> + <skip /> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"关闭"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index f9b22d226c4f..6bd05c69cfe7 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在應用程式外輕按兩下即可調整位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展開即可查看詳情。"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"要重新啟動改善檢視畫面嗎？"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"你可以重新啟動應用程式，讓系統更新檢視畫面。不過，系統可能不會儲存目前進度及你所做的任何變更"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"取消"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"重新啟動"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"不要再顯示"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"關閉"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index 1438e52ccb4a..082049f7d2f9 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"在應用程式外輕觸兩下即可調整位置"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"我知道了"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"展開即可查看詳細資訊。"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"要重新啟動改善檢視畫面嗎？"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"你可以重新啟動應用程式，讓系統更新檢視畫面。不過，系統可能不會儲存目前進度及你所做的任何變更"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"取消"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"重新啟動"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"不要再顯示"</string> <string name="maximize_button_text" msgid="1650859196290301963">"最大化"</string> <string name="minimize_button_text" msgid="271592547935841753">"最小化"</string> <string name="close_button_text" msgid="2913281996024033299">"關閉"</string> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index e9238dc0833a..18f722c9f7a1 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -82,6 +82,11 @@ <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Thepha kabili ngaphandle kwe-app ukuze uyimise kabusha"</string> <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ngiyezwa"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Nweba ukuze uthole ulwazi olwengeziwe"</string> + <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Qala kabusha ukuze uthole ukubuka okungcono?"</string> + <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Ungakwazi ukuqala kabusha i-app ukuze ibukeke kangcono esikrinini sakho, kodwa ungase ulahlekelwe ukuqhubeka kwakho nanoma yiziphi izinguquko ezingalondoloziwe"</string> + <string name="letterbox_restart_cancel" msgid="1342209132692537805">"Khansela"</string> + <string name="letterbox_restart_restart" msgid="8529976234412442973">"Qala kabusha"</string> + <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"Ungabonisi futhi"</string> <string name="maximize_button_text" msgid="1650859196290301963">"Khulisa"</string> <string name="minimize_button_text" msgid="271592547935841753">"Nciphisa"</string> <string name="close_button_text" msgid="2913281996024033299">"Vala"</string> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index 236309207b4f..aaeef196b618 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -82,7 +82,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont /** Flag for U animation features */ public static boolean IS_U_ANIMATION_ENABLED = SystemProperties.getInt("persist.wm.debug.predictive_back_anim", - SETTING_VALUE_OFF) == SETTING_VALUE_ON; + SETTING_VALUE_ON) == SETTING_VALUE_ON; /** Predictive back animation developer option */ private final AtomicBoolean mEnableAnimations = new AtomicBoolean(false); // TODO (b/241808055) Find a appropriate time to remove during refactor diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java index 2534498bdcc1..e24c2286013d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java @@ -126,7 +126,7 @@ public class Bubble implements BubbleViewProvider { private Icon mIcon; private boolean mIsBubble; private boolean mIsTextChanged; - private boolean mIsClearable; + private boolean mIsDismissable; private boolean mShouldSuppressNotificationDot; private boolean mShouldSuppressNotificationList; private boolean mShouldSuppressPeek; @@ -181,7 +181,7 @@ public class Bubble implements BubbleViewProvider { @VisibleForTesting(visibility = PRIVATE) public Bubble(@NonNull final String key, @NonNull final ShortcutInfo shortcutInfo, final int desiredHeight, final int desiredHeightResId, @Nullable final String title, - int taskId, @Nullable final String locus, boolean isClearable, Executor mainExecutor, + int taskId, @Nullable final String locus, boolean isDismissable, Executor mainExecutor, final Bubbles.BubbleMetadataFlagListener listener) { Objects.requireNonNull(key); Objects.requireNonNull(shortcutInfo); @@ -190,7 +190,7 @@ public class Bubble implements BubbleViewProvider { mKey = key; mGroupKey = null; mLocusId = locus != null ? new LocusId(locus) : null; - mIsClearable = isClearable; + mIsDismissable = isDismissable; mFlags = 0; mUser = shortcutInfo.getUserHandle(); mPackageName = shortcutInfo.getPackage(); @@ -248,8 +248,8 @@ public class Bubble implements BubbleViewProvider { } @Hide - public boolean isClearable() { - return mIsClearable; + public boolean isDismissable() { + return mIsDismissable; } /** @@ -533,7 +533,7 @@ public class Bubble implements BubbleViewProvider { mDeleteIntent = entry.getBubbleMetadata().getDeleteIntent(); } - mIsClearable = entry.isClearable(); + mIsDismissable = entry.isDismissable(); mShouldSuppressNotificationDot = entry.shouldSuppressNotificationDot(); mShouldSuppressNotificationList = entry.shouldSuppressNotificationList(); mShouldSuppressPeek = entry.shouldSuppressPeek(); @@ -612,7 +612,7 @@ public class Bubble implements BubbleViewProvider { * Whether this notification should be shown in the shade. */ boolean showInShade() { - return !shouldSuppressNotification() || !mIsClearable; + return !shouldSuppressNotification() || !mIsDismissable; } /** @@ -877,7 +877,7 @@ public class Bubble implements BubbleViewProvider { pw.print(" desiredHeight: "); pw.println(getDesiredHeightString()); pw.print(" suppressNotif: "); pw.println(shouldSuppressNotification()); pw.print(" autoExpand: "); pw.println(shouldAutoExpand()); - pw.print(" isClearable: "); pw.println(mIsClearable); + pw.print(" isDismissable: "); pw.println(mIsDismissable); pw.println(" bubbleMetadataFlagListener null: " + (mBubbleMetadataFlagListener == null)); if (mExpandedView != null) { mExpandedView.dump(pw); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt index e3aefa5bd8aa..e37c785f15f5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt @@ -110,7 +110,7 @@ internal class BubbleDataRepository( b.title, b.taskId, b.locusId?.id, - b.isClearable + b.isDismissable ) } } @@ -206,7 +206,7 @@ internal class BubbleDataRepository( entity.title, entity.taskId, entity.locus, - entity.isClearable, + entity.isDismissable, mainExecutor, bubbleMetadataFlagListener ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEntry.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEntry.java index 5f428269fb06..afe19c4b7363 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEntry.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEntry.java @@ -38,18 +38,18 @@ public class BubbleEntry { private StatusBarNotification mSbn; private Ranking mRanking; - private boolean mIsClearable; + private boolean mIsDismissable; private boolean mShouldSuppressNotificationDot; private boolean mShouldSuppressNotificationList; private boolean mShouldSuppressPeek; public BubbleEntry(@NonNull StatusBarNotification sbn, - Ranking ranking, boolean isClearable, boolean shouldSuppressNotificationDot, + Ranking ranking, boolean isDismissable, boolean shouldSuppressNotificationDot, boolean shouldSuppressNotificationList, boolean shouldSuppressPeek) { mSbn = sbn; mRanking = ranking; - mIsClearable = isClearable; + mIsDismissable = isDismissable; mShouldSuppressNotificationDot = shouldSuppressNotificationDot; mShouldSuppressNotificationList = shouldSuppressNotificationList; mShouldSuppressPeek = shouldSuppressPeek; @@ -115,9 +115,9 @@ public class BubbleEntry { return mRanking.canBubble(); } - /** @return true if this notification is clearable. */ - public boolean isClearable() { - return mIsClearable; + /** @return true if this notification can be dismissed. */ + public boolean isDismissable() { + return mIsDismissable; } /** @return true if {@link Policy#SUPPRESSED_EFFECT_BADGE} set for this notification. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleEntity.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleEntity.kt index f3abc271dad4..9b2e26394605 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleEntity.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleEntity.kt @@ -28,5 +28,5 @@ data class BubbleEntity( val title: String? = null, val taskId: Int, val locus: String? = null, - val isClearable: Boolean = false + val isDismissable: Boolean = false ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelper.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelper.kt index 14c053c58f1f..48d8ccf40174 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelper.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelper.kt @@ -43,9 +43,7 @@ private const val ATTR_DESIRED_HEIGHT_RES_ID = "hid" private const val ATTR_TITLE = "t" private const val ATTR_TASK_ID = "tid" private const val ATTR_LOCUS = "l" - -// TODO rename it to dismissable to follow NotificationEntry namings -private const val ATTR_CLEARABLE = "d" +private const val ATTR_DISMISSABLE = "d" /** * Writes the bubbles in xml format into given output stream. @@ -87,7 +85,7 @@ private fun writeXmlEntry(serializer: XmlSerializer, bubble: BubbleEntity) { bubble.title?.let { serializer.attribute(null, ATTR_TITLE, it) } serializer.attribute(null, ATTR_TASK_ID, bubble.taskId.toString()) bubble.locus?.let { serializer.attribute(null, ATTR_LOCUS, it) } - serializer.attribute(null, ATTR_CLEARABLE, bubble.isClearable.toString()) + serializer.attribute(null, ATTR_DISMISSABLE, bubble.isDismissable.toString()) serializer.endTag(null, TAG_BUBBLE) } catch (e: IOException) { throw RuntimeException(e) @@ -147,7 +145,7 @@ private fun readXmlEntry(parser: XmlPullParser): BubbleEntity? { parser.getAttributeWithName(ATTR_TITLE), parser.getAttributeWithName(ATTR_TASK_ID)?.toInt() ?: INVALID_TASK_ID, parser.getAttributeWithName(ATTR_LOCUS), - parser.getAttributeWithName(ATTR_CLEARABLE)?.toBoolean() ?: false + parser.getAttributeWithName(ATTR_DISMISSABLE)?.toBoolean() ?: false ) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java index c14704d04e3a..fe95d04bad3c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java @@ -215,8 +215,14 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { : taskStableBounds.right - taskBounds.left - mLayout.getMeasuredWidth(); final int positionY = taskStableBounds.bottom - taskBounds.top - mLayout.getMeasuredHeight(); - + // To secure a proper visualisation, we hide the layout while updating the position of + // the {@link SurfaceControl} it belongs. + final int oldVisibility = mLayout.getVisibility(); + if (oldVisibility == View.VISIBLE) { + mLayout.setVisibility(View.GONE); + } updateSurfacePosition(positionX, positionY); + mLayout.setVisibility(oldVisibility); } private void updateVisibilityOfViews() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java index 7096a645ef85..283b1ec0f752 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java @@ -16,6 +16,7 @@ package com.android.wm.shell.pip; +import android.annotation.Nullable; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; @@ -41,6 +42,11 @@ public abstract class PipContentOverlay { } } + @Nullable + public SurfaceControl getLeash() { + return mLeash; + } + /** * Animates the internal {@link #mLeash} by a given fraction. * @param atomicTx {@link SurfaceControl.Transaction} to operate, you should not explicitly diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java index 053491e3a3ab..22e804547d5c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java @@ -430,7 +430,8 @@ public class StartingSurfaceDrawer { } @Override - public @Nullable SplashScreenView get() { + @Nullable + public SplashScreenView get() { synchronized (this) { while (!mIsViewSet) { try { @@ -691,7 +692,7 @@ public class StartingSurfaceDrawer { private final TaskSnapshotWindow mTaskSnapshotWindow; private SplashScreenView mContentView; private boolean mSetSplashScreen; - private @StartingWindowType int mSuggestType; + @StartingWindowType private int mSuggestType; private int mBGColor; private final long mCreateTime; private int mSystemBarAppearance; @@ -732,7 +733,7 @@ public class StartingSurfaceDrawer { // Reset the system bar color which set by splash screen, make it align to the app. private void clearSystemBarColor() { - if (mDecorView == null) { + if (mDecorView == null || !mDecorView.isAttachedToWindow()) { return; } if (mDecorView.getLayoutParams() instanceof WindowManager.LayoutParams) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java index f77ac81feca8..2981f5e160f6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java @@ -36,6 +36,7 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; +import com.android.wm.shell.transition.Transitions; /** * View model for the window decoration with a caption and shadows. Works with @@ -65,6 +66,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { mTaskOrganizer = taskOrganizer; mDisplayController = displayController; mSyncQueue = syncQueue; + if (!Transitions.ENABLE_SHELL_TRANSITIONS) { + mTaskOperations = new TaskOperations(null, mContext, mSyncQueue); + } } @Override @@ -174,7 +178,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { final CaptionTouchEventListener touchEventListener = new CaptionTouchEventListener(taskInfo, taskPositioner); windowDecoration.setCaptionListeners(touchEventListener, touchEventListener); - windowDecoration.setDragResizeCallback(taskPositioner); + windowDecoration.setDragPositioningCallback(taskPositioner); windowDecoration.setDragDetector(touchEventListener.mDragDetector); windowDecoration.relayout(taskInfo, startT, finishT); setupCaptionColor(taskInfo, windowDecoration); @@ -185,17 +189,17 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { private final int mTaskId; private final WindowContainerToken mTaskToken; - private final DragResizeCallback mDragResizeCallback; + private final DragPositioningCallback mDragPositioningCallback; private final DragDetector mDragDetector; private int mDragPointerId = -1; private CaptionTouchEventListener( RunningTaskInfo taskInfo, - DragResizeCallback dragResizeCallback) { + DragPositioningCallback dragPositioningCallback) { mTaskId = taskInfo.taskId; mTaskToken = taskInfo.token; - mDragResizeCallback = dragResizeCallback; + mDragPositioningCallback = dragPositioningCallback; mDragDetector = new DragDetector(this); } @@ -247,20 +251,20 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: { mDragPointerId = e.getPointerId(0); - mDragResizeCallback.onDragResizeStart( + mDragPositioningCallback.onDragPositioningStart( 0 /* ctrlType */, e.getRawX(0), e.getRawY(0)); break; } case MotionEvent.ACTION_MOVE: { int dragPointerIdx = e.findPointerIndex(mDragPointerId); - mDragResizeCallback.onDragResizeMove( + mDragPositioningCallback.onDragPositioningMove( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); break; } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { int dragPointerIdx = e.findPointerIndex(mDragPointerId); - mDragResizeCallback.onDragResizeEnd( + mDragPositioningCallback.onDragPositioningEnd( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); break; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java index f94fbfca9bcf..060dc4e05b46 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java @@ -47,7 +47,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL private View.OnClickListener mOnCaptionButtonClickListener; private View.OnTouchListener mOnCaptionTouchListener; - private DragResizeCallback mDragResizeCallback; + private DragPositioningCallback mDragPositioningCallback; private DragResizeInputListener mDragResizeListener; private DragDetector mDragDetector; @@ -78,8 +78,8 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL mOnCaptionTouchListener = onCaptionTouchListener; } - void setDragResizeCallback(DragResizeCallback dragResizeCallback) { - mDragResizeCallback = dragResizeCallback; + void setDragPositioningCallback(DragPositioningCallback dragPositioningCallback) { + mDragPositioningCallback = dragPositioningCallback; } void setDragDetector(DragDetector dragDetector) { @@ -151,7 +151,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL mChoreographer, mDisplay.getDisplayId(), mDecorationContainerSurface, - mDragResizeCallback); + mDragPositioningCallback); } final int touchSlop = ViewConfiguration.get(mResult.mRootView.getContext()) 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 c0c0ab968a9b..606cf2854802 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 @@ -209,17 +209,17 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private final int mTaskId; private final WindowContainerToken mTaskToken; - private final DragResizeCallback mDragResizeCallback; + private final DragPositioningCallback mDragPositioningCallback; private final DragDetector mDragDetector; private int mDragPointerId = -1; private DesktopModeTouchEventListener( RunningTaskInfo taskInfo, - DragResizeCallback dragResizeCallback) { + DragPositioningCallback dragPositioningCallback) { mTaskId = taskInfo.taskId; mTaskToken = taskInfo.token; - mDragResizeCallback = dragResizeCallback; + mDragPositioningCallback = dragPositioningCallback; mDragDetector = new DragDetector(this); } @@ -283,13 +283,13 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { switch (e.getActionMasked()) { case MotionEvent.ACTION_DOWN: { mDragPointerId = e.getPointerId(0); - mDragResizeCallback.onDragResizeStart( + mDragPositioningCallback.onDragPositioningStart( 0 /* ctrlType */, e.getRawX(0), e.getRawY(0)); break; } case MotionEvent.ACTION_MOVE: { final int dragPointerIdx = e.findPointerIndex(mDragPointerId); - mDragResizeCallback.onDragResizeMove( + mDragPositioningCallback.onDragPositioningMove( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); break; } @@ -298,7 +298,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { final int dragPointerIdx = e.findPointerIndex(mDragPointerId); final int statusBarHeight = mDisplayController .getDisplayLayout(taskInfo.displayId).stableInsets().top; - mDragResizeCallback.onDragResizeEnd( + mDragPositioningCallback.onDragPositioningEnd( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); if (e.getRawY(dragPointerIdx) <= statusBarHeight) { if (DesktopModeStatus.isProto2Enabled()) { @@ -557,7 +557,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { final DesktopModeTouchEventListener touchEventListener = new DesktopModeTouchEventListener(taskInfo, taskPositioner); windowDecoration.setCaptionListeners(touchEventListener, touchEventListener); - windowDecoration.setDragResizeCallback(taskPositioner); + windowDecoration.setDragPositioningCallback(taskPositioner); windowDecoration.setDragDetector(touchEventListener.mDragDetector); windowDecoration.relayout(taskInfo, startT, finishT); incrementEventReceiverTasks(taskInfo.displayId); 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 31b56d3a1e93..744c18fe7adb 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 @@ -54,7 +54,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin private View.OnClickListener mOnCaptionButtonClickListener; private View.OnTouchListener mOnCaptionTouchListener; - private DragResizeCallback mDragResizeCallback; + private DragPositioningCallback mDragPositioningCallback; private DragResizeInputListener mDragResizeListener; private DragDetector mDragDetector; @@ -90,8 +90,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mOnCaptionTouchListener = onCaptionTouchListener; } - void setDragResizeCallback(DragResizeCallback dragResizeCallback) { - mDragResizeCallback = dragResizeCallback; + void setDragPositioningCallback(DragPositioningCallback dragPositioningCallback) { + mDragPositioningCallback = dragPositioningCallback; } void setDragDetector(DragDetector dragDetector) { @@ -179,7 +179,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mChoreographer, mDisplay.getDisplayId(), mDecorationContainerSurface, - mDragResizeCallback); + mDragPositioningCallback); } final int touchSlop = ViewConfiguration.get(mResult.mRootView.getContext()) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeCallback.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallback.java index ee160a15df19..0191c609a8b2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeCallback.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallback.java @@ -19,28 +19,28 @@ package com.android.wm.shell.windowdecor; /** * Callback called when receiving drag-resize or drag-move related input events. */ -public interface DragResizeCallback { +public interface DragPositioningCallback { /** - * Called when a drag resize starts. + * Called when a drag-resize or drag-move starts. * * @param ctrlType {@link TaskPositioner.CtrlType} indicating the direction of resizing, use * {@code 0} to indicate it's a move - * @param x x coordinate in window decoration coordinate system where the drag resize starts - * @param y y coordinate in window decoration coordinate system where the drag resize starts + * @param x x coordinate in window decoration coordinate system where the drag starts + * @param y y coordinate in window decoration coordinate system where the drag starts */ - void onDragResizeStart(@TaskPositioner.CtrlType int ctrlType, float x, float y); + void onDragPositioningStart(@TaskPositioner.CtrlType int ctrlType, float x, float y); /** - * Called when the pointer moves during a drag resize. + * Called when the pointer moves during a drag-resize or drag-move. * @param x x coordinate in window decoration coordinate system of the new pointer location * @param y y coordinate in window decoration coordinate system of the new pointer location */ - void onDragResizeMove(float x, float y); + void onDragPositioningMove(float x, float y); /** - * Called when a drag resize stops. + * Called when a drag-resize or drag-move stops. * @param x x coordinate in window decoration coordinate system where the drag resize stops * @param y y coordinate in window decoration coordinate system where the drag resize stops */ - void onDragResizeEnd(float x, float y); + void onDragPositioningEnd(float x, float y); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java index 29637637e23b..7d954ad92285 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java @@ -62,7 +62,7 @@ class DragResizeInputListener implements AutoCloseable { private final SurfaceControl mDecorationSurface; private final InputChannel mInputChannel; private final TaskResizeInputEventReceiver mInputEventReceiver; - private final com.android.wm.shell.windowdecor.DragResizeCallback mCallback; + private final DragPositioningCallback mCallback; private int mWidth; private int mHeight; @@ -83,7 +83,7 @@ class DragResizeInputListener implements AutoCloseable { Choreographer choreographer, int displayId, SurfaceControl decorationSurface, - DragResizeCallback callback) { + DragPositioningCallback callback) { mInputManager = context.getSystemService(InputManager.class); mHandler = handler; mChoreographer = choreographer; @@ -293,7 +293,7 @@ class DragResizeInputListener implements AutoCloseable { float rawX = e.getRawX(0); float rawY = e.getRawY(0); int ctrlType = calculateCtrlType(isTouch, x, y); - mCallback.onDragResizeStart(ctrlType, rawX, rawY); + mCallback.onDragPositioningStart(ctrlType, rawX, rawY); result = true; } break; @@ -305,7 +305,7 @@ class DragResizeInputListener implements AutoCloseable { int dragPointerIndex = e.findPointerIndex(mDragPointerId); float rawX = e.getRawX(dragPointerIndex); float rawY = e.getRawY(dragPointerIndex); - mCallback.onDragResizeMove(rawX, rawY); + mCallback.onDragPositioningMove(rawX, rawY); result = true; break; } @@ -313,7 +313,7 @@ class DragResizeInputListener implements AutoCloseable { case MotionEvent.ACTION_CANCEL: { if (mShouldHandleEvents) { int dragPointerIndex = e.findPointerIndex(mDragPointerId); - mCallback.onDragResizeEnd( + mCallback.onDragPositioningEnd( e.getRawX(dragPointerIndex), e.getRawY(dragPointerIndex)); } mShouldHandleEvents = false; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskPositioner.java index 8cd2a5946e91..d3f92277bf03 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskPositioner.java @@ -23,7 +23,7 @@ import android.window.WindowContainerTransaction; import com.android.wm.shell.ShellTaskOrganizer; -class TaskPositioner implements DragResizeCallback { +class TaskPositioner implements DragPositioningCallback { @IntDef({CTRL_TYPE_UNDEFINED, CTRL_TYPE_LEFT, CTRL_TYPE_RIGHT, CTRL_TYPE_TOP, CTRL_TYPE_BOTTOM}) @interface CtrlType {} @@ -38,8 +38,8 @@ class TaskPositioner implements DragResizeCallback { private final WindowDecoration mWindowDecoration; private final Rect mTaskBoundsAtDragStart = new Rect(); - private final PointF mResizeStartPoint = new PointF(); - private final Rect mResizeTaskBounds = new Rect(); + private final PointF mRepositionStartPoint = new PointF(); + private final Rect mRepositionTaskBounds = new Rect(); private boolean mHasMoved = false; private int mCtrlType; @@ -57,7 +57,7 @@ class TaskPositioner implements DragResizeCallback { } @Override - public void onDragResizeStart(int ctrlType, float x, float y) { + public void onDragPositioningStart(int ctrlType, float x, float y) { mHasMoved = false; mDragStartListener.onDragStart(mWindowDecoration.mTaskInfo.taskId); @@ -65,11 +65,11 @@ class TaskPositioner implements DragResizeCallback { mTaskBoundsAtDragStart.set( mWindowDecoration.mTaskInfo.configuration.windowConfiguration.getBounds()); - mResizeStartPoint.set(x, y); + mRepositionStartPoint.set(x, y); } @Override - public void onDragResizeMove(float x, float y) { + public void onDragPositioningMove(float x, float y) { final WindowContainerTransaction wct = new WindowContainerTransaction(); if (changeBounds(wct, x, y)) { // The task is being resized, send the |dragResizing| hint to core with the first @@ -84,7 +84,7 @@ class TaskPositioner implements DragResizeCallback { } @Override - public void onDragResizeEnd(float x, float y) { + public void onDragPositioningEnd(float x, float y) { // |mHasMoved| being false means there is no real change to the task bounds in WM core, so // we don't need a WCT to finish it. if (mHasMoved) { @@ -96,42 +96,44 @@ class TaskPositioner implements DragResizeCallback { mCtrlType = CTRL_TYPE_UNDEFINED; mTaskBoundsAtDragStart.setEmpty(); - mResizeStartPoint.set(0, 0); + mRepositionStartPoint.set(0, 0); mHasMoved = false; } private boolean changeBounds(WindowContainerTransaction wct, float x, float y) { - // |mResizeTaskBounds| is the bounds last reported if |mHasMoved| is true. If it's not true, - // we can compare it against |mTaskBoundsAtDragStart|. - final int oldLeft = mHasMoved ? mResizeTaskBounds.left : mTaskBoundsAtDragStart.left; - final int oldTop = mHasMoved ? mResizeTaskBounds.top : mTaskBoundsAtDragStart.top; - final int oldRight = mHasMoved ? mResizeTaskBounds.right : mTaskBoundsAtDragStart.right; - final int oldBottom = mHasMoved ? mResizeTaskBounds.bottom : mTaskBoundsAtDragStart.bottom; - - final float deltaX = x - mResizeStartPoint.x; - final float deltaY = y - mResizeStartPoint.y; - mResizeTaskBounds.set(mTaskBoundsAtDragStart); + // |mRepositionTaskBounds| is the bounds last reported if |mHasMoved| is true. If it's not + // true, we can compare it against |mTaskBoundsAtDragStart|. + final int oldLeft = mHasMoved ? mRepositionTaskBounds.left : mTaskBoundsAtDragStart.left; + final int oldTop = mHasMoved ? mRepositionTaskBounds.top : mTaskBoundsAtDragStart.top; + final int oldRight = mHasMoved ? mRepositionTaskBounds.right : mTaskBoundsAtDragStart.right; + final int oldBottom = + mHasMoved ? mRepositionTaskBounds.bottom : mTaskBoundsAtDragStart.bottom; + + final float deltaX = x - mRepositionStartPoint.x; + final float deltaY = y - mRepositionStartPoint.y; + mRepositionTaskBounds.set(mTaskBoundsAtDragStart); if ((mCtrlType & CTRL_TYPE_LEFT) != 0) { - mResizeTaskBounds.left += deltaX; + mRepositionTaskBounds.left += deltaX; } if ((mCtrlType & CTRL_TYPE_RIGHT) != 0) { - mResizeTaskBounds.right += deltaX; + mRepositionTaskBounds.right += deltaX; } if ((mCtrlType & CTRL_TYPE_TOP) != 0) { - mResizeTaskBounds.top += deltaY; + mRepositionTaskBounds.top += deltaY; } if ((mCtrlType & CTRL_TYPE_BOTTOM) != 0) { - mResizeTaskBounds.bottom += deltaY; + mRepositionTaskBounds.bottom += deltaY; } if (mCtrlType == CTRL_TYPE_UNDEFINED) { - mResizeTaskBounds.offset((int) deltaX, (int) deltaY); + mRepositionTaskBounds.offset((int) deltaX, (int) deltaY); } - if (oldLeft == mResizeTaskBounds.left && oldTop == mResizeTaskBounds.top - && oldRight == mResizeTaskBounds.right && oldBottom == mResizeTaskBounds.bottom) { + if (oldLeft == mRepositionTaskBounds.left && oldTop == mRepositionTaskBounds.top + && oldRight == mRepositionTaskBounds.right + && oldBottom == mRepositionTaskBounds.bottom) { return false; } - wct.setBounds(mWindowDecoration.mTaskInfo.token, mResizeTaskBounds); + wct.setBounds(mWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); return true; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java index 907977c661f8..3734487e8f4b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java @@ -29,7 +29,8 @@ import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; */ public interface WindowDecorViewModel { /** - * Sets the transition starter that starts freeform task transitions. + * Sets the transition starter that starts freeform task transitions. Only called when + * {@link com.android.wm.shell.transition.Transitions#ENABLE_SHELL_TRANSITIONS} is {@code true}. * * @param transitionStarter the transition starter that starts freeform task transitions */ diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelperTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelperTest.kt index c02e2d177029..3bfbcd26a577 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelperTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/storage/BubbleXmlHelperTest.kt @@ -35,7 +35,7 @@ class BubbleXmlHelperTest : ShellTestCase() { private val user0Bubbles = listOf( BubbleEntity(0, "com.example.messenger", "shortcut-1", "0k1", 120, 0, null, 1, - isClearable = true), + isDismissable = true), BubbleEntity(10, "com.example.chat", "alice and bob", "0k2", 0, 16537428, "title", 2, null), BubbleEntity(0, "com.example.messenger", "shortcut-2", "0k3", 120, 0, null, @@ -44,7 +44,7 @@ class BubbleXmlHelperTest : ShellTestCase() { private val user1Bubbles = listOf( BubbleEntity(1, "com.example.messenger", "shortcut-1", "1k1", 120, 0, null, 3, - isClearable = true), + isDismissable = true), BubbleEntity(12, "com.example.chat", "alice and bob", "1k2", 0, 16537428, "title", 4, null), BubbleEntity(1, "com.example.messenger", "shortcut-2", "1k3", 120, 0, null, diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java index 324940e4113c..0c5edc3f59de 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -359,14 +360,14 @@ public class CompatUIWindowManagerTest extends ShellTestCase { mWindowManager.updateVisibility(/* canShow= */ false); verify(mWindowManager, never()).createLayout(anyBoolean()); - verify(mLayout).setVisibility(View.GONE); + verify(mLayout, atLeastOnce()).setVisibility(View.GONE); // Show button. doReturn(View.GONE).when(mLayout).getVisibility(); mWindowManager.updateVisibility(/* canShow= */ true); verify(mWindowManager, never()).createLayout(anyBoolean()); - verify(mLayout).setVisibility(View.VISIBLE); + verify(mLayout, atLeastOnce()).setVisibility(View.VISIBLE); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/TaskPositionerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/TaskPositionerTest.kt index 804c416f0cf6..f185a8a80719 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/TaskPositionerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/TaskPositionerTest.kt @@ -66,13 +66,13 @@ class TaskPositionerTest : ShellTestCase() { @Test fun testDragResize_notMove_skipsTransactionOnEnd() { - taskPositioner.onDragResizeStart( + taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - taskPositioner.onDragResizeEnd( + taskPositioner.onDragPositioningEnd( STARTING_BOUNDS.left.toFloat() + 10, STARTING_BOUNDS.top.toFloat() + 10 ) @@ -87,18 +87,18 @@ class TaskPositionerTest : ShellTestCase() { @Test fun testDragResize_noEffectiveMove_skipsTransactionOnMoveAndEnd() { - taskPositioner.onDragResizeStart( + taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - taskPositioner.onDragResizeMove( + taskPositioner.onDragPositioningMove( STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - taskPositioner.onDragResizeEnd( + taskPositioner.onDragPositioningEnd( STARTING_BOUNDS.left.toFloat() + 10, STARTING_BOUNDS.top.toFloat() + 10 ) @@ -113,13 +113,13 @@ class TaskPositionerTest : ShellTestCase() { @Test fun testDragResize_hasEffectiveMove_issuesTransactionOnMoveAndEnd() { - taskPositioner.onDragResizeStart( + taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - taskPositioner.onDragResizeMove( + taskPositioner.onDragPositioningMove( STARTING_BOUNDS.left.toFloat() + 10, STARTING_BOUNDS.top.toFloat() ) @@ -133,7 +133,7 @@ class TaskPositionerTest : ShellTestCase() { } }) - taskPositioner.onDragResizeEnd( + taskPositioner.onDragPositioningEnd( STARTING_BOUNDS.left.toFloat() + 10, STARTING_BOUNDS.top.toFloat() + 10 ) @@ -150,7 +150,7 @@ class TaskPositionerTest : ShellTestCase() { @Test fun testDragResize_move_skipsDragResizingFlag() { - taskPositioner.onDragResizeStart( + taskPositioner.onDragPositioningStart( CTRL_TYPE_UNDEFINED, // Move STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() @@ -159,12 +159,12 @@ class TaskPositionerTest : ShellTestCase() { // Move the task 10px to the right. val newX = STARTING_BOUNDS.left.toFloat() + 10 val newY = STARTING_BOUNDS.top.toFloat() - taskPositioner.onDragResizeMove( + taskPositioner.onDragPositioningMove( newX, newY ) - taskPositioner.onDragResizeEnd(newX, newY) + taskPositioner.onDragPositioningEnd(newX, newY) verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> return@argThat wct.changes.any { (token, change) -> @@ -177,7 +177,7 @@ class TaskPositionerTest : ShellTestCase() { @Test fun testDragResize_resize_setsDragResizingFlag() { - taskPositioner.onDragResizeStart( + taskPositioner.onDragPositioningStart( CTRL_TYPE_RIGHT, // Resize right STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() @@ -186,12 +186,12 @@ class TaskPositionerTest : ShellTestCase() { // Resize the task by 10px to the right. val newX = STARTING_BOUNDS.right.toFloat() + 10 val newY = STARTING_BOUNDS.top.toFloat() - taskPositioner.onDragResizeMove( + taskPositioner.onDragPositioningMove( newX, newY ) - taskPositioner.onDragResizeEnd(newX, newY) + taskPositioner.onDragPositioningEnd(newX, newY) verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> return@argThat wct.changes.any { (token, change) -> diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8d96bb7ab274..2c139b72eab3 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1337,12 +1337,8 @@ public class AudioManager { public void setVolumeIndexForAttributes(@NonNull AudioAttributes attr, int index, int flags) { Preconditions.checkNotNull(attr, "attr must not be null"); final IAudioService service = getService(); - try { - service.setVolumeIndexForAttributes(attr, index, flags, - getContext().getOpPackageName(), getContext().getAttributionTag()); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + int groupId = getVolumeGroupIdForAttributes(attr); + setVolumeGroupVolumeIndex(groupId, index, flags); } /** @@ -1361,11 +1357,8 @@ public class AudioManager { public int getVolumeIndexForAttributes(@NonNull AudioAttributes attr) { Preconditions.checkNotNull(attr, "attr must not be null"); final IAudioService service = getService(); - try { - return service.getVolumeIndexForAttributes(attr); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + int groupId = getVolumeGroupIdForAttributes(attr); + return getVolumeGroupVolumeIndex(groupId); } /** @@ -1382,11 +1375,8 @@ public class AudioManager { public int getMaxVolumeIndexForAttributes(@NonNull AudioAttributes attr) { Preconditions.checkNotNull(attr, "attr must not be null"); final IAudioService service = getService(); - try { - return service.getMaxVolumeIndexForAttributes(attr); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + int groupId = getVolumeGroupIdForAttributes(attr); + return getVolumeGroupMaxVolumeIndex(groupId); } /** @@ -1403,8 +1393,168 @@ public class AudioManager { public int getMinVolumeIndexForAttributes(@NonNull AudioAttributes attr) { Preconditions.checkNotNull(attr, "attr must not be null"); final IAudioService service = getService(); + int groupId = getVolumeGroupIdForAttributes(attr); + return getVolumeGroupMinVolumeIndex(groupId); + } + + /** + * Returns the volume group id associated to the given {@link AudioAttributes}. + * + * @param attributes The {@link AudioAttributes} to consider. + * @return {@link android.media.audiopolicy.AudioVolumeGroup} id supporting the given + * {@link AudioAttributes} if found, + * {@code android.media.audiopolicy.AudioVolumeGroup.DEFAULT_VOLUME_GROUP} otherwise. + * @hide + */ + public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) { + Preconditions.checkNotNull(attributes, "Audio Attributes must not be null"); + return AudioProductStrategy.getVolumeGroupIdForAudioAttributes(attributes, + /* fallbackOnDefault= */ false); + } + + /** + * Sets the volume index for a particular group associated to given id. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @param index The volume index to set. See + * {@link #getVolumeGroupMaxVolumeIndex(id)} for the largest valid value + * {@link #getVolumeGroupMinVolumeIndex(id)} for the lowest valid value. + * @param flags One or more flags. + * @hide + */ + @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) + public void setVolumeGroupVolumeIndex(int groupId, int index, int flags) { + final IAudioService service = getService(); + try { + service.setVolumeGroupVolumeIndex(groupId, index, flags, + getContext().getOpPackageName(), getContext().getAttributionTag()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns the current volume index for a particular group associated to given id. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @return The current volume index for the stream. + * @hide + */ + @IntRange(from = 0) + @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) + public int getVolumeGroupVolumeIndex(int groupId) { + final IAudioService service = getService(); + try { + return service.getVolumeGroupVolumeIndex(groupId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns the maximum volume index for a particular group associated to given id. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @return The maximum valid volume index for the {@link AudioAttributes}. + * @hide + */ + @IntRange(from = 0) + @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) + public int getVolumeGroupMaxVolumeIndex(int groupId) { + final IAudioService service = getService(); + try { + return service.getVolumeGroupMaxVolumeIndex(groupId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns the minimum volume index for a particular group associated to given id. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @return The minimum valid volume index for the {@link AudioAttributes}. + * @hide + */ + @IntRange(from = 0) + @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) + public int getVolumeGroupMinVolumeIndex(int groupId) { + final IAudioService service = getService(); + try { + return service.getVolumeGroupMinVolumeIndex(groupId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Adjusts the volume of a particular group associated to given id by one step in a direction. + * <p> If the volume group is associated to a stream type, it fallbacks on + * {@link AudioManager#adjustStreamVolume()} for compatibility reason. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @param direction The direction to adjust the volume. One of + * {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, or + * {@link #ADJUST_SAME}. + * @param flags One or more flags. + * @throws SecurityException if the adjustment triggers a Do Not Disturb change and the caller + * is not granted notification policy access. + * @hide + */ + public void adjustVolumeGroupVolume(int groupId, int direction, int flags) { + IAudioService service = getService(); + try { + service.adjustVolumeGroupVolume(groupId, direction, flags, + getContext().getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get last audible volume of the group associated to given id before it was muted. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @return current volume if not muted, volume before muted otherwise. + * @hide + */ + @RequiresPermission("android.permission.QUERY_AUDIO_STATE") + @IntRange(from = 0) + public int getLastAudibleVolumeGroupVolume(int groupId) { + IAudioService service = getService(); + try { + return service.getLastAudibleVolumeGroupVolume(groupId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns the current mute state for a particular volume group associated to the given id. + * <p> Call first in prior {@link getVolumeGroupIdForAttributes} to retrieve the volume group + * id supporting the given {@link AudioAttributes}. + * + * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider. + * @return The mute state for the given {@link android.media.audiopolicy.AudioVolumeGroup} id. + * @see #adjustAttributesVolume(AudioAttributes, int, int) + * @hide + */ + public boolean isVolumeGroupMuted(int groupId) { + IAudioService service = getService(); try { - return service.getMinVolumeIndexForAttributes(attr); + return service.isVolumeGroupMuted(groupId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index ad933e02c0d5..88a0321d34da 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -126,14 +126,20 @@ interface IAudioService { List<AudioVolumeGroup> getAudioVolumeGroups(); - void setVolumeIndexForAttributes(in AudioAttributes aa, int index, int flags, - String callingPackage, in String attributionTag); + void setVolumeGroupVolumeIndex(int groupId, int index, int flags, String callingPackage, + in String attributionTag); + + int getVolumeGroupVolumeIndex(int groupId); + + int getVolumeGroupMaxVolumeIndex(int groupId); + + int getVolumeGroupMinVolumeIndex(int groupId); - int getVolumeIndexForAttributes(in AudioAttributes aa); + int getLastAudibleVolumeGroupVolume(int groupId); - int getMaxVolumeIndexForAttributes(in AudioAttributes aa); + boolean isVolumeGroupMuted(int groupId); - int getMinVolumeIndexForAttributes(in AudioAttributes aa); + void adjustVolumeGroupVolume(int groupId, int direction, int flags, String callingPackage); int getLastAudibleStreamVolume(int streamType); diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index 31d596765bcc..a792501a07ba 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -29,10 +29,10 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.GuardedBy; -import com.android.internal.util.Preconditions; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @hide @@ -142,7 +142,7 @@ public final class AudioProductStrategy implements Parcelable { */ public static int getLegacyStreamTypeForStrategyWithAudioAttributes( @NonNull AudioAttributes audioAttributes) { - Preconditions.checkNotNull(audioAttributes, "AudioAttributes must not be null"); + Objects.requireNonNull(audioAttributes, "AudioAttributes must not be null"); for (final AudioProductStrategy productStrategy : AudioProductStrategy.getAudioProductStrategies()) { if (productStrategy.supportsAudioAttributes(audioAttributes)) { @@ -162,6 +162,30 @@ public final class AudioProductStrategy implements Parcelable { return AudioSystem.STREAM_MUSIC; } + /** + * @hide + * @param attributes the {@link AudioAttributes} to identify VolumeGroupId with + * @param fallbackOnDefault if set, allows to fallback on the default group (e.g. the group + * associated to {@link AudioManager#STREAM_MUSIC}). + * @return volume group id associated with the given {@link AudioAttributes} if found, + * default volume group id if fallbackOnDefault is set + * <p>By convention, the product strategy with default attributes will be associated to the + * default volume group (e.g. associated to {@link AudioManager#STREAM_MUSIC}) + * or {@link AudioVolumeGroup#DEFAULT_VOLUME_GROUP} if not found. + */ + public static int getVolumeGroupIdForAudioAttributes( + @NonNull AudioAttributes attributes, boolean fallbackOnDefault) { + Objects.requireNonNull(attributes, "attributes must not be null"); + int volumeGroupId = getVolumeGroupIdForAudioAttributesInt(attributes); + if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) { + return volumeGroupId; + } + if (fallbackOnDefault) { + return getVolumeGroupIdForAudioAttributesInt(getDefaultAttributes()); + } + return AudioVolumeGroup.DEFAULT_VOLUME_GROUP; + } + private static List<AudioProductStrategy> initializeAudioProductStrategies() { ArrayList<AudioProductStrategy> apsList = new ArrayList<AudioProductStrategy>(); int status = native_list_audio_product_strategies(apsList); @@ -192,8 +216,8 @@ public final class AudioProductStrategy implements Parcelable { */ private AudioProductStrategy(@NonNull String name, int id, @NonNull AudioAttributesGroup[] aag) { - Preconditions.checkNotNull(name, "name must not be null"); - Preconditions.checkNotNull(aag, "AudioAttributesGroups must not be null"); + Objects.requireNonNull(name, "name must not be null"); + Objects.requireNonNull(aag, "AudioAttributesGroups must not be null"); mName = name; mId = id; mAudioAttributesGroups = aag; @@ -211,6 +235,15 @@ public final class AudioProductStrategy implements Parcelable { /** * @hide + * @return the product strategy ID (which is the generalisation of Car Audio Usage / legacy + * routing_strategy linked to {@link AudioAttributes#getUsage()}). + */ + @NonNull public String getName() { + return mName; + } + + /** + * @hide * @return first {@link AudioAttributes} associated to this product strategy. */ @SystemApi @@ -243,7 +276,7 @@ public final class AudioProductStrategy implements Parcelable { */ @TestApi public int getLegacyStreamTypeForAudioAttributes(@NonNull AudioAttributes aa) { - Preconditions.checkNotNull(aa, "AudioAttributes must not be null"); + Objects.requireNonNull(aa, "AudioAttributes must not be null"); for (final AudioAttributesGroup aag : mAudioAttributesGroups) { if (aag.supportsAttributes(aa)) { return aag.getStreamType(); @@ -260,7 +293,7 @@ public final class AudioProductStrategy implements Parcelable { */ @SystemApi public boolean supportsAudioAttributes(@NonNull AudioAttributes aa) { - Preconditions.checkNotNull(aa, "AudioAttributes must not be null"); + Objects.requireNonNull(aa, "AudioAttributes must not be null"); for (final AudioAttributesGroup aag : mAudioAttributesGroups) { if (aag.supportsAttributes(aa)) { return true; @@ -293,7 +326,7 @@ public final class AudioProductStrategy implements Parcelable { */ @TestApi public int getVolumeGroupIdForAudioAttributes(@NonNull AudioAttributes aa) { - Preconditions.checkNotNull(aa, "AudioAttributes must not be null"); + Objects.requireNonNull(aa, "AudioAttributes must not be null"); for (final AudioAttributesGroup aag : mAudioAttributesGroups) { if (aag.supportsAttributes(aa)) { return aag.getVolumeGroupId(); @@ -302,6 +335,17 @@ public final class AudioProductStrategy implements Parcelable { return AudioVolumeGroup.DEFAULT_VOLUME_GROUP; } + private static int getVolumeGroupIdForAudioAttributesInt(@NonNull AudioAttributes attributes) { + Objects.requireNonNull(attributes, "attributes must not be null"); + for (AudioProductStrategy productStrategy : getAudioProductStrategies()) { + int volumeGroupId = productStrategy.getVolumeGroupIdForAudioAttributes(attributes); + if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) { + return volumeGroupId; + } + } + return AudioVolumeGroup.DEFAULT_VOLUME_GROUP; + } + @Override public int describeContents() { return 0; @@ -377,8 +421,8 @@ public final class AudioProductStrategy implements Parcelable { */ private static boolean attributesMatches(@NonNull AudioAttributes refAttr, @NonNull AudioAttributes attr) { - Preconditions.checkNotNull(refAttr, "refAttr must not be null"); - Preconditions.checkNotNull(attr, "attr must not be null"); + Objects.requireNonNull(refAttr, "reference AudioAttributes must not be null"); + Objects.requireNonNull(attr, "requester's AudioAttributes must not be null"); String refFormattedTags = TextUtils.join(";", refAttr.getTags()); String cliFormattedTags = TextUtils.join(";", attr.getTags()); if (refAttr.equals(DEFAULT_ATTRIBUTES)) { diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 2f4dd8fad8bb..408883e4e9e2 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -1004,9 +1004,10 @@ DrmPlugin::SecurityLevel jintToSecurityLevel(jint jlevel) { static jbyteArray android_media_MediaDrm_getSupportedCryptoSchemesNative(JNIEnv *env) { sp<IDrm> drm = android::DrmUtils::MakeDrm(); + if (drm == NULL) return env->NewByteArray(0); + std::vector<uint8_t> bv; drm->getSupportedSchemes(bv); - jbyteArray jUuidBytes = env->NewByteArray(bv.size()); env->SetByteArrayRegion(jUuidBytes, 0, bv.size(), reinterpret_cast<const jbyte *>(bv.data())); return jUuidBytes; diff --git a/packages/PackageInstaller/res/values-pt-rBR/strings.xml b/packages/PackageInstaller/res/values-pt-rBR/strings.xml index b9e5be871a7a..43dd3311a65c 100644 --- a/packages/PackageInstaller/res/values-pt-rBR/strings.xml +++ b/packages/PackageInstaller/res/values-pt-rBR/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"Desinstalar app"</string> <string name="uninstall_update_title" msgid="824411791011583031">"Desinstalar atualização"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> é parte do seguinte app:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"Quer desinstalar este app?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"Você quer desinstalar este app?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Quer desinstalar este app para "<b>"todos"</b>" os usuários? O aplicativo e os dados dele serão removidos para "<b>"todos"</b>" os usuários do dispositivo."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"Quer desinstalar este app para o usuário <xliff:g id="USERNAME">%1$s</xliff:g>?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"Você quer desinstalar esse app do seu perfil de trabalho?"</string> diff --git a/packages/PackageInstaller/res/values-pt/strings.xml b/packages/PackageInstaller/res/values-pt/strings.xml index b9e5be871a7a..43dd3311a65c 100644 --- a/packages/PackageInstaller/res/values-pt/strings.xml +++ b/packages/PackageInstaller/res/values-pt/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"Desinstalar app"</string> <string name="uninstall_update_title" msgid="824411791011583031">"Desinstalar atualização"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> é parte do seguinte app:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"Quer desinstalar este app?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"Você quer desinstalar este app?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Quer desinstalar este app para "<b>"todos"</b>" os usuários? O aplicativo e os dados dele serão removidos para "<b>"todos"</b>" os usuários do dispositivo."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"Quer desinstalar este app para o usuário <xliff:g id="USERNAME">%1$s</xliff:g>?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"Você quer desinstalar esse app do seu perfil de trabalho?"</string> diff --git a/packages/PrintSpooler/res/values-or/strings.xml b/packages/PrintSpooler/res/values-or/strings.xml index 6f215d3af18b..dd29700f812b 100644 --- a/packages/PrintSpooler/res/values-or/strings.xml +++ b/packages/PrintSpooler/res/values-or/strings.xml @@ -47,7 +47,7 @@ <string name="savetopdf_button" msgid="2976186791686924743">"PDFରେ ସେଭ୍ କରନ୍ତୁ"</string> <string name="print_options_expanded" msgid="6944679157471691859">"ପ୍ରିଣ୍ଟ ବିକଳ୍ପକୁ ବଡ଼ କରାଯାଇଛି"</string> <string name="print_options_collapsed" msgid="7455930445670414332">"ପ୍ରିଣ୍ଟ ବିକଳ୍ପକୁ ଛୋଟ କରାଯାଇଛି"</string> - <string name="search" msgid="5421724265322228497">"ସନ୍ଧାନ କରନ୍ତୁ"</string> + <string name="search" msgid="5421724265322228497">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string> <string name="all_printers_label" msgid="3178848870161526399">"ସମସ୍ତ ପ୍ରିଣ୍ଟର୍"</string> <string name="add_print_service_label" msgid="5356702546188981940">"ସେବା ଯୋଗ କରନ୍ତୁ"</string> <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"ସର୍ଚ୍ଚ ବକ୍ସ ଦେଖାଯାଇଛି"</string> diff --git a/packages/SettingsLib/IllustrationPreference/res/values/attrs.xml b/packages/SettingsLib/IllustrationPreference/res/values/attrs.xml new file mode 100644 index 000000000000..141886cda8a7 --- /dev/null +++ b/packages/SettingsLib/IllustrationPreference/res/values/attrs.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <declare-styleable name="IllustrationPreference"> + <attr name="dynamicColor" format="boolean" /> + </declare-styleable> +</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java index 15920940140c..3b902757c43e 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java @@ -61,6 +61,8 @@ public class IllustrationPreference extends Preference { private View mMiddleGroundView; private OnBindListener mOnBindListener; + private boolean mLottieDynamicColor; + /** * Interface to listen in on when {@link #onBindViewHolder(PreferenceViewHolder)} occurs. */ @@ -146,6 +148,10 @@ public class IllustrationPreference extends Preference { ColorUtils.applyDynamicColors(getContext(), illustrationView); } + if (mLottieDynamicColor) { + LottieColorUtils.applyDynamicColors(getContext(), illustrationView); + } + if (mOnBindListener != null) { mOnBindListener.onBind(illustrationView); } @@ -262,6 +268,21 @@ public class IllustrationPreference extends Preference { } } + /** + * Sets the lottie illustration apply dynamic color. + */ + public void applyDynamicColor() { + mLottieDynamicColor = true; + notifyChanged(); + } + + /** + * Return if the lottie illustration apply dynamic color or not. + */ + public boolean isApplyDynamicColor() { + return mLottieDynamicColor; + } + private void resetImageResourceCache() { mImageDrawable = null; mImageUri = null; @@ -403,9 +424,15 @@ public class IllustrationPreference extends Preference { mIsAutoScale = false; if (attrs != null) { - final TypedArray a = context.obtainStyledAttributes(attrs, + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LottieAnimationView, 0 /*defStyleAttr*/, 0 /*defStyleRes*/); mImageResId = a.getResourceId(R.styleable.LottieAnimationView_lottie_rawRes, 0); + + a = context.obtainStyledAttributes(attrs, + R.styleable.IllustrationPreference, 0 /*defStyleAttr*/, 0 /*defStyleRes*/); + mLottieDynamicColor = a.getBoolean(R.styleable.IllustrationPreference_dynamicColor, + false); + a.recycle(); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index d6586db1b50a..d9d7cc9085fa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -185,6 +185,24 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { public abstract String getId(); /** + * Get disabled reason of device + * + * @return disabled reason of device + */ + public int getDisableReason() { + return -1; + } + + /** + * Checks if device is has disabled reason + * + * @return true if device has disabled reason + */ + public boolean hasDisabledReason() { + return false; + } + + /** * Checks if device is suggested device from application * * @return true if device is suggested device diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java index 103512d4a28a..21e119a48f7b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java @@ -215,4 +215,20 @@ public class IllustrationPreferenceTest { assertThat(mOnBindListenerAnimationView).isNull(); } + + @Test + public void onBindViewHolder_default_shouldNotApplyDynamicColor() { + mPreference.onBindViewHolder(mViewHolder); + + assertThat(mPreference.isApplyDynamicColor()).isFalse(); + } + + @Test + public void onBindViewHolder_applyDynamicColor_shouldReturnTrue() { + mPreference.applyDynamicColor(); + + mPreference.onBindViewHolder(mViewHolder); + + assertThat(mPreference.isApplyDynamicColor()).isTrue(); + } } diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/LargeScreenSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/LargeScreenSettings.java new file mode 100644 index 000000000000..bdd48690c239 --- /dev/null +++ b/packages/SettingsProvider/src/android/provider/settings/backup/LargeScreenSettings.java @@ -0,0 +1,53 @@ +/* + * 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.provider.settings.backup; + +import android.content.Context; +import android.graphics.Rect; +import android.util.DisplayMetrics; +import android.view.WindowManager; + +/** Settings that should not be restored when target device is a large screen + * i.e. tablets and foldables in unfolded state + */ +public class LargeScreenSettings { + private static final float LARGE_SCREEN_MIN_DPS = 600; + private static final String LARGE_SCREEN_DO_NOT_RESTORE = "accelerometer_rotation"; + + /** + * Autorotation setting should not be restored when the target device is a large screen. + * (b/243489549) + */ + public static boolean doNotRestoreIfLargeScreenSetting(String key, Context context) { + return isLargeScreen(context) && LARGE_SCREEN_DO_NOT_RESTORE.equals(key); + } + + // copied from systemui/shared/...Utilities.java + // since we don't want to add compile time dependency on sys ui package + private static boolean isLargeScreen(Context context) { + final WindowManager windowManager = context.getSystemService(WindowManager.class); + final Rect bounds = windowManager.getCurrentWindowMetrics().getBounds(); + float smallestWidth = dpiFromPx(Math.min(bounds.width(), bounds.height()), + context.getResources().getConfiguration().densityDpi); + return smallestWidth >= LARGE_SCREEN_MIN_DPS; + } + + private static float dpiFromPx(float size, int densityDpi) { + float densityRatio = (float) densityDpi / DisplayMetrics.DENSITY_DEFAULT; + return (size / densityRatio); + } +} diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index d3afccc9dcb1..d0055d7a55e1 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -37,6 +37,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.provider.settings.backup.DeviceSpecificSettings; import android.provider.settings.backup.GlobalSettings; +import android.provider.settings.backup.LargeScreenSettings; import android.provider.settings.backup.SecureSettings; import android.provider.settings.backup.SystemSettings; import android.provider.settings.validators.GlobalSettingsValidators; @@ -812,6 +813,12 @@ public class SettingsBackupAgent extends BackupAgentHelper { continue; } + if (LargeScreenSettings.doNotRestoreIfLargeScreenSetting(key, getBaseContext())) { + Log.i(TAG, "Skipping restore for setting " + key + " as the target device " + + "is a large screen (i.e tablet or foldable in unfolded state)"); + continue; + } + String value = null; boolean hasValueToRestore = false; if (cachedEntries.indexOfKey(key) >= 0) { diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index b6e006f3948a..e96aead597b3 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -674,6 +674,7 @@ <intent-filter> <action android:name="android.telecom.action.SHOW_SWITCH_TO_WORK_PROFILE_FOR_CALL_DIALOG" /> <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="tel" /> </intent-filter> </activity> diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt index c729b09628af..17a94b8639d0 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt @@ -41,6 +41,7 @@ import androidx.annotation.BinderThread import androidx.annotation.UiThread import com.android.internal.annotations.VisibleForTesting import com.android.internal.policy.ScreenDecorationsUtils +import java.lang.IllegalArgumentException import kotlin.math.roundToInt private const val TAG = "ActivityLaunchAnimator" @@ -338,13 +339,24 @@ class ActivityLaunchAnimator( * Return a [Controller] that will animate and expand [view] into the opening window. * * Important: The view must be attached to a [ViewGroup] when calling this function and - * during the animation. For safety, this method will return null when it is not. + * during the animation. For safety, this method will return null when it is not. The + * view must also implement [LaunchableView], otherwise this method will throw. * * Note: The background of [view] should be a (rounded) rectangle so that it can be * properly animated. */ @JvmStatic fun fromView(view: View, cujType: Int? = null): Controller? { + // Make sure the View we launch from implements LaunchableView to avoid visibility + // issues. + if (view !is LaunchableView) { + throw IllegalArgumentException( + "An ActivityLaunchAnimator.Controller was created from a View that does " + + "not implement LaunchableView. This can lead to subtle bugs where the" + + " visibility of the View we are launching from is not what we expected." + ) + } + if (view.parent !is ViewGroup) { Log.e( TAG, diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt index e91a6710ace5..b8d78fb208f4 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -40,6 +40,7 @@ import com.android.systemui.animation.back.BackAnimationSpec import com.android.systemui.animation.back.applyTo import com.android.systemui.animation.back.floatingSystemSurfacesForSysUi import com.android.systemui.animation.back.onBackAnimationCallbackFrom +import java.lang.IllegalArgumentException import kotlin.math.roundToInt private const val TAG = "DialogLaunchAnimator" @@ -157,12 +158,23 @@ constructor( * Create a [Controller] that can animate [source] to and from a dialog. * * Important: The view must be attached to a [ViewGroup] when calling this function and - * during the animation. For safety, this method will return null when it is not. + * during the animation. For safety, this method will return null when it is not. The + * view must also implement [LaunchableView], otherwise this method will throw. * * Note: The background of [view] should be a (rounded) rectangle so that it can be * properly animated. */ fun fromView(source: View, cuj: DialogCuj? = null): Controller? { + // Make sure the View we launch from implements LaunchableView to avoid visibility + // issues. + if (source !is LaunchableView) { + throw IllegalArgumentException( + "A DialogLaunchAnimator.Controller was created from a View that does not " + + "implement LaunchableView. This can lead to subtle bugs where the " + + "visibility of the View we are launching from is not what we expected." + ) + } + if (source.parent !is ViewGroup) { Log.e( TAG, @@ -249,23 +261,6 @@ constructor( } ?: controller - if ( - animatedParent == null && - controller is ViewDialogLaunchAnimatorController && - controller.source !is LaunchableView - ) { - // Make sure the View we launch from implements LaunchableView to avoid visibility - // issues. Given that we don't own dialog decorViews so we can't enforce it for launches - // from a dialog. - // TODO(b/243636422): Throw instead of logging to enforce this. - Log.w( - TAG, - "A dialog was launched from a View that does not implement LaunchableView. This " + - "can lead to subtle bugs where the visibility of the View we are " + - "launching from is not what we expected." - ) - } - // Make sure we don't run the launch animation from the same source twice at the same time. if (openedDialogs.any { it.controller.sourceIdentity == controller.sourceIdentity }) { Log.e( @@ -613,10 +608,16 @@ private class AnimatedDialog( } // Animate that view with the background. Throw if we didn't find one, because - // otherwise - // it's not clear what we should animate. + // otherwise it's not clear what we should animate. + if (viewGroupWithBackground == null) { + error("Unable to find ViewGroup with background") + } + + if (viewGroupWithBackground !is LaunchableView) { + error("The animated ViewGroup with background must implement LaunchableView") + } + viewGroupWithBackground - ?: throw IllegalStateException("Unable to find ViewGroup with background") } else { // We will make the dialog window (and therefore its DecorView) fullscreen to make // it possible to animate outside its bounds. @@ -639,7 +640,7 @@ private class AnimatedDialog( FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) ) - val dialogContentWithBackground = FrameLayout(dialog.context) + val dialogContentWithBackground = LaunchableFrameLayout(dialog.context) dialogContentWithBackground.background = decorView.background // Make the window background transparent. Note that setting the window (or @@ -720,7 +721,10 @@ private class AnimatedDialog( // Make the background view invisible until we start the animation. We use the transition // visibility like GhostView does so that we don't mess up with the accessibility tree (see - // b/204944038#comment17). + // b/204944038#comment17). Given that this background implements LaunchableView, we call + // setShouldBlockVisibilityChanges() early so that the current visibility (VISIBLE) is + // restored at the end of the animation. + dialogContentWithBackground.setShouldBlockVisibilityChanges(true) dialogContentWithBackground.setTransitionVisibility(View.INVISIBLE) // Make sure the dialog is visible instantly and does not do any window animation. diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt index 26aa0e85cbd2..23e3a01c2686 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt @@ -34,6 +34,7 @@ import android.view.ViewGroup import android.view.ViewGroupOverlay import android.widget.FrameLayout import com.android.internal.jank.InteractionJankMonitor +import java.lang.IllegalArgumentException import java.util.LinkedList import kotlin.math.min import kotlin.math.roundToInt @@ -46,7 +47,8 @@ private const val TAG = "GhostedViewLaunchAnimatorController" * of the ghosted view. * * Important: [ghostedView] must be attached to a [ViewGroup] when calling this function and during - * the animation. + * the animation. It must also implement [LaunchableView], otherwise an exception will be thrown + * during this controller instantiation. * * Note: Avoid instantiating this directly and call [ActivityLaunchAnimator.Controller.fromView] * whenever possible instead. @@ -101,6 +103,15 @@ constructor( private val background: Drawable? init { + // Make sure the View we launch from implements LaunchableView to avoid visibility issues. + if (ghostedView !is LaunchableView) { + throw IllegalArgumentException( + "A GhostedViewLaunchAnimatorController was created from a View that does not " + + "implement LaunchableView. This can lead to subtle bugs where the visibility " + + "of the View we are launching from is not what we expected." + ) + } + /** Find the first view with a background in [view] and its children. */ fun findBackground(view: View): Drawable? { if (view.background != null) { diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt new file mode 100644 index 000000000000..2eb503b43cc5 --- /dev/null +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.animation + +import android.content.Context +import android.util.AttributeSet +import android.widget.FrameLayout + +/** A [FrameLayout] that also implements [LaunchableView]. */ +open class LaunchableFrameLayout : FrameLayout, LaunchableView { + private val delegate = + LaunchableViewDelegate( + this, + superSetVisibility = { super.setVisibility(it) }, + ) + + constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int + ) : super(context, attrs, defStyleAttr) + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + defStyleRes: Int + ) : super(context, attrs, defStyleAttr, defStyleRes) + + override fun setShouldBlockVisibilityChanges(block: Boolean) { + delegate.setShouldBlockVisibilityChanges(block) + } + + override fun setVisibility(visibility: Int) { + delegate.setVisibility(visibility) + } +} diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt index 9257f99efe96..46d5a5c0af8c 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt @@ -25,7 +25,7 @@ import com.android.internal.jank.InteractionJankMonitor /** A [DialogLaunchAnimator.Controller] that can animate a [View] from/to a dialog. */ class ViewDialogLaunchAnimatorController internal constructor( - internal val source: View, + private val source: View, override val cuj: DialogCuj?, ) : DialogLaunchAnimator.Controller { override val viewRoot: ViewRootImpl? diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt index 0e3d41c40c97..7897934fa264 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt @@ -48,7 +48,7 @@ class RippleAnimation(private val config: RippleAnimationConfig) { animator.addUpdateListener { updateListener -> val now = updateListener.currentPlayTime val progress = updateListener.animatedValue as Float - rippleShader.progress = progress + rippleShader.rawProgress = progress rippleShader.distortionStrength = if (config.shouldDistort) 1 - progress else 0f rippleShader.time = now.toFloat() } diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt index 90585109643a..c764d536609b 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt @@ -18,6 +18,7 @@ package com.android.systemui.surfaceeffects.ripple import android.graphics.PointF import android.graphics.RuntimeShader import android.util.MathUtils +import com.android.systemui.animation.Interpolators import com.android.systemui.surfaceeffects.shaderutil.SdfShaderLibrary import com.android.systemui.surfaceeffects.shaderutil.ShaderUtilLibrary @@ -43,11 +44,24 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) : } // language=AGSL companion object { + // Default fade in/ out values. The value range is [0,1]. + const val DEFAULT_FADE_IN_START = 0f + const val DEFAULT_FADE_OUT_END = 1f + + const val DEFAULT_BASE_RING_FADE_IN_END = 0.1f + const val DEFAULT_BASE_RING_FADE_OUT_START = 0.3f + + const val DEFAULT_SPARKLE_RING_FADE_IN_END = 0.1f + const val DEFAULT_SPARKLE_RING_FADE_OUT_START = 0.4f + + const val DEFAULT_CENTER_FILL_FADE_IN_END = 0f + const val DEFAULT_CENTER_FILL_FADE_OUT_START = 0f + const val DEFAULT_CENTER_FILL_FADE_OUT_END = 0.6f + private const val SHADER_UNIFORMS = """ uniform vec2 in_center; uniform vec2 in_size; - uniform float in_progress; uniform float in_cornerRadius; uniform float in_thickness; uniform float in_time; @@ -73,7 +87,7 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) : * (1.-sparkleRing) * in_fadeSparkle; float rippleInsideAlpha = (1.-inside) * in_fadeFill; - float rippleRingAlpha = (1.-sparkleRing) * in_fadeRing; + float rippleRingAlpha = (1.-sparkleRing) * in_fadeRing * in_sparkle_strength; float rippleAlpha = max(rippleInsideAlpha, rippleRingAlpha) * in_color.a; vec4 ripple = vec4(in_color.rgb, 1.0) * rippleAlpha; return mix(ripple, vec4(sparkle), sparkle * in_sparkle_strength); @@ -143,11 +157,26 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) : } private fun subProgress(start: Float, end: Float, progress: Float): Float { + // Avoid division by 0. + if (start == end) { + // If start and end are the same and progress has exceeded the start/ end point, + // treat it as 1, otherwise 0. + return if (progress > start) 1f else 0f + } + val min = Math.min(start, end) val max = Math.max(start, end) val sub = Math.min(Math.max(progress, min), max) return (sub - start) / (end - start) } + + private fun getFade(fadeParams: FadeParams, rawProgress: Float): Float { + val fadeIn = subProgress(fadeParams.fadeInStart, fadeParams.fadeInEnd, rawProgress) + val fadeOut = + 1f - subProgress(fadeParams.fadeOutStart, fadeParams.fadeOutEnd, rawProgress) + + return Math.min(fadeIn, fadeOut) + } } /** Sets the center position of the ripple. */ @@ -162,33 +191,33 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) : maxSize.y = height } - /** Progress of the ripple. Float value between [0, 1]. */ - var progress: Float = 0.0f + /** + * Linear progress of the ripple. Float value between [0, 1]. + * + * <p>Note that the progress here is expected to be linear without any curve applied. + */ + var rawProgress: Float = 0.0f set(value) { field = value - setFloatUniform("in_progress", value) - val curvedProg = 1 - (1 - value) * (1 - value) * (1 - value) + progress = Interpolators.STANDARD.getInterpolation(value) - currentWidth = maxSize.x * curvedProg - currentHeight = maxSize.y * curvedProg - setFloatUniform("in_size", /* width= */ currentWidth, /* height= */ currentHeight) - setFloatUniform("in_thickness", maxSize.y * curvedProg * 0.5f) + setFloatUniform("in_fadeSparkle", getFade(sparkleRingFadeParams, value)) + setFloatUniform("in_fadeRing", getFade(baseRingFadeParams, value)) + setFloatUniform("in_fadeFill", getFade(centerFillFadeParams, value)) + } + + /** Progress with Standard easing curve applied. */ + private var progress: Float = 0.0f + set(value) { + currentWidth = maxSize.x * value + currentHeight = maxSize.y * value + setFloatUniform("in_size", currentWidth, currentHeight) + + setFloatUniform("in_thickness", maxSize.y * value * 0.5f) // radius should not exceed width and height values. - setFloatUniform("in_cornerRadius", Math.min(maxSize.x, maxSize.y) * curvedProg) + setFloatUniform("in_cornerRadius", Math.min(maxSize.x, maxSize.y) * value) setFloatUniform("in_blur", MathUtils.lerp(1.25f, 0.5f, value)) - - val fadeIn = subProgress(0f, 0.1f, value) - val fadeOutNoise = subProgress(0.4f, 1f, value) - var fadeOutRipple = 0f - var fadeFill = 0f - if (!rippleFill) { - fadeFill = subProgress(0f, 0.6f, value) - fadeOutRipple = subProgress(0.3f, 1f, value) - } - setFloatUniform("in_fadeSparkle", Math.min(fadeIn, 1 - fadeOutNoise)) - setFloatUniform("in_fadeFill", 1 - fadeFill) - setFloatUniform("in_fadeRing", Math.min(fadeIn, 1 - fadeOutRipple)) } /** Play time since the start of the effect. */ @@ -220,25 +249,134 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) : var distortionStrength: Float = 0.0f set(value) { field = value - setFloatUniform("in_distort_radial", 75 * progress * value) + setFloatUniform("in_distort_radial", 75 * rawProgress * value) setFloatUniform("in_distort_xy", 75 * value) } + /** + * Pixel density of the screen that the effects are rendered to. + * + * <p>This value should come from [resources.displayMetrics.density]. + */ var pixelDensity: Float = 1.0f set(value) { field = value setFloatUniform("in_pixelDensity", value) } + var currentWidth: Float = 0f + private set + + var currentHeight: Float = 0f + private set + /** * True if the ripple should stayed filled in as it expands to give a filled-in circle effect. * False for a ring effect. + * + * <p>You must reset fade params after changing this. + * + * TODO(b/265326983): Remove this and only expose fade params. */ var rippleFill: Boolean = false + set(value) { + if (value) { + baseRingFadeParams.fadeOutStart = 1f + baseRingFadeParams.fadeOutEnd = 1f - var currentWidth: Float = 0f - private set + centerFillFadeParams.fadeInStart = 0f + centerFillFadeParams.fadeInEnd = 0f + centerFillFadeParams.fadeOutStart = 1f + centerFillFadeParams.fadeOutEnd = 1f + } else { + // Set back to the original fade parameters. + // Ideally this should be set by the client as they know the initial value. + baseRingFadeParams.fadeOutStart = DEFAULT_BASE_RING_FADE_OUT_START + baseRingFadeParams.fadeOutEnd = DEFAULT_FADE_OUT_END - var currentHeight: Float = 0f - private set + centerFillFadeParams.fadeInStart = DEFAULT_FADE_IN_START + centerFillFadeParams.fadeInEnd = DEFAULT_CENTER_FILL_FADE_IN_END + centerFillFadeParams.fadeOutStart = DEFAULT_CENTER_FILL_FADE_OUT_START + centerFillFadeParams.fadeOutEnd = DEFAULT_CENTER_FILL_FADE_OUT_END + } + field = value + } + + /** Parameters that are used to fade in/ out of the sparkle ring. */ + val sparkleRingFadeParams = + FadeParams( + DEFAULT_FADE_IN_START, + DEFAULT_SPARKLE_RING_FADE_IN_END, + DEFAULT_SPARKLE_RING_FADE_OUT_START, + DEFAULT_FADE_OUT_END + ) + + /** + * Parameters that are used to fade in/ out of the base ring. + * + * <p>Note that the shader draws the sparkle ring on top of the base ring. + */ + val baseRingFadeParams = + FadeParams( + DEFAULT_FADE_IN_START, + DEFAULT_BASE_RING_FADE_IN_END, + DEFAULT_BASE_RING_FADE_OUT_START, + DEFAULT_FADE_OUT_END + ) + + /** + * Parameters that are used to fade in/ out of the center fill. + * + * <p>Note that if [rippleFill] is set to true, those will be ignored and the center fill will + * be always full alpha. + */ + val centerFillFadeParams = + FadeParams( + DEFAULT_FADE_IN_START, + DEFAULT_CENTER_FILL_FADE_IN_END, + DEFAULT_CENTER_FILL_FADE_OUT_START, + DEFAULT_CENTER_FILL_FADE_OUT_END + ) + + /** + * Parameters used for fade in and outs of the ripple. + * + * <p>Note that all the fade in/ outs are "linear" progression. + * ``` + * (opacity) + * 1 + * │ + * maxAlpha ← ―――――――――――― + * │ / \ + * │ / \ + * minAlpha ←――――/ \―――― (alpha change) + * │ + * │ + * 0 ―――↑―――↑―――――――――↑―――↑――――1 (progress) + * fadeIn fadeOut + * Start & End Start & End + * ``` + * <p>If no fade in/ out is needed, set [fadeInStart] and [fadeInEnd] to 0; [fadeOutStart] and + * [fadeOutEnd] to 1. + */ + data class FadeParams( + /** + * The starting point of the fade out which ends at [fadeInEnd], given that the animation + * goes from 0 to 1. + */ + var fadeInStart: Float = DEFAULT_FADE_IN_START, + /** + * The endpoint of the fade in when the fade in starts at [fadeInStart], given that the + * animation goes from 0 to 1. + */ + var fadeInEnd: Float, + /** + * The starting point of the fade out which ends at 1, given that the animation goes from 0 + * to 1. + */ + var fadeOutStart: Float, + + /** The endpoint of the fade out, given that the animation goes from 0 to 1. */ + var fadeOutEnd: Float = DEFAULT_FADE_OUT_END, + ) } diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt index b37c73417119..bc4796aff042 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt @@ -77,7 +77,7 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a rippleShader = RippleShader(rippleShape) rippleShader.color = RippleAnimationConfig.RIPPLE_DEFAULT_COLOR - rippleShader.progress = 0f + rippleShader.rawProgress = 0f rippleShader.sparkleStrength = RippleAnimationConfig.RIPPLE_SPARKLE_STRENGTH rippleShader.pixelDensity = resources.displayMetrics.density @@ -93,7 +93,7 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a animator.addUpdateListener { updateListener -> val now = updateListener.currentPlayTime val progress = updateListener.animatedValue as Float - rippleShader.progress = progress + rippleShader.rawProgress = progress rippleShader.distortionStrength = 1 - progress rippleShader.time = now.toFloat() invalidate() @@ -142,25 +142,13 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a } // To reduce overdraw, we mask the effect to a circle or a rectangle that's bigger than the // active effect area. Values here should be kept in sync with the animation implementation - // in the ripple shader. + // in the ripple shader. (Twice bigger) if (rippleShape == RippleShape.CIRCLE) { - val maskRadius = - (1 - - (1 - rippleShader.progress) * - (1 - rippleShader.progress) * - (1 - rippleShader.progress)) * maxWidth + val maskRadius = rippleShader.currentWidth canvas.drawCircle(centerX, centerY, maskRadius, ripplePaint) } else { - val maskWidth = - (1 - - (1 - rippleShader.progress) * - (1 - rippleShader.progress) * - (1 - rippleShader.progress)) * maxWidth * 2 - val maskHeight = - (1 - - (1 - rippleShader.progress) * - (1 - rippleShader.progress) * - (1 - rippleShader.progress)) * maxHeight * 2 + val maskWidth = rippleShader.currentWidth * 2 + val maskHeight = rippleShader.currentHeight * 2 canvas.drawRect( /* left= */ centerX - maskWidth, /* top= */ centerY - maskHeight, diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt index 4e96ddabfda6..cfc38df08b0a 100644 --- a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt +++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt @@ -33,8 +33,8 @@ import androidx.compose.foundation.layout.requiredSize import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.LocalMinimumTouchTargetEnforcement import androidx.compose.material3.contentColorFor +import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.DisposableEffect @@ -65,21 +65,17 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.findRootCoordinates -import androidx.compose.ui.layout.layout import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalViewConfiguration import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp import androidx.lifecycle.ViewTreeLifecycleOwner import androidx.lifecycle.ViewTreeViewModelStoreOwner -import com.android.compose.runtime.movableContentOf import com.android.systemui.animation.Expandable import com.android.systemui.animation.LaunchAnimator import kotlin.math.max import kotlin.math.min -import kotlin.math.roundToInt /** * Create an expandable shape that can launch into an Activity or a Dialog. @@ -220,21 +216,8 @@ fun Expandable( // If this expandable is expanded when it's being directly clicked on, let's ensure that it has // the minimum interactive size followed by all M3 components (48.dp). val minInteractiveSizeModifier = - if (onClick != null && LocalMinimumTouchTargetEnforcement.current) { - // TODO(b/242040009): Replace this by Modifier.minimumInteractiveComponentSize() once - // http://aosp/2305511 is available. - val minTouchSize = LocalViewConfiguration.current.minimumTouchTargetSize - Modifier.layout { measurable, constraints -> - // Copied from androidx.compose.material3.InteractiveComponentSize.kt - val placeable = measurable.measure(constraints) - val width = maxOf(placeable.width, minTouchSize.width.roundToPx()) - val height = maxOf(placeable.height, minTouchSize.height.roundToPx()) - layout(width, height) { - val centerX = ((width - placeable.width) / 2f).roundToInt() - val centerY = ((height - placeable.height) / 2f).roundToInt() - placeable.place(centerX, centerY) - } - } + if (onClick != null) { + Modifier.minimumInteractiveComponentSize() } else { Modifier } diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index 7645decfde24..d1108503b556 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt @@ -85,7 +85,8 @@ class DefaultClockController( animations = DefaultClockAnimations(dozeFraction, foldFraction) events.onColorPaletteChanged(resources) events.onTimeZoneChanged(TimeZone.getDefault()) - events.onTimeTick() + smallClock.events.onTimeTick() + largeClock.events.onTimeTick() } open inner class DefaultClockFaceController( @@ -109,6 +110,8 @@ class DefaultClockController( override val events = object : ClockFaceEvents { + override fun onTimeTick() = view.refreshTime() + override fun onRegionDarknessChanged(isRegionDark: Boolean) { this@DefaultClockFaceController.isRegionDark = isRegionDark updateColor() @@ -169,8 +172,6 @@ class DefaultClockController( } inner class DefaultClockEvents : ClockEvents { - override fun onTimeTick() = clocks.forEach { it.refreshTime() } - override fun onTimeFormatChanged(is24Hr: Boolean) = clocks.forEach { it.refreshFormat(is24Hr) } diff --git a/packages/SystemUI/docs/device-entry/quickaffordance.md b/packages/SystemUI/docs/device-entry/quickaffordance.md index ccb35fac36f2..79d5718efe0d 100644 --- a/packages/SystemUI/docs/device-entry/quickaffordance.md +++ b/packages/SystemUI/docs/device-entry/quickaffordance.md @@ -52,6 +52,10 @@ A picker experience may: * Unselect an already-selected quick affordance from a slot * Unselect all already-selected quick affordances from a slot +## Testing +* Add a unit test for your implementation of `KeyguardQuickAffordanceConfig` +* Manually verify that your implementation works in multi-user environments from both the main user and a secondary user + ## Debugging To see the current state of the system, you can run `dumpsys`: diff --git a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index bc6e5ec6117c..e0cc8f4a7596 100644 --- a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java @@ -50,16 +50,24 @@ public interface BcSmartspaceDataPlugin extends Plugin { String TAG = "BcSmartspaceDataPlugin"; /** Register a listener to get Smartspace data. */ - void registerListener(SmartspaceTargetListener listener); + default void registerListener(SmartspaceTargetListener listener) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Unregister a listener. */ - void unregisterListener(SmartspaceTargetListener listener); + default void unregisterListener(SmartspaceTargetListener listener) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Register a SmartspaceEventNotifier. */ - default void registerSmartspaceEventNotifier(SmartspaceEventNotifier notifier) {} + default void registerSmartspaceEventNotifier(SmartspaceEventNotifier notifier) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Push a SmartspaceTargetEvent to the SmartspaceEventNotifier. */ - default void notifySmartspaceEvent(SmartspaceTargetEvent event) {} + default void notifySmartspaceEvent(SmartspaceTargetEvent event) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Allows for notifying the SmartspaceSession of SmartspaceTargetEvents. */ interface SmartspaceEventNotifier { @@ -72,16 +80,20 @@ public interface BcSmartspaceDataPlugin extends Plugin { * will be responsible for correctly setting the LayoutParams */ default SmartspaceView getView(ViewGroup parent) { - return null; + throw new UnsupportedOperationException("Not implemented by " + getClass()); } /** * As the smartspace view becomes available, allow listeners to receive an event. */ - default void addOnAttachStateChangeListener(View.OnAttachStateChangeListener listener) { } + default void addOnAttachStateChangeListener(View.OnAttachStateChangeListener listener) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Updates Smartspace data and propagates it to any listeners. */ - void onTargetsAvailable(List<SmartspaceTarget> targets); + default void onTargetsAvailable(List<SmartspaceTarget> targets) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** Provides Smartspace data to registered listeners. */ interface SmartspaceTargetListener { @@ -96,7 +108,9 @@ public interface BcSmartspaceDataPlugin extends Plugin { /** * Sets {@link BcSmartspaceConfigPlugin}. */ - void registerConfigProvider(BcSmartspaceConfigPlugin configProvider); + default void registerConfigProvider(BcSmartspaceConfigPlugin configProvider) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** * Primary color for unprotected text @@ -138,28 +152,38 @@ public interface BcSmartspaceDataPlugin extends Plugin { /** * Set or clear Do Not Disturb information. */ - void setDnd(@Nullable Drawable image, @Nullable String description); + default void setDnd(@Nullable Drawable image, @Nullable String description) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** * Set or clear next alarm information */ - void setNextAlarm(@Nullable Drawable image, @Nullable String description); + default void setNextAlarm(@Nullable Drawable image, @Nullable String description) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** * Set or clear device media playing */ - void setMediaTarget(@Nullable SmartspaceTarget target); + default void setMediaTarget(@Nullable SmartspaceTarget target) { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** * Get the index of the currently selected page. */ - int getSelectedPage(); + default int getSelectedPage() { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } /** * Return the top padding value from the currently visible card, or 0 if there is no current * card. */ - int getCurrentCardTopPadding(); + default int getCurrentCardTopPadding() { + throw new UnsupportedOperationException("Not implemented by " + getClass()); + } } /** Interface for launching Intents, which can differ on the lockscreen */ diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt index a2a07095c16c..7727589490d1 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt @@ -66,7 +66,8 @@ interface ClockController { events.onColorPaletteChanged(resources) animations.doze(dozeFraction) animations.fold(foldFraction) - events.onTimeTick() + smallClock.events.onTimeTick() + largeClock.events.onTimeTick() } /** Optional method for dumping debug information */ @@ -87,9 +88,6 @@ interface ClockFaceController { /** Events that should call when various rendering parameters change */ interface ClockEvents { - /** Call every time tick */ - fun onTimeTick() {} - /** Call whenever timezone changes */ fun onTimeZoneChanged(timeZone: TimeZone) {} @@ -131,6 +129,13 @@ interface ClockAnimations { /** Events that have specific data about the related face */ interface ClockFaceEvents { + /** Call every time tick */ + fun onTimeTick() {} + + /** Expected interval between calls to onTimeTick. Can always reduce to PER_MINUTE in AOD. */ + val tickRate: ClockTickRate + get() = ClockTickRate.PER_MINUTE + /** Region Darkness specific to the clock face */ fun onRegionDarknessChanged(isDark: Boolean) {} @@ -150,6 +155,13 @@ interface ClockFaceEvents { fun onTargetRegionChanged(targetRegion: Rect?) {} } +/** Tick rates for clocks */ +enum class ClockTickRate(val value: Int) { + PER_MINUTE(2), // Update the clock once per minute. + PER_SECOND(1), // Update the clock once per second. + PER_FRAME(0), // Update the clock every second. +} + /** Some data about a clock design */ data class ClockMetadata( val clockId: ClockId, diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java index 9ed3bac57e66..70b5d739ea7c 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java @@ -105,6 +105,11 @@ public interface StatusBarStateController { default void onDozingChanged(boolean isDozing) {} /** + * Callback to be notified when Dreaming changes. Dreaming is stored separately from state. + */ + default void onDreamingChanged(boolean isDreaming) {} + + /** * Callback to be notified when the doze amount changes. Useful for animations. * Note: this will be called for each animation frame. Please be careful to avoid * performance regressions. diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml index 2cac9c706fe9..90851e2a921c 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml @@ -45,7 +45,7 @@ android:id="@+id/user_switcher_header" android:textDirection="locale" android:layout_width="@dimen/bouncer_user_switcher_width" - android:layout_height="wrap_content" /> + android:layout_height="match_parent" /> </com.android.keyguard.KeyguardUserSwitcherAnchor> </LinearLayout> diff --git a/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml index a1068c65bae2..6c8db91d49bb 100644 --- a/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml @@ -25,9 +25,6 @@ <!-- Margin around the various security views --> <dimen name="keyguard_security_view_top_margin">12dp</dimen> - <!-- Padding for the lock icon on the keyguard --> - <dimen name="lock_icon_padding">16dp</dimen> - <!-- Overload default clock widget parameters --> <dimen name="widget_big_font_size">100dp</dimen> <dimen name="widget_label_font_size">18sp</dimen> diff --git a/packages/SystemUI/res/layout/clipboard_overlay_legacy.xml b/packages/SystemUI/res/layout/clipboard_overlay_legacy.xml deleted file mode 100644 index 1a1fc75a41a1..000000000000 --- a/packages/SystemUI/res/layout/clipboard_overlay_legacy.xml +++ /dev/null @@ -1,160 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2021 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<com.android.systemui.screenshot.DraggableConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/clipboard_ui" - android:theme="@style/FloatingOverlay" - android:alpha="0" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:contentDescription="@string/clipboard_overlay_window_name"> - <ImageView - android:id="@+id/actions_container_background" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp" - android:elevation="4dp" - android:background="@drawable/action_chip_container_background" - android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal" - app:layout_constraintBottom_toBottomOf="@+id/actions_container" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/actions_container" - app:layout_constraintEnd_toEndOf="@+id/actions_container"/> - <HorizontalScrollView - android:id="@+id/actions_container" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal" - android:paddingEnd="@dimen/overlay_action_container_padding_right" - android:paddingVertical="@dimen/overlay_action_container_padding_vertical" - android:elevation="4dp" - android:scrollbars="none" - android:layout_marginBottom="4dp" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintWidth_percent="1.0" - app:layout_constraintWidth_max="wrap" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/preview_border" - app:layout_constraintEnd_toEndOf="parent"> - <LinearLayout - android:id="@+id/actions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:animateLayoutChanges="true"> - <include layout="@layout/overlay_action_chip" - android:id="@+id/share_chip"/> - <include layout="@layout/overlay_action_chip" - android:id="@+id/remote_copy_chip"/> - <include layout="@layout/overlay_action_chip" - android:id="@+id/edit_chip"/> - </LinearLayout> - </HorizontalScrollView> - <View - android:id="@+id/preview_border" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginStart="@dimen/overlay_offset_x" - android:layout_marginBottom="12dp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - android:elevation="7dp" - app:layout_constraintEnd_toEndOf="@id/clipboard_preview_end" - app:layout_constraintTop_toTopOf="@id/clipboard_preview_top" - android:background="@drawable/overlay_border"/> - <androidx.constraintlayout.widget.Barrier - android:id="@+id/clipboard_preview_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:barrierMargin="@dimen/overlay_border_width" - app:barrierDirection="end" - app:constraint_referenced_ids="clipboard_preview"/> - <androidx.constraintlayout.widget.Barrier - android:id="@+id/clipboard_preview_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:barrierDirection="top" - app:barrierMargin="@dimen/overlay_border_width_neg" - app:constraint_referenced_ids="clipboard_preview"/> - <FrameLayout - android:id="@+id/clipboard_preview" - android:elevation="7dp" - android:background="@drawable/overlay_preview_background" - android:clipChildren="true" - android:clipToOutline="true" - android:clipToPadding="true" - android:layout_width="@dimen/clipboard_preview_size" - android:layout_margin="@dimen/overlay_border_width" - android:layout_height="wrap_content" - android:layout_gravity="center" - app:layout_constraintBottom_toBottomOf="@id/preview_border" - app:layout_constraintStart_toStartOf="@id/preview_border" - app:layout_constraintEnd_toEndOf="@id/preview_border" - app:layout_constraintTop_toTopOf="@id/preview_border"> - <TextView android:id="@+id/text_preview" - android:textFontWeight="500" - android:padding="8dp" - android:gravity="center|start" - android:ellipsize="end" - android:autoSizeTextType="uniform" - android:autoSizeMinTextSize="@dimen/clipboard_overlay_min_font" - android:autoSizeMaxTextSize="@dimen/clipboard_overlay_max_font" - android:textColor="?attr/overlayButtonTextColor" - android:textColorLink="?attr/overlayButtonTextColor" - android:background="?androidprv:attr/colorAccentSecondary" - android:layout_width="@dimen/clipboard_preview_size" - android:layout_height="@dimen/clipboard_preview_size"/> - <ImageView - android:id="@+id/image_preview" - android:scaleType="fitCenter" - android:adjustViewBounds="true" - android:contentDescription="@string/clipboard_image_preview" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - <TextView - android:id="@+id/hidden_preview" - android:visibility="gone" - android:textFontWeight="500" - android:padding="8dp" - android:gravity="center" - android:textSize="14sp" - android:textColor="?attr/overlayButtonTextColor" - android:background="?androidprv:attr/colorAccentSecondary" - android:layout_width="@dimen/clipboard_preview_size" - android:layout_height="@dimen/clipboard_preview_size"/> - </FrameLayout> - <FrameLayout - android:id="@+id/dismiss_button" - android:layout_width="@dimen/overlay_dismiss_button_tappable_size" - android:layout_height="@dimen/overlay_dismiss_button_tappable_size" - android:elevation="10dp" - android:visibility="gone" - android:alpha="0" - app:layout_constraintStart_toEndOf="@id/clipboard_preview" - app:layout_constraintEnd_toEndOf="@id/clipboard_preview" - app:layout_constraintTop_toTopOf="@id/clipboard_preview" - app:layout_constraintBottom_toTopOf="@id/clipboard_preview" - android:contentDescription="@string/clipboard_dismiss_description"> - <ImageView - android:id="@+id/dismiss_image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="@dimen/overlay_dismiss_button_margin" - android:src="@drawable/overlay_cancel"/> - </FrameLayout> -</com.android.systemui.screenshot.DraggableConstraintLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml b/packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml index de96e9765668..446bb0122630 100644 --- a/packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml +++ b/packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:paddingVertical="@dimen/dream_overlay_complication_home_controls_padding"> - <ImageView + <com.android.systemui.common.ui.view.LaunchableImageView android:id="@+id/home_controls_chip" android:layout_height="@dimen/keyguard_affordance_fixed_height" android:layout_width="@dimen/keyguard_affordance_fixed_width" diff --git a/packages/SystemUI/res/layout/global_actions_grid_lite.xml b/packages/SystemUI/res/layout/global_actions_grid_lite.xml index 5588fd391681..a64c9aebec3e 100644 --- a/packages/SystemUI/res/layout/global_actions_grid_lite.xml +++ b/packages/SystemUI/res/layout/global_actions_grid_lite.xml @@ -33,7 +33,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_weight="1"> - <androidx.constraintlayout.widget.ConstraintLayout + <com.android.systemui.common.ui.view.LaunchableConstraintLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@android:id/list" @@ -55,6 +55,6 @@ app:flow_horizontalGap="@dimen/global_actions_lite_padding" app:flow_verticalGap="@dimen/global_actions_lite_padding" app:flow_horizontalStyle="packed"/> - </androidx.constraintlayout.widget.ConstraintLayout> + </com.android.systemui.common.ui.view.LaunchableConstraintLayout> </com.android.systemui.globalactions.GlobalActionsLayoutLite> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml index 6f3362308484..07c428b5dd7a 100644 --- a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml +++ b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml @@ -24,7 +24,7 @@ android:layout_gravity="end"> <!-- We add a background behind the UserAvatarView with the same color and with a circular shape so that this view can be expanded into a Dialog or an Activity. --> - <FrameLayout + <com.android.systemui.animation.LaunchableFrameLayout android:id="@+id/kg_multi_user_avatar_with_background" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -42,5 +42,5 @@ systemui:framePadding="0dp" systemui:frameWidth="0dp"> </com.android.systemui.statusbar.phone.UserAvatarView> - </FrameLayout> + </com.android.systemui.animation.LaunchableFrameLayout> </FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/media_recommendation_view.xml b/packages/SystemUI/res/layout/media_recommendation_view.xml new file mode 100644 index 000000000000..c54c4e48d13d --- /dev/null +++ b/packages/SystemUI/res/layout/media_recommendation_view.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<!-- Layout for media recommendation item inside QSPanel carousel --> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Album cover --> + <ImageView + android:id="@+id/media_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:translationZ="0dp" + android:scaleType="centerCrop" + android:adjustViewBounds="true" + android:clipToOutline="true" + android:background="@drawable/bg_smartspace_media_item"/> + + <!-- App icon --> + <com.android.internal.widget.CachingIconView + android:id="@+id/media_rec_app_icon" + android:layout_width="@dimen/qs_media_rec_icon_top_margin" + android:layout_height="@dimen/qs_media_rec_icon_top_margin" + android:layout_marginStart="@dimen/qs_media_info_spacing" + android:layout_marginTop="@dimen/qs_media_info_spacing"/> + + <!-- Artist name --> + <TextView + android:id="@+id/media_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/qs_media_info_spacing" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + android:layout_marginBottom="@dimen/qs_media_rec_album_title_bottom_margin" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:singleLine="true" + android:textSize="12sp" + android:gravity="top" + android:layout_gravity="bottom" + android:importantForAccessibility="no"/> + + <!-- Album name --> + <TextView + android:id="@+id/media_subtitle" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_media_rec_album_subtitle_height" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + android:layout_marginStart="@dimen/qs_media_info_spacing" + android:layout_marginBottom="@dimen/qs_media_info_spacing" + android:fontFamily="@*android:string/config_headlineFontFamily" + android:singleLine="true" + android:textSize="11sp" + android:gravity="center_vertical" + android:layout_gravity="bottom" + android:importantForAccessibility="no"/> + + <!-- Seek Bar --> + <SeekBar + android:id="@+id/media_progress_bar" + android:layout_width="match_parent" + android:layout_height="12dp" + android:layout_gravity="bottom" + android:maxHeight="@dimen/qs_media_enabled_seekbar_height" + android:thumb="@android:color/transparent" + android:splitTrack="false" + android:clickable="false" + android:progressTint="?android:attr/textColorPrimary" + android:progressBackgroundTint="?android:attr/textColorTertiary" + android:paddingTop="5dp" + android:paddingBottom="5dp" + android:paddingStart="0dp" + android:paddingEnd="0dp" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + android:layout_marginStart="@dimen/qs_media_info_spacing" + android:layout_marginBottom="@dimen/qs_media_info_spacing"/> +</merge>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/media_recommendations.xml b/packages/SystemUI/res/layout/media_recommendations.xml new file mode 100644 index 000000000000..65fc19c5b2a4 --- /dev/null +++ b/packages/SystemUI/res/layout/media_recommendations.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<!-- Layout for media recommendations inside QSPanel carousel --> +<com.android.systemui.util.animation.TransitionLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/media_recommendations_updated" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:clipToPadding="false" + android:forceHasOverlappingRendering="false" + android:background="@drawable/qs_media_background" + android:theme="@style/MediaPlayer"> + + <!-- This view just ensures the full media player is a certain height. --> + <View + android:id="@+id/sizing_view" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_media_session_height_expanded" /> + + <TextView + android:id="@+id/media_rec_title" + style="@style/MediaPlayer.Recommendation.Header" + android:text="@string/controls_media_smartspace_rec_header"/> + + <FrameLayout + android:id="@+id/media_cover1_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + > + + <include + layout="@layout/media_recommendation_view"/> + + </FrameLayout> + + + <FrameLayout + android:id="@+id/media_cover2_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + > + + <include + layout="@layout/media_recommendation_view"/> + + </FrameLayout> + + <FrameLayout + android:id="@+id/media_cover3_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + > + + <include + layout="@layout/media_recommendation_view"/> + + </FrameLayout> + + <include + layout="@layout/media_long_press_menu" /> + +</com.android.systemui.util.animation.TransitionLayout> diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml index abc83379950a..f2e114b511bc 100644 --- a/packages/SystemUI/res/layout/media_session_view.xml +++ b/packages/SystemUI/res/layout/media_session_view.xml @@ -106,7 +106,7 @@ app:layout_constrainedWidth="true" app:layout_constraintWidth_min="@dimen/min_clickable_item_size" app:layout_constraintHeight_min="@dimen/min_clickable_item_size"> - <LinearLayout + <com.android.systemui.common.ui.view.LaunchableLinearLayout android:id="@+id/media_seamless_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -135,7 +135,7 @@ android:textDirection="locale" android:textSize="12sp" android:lineHeight="16sp" /> - </LinearLayout> + </com.android.systemui.common.ui.view.LaunchableLinearLayout> </LinearLayout> <!-- Song name --> diff --git a/packages/SystemUI/res/layout/ongoing_call_chip.xml b/packages/SystemUI/res/layout/ongoing_call_chip.xml index c949ba0db171..18d231c5d32f 100644 --- a/packages/SystemUI/res/layout/ongoing_call_chip.xml +++ b/packages/SystemUI/res/layout/ongoing_call_chip.xml @@ -23,7 +23,7 @@ android:layout_gravity="center_vertical|start" android:layout_marginStart="5dp" > - <LinearLayout + <com.android.systemui.common.ui.view.LaunchableLinearLayout android:id="@+id/ongoing_call_chip_background" android:layout_width="wrap_content" android:layout_height="@dimen/ongoing_appops_chip_height" @@ -55,5 +55,5 @@ android:textColor="?android:attr/colorPrimary" /> - </LinearLayout> + </com.android.systemui.common.ui.view.LaunchableLinearLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/screenshot_detection_notice.xml b/packages/SystemUI/res/layout/screenshot_detection_notice.xml new file mode 100644 index 000000000000..fc936c01227e --- /dev/null +++ b/packages/SystemUI/res/layout/screenshot_detection_notice.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/screenshot_detection_notice" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:padding="12dp" + android:visibility="gone"> + + <TextView + android:id="@+id/screenshot_detection_notice_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineHeight="24sp" + android:textSize="18sp" /> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/screenshot_static.xml b/packages/SystemUI/res/layout/screenshot_static.xml index 496eb6e6130e..a748e29ee041 100644 --- a/packages/SystemUI/res/layout/screenshot_static.xml +++ b/packages/SystemUI/res/layout/screenshot_static.xml @@ -31,7 +31,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/actions_container" app:layout_constraintEnd_toEndOf="@+id/actions_container" - app:layout_constraintBottom_toTopOf="@id/screenshot_message_container"/> + app:layout_constraintBottom_toTopOf="@id/guideline"/> <HorizontalScrollView android:id="@+id/actions_container" android:layout_width="0dp" @@ -127,57 +127,30 @@ app:layout_constraintTop_toTopOf="@id/screenshot_preview" android:elevation="7dp"/> - <androidx.constraintlayout.widget.ConstraintLayout + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintGuide_end="0dp" /> + + <FrameLayout android:id="@+id/screenshot_message_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/overlay_action_container_margin_horizontal" - android:layout_marginVertical="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom" android:paddingHorizontal="@dimen/overlay_action_container_padding_end" android:paddingVertical="@dimen/overlay_action_container_padding_vertical" android:elevation="4dp" android:background="@drawable/action_chip_container_background" android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"> - - <ImageView - android:id="@+id/screenshot_message_icon" - android:layout_width="48dp" - android:layout_height="48dp" - android:paddingEnd="4dp" - android:src="@drawable/ic_work_app_badge" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/screenshot_message_content" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> - - <TextView - android:id="@+id/screenshot_message_content" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="start" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/screenshot_message_icon" - app:layout_constraintEnd_toStartOf="@id/message_dismiss_button"/> - - <FrameLayout - android:id="@+id/message_dismiss_button" - android:layout_width="@dimen/overlay_dismiss_button_tappable_size" - android:layout_height="@dimen/overlay_dismiss_button_tappable_size" - app:layout_constraintStart_toEndOf="@id/screenshot_message_content" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - android:contentDescription="@string/screenshot_dismiss_work_profile"> - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="@dimen/overlay_dismiss_button_margin" - android:src="@drawable/overlay_cancel"/> - </FrameLayout> - - </androidx.constraintlayout.widget.ConstraintLayout> + > + <include layout="@layout/screenshot_work_profile_first_run" /> + <include layout="@layout/screenshot_detection_notice" /> + </FrameLayout> </com.android.systemui.screenshot.DraggableConstraintLayout> diff --git a/packages/SystemUI/res/layout/screenshot_work_profile_first_run.xml b/packages/SystemUI/res/layout/screenshot_work_profile_first_run.xml new file mode 100644 index 000000000000..392d84537e92 --- /dev/null +++ b/packages/SystemUI/res/layout/screenshot_work_profile_first_run.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/work_profile_first_run" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingStart="16dp" + android:paddingEnd="4dp" + android:paddingVertical="16dp" + android:visibility="gone"> + <ImageView + android:id="@+id/screenshot_message_icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginEnd="12dp" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_work_app_badge"/> + + <TextView + android:id="@+id/screenshot_message_content" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="start|center_vertical" + android:textSize="18sp" + android:textColor="?android:attr/textColorPrimary" + android:lineHeight="24sp" + /> + + <FrameLayout + android:id="@+id/message_dismiss_button" + android:layout_width="@dimen/overlay_dismiss_button_tappable_size" + android:layout_height="@dimen/overlay_dismiss_button_tappable_size" + android:contentDescription="@string/screenshot_dismiss_work_profile"> + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + android:src="@drawable/overlay_cancel"/> + </FrameLayout> +</LinearLayout> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 771f9722214a..fb4a3cbe938f 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Outomaties"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Geen klank of vibrasie nie"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Geen klank of vibrasie nie en verskyn laer in gespreksafdeling"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Kan lui of vibreer op grond van toestelinstellings"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Kan lui of vibreer op grond van toestelinstellings. Gesprekke van <xliff:g id="APP_NAME">%1$s</xliff:g> af verskyn by verstek in ’n borrel."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Laat die stelsel bepaal of hierdie kennisgewing \'n klank moet maak of vibreer"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Bevorder na Verstek"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Gedegradeer na Stil"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Kies program om kontroles by te voeg"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontrole bygevoeg.}other{# kontroles bygevoeg.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Verwyder"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Voeg <xliff:g id="APPNAME">%s</xliff:g> by?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Wanneer jy <xliff:g id="APPNAME">%s</xliff:g> byvoeg, kan dit kontroles en inhoud by hierdie paneel voeg. Jy kan in sommige apps kies watter kontroles hier verskyn."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"As gunsteling gemerk"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"As gunsteling gemerk; posisie <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"As gunsteling ontmerk"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Fout, probeer weer"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Voeg kontroles by"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Wysig kontroles"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Voeg app by"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Voeg uitvoere by"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Groep"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 toestel gekies"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batterykrag oor"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Koppel jou stilus aan ’n laaier"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Stilus se battery is amper pap"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Kan nie van hierdie profiel af bel nie"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Jou werkbeleid laat jou toe om slegs van die werkprofiel af foonoproepe te maak"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Skakel oor na werkprofiel"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Maak toe"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 447f98d886f9..bf00ec390676 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ራስ-ሰር"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"ምንም ድምፅ ወይም ንዝረት የለም"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"ምንም ድምፅ ወይም ንዝረት የለም እና በውይይት ክፍል ላይ አይታይም"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"በመሣሪያ ቅንብሮች መሰረት ሊጮህ ወይም ሊነዝር ይችላል"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"በስልክ ቅንብሮች መሰረት ሊጮህ ወይም ሊነዝር ይችላል። የ<xliff:g id="APP_NAME">%1$s</xliff:g> ውይይቶች በነባሪነት አረፋ ይሆናሉ።"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ይህ ማሳወቂያ ድምፅ ወይም ንዝረት መደረግ ካለበት ስርዓቱ እንዲወሰን ያድርጉት"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ሁኔታ:</b> ለነባሪ ከፍ ተዋውቋል።"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ሁኔታ:</b> ወደ ዝምታ ዝቅ ተደርጓል"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"መቆጣጠሪያዎችን ለማከል መተግበሪያ ይምረጡ"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# ቁጥጥር ታክሏል።}one{# ቁጥጥር ታክሏል።}other{# ቁጥጥሮች ታክለዋል።}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ተወግዷል"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ተወዳጅ የተደረገ"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ተወዳጅ ተደርጓል፣ አቋም <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ተወዳጅ አልተደረገም"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"ስህተት፣ እንደገና ይሞክሩ"</string> <string name="controls_menu_add" msgid="4447246119229920050">"መቆጣጠሪያዎችን አክል"</string> <string name="controls_menu_edit" msgid="890623986951347062">"መቆጣጠሪያዎችን ያርትዑ"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ውጽዓቶችን ያክሉ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ቡድን"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 መሣሪያ ተመርጧል"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ባትሪ ይቀራል"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ብሮስፌዎን ከኃይል መሙያ ጋር ያገናኙ"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"የብሮስፌ ባትሪ ዝቅተኛ ነው"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"የቪድዮ ካሜራ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"ከዚህ መገለጫ መደወል አይቻልም"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"የሥራ መመሪያዎ እርስዎ ከሥራ መገለጫው ብቻ ጥሪ እንዲያደርጉ ይፈቅድልዎታል"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"ወደ የሥራ መገለጫ ቀይር"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"ዝጋ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 8099b235af99..804e565cc50a 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"تلقائي"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"بدون صوت أو اهتزاز"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"بدون صوت أو اهتزاز وتظهر في أسفل قسم المحادثات"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"يمكن إصدار رنين أو اهتزاز بناءً على إعدادات الجهاز"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"يمكن إصدار رنين أو اهتزاز بناءً على إعدادات الجهاز. تظهر المحادثات من \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" كفقاعات تلقائيًا."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"السماح للنظام بتحديد ما إذا يجب اهتزاز الجهاز أو إصدار رنين عند تلقّي هذا الإشعار"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>الحالة:</b> تمت الترقية إلى الإعداد التلقائي"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>الحالة:</b> تم خفض الترتيب إلى الوضع صامت"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"اختيار تطبيق لإضافة عناصر التحكّم"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{تمت إضافة عنصر تحكّم واحد.}zero{تمت إضافة # عنصر تحكّم.}two{تمت إضافة عنصرَي تحكّم.}few{تمت إضافة # عناصر تحكّم.}many{تمت إضافة # عنصر تحكّم.}other{تمت إضافة # عنصر تحكّم.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"تمت الإزالة"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"تمت الإضافة إلى المفضّلة"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"تمت الإضافة إلى المفضّلة، الموضع <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"تمت الإزالة من المفضّلة"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"حدث خطأ، يُرجى إعادة المحاولة."</string> <string name="controls_menu_add" msgid="4447246119229920050">"إضافة عناصر تحكّم"</string> <string name="controls_menu_edit" msgid="890623986951347062">"تعديل عناصر التحكّم"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"إضافة مخرجات"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"مجموعة"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"تم اختيار جهاز واحد."</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"النسبة المئوية المتبقية من شحن البطارية: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"عليك توصيل قلم الشاشة بشاحن."</string> <string name="stylus_battery_low" msgid="7134370101603167096">"بطارية قلم الشاشة منخفضة"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"كاميرا فيديو"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"لا يمكن الاتصال باستخدام هذا الملف الشخصي."</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"تسمح لك سياسة العمل بإجراء المكالمات الهاتفية من الملف الشخصي للعمل فقط."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"التبديل إلى الملف الشخصي للعمل"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"إغلاق"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index fa04cb840abb..9e08a8160a60 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"স্বয়ংক্ৰিয়"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"কোনো ধ্বনি অথবা কম্পন নাই"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"কোনো ধ্বনি অথবা কম্পন নাই আৰু বাৰ্তালাপ শাখাটোৰ তলৰ অংশত দেখা পোৱা যায়"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ডিভাইচৰ ছেটিঙৰ ওপৰত নিৰ্ভৰ কৰি ৰিং কৰিব অথবা কম্পন হ’ব পাৰে"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ডিভাইচৰ ছেটিঙৰ ওপৰত নিৰ্ভৰ কৰি ৰিং কৰিব অথবা কম্পন হ’ব পাৰে। <xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাৰ্তালাপ ডিফ’ল্টভাৱে বাবল হিচাপে প্ৰদৰ্শিত হয়।"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"এই জাননীটোৱে ধ্বনি নে কম্পন সৃষ্টি কৰিব সেয়া ছিষ্টেমটোক নিৰ্ধাৰণ কৰিবলৈ দিয়ক"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>স্থিতি:</b> ডিফ’ল্টলৈ বৃদ্ধি কৰা হৈছে"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>স্থিতি:</b> নীৰৱলৈ হ্ৰাস কৰা হৈছে"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"নিয়ন্ত্ৰণসমূহ যোগ কৰিবলৈ এপ্ বাছনি কৰক"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# টা নিয়ন্ত্ৰণ যোগ দিয়া হৈছে।}one{# টা নিয়ন্ত্ৰণ যোগ দিয়া হৈছে।}other{# টা নিয়ন্ত্ৰণ যোগ দিয়া হৈছে।}}"</string> <string name="controls_removed" msgid="3731789252222856959">"আঁতৰোৱা হ’ল"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"প্ৰিয় হিচাপে চিহ্নিত কৰা হ’ল"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"প্ৰিয় হিচাপে চিহ্নিত কৰা হ’ল, স্থান <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"অপ্ৰিয় হিচাপে চিহ্নিত কৰা হ’ল"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"আসোঁৱাহ হৈছে, আকৌ চেষ্টা কৰক"</string> <string name="controls_menu_add" msgid="4447246119229920050">"নিয়ন্ত্ৰণসমূহ যোগ দিয়ক"</string> <string name="controls_menu_edit" msgid="890623986951347062">"নিয়ন্ত্ৰণসমূহ সম্পাদনা কৰক"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"আউটপুটসমূহ যোগ দিয়ক"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"গোট"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"১ টা ডিভাইচ বাছনি কৰা হৈছে"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> বেটাৰী বাকী আছে"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"আপোনাৰ ষ্টাইলাছ এটা চাৰ্জাৰৰ সৈতে সংযোগ কৰক"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ষ্টাইলাছৰ বেটাৰী কম আছে"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ভিডিঅ’ কেমেৰা"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"এই প্ৰ’ফাইলৰ পৰা কল কৰিব নোৱাৰি"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"আপোনাৰ কৰ্মস্থানৰ নীতিয়ে আপোনাক কেৱল কৰ্মস্থানৰ প্ৰ’ফাইলৰ পৰা ফ’ন কল কৰিবলৈ দিয়ে"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"কৰ্মস্থানৰ প্ৰ’ফাইললৈ সলনি কৰক"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"বন্ধ কৰক"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index e6b27e039c26..73149e876544 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Avtomatik"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Səs və ya vibrasiya yoxdur"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Söhbət siyahısının aşağısında səssiz və vibrasiyasız görünür"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Cihaz ayarlarına əsasən zəng çala və ya vibrasiya edə bilər"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Cihaz ayarlarına əsasən zəng çala və ya vibrasiya edə bilər. <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqindən söhbətlərdə defolt olaraq qabarcıq çıxır."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Bu bildirişin səs çıxarması və ya vibrasiya etməsi sistem tərəfindən təyin edilsin"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Defolt ayara keçirilib"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Səssiz rejimə keçirilib"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Kontrol əlavə etmək üçün tətbiq seçin"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# nizamlayıcı əlavə edilib.}other{# nizamlayıcı əlavə edilib.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Silinib"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> əlavə edilsin?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"<xliff:g id="APPNAME">%s</xliff:g> əlavə etdiyiniz zaman, o, bu panelə nizamlayıcılar və məzmun əlavə edə bilər. Bəzi tətbiqlərdə burada hansı nizamlayıcıların göstərilməsini seçə bilərsiniz."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Sevimlilərə əlavə edilib"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Sevimlilərə əlavə edilib, sıra: <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Sevimlilərdən silinib"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Xəta, yenidən cəhd edin"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Vidcet əlavə edin"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Vidcetlərə düzəliş edin"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Tətbiq əlavə edin"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Nəticələri əlavə edin"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Qrup"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 cihaz seçilib"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> enerji qalıb"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Qələmi adapterə qoşun"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Qələm enerjisi azdır"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Bu profildən zəng etmək mümkün deyil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"İş siyasətiniz yalnız iş profilindən telefon zəngləri etməyə imkan verir"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"İş profilinə keçin"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Bağlayın"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index fb95a918622e..89d72a15e9ea 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatska"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Bez zvuka i vibriranja"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Bez zvuka i vibriranja i prikazuje se u nastavku odeljka za konverzacije"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Može da zvoni ili vibrira u zavisnosti od podešavanja uređaja"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Može da zvoni ili vibrira u zavisnosti od podešavanja uređaja. Konverzacije iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> podrazumevano se prikazuju u oblačićima."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Neka sistem utvrdi da li ovo obaveštenje treba da emituje zvuk ili da vibrira"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Unapređeno u Podrazumevano"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Degradirano u Nečujno"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Odaberite aplikaciju za dodavanje kontrola"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontrola je dodata.}one{# kontrola je dodata.}few{# kontrole su dodate.}other{# kontrola je dodato.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Uklonjeno"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Želite li da dodate <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Kada dodate aplikaciju <xliff:g id="APPNAME">%s</xliff:g>, ona može da dodaje kontrole i sadržaj u ovo okno. U nekim aplikacijama možete da izaberete koje će se kontrole ovde prikazivati."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Označeno je kao omiljeno"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Označeno je kao omiljeno, <xliff:g id="NUMBER">%d</xliff:g>. pozicija"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Uklonjeno je iz omiljenih"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Greška. Probajte ponovo"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Dodaj kontrole"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Izmeni kontrole"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Dodaj aplikaciju"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Dodajte izlaze"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupa"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Izabran je 1 uređaj"</string> @@ -1013,7 +1014,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• da je dostupan barem jedan uređaj"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Dodirnite i zadržite prečicu"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Otkaži"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Obrnite"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Obrni"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Otvorite telefon za bolji selfi"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Želite da obrnete na prednji ekran za bolji selfi?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Koristite zadnju kameru da biste snimili širu sliku sa višom rezolucijom."</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostalo je još<xliff:g id="PERCENTAGE">%s</xliff:g> baterije"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Povežite pisaljku sa punjačem"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Nizak nivo baterije pisaljke"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Video kamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Ne možete da upućujete pozive sa ovog profila"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Smernice za posao vam omogućavaju da telefonirate samo sa poslovnog profila"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Pređi na poslovni profil"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zatvori"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index f1d174d33991..5bbe00111f3a 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Аўтаматычна"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Без гуку ці вібрацыі"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Паказваецца без гуку ці вібрацыі ў раздзеле размоў"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"У залежнасці ад налад прылады магчымы званок або вібрацыя"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"У залежнасці ад налад прылады магчымы званок або вібрацыя. Размовы ў праграме \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" стандартна паяўляюцца ў выглядзе ўсплывальных апавяшчэнняў."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Сістэма сама будзе вызначаць, ці трэба для гэтага апавяшчэння ўключаць гук або вібрацыю"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Стан:</b> Пазначана як стандартнае"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Стан:</b> Пераведзена ў рэжым \"Без гуку\""</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Выберыце праграму для дадавання элементаў кіравання"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Дададзены # элемент кіравання.}one{Дададзена # элемента кіравання.}few{Дададзена # элементы кіравання.}many{Дададзена # элементаў кіравання.}other{Дададзена # элемента кіравання.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Выдалена"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Дададзена ў абранае"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Дададзена ў абранае, пазіцыя <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Выдалена з абранага"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Памылка, паўтарыце спробу"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Дадаць элементы кіравання"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Змяніць элементы кіравання"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Дадайце прылады вываду"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Група"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Выбрана 1 прылада"</string> @@ -1015,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Скасаваць"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Пераключыць"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Каб атрымаць лепшае сэлфі, раскрыйце тэлефон"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Пераключыць на пярэднюю камеру для лепшага сэлфі?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Пераключыць на пярэдні дысплэй для лепшага сэлфі?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Каб зрабіць шырэйшае фота з больш высокай раздзяляльнасцю, скарыстайце заднюю камеру."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Гэты экран будзе выключаны"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Складная прылада ў раскладзеным выглядзе"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Засталося зараду: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Падключыце пяро да зараднай прылады"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Нізкі ўзровень зараду пяра"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Відэакамера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Не ўдалося зрабіць выклік з гэтага профілю"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Згодна з палітыкай вашай арганізацыі, рабіць тэлефонныя выклікі дазволена толькі з працоўнага профілю"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Пераключыцца на працоўны профіль"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Закрыць"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index ce4b9edf4f4c..72c6b9de00b0 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматично"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Без звук или вибриране"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Без звук или вибриране и се показва по-долу в секцията с разговори"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Може да звъни или да вибрира въз основа на настройките на устройството"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Може да звъни или да вибрира въз основа на настройките на устройството. Разговорите от <xliff:g id="APP_NAME">%1$s</xliff:g> се показват като балончета по подразбиране."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Нека системата да определя дали дадено известие да се придружава от звук, или вибриране"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Състояние:</b> Повишено до основно"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Състояние:</b> Понижено до беззвучно"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Изберете приложение, за да добавите контроли"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Добавена е # контрола.}other{Добавени са # контроли.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Премахнато"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Означено като любимо"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Означено като любимо – позиция <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Не е означено като любимо"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Грешка. Опитайте отново"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Добавяне на контроли"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Редактиране на контролите"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Добавяне на изходящи устройства"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Група"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 избрано устройство"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Оставаща батерия: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Свържете писалката към зарядно устройство"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Батерията на писалката е изтощена"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Видеокамера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Не може да се извърши обаждане от този потребителски профил"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Служебните правила ви дават възможност да извършвате телефонни обаждания само от служебния потребителски профил"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Превключване към служебния потребителски профил"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Затваряне"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 33e8eef61f20..598db2c0f341 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"অটোমেটিক"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"আওয়াজ করবে না বা ভাইব্রেট হবে না"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"আওয়াজ করবে না বা ভাইব্রেট হবে না এবং কথোপকথন বিভাগের নিচের দিকে দেখা যাবে"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ডিভাইসের সেটিংস অনুযায়ী রিং বা ভাইব্রেট হতে পারে"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ডিভাইসের সেটিংস অনুযায়ী রিং বা ভাইব্রেট হতে পারে। <xliff:g id="APP_NAME">%1$s</xliff:g>-এর কথোপকথন সাধারণত বাবলের মতো দেখাবে।"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"এই বিজ্ঞপ্তি এলে ডিভাইস আওয়াজ করবে না ভাইব্রেট করবে তা সিস্টেমকে সেট করতে দিন"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>স্ট্যাটাস:</b> লেভেল বাড়িয়ে ডিফল্ট করা হয়েছে"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>স্ট্যাটাস:</b> লেভেল কমিয়ে সাইলেন্ করা হয়েছে"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"কন্ট্রোল যোগ করতে অ্যাপ বেছে নিন"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{#টি কন্ট্রোল যোগ করা হয়েছে।}one{#টি কন্ট্রোল যোগ করা হয়েছে।}other{#টি কন্ট্রোল যোগ করা হয়েছে।}}"</string> <string name="controls_removed" msgid="3731789252222856959">"সরানো হয়েছে"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"পছন্দসই হিসেবে চিহ্নিত করেছেন"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"পছন্দসই হিসেবে চিহ্নিত করেছেন, অবস্থান <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"পছন্দসই থেকে সরিয়ে দিয়েছেন"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"সমস্যা হয়েছে, আবার চেষ্টা করুন"</string> <string name="controls_menu_add" msgid="4447246119229920050">"কন্ট্রোল যোগ করুন"</string> <string name="controls_menu_edit" msgid="890623986951347062">"কন্ট্রোল এডিট করুন"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"আউটপুট যোগ করুন"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"গ্রুপ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"১টি ডিভাইস বেছে নেওয়া হয়েছে"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ব্যাটারির চার্জ বাকি আছে"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"কোনও চার্জারের সাথে আপনার স্টাইলাস কানেক্ট করুন"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"স্টাইলাস ব্যাটারিতে চার্জ কম আছে"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ভিডিও ক্যামেরা"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"এই প্রোফাইল থেকে কল করা যাচ্ছে না"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"কাজ সংক্রান্ত নীতি, আপনাকে শুধুমাত্র অফিস প্রোফাইল থেকে কল করার অনুমতি দেয়"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"অফিস প্রোফাইলে পাল্টে নিন"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"বন্ধ করুন"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index c0c609d2ac6f..88ce4db6d50f 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -532,8 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatski"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Bez zvuka ili vibracije"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Bez zvuka ili vibracije i pojavljuje se pri dnu odjeljka razgovora"</string> - <string name="notification_channel_summary_default" msgid="777294388712200605">"Možda će zvoniti ili vibrirati, ovisno o postavkama uređaja"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Možda će zvoniti ili vibrirati, ovisno o postavkama uređaja. Razgovori iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> prikazuju se u oblačiću prema zadanim postavkama."</string> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Može zvoniti ili vibrirati na osnovu postavki uređaja"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Može zvoniti ili vibrirati na osnovu postavki uređaja. Razgovori iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> prikazuju se u oblačićima prema zadanim postavkama."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Neka sistem odluči treba li se ovo obavještenje oglasiti zvukom ili vibracijom"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> je unaprijeđen u Zadano"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> je unazađen u Nečujno"</string> @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Odaberite aplikaciju da dodate kontrole"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Dodana je # kontrola.}one{Dodana je # kontrola.}few{Dodane su # kontrole.}other{Dodano je # kontrola.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Uklonjeno"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Dodati aplikaciju <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Kada dodate aplikaciju <xliff:g id="APPNAME">%s</xliff:g>, ona može dodavati kontrole i sadržaj na ovu ploču. U nekim aplikacijama možete odabrati koje kontrole se prikazuju ovdje."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Dodano u omiljeno"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Dodano u omiljeno, pozicija <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Uklonjeno iz omiljenog"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Greška, pokušajte ponovo"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Dodaj kontrole"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Uredi kontrole"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Dodaj aplikaciju"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Dodajte izlaze"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupa"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Odabran je 1 uređaj"</string> @@ -1021,9 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostalo baterije: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Priključite pisaljku na punjač"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Baterija pisaljke je slaba"</string> - <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> - <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nije moguće uspostavljati pozive s ovog profila"</string> - <string name="call_from_work_profile_text" msgid="3458704745640229638">"Vaša pravila za poslovne uređaje omogućuju vam upućivanje poziva samo s poslovnog profila"</string> - <string name="call_from_work_profile_action" msgid="2937701298133010724">"Prijeđite na poslovni profil"</string> + <string name="video_camera" msgid="7654002575156149298">"Video kamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nije moguće pozvati s ovog profila"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Radna pravila vam dozvoljavaju upućivanje telefonskih poziva samo s radnog profila"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Pređite na radni profil"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zatvori"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 9c10046ba84c..953cc3578636 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automàtic"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Sense so ni vibració"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Sense so ni vibració i es mostra més avall a la secció de converses"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Pot sonar o vibrar en funció de la configuració del dispositiu"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Pot sonar o vibrar en funció de la configuració del dispositiu. Les converses de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> es mostren com a bombolles de manera predeterminada."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Fes que el sistema determini si aquesta notificació ha d\'emetre un so o una vibració"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Estat</b>: s\'ha augmentat a Predeterminat"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estat</b>: s\'ha disminuït a Silenci"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Selecciona l\'aplicació per afegir controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{S\'ha afegit # control.}many{# controls added.}other{S\'han afegit # controls.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Suprimit"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Afegit als preferits"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Afegit als preferits, posició <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Suprimit dels preferits"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error; torna-ho a provar"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Afegeix controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edita els controls"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Afegeix sortides"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grup"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositiu seleccionat"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de bateria"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connecta el llapis òptic a un carregador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Bateria del llapis òptic baixa"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Càmera de vídeo"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"No es pot trucar des d\'aquest perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"La teva política de treball et permet fer trucades només des del perfil de treball"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Canvia al perfil de treball"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Tanca"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index db60cfdf7dc4..7c70cd86365c 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Vyberte aplikaci, pro kterou chcete přidat ovládací prvky"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Byl přidán # ovládací prvek.}few{Byly přidány # ovládací prvky.}many{Bylo přidáno # ovládacího prvku.}other{Bylo přidáno # ovládacích prvků.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Odstraněno"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Přidáno do oblíbených"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Přidáno do oblíbených na pozici <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Odebráno z oblíbených"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Chyba, zkuste to znovu"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Přidat ovládací prvky"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Upravit ovládací prvky"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Přidání výstupů"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Skupina"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Je vybráno 1 zařízení"</string> @@ -1013,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Zrušit"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Otočit"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Rozložte telefon, selfie bude lepší"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Otočit na přední fotoaparát pro lepší selfie?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Otočit na přední displej pro lepší selfie?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Pomocí zadního fotoaparátu pořiďte širší fotku s vyšším rozlišením."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Tato obrazovka se vypne"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Rozkládání rozkládacího zařízení"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Vaše pracovní zásady vám umožňují telefonovat pouze z pracovního profilu"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Přepnout na pracovní profil"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zavřít"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 4ad66fa0c62a..7c4e92c3821a 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatisk"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ingen lyd eller vibration"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ingen lyd eller vibration, og den vises længere nede i samtalesektionen"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Kan ringe eller vibrere baseret på enhedens indstillinger"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Kan ringe eller vibrere baseret på enhedens indstillinger. Samtaler fra <xliff:g id="APP_NAME">%1$s</xliff:g> vises som standard i bobler."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Få systemet til at afgøre, om denne notifikation skal vibrere eller afspille en lyd"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Angivet som Standard"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Angivet som Lydløs"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Vælg en app for at tilføje styring"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# styringselement er tilføjet.}one{# styringselement er tilføjet.}other{# styringselementer er tilføjet.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Fjernet"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Angivet som favorit"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Angivet som favorit. Position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Fjernet fra favoritter"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Der opstod en fejl. Prøv igen"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Tilføj styring"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Rediger styring"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Tilføj medieudgange"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Gruppe"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Der er valgt 1 enhed"</string> @@ -1017,20 +1021,17 @@ <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Fold telefonen ud for at tage en bedre selfie"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Vil du bruge frontkameraet for at få bedre selfie?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Brug bagsidekameraet for at få et bredere billede med højere opløsning."</string> - <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ *Denne skærm slukkes"</b></string> + <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Denne skærm slukkes"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Foldbar enhed foldes ud"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Foldbar enhed vendes om"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteri tilbage"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Slut din styluspen til en oplader"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Lavt batteriniveau på styluspen"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Du kan ikke ringe fra denne profil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Din arbejdspolitik tillader kun, at du kan foretage telefonopkald fra arbejdsprofilen"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Skift til arbejdsprofil"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Luk"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 86d5d76f0976..2b975bc78236 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatisch"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Kein Ton und keine Vibration"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Kein Ton und keine Vibration, erscheint weiter unten im Bereich „Unterhaltungen“"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Kann je nach Geräteeinstellungen klingeln oder vibrieren"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Kann je nach Geräteeinstellungen klingeln oder vibrieren. Unterhaltungen von <xliff:g id="APP_NAME">%1$s</xliff:g> werden standardmäßig als Bubble angezeigt."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Das System entscheiden lassen, ob bei dieser Benachrichtigung ein Ton oder eine Vibration ausgegeben wird"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status</b>: auf „Standard“ hochgestuft"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status</b>: auf „Lautlos“ herabgestuft"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"App zum Hinzufügen von Steuerelementen auswählen"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# Steuerelement hinzugefügt.}other{# Steuerelemente hinzugefügt.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Entfernt"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Zu Favoriten hinzugefügt"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Zu Favoriten hinzugefügt, Position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Aus Favoriten entfernt"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Fehler – versuch es noch mal"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Steuerelemente hinzufügen"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Steuerelemente bearbeiten"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Ausgabegeräte hinzufügen"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Gruppe"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Ein Gerät ausgewählt"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akku bei <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Schließe deinen Eingabestift an ein Ladegerät an"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Stylus-Akkustand niedrig"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Keine Anrufe über dieses Profil möglich"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Gemäß den Arbeitsrichtlinien darfst du nur über dein Arbeitsprofil telefonieren"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Zum Arbeitsprofil wechseln"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Schließen"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index ad6610410886..47bcfcbbfe3c 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Αυτόματο"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Χωρίς ήχο ή δόνηση"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Χωρίς ήχο ή δόνηση και εμφανίζεται χαμηλά στην ενότητα συζητήσεων"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Ενδέχεται να κουδουνίζει ή να δονείται βάσει των ρυθμίσεων συσκευής"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Ενδέχεται να κουδουνίζει ή να δονείται βάσει των ρυθμίσεων συσκευής. Οι συζητήσεις από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> εμφανίζονται σε συννεφάκι από προεπιλογή."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Επιτρέψτε στο σύστημα να αποφασίσει αν αυτή η ειδοποίηση θα αναπαράγει έναν ήχο ή θα ενεργοποιήσει τη δόνηση της συσκευής"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Κατάσταση:</b> Προάχθηκε σε Προεπιλογή"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Κατάσταση:</b> Υποβιβάστηκε σε Αθόρυβη"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Επιλογή εφαρμογής για προσθήκη στοιχείων ελέγχου"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Προστέθηκε # στοιχείο ελέγχου.}other{Προστέθηκαν # στοιχεία ελέγχου.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Καταργήθηκε"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Προσθήκη <xliff:g id="APPNAME">%s</xliff:g>;"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Όταν προσθέσετε την εφαρμογή <xliff:g id="APPNAME">%s</xliff:g>, μπορεί να προσθέσει στοιχεία ελέγχου και περιεχόμενο σε αυτό το πλαίσιο. Σε ορισμένες εφαρμογές, μπορείτε να επιλέξετε ποια στοιχεία ελέγχου θα εμφανίζονται εδώ."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Προστέθηκε στα αγαπημένα"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Προστέθηκε στα αγαπημένα, στη θέση <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Αφαιρέθηκε από τα αγαπημένα"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Σφάλμα, προσπαθήστε ξανά."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Προσθήκη στοιχείων ελέγχου"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Επεξεργασία στοιχείων ελέγχου"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Προσθήκη εφαρμογής"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Προσθήκη εξόδων"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Ομάδα"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Επιλέχτηκε 1 συσκευή"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Απομένει το <xliff:g id="PERCENTAGE">%s</xliff:g> της μπαταρίας"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Συνδέστε τη γραφίδα σε έναν φορτιστή"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Χαμηλή στάθμη μπαταρίας γραφίδας"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Βιντεοκάμερα"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Δεν είναι δυνατή η κλήση από αυτό το προφίλ"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Η πολιτική εργασίας σάς επιτρέπει να πραγματοποιείτε τηλεφωνικές κλήσεις μόνο από το προφίλ εργασίας σας."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Εναλλαγή σε προφίλ εργασίας"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Κλείσιμο"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 5a82f79cc697..2b5e8f987f7c 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Choose app to add controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control added.}other{# controls added.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Add <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"When you add <xliff:g id="APPNAME">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favourited"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favourited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavourited"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Add controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Add app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"One device selected"</string> @@ -1026,4 +1029,5 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Your work policy allows you to make phone calls only from the work profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Switch to work profile"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Close"</string> + <string name="lock_screen_settings" msgid="9197175446592718435">"Lock screen settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 3bcb98e18d42..77452b5bf76c 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Choose app to add controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control added.}other{# controls added.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Add <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"When you add <xliff:g id="APPNAME">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favorited"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favorited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavorited"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Add controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Add app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 device selected"</string> @@ -1026,4 +1029,5 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Your work policy allows you to make phone calls only from the work profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Switch to work profile"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Close"</string> + <string name="lock_screen_settings" msgid="9197175446592718435">"Lock screen settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 5a82f79cc697..2b5e8f987f7c 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Choose app to add controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control added.}other{# controls added.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Add <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"When you add <xliff:g id="APPNAME">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favourited"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favourited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavourited"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Add controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Add app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"One device selected"</string> @@ -1026,4 +1029,5 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Your work policy allows you to make phone calls only from the work profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Switch to work profile"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Close"</string> + <string name="lock_screen_settings" msgid="9197175446592718435">"Lock screen settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 5a82f79cc697..2b5e8f987f7c 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Choose app to add controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control added.}other{# controls added.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Add <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"When you add <xliff:g id="APPNAME">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favourited"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favourited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavourited"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Add controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Add app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"One device selected"</string> @@ -1026,4 +1029,5 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Your work policy allows you to make phone calls only from the work profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Switch to work profile"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Close"</string> + <string name="lock_screen_settings" msgid="9197175446592718435">"Lock screen settings"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 86414918df5e..173b905704b6 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Choose app to add controls"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control added.}other{# controls added.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Add <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"When you add <xliff:g id="APPNAME">%s</xliff:g>, it can add controls and content to this panel. In some apps, you can choose which controls show up here."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favorited"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favorited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavorited"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Add controls"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Add app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 device selected"</string> @@ -1026,4 +1029,5 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Your work policy allows you to make phone calls only from the work profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Switch to work profile"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Close"</string> + <string name="lock_screen_settings" msgid="9197175446592718435">"Lock screen settings"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 2d7954d22630..e5e20ba11022 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Sin sonido ni vibración"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"No suena ni vibra, y aparece en la parte inferior de la sección de conversaciones."</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Puede sonar o vibrar según la configuración del dispositivo"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Puede sonar o vibrar según la configuración del dispositivo. Conversaciones de la burbuja de <xliff:g id="APP_NAME">%1$s</xliff:g> de forma predeterminada."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Dejar que el sistema determine si esta notificación debe emitir un sonido o una vibración"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Estado:</b> Se promovió a Predeterminada"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> Descendió de nivel a Silenciada"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Elige la app para agregar los controles"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Se agregó # control.}many{Se agregaron # controles.}other{Se agregaron # controles.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Quitados"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"¿Quieres agregar <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Si agregas la app de <xliff:g id="APPNAME">%s</xliff:g>, se incluirán controles y contenido en este panel. Algunas apps te permiten elegir qué controles mostrar aquí."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Está en favoritos"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Está en favoritos en la posición <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"No está en favoritos"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error. Vuelve a intentarlo."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Agregar controles"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controles"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Agregar app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Agregar salidas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Se seleccionó 1 dispositivo"</string> @@ -1015,7 +1016,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Cancelar"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Girar ahora"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Despliega el teléfono para tomar una selfie mejor"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"¿Cambiar a pantalla frontal para mejores selfies?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"¿Girar a pantalla frontal para mejores selfies?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Usa la cámara trasera para tomar una foto más amplia y con mejor resolución."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Esta pantalla se apagará"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Dispositivo plegable siendo desplegado"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> de batería restante"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta tu pluma stylus a un cargador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"La pluma stylus tiene poca batería"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videocámara"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"No se puede llamar desde este perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Tu política del trabajo te permite hacer llamadas telefónicas solo desde el perfil de trabajo"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Cambiar al perfil de trabajo"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Cerrar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 9bd4b452e051..41d9c9e96666 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Sin sonido ni vibración"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Sin sonido ni vibración, y se muestra más abajo en la sección de conversaciones"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Puede sonar o vibrar según los ajustes del dispositivo"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Puede sonar o vibrar según los ajustes del dispositivo. Las conversaciones de <xliff:g id="APP_NAME">%1$s</xliff:g> aparecen como burbujas de forma predeterminada."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Haz que el sistema determine si con esta notificación el dispositivo debe sonar o vibrar"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Estado:</b> cambio a Predeterminado"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> cambio a Silencio"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Elige una aplicación para añadir controles"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# control añadido.}many{# controles añadidos.}other{# controles añadidos.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Quitado"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Añadido a favoritos"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Añadido a favoritos (posición <xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Quitado de favoritos"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error: Vuelve a intentarlo"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Añadir controles"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controles"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Añadir dispositivos de salida"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositivo seleccionado"</string> @@ -1013,24 +1017,21 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Al menos un dispositivo debe estar disponible"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Mantén pulsado el acceso directo"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Cancelar"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Girar ahora"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Usar ahora"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Despliega el teléfono para hacer un selfie mejor"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"¿Usar pantalla frontal para hacer mejores selfies?"</string> - <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Usa la cámara trasera para hacer una foto más amplia y con mayor resolución."</string> + <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Usa la cámara trasera para hacer fotos más amplias y con mayor resolución."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Esta pantalla se apagará"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Dispositivo plegable desplegándose"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Dispositivo plegable mostrado desde varios ángulos"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batería restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta tu lápiz óptico a un cargador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Batería del lápiz óptico baja"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videocámara"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"No se puede llamar desde este perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Tu política del trabajo solo te permite hacer llamadas telefónicas desde el perfil de trabajo"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Cambiar al perfil de trabajo"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Cerrar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index baf8520564ea..225812ca4639 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automaatne"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ilma heli ja vibreerimiseta"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ilma heli ja vibreerimiseta, kuvatakse vestluste jaotises allpool"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Võib seadme seadete põhjal heliseda või vibreerida"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Võib seadme seadete põhjal heliseda või vibreerida. Rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> vestlused kuvatakse vaikimisi mullis."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Laske süsteemil määrata, kas selle märguande puhul peaks esitama heli või vibreerima"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Olek:</b> määrati prioriteet Vaikimisi"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Olek:</b> määrati prioriteet Vaikne"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Valige juhtelementide lisamiseks rakendus"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Lisati # juhtnupp.}other{Lisati # juhtnuppu.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Eemaldatud"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Lisatud lemmikuks"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Lisatud lemmikuks, positsioon <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Eemaldatud lemmikute hulgast"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Ilmnes viga, proovige uuesti"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Lisa juhtelemente"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Muuda juhtelemente"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Väljundite lisamine"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupp"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 seade on valitud"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akutase on <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ühendage elektronpliiats laadijaga"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Elektronpliiatsi akutase on madal"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokaamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Sellelt profiililt ei saa helistada"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Teie töökoha eeskirjad lubavad teil helistada ainult tööprofiililt"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Lülitu tööprofiilile"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Sule"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index b9018f58868a..37a66b0c5a2e 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatikoa"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ez du tonurik jotzen edo dar-dar egiten"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ez du tonurik jotzen edo dar-dar egiten, eta elkarrizketen atalaren behealdean agertzen da"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Baliteke tonua jotzea edo dardara egitea, gailuaren ezarpenen arabera"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Baliteke tonua jotzea edo dardara egitea, gailuaren ezarpenen arabera. Modu lehenetsian, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioko elkarrizketak burbuila gisa agertzen dira."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Ezarri sistemak zehaztu dezala jakinarazpen honek soinua edo dardara egin behar duen ala ez"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"Lehenetsi gisa ezarri da <b>egoera:</b>"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"Soinurik gabeko modura aldatu da <b>egoera:</b>"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Aukeratu aplikazio bat kontrolatzeko aukerak gehitzeko"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Kontrolatzeko # aukera gehitu da.}other{Kontrolatzeko # aukera gehitu dira.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Kenduta"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> gehitu nahi duzu?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"<xliff:g id="APPNAME">%s</xliff:g> gehitzen duzunean, kontrolatzeko aukerak eta edukia gehi ditzake panelean. Aplikazio batzuetan, hemen zein kontrolatzeko aukera agertzen diren aukera dezakezu."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Gogokoetan dago"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"<xliff:g id="NUMBER">%d</xliff:g>. gogokoa da"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Ez dago gogokoetan"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Errorea. Saiatu berriro."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Gehitu aukerak"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editatu aukerak"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Gehitu aplikazio bat"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Gehitu irteerak"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Taldea"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 gailu hautatu da"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateriaren <xliff:g id="PERCENTAGE">%s</xliff:g> geratzen da"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Konektatu arkatza kargagailu batera"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Arkatzak bateria gutxi du"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Bideokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Ezin duzu deitu profil honetatik"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Deiak laneko profiletik soilik egiteko baimena ematen dizute laneko gidalerroek"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Aldatu laneko profilera"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Itxi"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 1acbd5a36324..a057ad97b4c2 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"انتخاب برنامه برای افزودن کنترلها"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# کنترل اضافه شد.}one{# کنترل اضافه شد.}other{# کنترل اضافه شد.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"حذف شد"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"به موارد دلخواه اضافه شد"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"اضافهشده به موارد دلخواه، جایگاه <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"حذفشده از موارد دلخواه"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"خطا، دوباره امتحان کنید"</string> <string name="controls_menu_add" msgid="4447246119229920050">"افزودن کنترلها"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ویرایش کنترلها"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"افزودن خروجی"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"گروه"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"۱ دستگاه انتخاب شد"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"خطمشی کاری شما فقط به برقراری تماس ازطریق نمایه کاری اجازه میدهد"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"رفتن به نمایه کاری"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"بستن"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index ffea8829cc93..c4f55713f62e 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automaattinen"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ei ääntä tai värinää"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ei ääntä tai värinää ja näkyy alempana keskusteluosiossa"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Voi soida tai väristä laitteen asetuksista riippuen"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Voi soida tai väristä laitteen asetuksista riippuen. Keskusteluista (<xliff:g id="APP_NAME">%1$s</xliff:g>) luodaan oletuksena kuplia."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Järjestelmä valitsee, kuuluuko tästä ilmoituksesta ääntä tai väriseekö se"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Tila:</b> valittu oletusarvoiseksi"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Tila:</b> hiljennetty"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Valitse sovellus lisätäksesi säätimiä"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# säädin lisätty.}other{# säädintä lisätty.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Poistettu"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Lisätty suosikkeihin"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Lisätty suosikkeihin sijalle <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Poistettu suosikeista"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Virhe, yritä uudelleen"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Lisää säätimiä"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Muokkaa säätimiä"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Lisää toistotapoja"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Ryhmä"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 laite valittu"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akkua jäljellä <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Yhdistä näyttökynä laturiin"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Näyttökynän akku vähissä"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Tästä profiilista ei voi soittaa"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Työkäytäntö sallii sinun soittaa puheluita vain työprofiilista"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Vaihda työprofiiliin"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Sulje"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 0d2db40cb14a..a65d2f367ca3 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatique"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Aucun son ni vibration"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Aucun son ni vibration, et s\'affiche plus bas dans la section des conversations"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Peut sonner ou vibrer, selon les paramètres de l\'appareil"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Peut sonner ou vibrer, selon les paramètres de l\'appareil. Conversations des bulles de <xliff:g id="APP_NAME">%1$s</xliff:g> par défaut."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Faire en sorte que le système détermine si cette notification devrait émettre un son ou vibrer"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>État :</b> élevé à la catégorie Par défaut"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>État :</b> abaissé à la catégorie Silencieux"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Sélectionnez l\'application pour laquelle ajouter des commandes"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# commande ajoutée.}one{# commande ajoutée.}many{# de commandes ajoutées.}other{# commandes ajoutées.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Supprimé"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Ajouté aux favoris"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Ajouté aux favoris, en position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Supprimé des favoris"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erreur. Veuillez réessayer."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Ajouter des commandes"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Modifier des commandes"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Ajouter des sorties"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Groupe"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Un appareil sélectionné"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Charge restante de la pile : <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connectez votre stylet à un chargeur"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Pile du stylet faible"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Mode vidéo"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Impossible de passer un appel à partir de ce profil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Votre politique de l\'entreprise vous autorise à passer des appels téléphoniques uniquement à partir de votre profil professionnel"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Passer au profil professionnel"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Fermer"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index e0ee5c420f0e..c779b63cdee0 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatique"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ni son, ni vibreur"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ni son, ni vibreur ; s\'affiche plus bas dans la section des conversations"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Peut sonner ou vibrer en fonction des paramètres de l\'appareil"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Peut sonner ou vibrer en fonction des paramètres de l\'appareil. Les conversations provenant de <xliff:g id="APP_NAME">%1$s</xliff:g> s\'affichent sous forme de bulles par défaut."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Laisser le système déterminer si cette notification doit être accompagnée d\'un son ou d\'une vibration"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>État :</b> Élevée à la catégorie \"Par défaut\""</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>État :</b> Abaissée à la catégorie \"Silencieux\""</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Sélectionnez l\'appli pour laquelle ajouter des commandes"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# commande ajoutée.}one{# commande ajoutée.}many{# commandes ajoutées.}other{# commandes ajoutées.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Supprimé"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Ajouté aux favoris"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Ajouté aux favoris, en position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Supprimé des favoris"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erreur. Veuillez réessayer."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Ajouter des commandes"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Modifier des commandes"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Ajouter des sorties"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Groupe"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 appareil sélectionné"</string> @@ -1013,24 +1017,21 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Au moins un appareil est disponible"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Appuyez de manière prolongée sur raccourci"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Annuler"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Retourner maintenant"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Retourner"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Déplier le téléphone pour un meilleur selfie"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Passer à l\'écran frontal pour un meilleur selfie ?"</string> - <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Utilisez la caméra arrière pour prendre une photo plus large avec une résolution supérieure."</string> - <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Cet écran sera désactivé"</b></string> + <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Utilisez la caméra arrière pour prendre une photo plus large d\'une résolution supérieure."</string> + <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Cet écran s\'éteindra"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Appareil pliable qui est déplié"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Appareil pliable qui est retourné"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> de batterie restante"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connectez votre stylet à un chargeur"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"La batterie du stylet est faible"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Caméra vidéo"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Impossible d\'appeler depuis ce profil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Votre règle professionnelle ne vous permet de passer des appels que depuis le profil professionnel"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Passer au profil professionnel"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Fermer"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 87b01786fa30..9c270a9abcd5 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Sen son nin vibración"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Sen son nin vibración, e aparecen máis abaixo na sección de conversas"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Poderían facer que o dispositivo soe ou vibre en función da súa configuración"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Poderían facer que o dispositivo soe ou vibre en función da súa configuración. As conversas de <xliff:g id="APP_NAME">%1$s</xliff:g> móstranse en burbullas de forma predeterminada."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Fai que o sistema determine se a notificación debe emitir un son ou unha vibración"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Estado:</b> ascendeuse a Predeterminada"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Estado:</b> o nivel diminuíuse a Silencioso"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Escolle unha aplicación para engadir controis"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Engadiuse # control.}other{Engadíronse # controis.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Quitouse"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Está entre os controis favoritos"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Está entre os controis favoritos (posición: <xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Non está entre os controis favoritos"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erro. Téntao de novo"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Engadir controis"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controis"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Engadir saídas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Seleccionouse 1 dispositivo"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batería restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta o lapis óptico a un cargador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"O lapis óptico ten pouca batería"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videocámara"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Non se pode chamar desde este perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"A política do teu traballo só che permite facer chamadas de teléfono desde o perfil de traballo"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Cambiar ao perfil de traballo"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Pechar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index d287f88f3cb4..3457430a65b2 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"નિયંત્રણો ઉમેરવા માટે ઍપ પસંદ કરો"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# નિયંત્રણ ઉમેર્યું.}one{# નિયંત્રણ ઉમેર્યું.}other{# નિયંત્રણ ઉમેર્યા.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"કાઢી નાખ્યું"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> ઉમેરીએ?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"જ્યારે તમે <xliff:g id="APPNAME">%s</xliff:g> ઉમેરો, ત્યારે તે આ પૅનલમાં નિયંત્રણો અને કન્ટેન્ટ ઉમેરી શકે છે. કેટલીક ઍપમાં, અહીં કયા નિયંત્રણો દેખાય તે તમે પસંદ કરી શકો છો."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"મનપસંદમાં ઉમેર્યું"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"મનપસંદમાં ઉમેર્યું, સ્થાન <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"મનપસંદમાંથી કાઢી નાખ્યું"</string> @@ -817,7 +819,7 @@ <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"અન્ય"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"ડિવાઇસનાં નિયંત્રણોમાં ઉમેરો"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"ઉમેરો"</string> - <string name="controls_dialog_message" msgid="342066938390663844">"<xliff:g id="APP">%s</xliff:g> દ્વારા સૂચન કરેલા"</string> + <string name="controls_dialog_message" msgid="342066938390663844">"<xliff:g id="APP">%s</xliff:g> દ્વારા સૂચવેલા"</string> <string name="controls_tile_locked" msgid="731547768182831938">"ડિવાઇસ લૉક કરેલું છે"</string> <string name="controls_settings_show_controls_dialog_title" msgid="3357852503553809554">"લૉક સ્ક્રીનમાંથી ડિવાઇસ બતાવીએ અને નિયંત્રિત કરીએ?"</string> <string name="controls_settings_show_controls_dialog_message" msgid="7666211700524587969">"તમે તમારા બાહ્ય ડિવાઇસ માટેના નિયંત્રણો લૉક સ્ક્રીન પર ઉમેરી શકો છો.\n\nતમારી ડિવાઇસ ઍપ કદાચ તમને તમારો ફોન કે ટૅબ્લેટ અનલૉક કર્યા વિના અમુક ડિવાઇસ નિયંત્રિત કરવાની મંજૂરી આપી શકે.\n\nતમે ગમે ત્યારે સેટિંગમાં જઈને ફેરફાર કરી શકો છો."</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"ભૂલ, ફરીથી પ્રયાસ કરો"</string> <string name="controls_menu_add" msgid="4447246119229920050">"નિયંત્રણો ઉમેરો"</string> <string name="controls_menu_edit" msgid="890623986951347062">"નિયંત્રણોમાં ફેરફાર કરો"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"ઍપ ઉમેરો"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"આઉટપુટ ઉમેરો"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ગ્રૂપ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 ડિવાઇસ પસંદ કર્યું"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"તમારી ઑફિસની પૉલિસી તમને માત્ર ઑફિસની પ્રોફાઇલ પરથી જ ફોન કૉલ કરવાની મંજૂરી આપે છે"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"ઑફિસની પ્રોફાઇલ પર સ્વિચ કરો"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"બંધ કરો"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 8fe43acd4784..d96bc52c48e2 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"अपने-आप"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"किसी तरह की आवाज़ या वाइब्रेशन न हो"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"इससे किसी तरह की आवाज़ या वाइब्रेशन नहीं होता और बातचीत, सेक्शन में सबसे नीचे दिखती है"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"डिवाइस की सेटिंग के आधार पर, सूचना आने पर घंटी बज सकती है या वाइब्रेशन हो सकता है"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"डिवाइस की सेटिंग के आधार पर, सूचना आने पर घंटी बज सकती है या वाइब्रेशन हो सकता है. <xliff:g id="APP_NAME">%1$s</xliff:g> पर होने वाली बातचीत, डिफ़ॉल्ट रूप से बबल के तौर पर दिखती है."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"सिस्टम को यह तय करने की अनुमति दें कि इस सूचना के मिलने पर आवाज़ हो या वाइब्रेशन हो"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>स्थिति:</b> लेवल बढ़ाकर, डिफ़ॉल्ट के तौर पर सेट किया गया"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>स्थिति:</b> लेवल घटाकर, साइलेंट पर सेट किया गया"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"कंट्रोल जोड़ने के लिए ऐप्लिकेशन चुनें"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# कंट्रोल जोड़ा गया.}one{# कंट्रोल जोड़ा गया.}other{# कंट्रोल जोड़े गए.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"हटाया गया"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"पसंदीदा बनाया गया"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"पसंदीदा बनाया गया, क्रम संख्या <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"पसंदीदा से हटाया गया"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"गड़बड़ी हुई, फिर से कोशिश करें"</string> <string name="controls_menu_add" msgid="4447246119229920050">"कंट्राेल जोड़ें"</string> <string name="controls_menu_edit" msgid="890623986951347062">"कंट्रोल में बदलाव करें"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"आउटपुट जोड़ें"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ग्रुप"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"एक डिवाइस चुना गया"</string> @@ -1013,7 +1017,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• कम से कम एक डिवाइस उपलब्ध है"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"शॉर्टकट को दबाकर रखें"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"रद्द करें"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"कैमरा अभी स्विच करें"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"अभी स्विच करें"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"बेहतर सेल्फ़ी के लिए फ़ोन को अनफ़ोल्ड करें"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"बेहतर सेल्फ़ी के लिए फ़्रंट डिसप्ले पर स्विच करें?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"वाइड ऐंगल में हाई रिज़ॉल्यूशन वाली फ़ोटो लेने के लिए, पीछे का कैमरा इस्तेमाल करें."</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> बैटरी बची है"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"अपने स्टाइलस को चार्ज करें"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"स्टाइलस की बैटरी कम है"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"वीडियो कैमरा"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"यह प्रोफ़ाइल होने पर कॉल नहीं की जा सकती"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"ऑफ़िस की नीति के तहत, वर्क प्रोफ़ाइल होने पर ही फ़ोन कॉल किए जा सकते हैं"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"वर्क प्रोफ़ाइल पर स्विच करें"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"बंद करें"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index d8d969b381b1..cb83de90ad54 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Odabir aplikacije za dodavanje kontrola"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Dodana je # kontrola.}one{Dodana je # kontrola.}few{Dodane su # kontrole.}other{Dodano je # kontrola.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Uklonjeno"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Želite li dodati aplikaciju <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Kada dodate aplikaciju <xliff:g id="APPNAME">%s</xliff:g>, može dodati kontrole i sadržaj na ovu ploču. U nekim aplikacijama možete odabrati koje se kontrole prikazuju ovdje."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Dodano u favorite"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Dodano u favorite, položaj <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Uklonjeno iz favorita"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Pogreška, pokušajte ponovo"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Dodaj kontrole"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Uredi kontrole"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Dodavanje aplikacije"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Dodavanje izlaza"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupa"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Odabran je jedan uređaj"</string> @@ -1011,7 +1014,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Dostupan je najmanje jedan uređaj"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Prečac za dodirnuti i zadržati"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Odustani"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Okreni odmah"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Prebaci"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Otvorite telefon da biste snimili bolji selfie"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Prebaciti na prednji zaslon za bolji selfie?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Upotrijebite stražnji fotoaparat za širu fotografiju s višom razlučivošću."</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Vaša pravila za poslovne uređaje omogućuju vam upućivanje poziva samo s poslovnog profila"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Prijeđite na poslovni profil"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zatvori"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 24d80ecdc373..cabd8987c2d0 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatikus"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Nincs hang és rezgés"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Nincs hang és rezgés, továbbá lejjebb jelenik meg a beszélgetések szakaszában"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Az eszközbeállítások alapján csöröghet és rezeghet"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Az eszközbeállítások alapján csöröghet és rezeghet. A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazásban lévő beszélgetések alapértelmezés szerint buborékban jelennek meg."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"A rendszer határozza meg, hogy ez az értesítés adjon-e ki hangot, illetve rezegjen-e"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Állapot:</b> alapértelmezettre állítva"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Állapot:</b> némára állítva"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Válasszon alkalmazást a vezérlők hozzáadásához"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# vezérlő hozzáadva.}other{# vezérlő hozzáadva.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Eltávolítva"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Hozzáadja a(z) <xliff:g id="APPNAME">%s</xliff:g> alkalmazást?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"A(z) <xliff:g id="APPNAME">%s</xliff:g> hozzáadását követően az alkalmazás vezérlőelemeket és tartalmakat adhat hozzá ehhez a panelhez. Egyes alkalmazásokban kiválasztható, hogy mely vezérlőelemek jelenjenek meg itt."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Hozzáadva a kedvencekhez"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Hozzáadva a kedvencekhez <xliff:g id="NUMBER">%d</xliff:g>. helyen"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Eltávolítva a kedvencek közül"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Hiba történt. Próbálja újra."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Vezérlők hozzáadása"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Vezérlők szerkesztése"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Alkalmazás hozzáadása"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Kimenetek hozzáadása"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Csoport"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 eszköz kiválasztva"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akkumulátor töltöttségi szintje: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Tegye töltőre az érintőceruzát"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Az érintőceruza töltöttsége alacsony"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nem lehet hívást kezdeményezni ebből a profilból"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"A munkahelyi házirend csak munkaprofilból kezdeményezett telefonhívásokat engedélyez"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Váltás munkaprofilra"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Bezárás"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 7cf0c81be386..5b3cefb179bb 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Ավտոմատ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Առանց ձայնի կամ թրթռոցի"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Առանց ձայնի և թրթռոցի, հայտնվում է զրույցների ցանկի ներքևում"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Կարող է զնգալ կամ թրթռալ՝ կախված սարքի կարգավորումներից"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Կարող է զնգալ կամ թրթռալ՝ կախված սարքի կարգավորումներից։ <xliff:g id="APP_NAME">%1$s</xliff:g>-ի զրույցներն ըստ կանխադրման հայտնվում են ամպիկների տեսքով։"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Թող համակարգն ավտոմատ որոշի՝ արդյոք այս ծանուցումը ձայնով, թե թրթռոցով է պետք մատուցել"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Կարգավիճակը․</b> բարձրացվել է և դարձել կանխադրված"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Կարգավիճակը․</b> իջեցվել է և դարձել անձայն"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Ընտրեք հավելված` կառավարման տարրեր ավելացնելու համար"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Ավելացվեց կառավարման # տարր։}one{Ավելացվեց կառավարման # տարր։}other{Ավելացվեց կառավարման # տարր։}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Հեռացված է"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Ավելացված է ընտրանիում"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Ավելացված է ընտրանիում, դիրքը՝ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Հեռացված է ընտրանուց"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Սխալ առաջացավ։ Նորից փորձեք։"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Ավելացնել կառավարման տարրեր"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Փոփոխել կառավարման տարրերը"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Ավելացրեք մուտքագրման սարքեր"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Խումբ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Ընտրված է 1 սարք"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ձեր ստիլուսը միացրեք լիցքավորիչի"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Ստիլուսի մարտկոցի լիցքի ցածր մակարդակ"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Տեսախցիկ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Հնարավոր չէ զանգել այս պրոֆիլից"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Ձեր աշխատանքային կանոնների համաձայն՝ դուք կարող եք զանգեր կատարել աշխատանքային պրոֆիլից"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Անցնել աշխատանքային պրոֆիլ"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Փակել"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 877b7def0069..a00839f42785 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Otomatis"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Tidak ada suara atau getaran"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Tidak ada suara atau getaran dan ditampilkan lebih rendah di bagian percakapan"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Dapat berdering atau bergetar berdasarkan setelan perangkat"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Dapat berdering atau bergetar berdasarkan setelan perangkat. Percakapan <xliff:g id="APP_NAME">%1$s</xliff:g> ditampilkan sebagai balon secara default."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Biarkan sistem menentukan apakah notifikasi ini akan berbunyi atau bergetar"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Dipromosikan menjadi Default"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Didemosikan menjadi Senyap"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Pilih aplikasi untuk menambahkan kontrol"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontrol ditambahkan.}other{# kontrol ditambahkan.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Dihapus"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Difavoritkan"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Difavoritkan, posisi <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Batal difavoritkan"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Error, coba lagi"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Tambahkan kontrol"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit kontrol"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Tambahkan output"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grup"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 perangkat dipilih"</string> @@ -1015,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Batal"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Balik sekarang"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Bentangkan ponsel untuk selfie yang lebih baik"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Gunakan layar depan untuk selfie yang lebih baik?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Balik ke layar depan untuk selfie yang lebih bagus?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Gunakan kamera belakang untuk foto dengan resolusi lebih tinggi dan lebih lebar."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Layar ini akan dinonaktifkan"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Perangkat foldable sedang dibentangkan"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Baterai tersisa <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Hubungkan stilus ke pengisi daya"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Baterai stilus lemah"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Kamera video"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Tidak dapat melakukan panggilan dari profil ini"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Kebijakan kantor mengizinkan Anda melakukan panggilan telepon hanya dari profil kerja"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Beralih ke profil kerja"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Tutup"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 1e7934a2e16f..319988c1a6b8 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Sjálfvirk"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ekkert hljóð eða titringur"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ekkert hljóð eða titringur og birtist neðar í samtalshluta"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Gæti hringt eða titrað en það fer eftir stillingum tækisins"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Gæti hringt eða titrað en það fer eftir stillingum tækisins. Samtöl frá <xliff:g id="APP_NAME">%1$s</xliff:g> birtast sjálfkrafa í blöðru."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Láta kerfið ákvarða hvort hljóð eða titringur fylgir þessari tilkynningu"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Staða:</b> gerð sjálfgefin"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Staða:</b> var gerð þögul"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Veldu forrit til að bæta við stýringum"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# stýringu bætt við.}one{# stýringu bætt við.}other{# stýringum bætt við.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Fjarlægt"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Eftirlæti"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Eftirlæti, staða <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Fjarlægt úr eftirlæti"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Villa, reyndu aftur"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Bæta við stýringum"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Breyta stýringum"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Bæta við úttaki"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Hópur"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 tæki valið"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> hleðsla eftir á rafhlöðu"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Tengdu pennann við hleðslutæki"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Rafhlaða pennans er að tæmast"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Kvikmyndatökuvél"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Ekki er hægt að hringja úr þessu sniði"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Vinnureglur gera þér aðeins kleift að hringja símtöl úr vinnusniði"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Skipta yfir í vinnusnið"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Loka"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 211d01d921a0..fffb8d69bef4 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Scegli un\'app per aggiungere controlli"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controllo aggiunto.}many{# controlli aggiunti.}other{# controlli aggiunti.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Rimosso"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Vuoi aggiungere <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Se la aggiungi, l\'app <xliff:g id="APPNAME">%s</xliff:g> può aggiungere controlli e contenuti a questo riquadro. In alcune app puoi scegliere quali controlli visualizzare qui."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Aggiunto ai preferiti"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Preferito, posizione <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Rimosso dai preferiti"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Errore, riprova"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Aggiungi controlli"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Modifica controlli"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Aggiungi app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Aggiungi uscite"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Gruppo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositivo selezionato"</string> @@ -1013,9 +1016,9 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Annulla"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Gira ora"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Apri il telefono per un selfie migliore"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Girare su display frontale per un selfie migliore?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Passare al display frontale per un selfie migliore?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Utilizza la fotocamera posteriore per una foto più ampia con maggiore risoluzione."</string> - <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Questo schermo verrà disattivato"</b></string> + <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Questo schermo verrà spento"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Dispositivo pieghevole che viene aperto"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Dispositivo pieghevole che viene capovolto"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteria rimanente"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Le norme di lavoro ti consentono di fare telefonate soltanto dal profilo di lavoro"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Passa a profilo di lavoro"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Chiudi"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index fbec1f73a332..dfe8a6459499 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"באופן אוטומטי"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"ללא צליל או רטט"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"ללא צליל או רטט ומופיעה למטה בקטע התראות השיחה"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ייתכן שיופעל צלצול או רטט בהתאם להגדרות במכשיר"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ייתכן שיופעל צלצול או רטט בהתאם להגדרות במכשיר. שיחות מהאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> מופיעות בבועות כברירת מחדל."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"אפשר לתת למערכת לקבוע אם ההתראה הזאת צריכה להיות מלווה בצליל או ברטט"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>הסטטוס:</b> הועלה בדרגה ל\'ברירת מחדל\'"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>הסטטוס:</b> הורד בדרגה ל\'שקט\'"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"יש לבחור אפליקציה כדי להוסיף פקדים"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{נוסף אמצעי בקרה אחד (#).}one{נוספו # אמצעי בקרה.}two{נוספו # אמצעי בקרה.}other{נוספו # אמצעי בקרה.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"הוסר"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"סומן כמועדף"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"סומן כמועדף, במיקום <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"הוסר מהמועדפים"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"שגיאה, יש לנסות שוב"</string> <string name="controls_menu_add" msgid="4447246119229920050">"הוספת פקדים"</string> <string name="controls_menu_edit" msgid="890623986951347062">"עריכת פקדים"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"הוספת מכשירי פלט"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"קבוצה"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"נבחר מכשיר אחד"</string> @@ -1013,7 +1017,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• יש לפחות מכשיר אחד זמין"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"מקש קיצור ללחיצה ארוכה"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"ביטול"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"הפכת את המכשיר"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"אני רוצה להפוך"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"כדי לצלם תמונת סלפי טובה יותר, פותחים את הטלפון"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"להפוך למסך הקדמי כדי לצלם תמונת סלפי טובה יותר?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"במצלמה האחורית אפשר לצלם תמונה רחבה יותר ברזולוציה גבוהה יותר."</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"רמת הטעינה שנותרה בסוללה: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"כדאי לחבר את הסטיילוס למטען"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"הסוללה של הסטיילוס חלשה"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"מצלמת וידאו"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"אי אפשר להתקשר מהפרופיל הזה"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"המדיניות של מקום העבודה מאפשרת לך לבצע שיחות טלפון רק מפרופיל העבודה"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"מעבר לפרופיל עבודה"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"סגירה"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 8e66ec303e56..7db687ad6c2e 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -447,7 +447,7 @@ <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"字幕のオーバーレイ"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"有効にする"</string> <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"無効にする"</string> - <string name="sound_settings" msgid="8874581353127418308">"サウンドとバイブレーション"</string> + <string name="sound_settings" msgid="8874581353127418308">"音とバイブレーション"</string> <string name="volume_panel_dialog_settings_button" msgid="2513228491513390310">"設定"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"アプリは固定されています"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"固定を解除するまで画面が常に表示されるようになります。[戻る] と [最近] を同時に押し続けると固定が解除されます。"</string> @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"コントロールを追加するアプリの選択"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# 件のコントロールを追加しました。}other{# 件のコントロールを追加しました。}}"</string> <string name="controls_removed" msgid="3731789252222856959">"削除済み"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> を追加しますか？"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"<xliff:g id="APPNAME">%s</xliff:g> を追加することで、コントロールやコンテンツをこのパネルに追加できます。一部のアプリでは、ここに表示されるコントロールを選択できます。"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"お気に入りに追加済み"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"お気に入りに追加済み、位置: <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"お気に入りから削除済み"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"エラー: もう一度お試しください"</string> <string name="controls_menu_add" msgid="4447246119229920050">"コントロールを追加"</string> <string name="controls_menu_edit" msgid="890623986951347062">"コントロールを編集"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"アプリを追加"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"出力の追加"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"グループ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"選択したデバイス: 1 台"</string> @@ -1011,7 +1014,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• 利用できるデバイスが 1 台以上ある"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"ショートカットの長押しが必要です"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"キャンセル"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"切り替えましょう"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"切り替える"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"高画質で撮るにはスマートフォンを開いてください"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"前面ディスプレイに切り替えて綺麗に撮りましょう"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"高解像度で広い範囲を撮影するには、背面カメラを使用してください。"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"仕事用ポリシーでは、通話の発信を仕事用プロファイルからのみに制限できます"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"仕事用プロファイルに切り替える"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"閉じる"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 599b9d9477f1..f4c934cbad09 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"აირჩიეთ აპი მართვის საშუალებების დასამატებლად"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{დაემატა მართვის # საშუალება.}other{დაემატა მართვის # საშუალება.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ამოიშალა"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"გსურთ <xliff:g id="APPNAME">%s</xliff:g>-ის დამატება?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"როდესაც <xliff:g id="APPNAME">%s</xliff:g>-ს ამატებთ, მან შეიძლება დაამატოს მართვის საშუალებები და კონტენტი მოცემულ არეში. ზოგიერთ აპში შეგიძლიათ აირჩიოთ, რომელი მართვის საშუალებები უნდა გამოჩნდეს აქ."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"რჩეულებშია"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"რჩეულებშია, პოზიციაზე <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"რჩეულებიდან ამოღებულია"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"შეცდომა, ისევ ცადეთ"</string> <string name="controls_menu_add" msgid="4447246119229920050">"მართვის საშუალებების დამატება"</string> <string name="controls_menu_edit" msgid="890623986951347062">"მართვის საშუალებათა რედაქტირება"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"აპის დამატება"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"მედია-გამოსავლების დამატება"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ჯგუფი"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"არჩეულია 1 მოწყობილობა"</string> @@ -1011,9 +1014,9 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• ხელმისაწვდომია მინიმუმ ერთი მოწყობილობა"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"შეხების დაamp; მოცდის მალსახმობი"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"გაუქმება"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"გადაატრიალეთ ახლა"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"ახლა გადატრიალება"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"გაშალეთ ტელეფონი უკეთესი სელფისთვის"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"გადააბრუნეთ წინა ეკრანზე უკეთესი სელფის მისაღებად?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"გამოვიყენოთ წინა ეკრანი უკეთესი სელფის მისაღებად?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"გამოიყენეთ უკანა კამერა უფრო ფართო ფოტოს გადასაღებად მაღალი გარჩევადობით."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ ეს ეკრანი გამოირთვება"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"დასაკეცი მოწყობილობა იხსნება"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"თქვენი სამსახურის წესები საშუალებას გაძლევთ, სატელეფონო ზარები განახორციელოთ მხოლოდ სამსახურის პროფილიდან"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"სამსახურის პროფილზე გადართვა"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"დახურვა"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 0dd10d0f9b9d..a3b330ce2905 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматты"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Дыбыс не діріл болмайды."</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Дыбыс не діріл болмайды, әңгімелер бөлімінің төмен жағында тұрады."</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Құрылғы параметрлеріне байланысты шырылдауы не дірілдеуі мүмкін"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Құрылғы параметрлеріне байланысты шырылдауы не дірілдеуі мүмкін. <xliff:g id="APP_NAME">%1$s</xliff:g> чаттары әдепкісінше қалқымалы етіп көрсетіледі."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Хабарландыру дыбысының немесе дірілдің қосылуын жүйе анықтайтын болады"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Күйі:</b> \"Әдепкі\" санатына көтерілген"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Күйі:</b> \"Үнсіз\" санатына төмендетілген"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Басқару элементтері қосылатын қолданбаны таңдаңыз"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# басқару элементі қосылды.}other{# басқару элементі қосылды.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Өшірілді"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Таңдаулыларға қосылды"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Таңдаулыларға қосылды, <xliff:g id="NUMBER">%d</xliff:g>-позиция"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Таңдаулылардан алып тасталды"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Қате шықты. Қайталап көріңіз."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Басқару элементтерін қосу"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Басқару элементтерін өзгерту"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Шығыс сигналдарды қосу"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Топ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 құрылғы таңдалды."</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Қалған батарея заряды: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Стилусты зарядтағышқа жалғаңыз."</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Стилус батареясының заряды аз"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Бейнекамера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Бұл профильден қоңырау шалу мүмкін емес"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Жұмыс саясатыңызға сәйкес тек жұмыс профилінен қоңырау шалуға болады."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Жұмыс профиліне ауысу"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Жабу"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index eea029bfce5a..05d0429b809c 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ស្វ័យប្រវត្តិ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"គ្មានសំឡេង ឬការញ័រទេ"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"គ្មានសំឡេងឬការញ័រ និងបង្ហាញទាបជាងនៅក្នុងផ្នែកសន្ទនា"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"អាចរោទ៍ ឬញ័រ ដោយផ្អែកលើការកំណត់ឧបករណ៍"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"អាចរោទ៍ ឬញ័រ ដោយផ្អែកលើការកំណត់ឧបករណ៍។ ការសន្ទនាពីផ្ទាំងអណ្ដែត <xliff:g id="APP_NAME">%1$s</xliff:g> តាមលំនាំដើម។"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ឱ្យប្រព័ន្ធកំណត់ថាតើការជូនដំណឹងនេះគួរតែបន្លឺសំឡេង ឬញ័រ"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ស្ថានភាព៖</b> បានដំឡើងទៅលំនាំដើម"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ស្ថានភាព៖</b> បានបញ្ចុះទៅស្ងាត់"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ជ្រើសរើសកម្មវិធីដែលត្រូវបញ្ចូលផ្ទាំងគ្រប់គ្រង"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{បានបញ្ចូលការគ្រប់គ្រង #។}other{បានបញ្ចូលការគ្រប់គ្រង #។}}"</string> <string name="controls_removed" msgid="3731789252222856959">"បានដកចេញ"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"បានដាក់ជាសំណព្វ"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"បានដាក់ជាសំណព្វ ទីតាំងទី <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"បានដកចេញពីសំណព្វ"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"មានបញ្ហា សូមព្យាយាមម្តងទៀត"</string> <string name="controls_menu_add" msgid="4447246119229920050">"បញ្ចូលផ្ទាំងគ្រប់គ្រង"</string> <string name="controls_menu_edit" msgid="890623986951347062">"កែផ្ទាំងគ្រប់គ្រង"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"បញ្ចូលឧបករណ៍មេឌៀ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ក្រុម"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"បានជ្រើសរើសឧបករណ៍ 1"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ថ្មនៅសល់ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ភ្ជាប់ប៊ិករបស់អ្នកជាមួយឆ្នាំងសាក"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ថ្មប៊ិកនៅសល់តិច"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"កាមេរ៉ាវីដេអូ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"មិនអាចហៅទូរសព្ទពីកម្រងព័ត៌មាននេះបានទេ"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"គោលការណ៍ការងាររបស់អ្នកអនុញ្ញាតឱ្យអ្នកធ្វើការហៅទូរសព្ទបានតែពីកម្រងព័ត៌មានការងារប៉ុណ្ណោះ"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"ប្ដូរទៅកម្រងព័ត៌មានការងារ"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"បិទ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 92956acae2d5..e5437804f00a 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಲು ಆ್ಯಪ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# ನಿಯಂತ್ರಣವನ್ನು ಸೇರಿಸಲಾಗಿದೆ.}one{# ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ.}other{# ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> ಅನ್ನು ಸೇರಿಸಬೇಕೆ?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"ನೀವು <xliff:g id="APPNAME">%s</xliff:g> ಅನ್ನು ಸೇರಿಸಿದಾಗ, ಅದು ಈ ಪ್ಯಾನೆಲ್ಗೆ ನಿಯಂತ್ರಣಗಳು ಮತ್ತು ವಿಷಯವನ್ನು ಸೇರಿಸಬಹುದು. ಕೆಲವು ಆ್ಯಪ್ಗಳಲ್ಲಿ, ಇಲ್ಲಿ ಯಾವ ನಿಯಂತ್ರಣಗಳು ಕಾಣಿಸಬೇಕು ಎಂಬುದನ್ನು ನೀವು ಆಯ್ಕೆಮಾಡಬಹುದು."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ಮೆಚ್ಚಲಾಗಿರುವುದು"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ಮೆಚ್ಚಲಾಗಿರುವುದು, ಸ್ಥಾನ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ಮೆಚ್ಚಿನದಲ್ಲದ್ದು"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"ದೋಷ, ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> <string name="controls_menu_add" msgid="4447246119229920050">"ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಿ"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ನಿಯಂತ್ರಣಗಳನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"ಆ್ಯಪ್ ಅನ್ನು ಸೇರಿಸಿ"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ಔಟ್ಪುಟ್ಗಳನ್ನು ಸೇರಿಸಿ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ಗುಂಪು"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 ಸಾಧನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"ನಿಮ್ಮ ಕೆಲಸದ ನೀತಿಯು ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ನಿಂದ ಮಾತ್ರ ಫೋನ್ ಕರೆಗಳನ್ನು ಮಾಡಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ಗೆ ಬದಲಿಸಿ"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"ಮುಚ್ಚಿರಿ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 0815dbff2da4..ad5b52335aae 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"자동"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"소리 또는 진동 없음"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"소리나 진동이 울리지 않으며 대화 섹션 하단에 표시됨"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"기기 설정에 따라 벨소리나 진동이 울릴 수 있음"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"기기 설정에 따라 벨소리나 진동이 울릴 수 있습니다. 기본적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>의 대화는 대화창으로 표시됩니다."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"시스템에서 알림 시 소리 또는 진동을 사용할지 결정하도록 허용합니다."</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>상태:</b> 기본으로 높임"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>상태:</b> 무음으로 낮춤"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"컨트롤을 추가할 앱을 선택하세요"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{설정이 #개 추가되었습니다.}other{설정이 #개 추가되었습니다.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"삭제됨"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"즐겨찾기에 추가됨"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"즐겨찾기에 추가됨, 위치 <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"즐겨찾기에서 삭제됨"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"오류. 다시 시도하세요."</string> <string name="controls_menu_add" msgid="4447246119229920050">"컨트롤 추가"</string> <string name="controls_menu_edit" msgid="890623986951347062">"컨트롤 수정"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"출력 추가"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"그룹"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"기기 1대 선택됨"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"배터리 <xliff:g id="PERCENTAGE">%s</xliff:g> 남음"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"스타일러스를 충전기에 연결하세요"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"스타일러스 배터리 부족"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"비디오 카메라"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"이 프로필에서 전화를 걸 수 없음"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"직장 정책이 직장 프로필에서만 전화를 걸도록 허용합니다."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"직장 프로필로 전환"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"닫기"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 4d026f56ad64..5c6166af7ada 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматтык"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Үнү чыкпайт жана дирилдебейт"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Үнү чыкпайт же дирилдебейт жана сүйлөшүүлөр тизмесинин ылдый жагында көрүнөт"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Түзмөктүн параметрлерине жараша шыңгырап же дирилдеши мүмкүн"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Түзмөктүн параметрлерине жараша шыңгырап же дирилдеши мүмкүн. <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосундагы сүйлөшүүлөр демейки шартта калкып чыкма билдирмелер болуп көрүнөт."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Билдирменин үнүн чыгартууну же басууну тутумга тапшырыңыз"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Абалы:</b> Демейкиге өзгөрдү"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Абалы:</b> Үнсүз абалга төмөндөдү"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Башкаруу элементтери кошула турган колдонмону тандоо"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# көзөмөл кошулду.}other{# көзөмөл кошулду.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Өчүрүлдү"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> кошулсунбу?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"<xliff:g id="APPNAME">%s</xliff:g> колдонмосун кошсоңуз, ал бул панелге башкаруу элементтерин жана контентти кошо алат. Айрым колдонмолордо бул жерде көрүнүүчү башкаруу элементтерин тандай аласыз."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Сүйүктүүлөргө кошулду"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Сүйүктүүлөргө <xliff:g id="NUMBER">%d</xliff:g>-позицияга кошулду"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Сүйүктүүлөрдөн чыгарылды"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Ката, кайталап көрүңүз"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Башкаруу элементтерин кошуу"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Башкаруу элементтерин түзөтүү"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Колдонмо кошуу"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Медиа түзмөктөрдү кошуу"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Топ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 түзмөк тандалды"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Батареянын кубаты: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Стилусту кубаттаңыз"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Стилустун батареясы отурайын деп калды"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Видео камера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Бул профилден чала албайсыз"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Жумуш саясатыңызга ылайык, жумуш профилинен гана чалууларды аткара аласыз"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Жумуш профилине которулуу"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Жабуу"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index e147c2241e2b..c07470a37e18 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ອັດຕະໂນມັດ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"ບໍ່ມີສຽງ ຫຼື ການສັ່ນເຕືອນ"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"ບໍ່ມີສຽງ ຫຼື ການສັ່ນເຕືອນ ແລະ ປາກົດຢູ່ທາງລຸ່ມຂອງພາກສ່ວນການສົນທະນາ"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ອາດສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນໂດຍອ້າງອີງຈາກການຕັ້ງຄ່າອຸປະກອນ"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ອາດສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນໂດຍອ້າງອີງຈາກການຕັ້ງຄ່າອຸປະກອນ. ການສົນທະນາຈາກ <xliff:g id="APP_NAME">%1$s</xliff:g> ຈະເປັນ bubble ຕາມຄ່າເລີ່ມຕົ້ນ."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ໃຫ້ລະບົບກຳນົດວ່າການແຈ້ງເຕືອນນິ້ຄວນມີສຽງ ຫຼື ສັ່ນເຕືອນຫຼືບໍ່"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ສະຖານະ:</b> ເລື່ອນລະດັບເປັນຄ່າເລີ່ມຕົ້ນແລ້ວ"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ສະຖານະ:</b> ຫຼຸດລະດັບເປັນປິດສຽງແລ້ວ"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ເລືອກແອັບເພື່ອເພີ່ມການຄວບຄຸມ"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{ເພີ່ມ # ການຄວບຄຸມແລ້ວ.}other{ເພີ່ມ # ການຄວບຄຸມແລ້ວ.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ລຶບອອກແລ້ວ"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"ເພີ່ມ <xliff:g id="APPNAME">%s</xliff:g> ບໍ?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"ເມື່ອທ່ານເພີ່ມ <xliff:g id="APPNAME">%s</xliff:g>, ມັນຈະສາມາດເພີ່ມການຄວບຄຸມ ແລະ ເນື້ອຫາໃສ່ແຜງນີ້ໄດ້. ໃນບາງແອັບ, ທ່ານສາມາດເລືອກວ່າຈະໃຫ້ສ່ວນຄວບຄຸມໃດສະແດງຂຶ້ນຢູ່ບ່ອນນີ້ໄດ້."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ເພີ່ມລາຍການທີ່ມັກແລ້ວ"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ເພີ່ມລາຍການທີ່ມັກແລ້ວ, ຕຳແໜ່ງ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ຍົກເລີກລາຍການທີ່ມັກແລ້ວ"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"ຜິດພາດ, ກະລຸນາລອງໃໝ່"</string> <string name="controls_menu_add" msgid="4447246119229920050">"ເພີ່ມການຄວບຄຸມ"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ແກ້ໄຂການຄວບຄຸມ"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"ເພີ່ມແອັບ"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ເພີ່ມເອົ້າພຸດ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ກຸ່ມ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"ເລືອກ 1 ອຸປະກອນແລ້ວ"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ແບັດເຕີຣີເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ເຊື່ອມຕໍ່ປາກກາຂອງທ່ານກັບສາຍສາກ"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ແບັດເຕີຣີປາກກາເຫຼືອໜ້ອຍ"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ກ້ອງວິດີໂອ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"ບໍ່ສາມາດໂທຈາກໂປຣໄຟລ໌ນີ້ໄດ້"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"ນະໂຍບາຍບ່ອນເຮັດວຽກຂອງທ່ານອະນຸຍາດໃຫ້ທ່ານໂທລະສັບໄດ້ຈາກໂປຣໄຟລ໌ບ່ອນເຮັດວຽກເທົ່ານັ້ນ"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"ສະຫຼັບໄປໃຊ້ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"ປິດ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 0d5c04522346..737e652e511d 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Pasirinkite programą, kad pridėtumėte valdiklių"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Pridėtas # valdiklis.}one{Pridėtas # valdiklis.}few{Pridėti # valdikliai.}many{Pridėta # valdiklio.}other{Pridėta # valdiklių.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Pašalinta"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Pridėti „<xliff:g id="APPNAME">%s</xliff:g>“?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Pridėjus programą „<xliff:g id="APPNAME">%s</xliff:g>“, ji gali pridėti valdiklių ir turinio prie šio skydelio. Kai kuriose programose galite pasirinkti, kurie valdikliai čia rodomi."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Įtraukta į mėgstamiausius"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Įtraukta į mėgstamiausius, padėtis: <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Pašalinta iš mėgstamiausių"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Klaida, bandykite dar kartą"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Pridėti valdiklių"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Redaguoti valdiklius"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Pridėti programą"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Išvesčių pridėjimas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupė"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Pasirinktas 1 įrenginys"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Pagal jūsų darbo politiką galite skambinti telefonu tik iš darbo profilio"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Perjungti į darbo profilį"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Uždaryti"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index ae22afd32d76..920057372d9c 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automātiski"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Nav skaņas signāla vai vibrācijas"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Nav skaņas signāla vai vibrācijas, kā arī atrodas tālāk sarunu sadaļā"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Atkarībā no iestatījumiem var zvanīt vai vibrēt"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Atkarībā no ierīces iestatījumiem var zvanīt vai vibrēt. Sarunas no lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> pēc noklusējuma tiek parādītas burbulī."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Iestatiet, lai sistēma noteiktu, vai šim paziņojumam būs skaņa vai vibrācija"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Statuss:</b> svarīgums paaugstināts līdz noklusējumam"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Statuss:</b> svarīgums pazemināts, un paziņojums tiks rādīts bez skaņas"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Izvēlieties lietotni, lai pievienotu vadīklas"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Pievienota # vadīkla.}zero{Pievienotas # vadīklas.}one{Pievienota # vadīkla.}other{Pievienotas # vadīklas.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Noņemta"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Vai pievienot lietotni <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Ja pievienosiet lietotni <xliff:g id="APPNAME">%s</xliff:g>, tā varēs pievienot vadīklas un saturu šim panelim. Dažās lietotnēs varat izvēlēties, kuras vadīklas šeit rādīt."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Pievienota izlasei"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Pievienota izlasei, <xliff:g id="NUMBER">%d</xliff:g>. pozīcija"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Noņemta no izlases"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Radās kļūda. Mēģiniet vēlreiz."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Pievienot vadīklas"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Rediģēt vadīklas"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Pievienot lietotni"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Izejas ierīču pievienošana"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupa"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Atlasīta viena ierīce"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Atlikušais uzlādes līmenis: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Pievienojiet skārienekrāna pildspalvu lādētājam"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Zems skārienekrāna pildspalvas akumulatora līmenis"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nevar zvanīt no šī profila"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Saskaņā ar jūsu darba politiku tālruņa zvanus drīkst veikt tikai no darba profila"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Pārslēgties uz darba profilu"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Aizvērt"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index afe276fe7a0b..5052c2c99987 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматски"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Без звук или вибрации"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Без звук или вибрации и се појавува подолу во делот со разговори"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Може да ѕвони или вибрира во зависност од поставките на уредот"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Може да ѕвони или вибрира во зависност од поставките на уредот. Стандардно, разговорите од <xliff:g id="APP_NAME">%1$s</xliff:g> се во балончиња."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Дозволете системот да определи дали известувањево треба да испушти звук или да вибрира"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Статус:</b> поставено на „Стандардно“"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус:</b> намалено на „Тивко“"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Изберете апликација за да додадете контроли"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Додадена е # контрола.}one{Додадени се # контрола.}other{Додадени се # контроли.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Отстранета"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Да се додаде <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Кога ќе ја додадете <xliff:g id="APPNAME">%s</xliff:g>, таа ќе може да додава контроли и содржини на таблава. Кај некои апликации, може да изберете кои контроли ќе се прикажуваат тука."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Омилена"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Омилена, позиција <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Неомилена"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Грешка, обидете се повторно"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Додајте контроли"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Изменете ги контролите"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Додајте апликација"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Додајте излези"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Група"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Избран е 1 уред"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Преостаната батерија: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Поврзете го пенкалото со полнач"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Слаба батерија на пенкало"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Видеокамера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Не можете да се јавите од профилов"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Вашето работно правило ви дозволува да упатувате повици само од работниот профил"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Префрли се на работен профил"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Затвори"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 1e23455e7722..f4e461da0c14 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"നിയന്ത്രണങ്ങൾ ചേർക്കാൻ ആപ്പ് തിരഞ്ഞെടുക്കുക"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# നിയന്ത്രണം ചേർത്തു.}other{# നിയന്ത്രണങ്ങൾ ചേർത്തു.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"നീക്കം ചെയ്തു"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> ചേർക്കണോ?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"നിങ്ങൾ <xliff:g id="APPNAME">%s</xliff:g> ചേർത്താൽ, അതിന് ഈ പാനലിലേക്ക് നിയന്ത്രണങ്ങളും ഉള്ളടക്കവും ചേർക്കാനാകും. ചില ആപ്പുകളിൽ, ഇവിടെ ഏത് നിയന്ത്രണങ്ങൾ ദൃശ്യമാകണമെന്ന് നിങ്ങൾക്ക് തിരഞ്ഞെടുക്കാനാകും."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"പ്രിയപ്പെട്ടതാക്കി"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"പ്രിയപ്പെട്ടതാക്കി, സ്ഥാനം <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"പ്രിയപ്പെട്ടതല്ലാതാക്കി"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"പിശക്, വീണ്ടും ശ്രമിക്കുക"</string> <string name="controls_menu_add" msgid="4447246119229920050">"നിയന്ത്രണങ്ങൾ ചേർക്കുക"</string> <string name="controls_menu_edit" msgid="890623986951347062">"നിയന്ത്രണങ്ങൾ എഡിറ്റ് ചെയ്യുക"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"ആപ്പ് ചേർക്കുക"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ഔട്ട്പുട്ടുകൾ ചേർക്കുക"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ഗ്രൂപ്പ്"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"ഒരു ഉപകരണം തിരഞ്ഞെടുത്തു"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"ഔദ്യോഗിക പ്രൊഫൈലിൽ നിന്ന് മാത്രം ഫോൺ കോളുകൾ ചെയ്യാനാണ് നിങ്ങളുടെ ഔദ്യോഗിക നയം അനുവദിക്കുന്നത്"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"ഔദ്യോഗിക പ്രൊഫൈലിലേക്ക് മാറുക"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"അടയ്ക്കുക"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 4d06e1f482fd..f4ace180e69c 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автомат"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Дуу эсвэл чичиргээ байхгүй"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Дуу эсвэл чичиргээ байхгүй бөгөөд харилцан ярианы хэсгийн доод талд харагдана"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Төхөөрөмжийн тохиргоонд тулгуурлан хонх дуугаргах эсвэл чичиргэж болзошгүй"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Төхөөрөмжийн тохиргоонд тулгуурлан хонх дуугаргах эсвэл чичиргэж болзошгүй. <xliff:g id="APP_NAME">%1$s</xliff:g>-н харилцан яриаг өгөгдмөлөөр бөмбөлөг болгоно."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Энэ мэдэгдэл дуу гаргах эсвэл чичрэх эсэхийг системээр тодорхойлуулаарай"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Төлөв:</b> Өгөгдмөл болгож дэвшүүлсэн"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Төлөв:</b> Чимээгүй болгож зэрэглэлийг нь бууруулсан"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Хяналтууд нэмэхийн тулд аппыг сонгоно уу"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# хяналт нэмсэн.}other{# хяналт нэмсэн.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Хассан"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Дуртай гэж тэмдэглэсэн"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"<xliff:g id="NUMBER">%d</xliff:g>-р байршилд дуртай гэж тэмдэглэсэн"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Дургүй гэж тэмдэглэсэн"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Алдаа гарав, дахин оролдоно уу"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Хяналт нэмэх"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Хяналтыг өөрчлөх"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Гаралт нэмэх"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Бүлэг"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 төхөөрөмж сонгосон"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> батарей үлдлээ"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Мэдрэгч үзгээ цэнэглэгчтэй холбоорой"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Мэдрэгч үзэгний батарей бага байна"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Видео камер"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Энэ профайлаас залгах боломжгүй"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Таны ажлын бодлого танд зөвхөн ажлын профайлаас утасны дуудлага хийхийг зөвшөөрдөг"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Ажлын профайл руу сэлгэх"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Хаах"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 201387940f74..96ecc999d567 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ऑटोमॅटिक"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"आवाज किंवा व्हायब्रेशन नाही"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"आवाज किंवा व्हायब्रेशन नाही आणि संभाषण विभागात सर्वात तळाशी दिसते"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"डिव्हाइस सेटिंग्जनुसार रिंग किंवा व्हायब्रेट होऊ शकतो"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"डिव्हाइस सेटिंग्जनुसार रिंग किंवा व्हायब्रेट होऊ शकतो. <xliff:g id="APP_NAME">%1$s</xliff:g> मधील संभाषणे बाय डीफॉल्ट बबल होतात."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ही सूचना मिळाल्यावर आवाज व्हावा की व्हायब्रेशन व्हावे ते सिस्टममध्ये नमूद करा"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>स्थिती</b> ही डीफॉल्ट म्हणून प्रमोट केली गेली"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>स्थिती</b> ला सायलंट म्हणून डीमोट केले गेले"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"नियंत्रणे जोडण्यासाठी ॲप निवडा"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# नियंत्रण जोडले आहे.}other{# नियंत्रणे जोडली आहेत.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"काढून टाकले"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> जोडायचे आहे का?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"तुम्ही <xliff:g id="APPNAME">%s</xliff:g> जोडता, तेव्हा ते या पॅनलमध्ये नियंत्रणे आणि आशय जोडू शकते. येथे कोणती नियंत्रणे दाखवावीत ते तुम्ही काही अॅप्समध्ये निवडू शकता."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"आवडले"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"आवडले, स्थान <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"नावडले"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"एरर, पुन्हा प्रयत्न करा"</string> <string name="controls_menu_add" msgid="4447246119229920050">"नियंत्रणे जोडा"</string> <string name="controls_menu_edit" msgid="890623986951347062">"नियंत्रणे संपादित करा"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"अॅप जोडा"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"आउटपुट जोडा"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"गट"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"एक डिव्हाइस निवडले"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> बॅटरी शिल्लक आहे"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"तुमचे स्टायलस चार्जरशी कनेक्ट करा"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"स्टायलस बॅटरी कमी आहे"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"व्हिडिओ कॅमेरा"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"या प्रोफाइलवरून कॉल करू शकत नाही"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"तुमचे कामाशी संबंधित धोरण तुम्हाला फक्त कार्य प्रोफाइलवरून फोन कॉल करन्याची अनुमती देते"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"कार्य प्रोफाइलवर स्विच करा"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"बंद करा"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 6930fac9c514..2782925b4381 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Pilih apl untuk menambahkan kawalan"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kawalan ditambah.}other{# kawalan ditambah.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Dialih keluar"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Digemari"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Digemari, kedudukan <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Dinyahgemari"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Ralat, cuba lagi"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Tambah kawalan"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edit kawalan"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Tambah output"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Kumpulan"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 peranti dipilih"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Dasar kerja anda membenarkan anda membuat panggilan telefon hanya daripada profil kerja"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Tukar kepada profil kerja"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Tutup"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 3a7cf144df82..f87565469f93 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"အလိုအလျောက်"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"အသံ သို့မဟုတ် တုန်ခါမှုမရှိပါ"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"အသံ သို့မဟုတ် တုန်ခါမှုမရှိပါ၊ စကားဝိုင်းကဏ္ဍ၏ အောက်ပိုင်းတွင် မြင်ရသည်"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"စက်ပစ္စည်း ဆက်တင်များပေါ် အခြေခံပြီး အသံမြည်နိုင်သည် (သို့) တုန်ခါနိုင်သည်"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"စက်ပစ္စည်းဆက်တင်များပေါ် အခြေခံပြီး အသံမြည်နိုင်သည် (သို့) တုန်ခါနိုင်သည်။ မူရင်းသတ်မှတ်ချက်အဖြစ် <xliff:g id="APP_NAME">%1$s</xliff:g> မှ စကားဝိုင်းများကို ပူဖောင်းကွက်ဖြင့် ပြသည်။"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ဤအကြောင်းကြားချက်က အသံ သို့မဟုတ် တုန်ခါမှု ပေးရန် သင့်/မသင့်ကို စနစ်က ဆုံးဖြတ်ပါစေ"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>အခြေအနေ-</b> မူရင်းသို့ ချိန်ညှိထားသည်"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>အခြေအနေ-</b> အသံတိတ်ခြင်းသို့ ပြန်ချိန်ညှိထားသည်"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ထိန်းချုပ်မှုများထည့်ရန် အက်ပ်ရွေးခြင်း"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{ထိန်းချုပ်ခလုတ် # ခု ထည့်ထားသည်။}other{ထိန်းချုပ်ခလုတ် # ခု ထည့်ထားသည်။}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ဖယ်ရှားထားသည်"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"အကြိုက်ဆုံးတွင် ထည့်ထားသည်"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"အကြိုက်ဆုံးတွင် ထည့်ထားသည်၊ အဆင့် <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"အကြိုက်ဆုံးမှ ဖယ်ရှားထားသည်"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"မှားသွားသည်၊ ပြန်စမ်းကြည့်ပါ"</string> <string name="controls_menu_add" msgid="4447246119229920050">"ထိန်းချုပ်မှုများ ထည့်ရန်"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ထိန်းချုပ်မှုများ ပြင်ရန်"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"မီဒီယာအထွက်များ ထည့်ရန်"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"အုပ်စု"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"စက်ပစ္စည်း ၁ ခုကို ရွေးချယ်ထားသည်"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ဘက်ထရီ <xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်သေးသည်"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"စတိုင်လပ်စ်ကို အားသွင်းကိရိယာနှင့် ချိတ်ဆက်ခြင်း"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"စတိုင်လပ်စ် ဘက်ထရီ အားနည်းနေသည်"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ဗီဒီယိုကင်မရာ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"ဤပရိုဖိုင်မှ ခေါ်ဆို၍ မရပါ"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"သင့်အလုပ်မူဝါဒသည် သင့်အား အလုပ်ပရိုဖိုင်မှသာ ဖုန်းခေါ်ဆိုခွင့် ပြုသည်"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"အလုပ်ပရိုဖိုင်သို့ ပြောင်းရန်"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"ပိတ်ရန်"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 5fc1884f0fc3..5c1258b9bc93 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatisk"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ingen lyd eller vibrering"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ingen lyd eller vibrering, og vises lavere i samtaledelen"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Kan ringe eller vibrere basert på enhetsinnstillingene"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Kan ringe eller vibrere basert på enhetsinnstillingene. Samtaler fra <xliff:g id="APP_NAME">%1$s</xliff:g> vises som standard som bobler."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"La systemet velge om dette varselet skal lage lyd eller vibrere"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Oppgradert til standard"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Nedgradert til lydløst"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Velg en app for å legge til kontroller"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontroll er lagt til.}other{# kontroller er lagt til.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Fjernet"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favoritt"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favoritt, posisjon <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Fjernet som favoritt"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"En feil oppsto. Prøv på nytt"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Legg til kontroller"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Endre kontroller"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Legg til utenheter"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Gruppe"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 enhet er valgt"</string> @@ -1015,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Avbryt"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Vend nå"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Brett ut telefonen for å ta bedre selfier"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Vil du bytte til frontskjermen for bedre selfier?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Vil du bruke frontkameraet for bedre selfier?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Bruk det bakovervendte kameraet for å ta bredere bilder med høyere oppløsning."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Denne skjermen slås av"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"En sammenleggbar enhet blir brettet ut"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteri gjenstår"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Koble pekepennen til en lader"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Det er lite batteri i pekepennen"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Kan ikke ringe fra denne profilen"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Som følge av jobbreglene dine kan du bare starte telefonanrop fra jobbprofilen."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Bytt til jobbprofilen"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Lukk"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index d74d1534e3aa..e2c8b4b4dc00 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"स्वचालित"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"बज्दैन पनि, भाइब्रेट पनि हुँदैन"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"बज्दैन पनि, भाइब्रेट पनि हुँदैन र वार्तालाप खण्डको तलतिर देखा पर्छ"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"डिभाइसको सेटिङका आधारमा घन्टी बज्न वा भाइब्रेट हुन सक्छ"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"डिभाइसको सेटिङका आधारमा घन्टी बज्न वा कम्पन हुन सक्छ। <xliff:g id="APP_NAME">%1$s</xliff:g> मार्फत गरिएका वार्तालापहरू स्वतः बबलमा देखिन्छन्।"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"सिस्टमलाई यो सूचना आउँदा ध्वनि बज्नु पर्छ वा कम्पन हुनु पर्छ भन्ने कुराको निधो गर्न दिनुहोस्"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>स्थिति:</b> सूचनालाई महत्त्वपूर्ण ठानी डिफल्ट मोडमा सेट गरिएको छ"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>स्थिति:</b> सूचनालाई कम महत्त्वपूर्ण ठानी साइलेन्ट मोडमा सेट गरिएको छ"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"कन्ट्रोल थप्नु पर्ने एप छान्नुहोस्"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# कन्ट्रोल हालियो।}other{# वटा कन्ट्रोल हालियो।}}"</string> <string name="controls_removed" msgid="3731789252222856959">"हटाइएको"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> हाल्ने हो?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"तपाईंले <xliff:g id="APPNAME">%s</xliff:g> हाल्नुभयो भने यसले यो प्यानलमा सेटिङ र सामग्री हाल्न सक्छ। तपाईं केही एपहरूमा यहाँ कुन कुन सेटिङ देखाउने भन्ने कुरा छनौट गर्न सक्नुहुन्छ।"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"मनपराइएको"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"मन पराइएका कुराहरूको <xliff:g id="NUMBER">%d</xliff:g> औँ स्थानमा"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"मन पर्ने कुराहरूको सूचीमा नराखिएको"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"त्रुटि भयो, फेरि प्रयास गर्नु…"</string> <string name="controls_menu_add" msgid="4447246119229920050">"कन्ट्रोल थप्नुहोस्"</string> <string name="controls_menu_edit" msgid="890623986951347062">"कन्ट्रोल सम्पादन गर्नुहोस्"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"एप हाल्नुहोस्"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"आउटपुट यन्त्रहरू थप्नुहोस्"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"समूह"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"१ यन्त्र चयन गरियो"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ब्याट्री बाँकी छ"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"आफ्नो स्टाइलस चार्जरमा कनेक्ट गर्नुहोस्"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"स्टाइलसको ब्याट्री लो छ"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"भिडियो क्यामेरा"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"यो प्रोफाइलबाट कल गर्न सकिँदैन"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"तपाईंको कामसम्बन्धी नीतिअनुसार कार्य प्रोफाइलबाट मात्र फोन कल गर्न सकिन्छ"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"कार्य प्रोफाइल प्रयोग गर्नुहोस्"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"बन्द गर्नुहोस्"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 1b3cefd9ac77..56d530300ed2 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Kies de app waaraan je bedieningselementen wilt toevoegen"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# bedieningselement toegevoegd.}other{# bedieningselementen toegevoegd.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Verwijderd"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> toevoegen?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Als je <xliff:g id="APPNAME">%s</xliff:g> toevoegt, kan deze app bedieningselementen en content aan dit deelvenster toevoegen. In sommige apps kun je kiezen welke bedieningselementen hier worden getoond."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Gemarkeerd als favoriet"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Gemarkeerd als favoriet, positie <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Verwijderd als favoriet"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Fout, probeer het opnieuw"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Bedieningselementen toevoegen"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Bedieningselementen bewerken"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"App toevoegen"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Uitvoer toevoegen"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Groep"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Eén apparaat geselecteerd"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Op basis van je werkbeleid kun je alleen bellen vanuit het werkprofiel"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Overschakelen naar werkprofiel"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Sluiten"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 37b1990aa4eb..5396edef8054 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ସ୍ୱଚାଳିତ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"କୌଣସି ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ ନାହିଁ"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"କୌଣସି ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ ନାହିଁ ଏବଂ ବାର୍ତ୍ତାଳାପ ବିଭାଗର ନିମ୍ନରେ ଦେଖାଯାଏ"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ଡିଭାଇସ ସେଟିଂସ ଆଧାରରେ ରିଂ କିମ୍ବା ଭାଇବ୍ରେଟ ହୋଇପାରେ"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ଡିଭାଇସ ସେଟିଂସ ଆଧାରରେ ରିଂ କିମ୍ବା ଭାଇବ୍ରେଟ ହୋଇପାରେ। ଡିଫଲ୍ଟ ଭାବରେ <xliff:g id="APP_NAME">%1$s</xliff:g>ରୁ ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ବବଲ ଭାବେ ଦେଖାଯାଏ।"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ଏହି ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ ହେବା ସମୟରେ ସାଉଣ୍ଡ ହେବା ଉଚିତ ନା ଭାଇବ୍ରେସନ୍ ତାହା ସିଷ୍ଟମକୁ ସ୍ଥିର କରିବାକୁ ଦିଅନ୍ତୁ"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ସ୍ଥିତି:</b> ଡିଫଲ୍ଟକୁ ପ୍ରମୋଟ୍ କରାଯାଇଛି"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ସ୍ଥିତି:</b> ନୀରବକୁ ଡିମୋଟ୍ କରାଯାଇଛି"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଯୋଗ କରିବାକୁ ଆପ୍ ବାଛନ୍ତୁ"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{#ଟି ନିୟନ୍ତ୍ରଣ ଯୋଗ କରାଯାଇଛି।}other{#ଟି ନିୟନ୍ତ୍ରଣ ଯୋଗ କରାଯାଇଛି।}}"</string> <string name="controls_removed" msgid="3731789252222856959">"କାଢ଼ି ଦିଆଯାଇଛି"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ପସନ୍ଦ କରାଯାଇଛି"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ପସନ୍ଦ କରାଯାଇଛି, ସ୍ଥିତି <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ନାପସନ୍ଦ କରାଯାଇଛି"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"ତ୍ରୁଟି ହୋଇଛି, ପୁଣି ଚେଷ୍ଟା କର"</string> <string name="controls_menu_add" msgid="4447246119229920050">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ଯୋଗ କରନ୍ତୁ"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଏଡିଟ କରନ୍ତୁ"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ଆଉଟପୁଟ୍ ଯୋଗ କରନ୍ତୁ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ଗୋଷ୍ଠୀ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1ଟି ଡିଭାଇସ୍ ଚୟନ କରାଯାଇଛି"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବେଟେରୀ ଚାର୍ଜ ବାକି ଅଛି"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ଏକ ଚାର୍ଜର ସହ ଆପଣଙ୍କ ଷ୍ଟାଇଲସକୁ କନେକ୍ଟ କରନ୍ତୁ"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ଷ୍ଟାଇଲସ ବେଟେରୀର ଚାର୍ଜ କମ ଅଛି"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ଭିଡିଓ କେମେରା"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"ଏହି ପ୍ରୋଫାଇଲରୁ କଲ କରାଯାଇପାରିବ ନାହିଁ"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"ଆପଣଙ୍କ ୱାର୍କ ନୀତି ଆପଣଙ୍କୁ କେବଳ ୱାର୍କ ପ୍ରୋଫାଇଲରୁ ଫୋନ କଲ କରିବାକୁ ଅନୁମତି ଦିଏ"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ସ୍ୱିଚ କରନ୍ତୁ"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"ବନ୍ଦ କରନ୍ତୁ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 58df165529cb..10c89f2f35aa 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"ਸਵੈਚਲਿਤ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਹੀਂ"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਹੀਂ ਅਤੇ ਸੂਚਨਾਵਾਂ ਗੱਲਬਾਤ ਸੈਕਸ਼ਨ ਵਿੱਚ ਹੇਠਲੇ ਪਾਸੇ ਦਿਸਦੀਆਂ ਹਨ"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਘੰਟੀ ਵੱਜ ਸਕਦੀ ਹੈ ਜਾਂ ਥਰਥਰਾਹਟ ਹੋ ਸਕਦੀ ਹੈ"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਘੰਟੀ ਵੱਜ ਸਕਦੀ ਹੈ ਜਾਂ ਥਰਥਰਾਹਟ ਹੋ ਸਕਦੀ ਹੈ। ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ <xliff:g id="APP_NAME">%1$s</xliff:g> ਬਬਲ ਤੋਂ ਗੱਲਾਂਬਾਤਾਂ।"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ਸਿਸਟਮ ਨੂੰ ਨਿਰਧਾਰਤ ਕਰਨ ਦਿਓ ਕਿ ਇਸ ਸੂਚਨਾ ਲਈ ਕੋਈ ਧੁਨੀ ਵਜਾਉਣੀ ਚਾਹੀਦੀ ਹੈ ਜਾਂ ਥਰਥਰਾਹਟ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਵਧਾ ਕੇ ਪੂਰਵ-ਨਿਰਧਾਰਤ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>ਸਥਿਤੀ:</b> ਦਰਜਾ ਘਟਾ ਕੇ ਸ਼ਾਂਤ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਐਪ ਚੁਣੋ"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।}one{# ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।}other{# ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ।}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ਹਟਾਇਆ ਗਿਆ"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ਮਨਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ਮਨਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ, ਸਥਾਨ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ਮਨਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਇਆ ਗਿਆ"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"ਗੜਬੜ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="controls_menu_add" msgid="4447246119229920050">"ਕੰਟਰੋਲ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="controls_menu_edit" msgid="890623986951347062">"ਕੰਟਰੋਲਾਂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ਆਊਟਪੁੱਟ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"ਗਰੁੱਪ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 ਡੀਵਾਈਸ ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬੈਟਰੀ ਬਾਕੀ"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ਆਪਣੇ ਸਟਾਈਲਸ ਨੂੰ ਚਾਰਜਰ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ਸਟਾਈਲਸ ਦੀ ਬੈਟਰੀ ਘੱਟ ਹੈ"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"ਵੀਡੀਓ ਕੈਮਰਾ"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"ਤੁਹਾਡੀ ਕਾਰਜ ਨੀਤੀ ਤੁਹਾਨੂੰ ਸਿਰਫ਼ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹੀ ਫ਼ੋਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ \'ਤੇ ਜਾਓ"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"ਬੰਦ ਕਰੋ"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index a7c24f8a026f..4abddab65602 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatycznie"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Bez dźwięku i wibracji"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Brak dźwięku i wibracji, wyświetla się niżej w sekcji rozmów"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Może włączać dzwonek lub wibracje w zależności od ustawień urządzenia"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Może włączyć dzwonek lub wibracje w zależności od ustawień urządzenia. Rozmowy z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> są domyślnie wyświetlane jako dymki."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Pozwól systemowi decydować, czy o powiadomieniu powinien informować dźwięk czy wibracja"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Stan:</b> zmieniony na Domyślny"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stan:</b> zmieniono na Ciche"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Wybierz aplikację, do której chcesz dodać elementy sterujące"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Dodano # element sterujący.}few{Dodano # elementy sterujące.}many{Dodano # elementów sterujących.}other{Dodano # elementu sterującego.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Usunięto"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Dodano do ulubionych"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Dodano do ulubionych, pozycja <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Usunięto z ulubionych"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Błąd, spróbuj ponownie"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Dodaj elementy sterujące"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Edytuj elementy sterujące"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Dodaj urządzenia wyjściowe"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupa"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Wybrano 1 urządzenie"</string> @@ -1017,20 +1021,17 @@ <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Rozłóż telefon, aby uzyskać lepszej jakości selfie"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Przełączyć na przedni wyświetlacz?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Użyj tylnego aparatu, aby zrobić szersze zdjęcie o większej rozdzielczości."</string> - <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"* Ekran się wyłączy"</b></string> + <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"* Ten ekran się wyłączy"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Składane urządzenie jest rozkładane"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Składane urządzenie jest obracane"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g> baterii"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Podłącz rysik do ładowarki"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Słaba bateria w rysiku"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Kamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nie można nawiązać połączenia z tego profilu"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Zasady obowiązujące w firmie zezwalają na nawiązywanie połączeń telefonicznych tylko w profilu służbowym"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Przełącz na profil służbowy"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zamknij"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index e56a7c7613af..f1adbfd12441 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Som e vibração desativados"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"O som e a vibração estão desativados, e o balão aparece na parte inferior da seção de conversa"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Pode vibrar ou tocar com base nas configurações do dispositivo"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Pode vibrar ou tocar com base nas configurações do dispositivo. As conversas do app <xliff:g id="APP_NAME">%1$s</xliff:g> aparecem em balões por padrão."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Faça com que o sistema determine se a notificação resultará em som ou vibração"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> promovida a Padrão"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> rebaixada a Silenciosa"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Escolha um app para adicionar controles"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controle adicionado.}one{# controle adicionado.}many{# de controles adicionados.}other{# controles adicionados.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removido"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Adicionar o app <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Quando você adiciona o app <xliff:g id="APPNAME">%s</xliff:g>, ele pode incluir controles e conteúdo neste painel. Em alguns casos, é possível escolher quais controles aparecem aqui."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Adicionado como favorito"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Adicionado como favorito (posição <xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Removido dos favoritos"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erro. Tente novamente"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Adicionar controles"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controles"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Adicionar app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Adicionar saídas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositivo selecionado"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateria restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecte sua stylus a um carregador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Bateria da stylus fraca"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Filmadora"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Não é possível fazer uma ligação por este perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Sua política de trabalho só permite fazer ligações pelo perfil de trabalho"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Alternar para o perfil de trabalho"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Fechar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 7f1ce909c6d7..4aa89ea4533c 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Escolha uma app para adicionar controlos"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controlo adicionado.}many{# controlos adicionados.}other{# controlos adicionados.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removido"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Adicionado aos favoritos"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Adicionados aos favoritos, posição <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Removido dos favoritos"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erro. Tente novamente."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Adicionar controlos"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controlos"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Adicione saídas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositivo selecionado"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"A sua Política de Trabalho só lhe permite fazer chamadas telefónicas a partir do perfil de trabalho"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Mudar para perfil de trabalho"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Fechar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index e56a7c7613af..f1adbfd12441 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Som e vibração desativados"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"O som e a vibração estão desativados, e o balão aparece na parte inferior da seção de conversa"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Pode vibrar ou tocar com base nas configurações do dispositivo"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Pode vibrar ou tocar com base nas configurações do dispositivo. As conversas do app <xliff:g id="APP_NAME">%1$s</xliff:g> aparecem em balões por padrão."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Faça com que o sistema determine se a notificação resultará em som ou vibração"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> promovida a Padrão"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> rebaixada a Silenciosa"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Escolha um app para adicionar controles"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controle adicionado.}one{# controle adicionado.}many{# de controles adicionados.}other{# controles adicionados.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removido"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Adicionar o app <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Quando você adiciona o app <xliff:g id="APPNAME">%s</xliff:g>, ele pode incluir controles e conteúdo neste painel. Em alguns casos, é possível escolher quais controles aparecem aqui."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Adicionado como favorito"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Adicionado como favorito (posição <xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Removido dos favoritos"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Erro. Tente novamente"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Adicionar controles"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editar controles"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Adicionar app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Adicionar saídas"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 dispositivo selecionado"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateria restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecte sua stylus a um carregador"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Bateria da stylus fraca"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Filmadora"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Não é possível fazer uma ligação por este perfil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Sua política de trabalho só permite fazer ligações pelo perfil de trabalho"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Alternar para o perfil de trabalho"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Fechar"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index a4c66ec88c0d..894e22e12c22 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automat"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Fără sunet sau vibrații"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Fără sunet sau vibrații și apare în partea de jos a secțiunii de conversație"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Poate să sune sau să vibreze, în funcție de setările dispozitivului"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Poate să sune sau să vibreze, în funcție de setările dispozitivului. Conversațiile din balonul <xliff:g id="APP_NAME">%1$s</xliff:g> în mod prestabilit."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Solicită-i sistemului să stabilească dacă această notificare e sonoră sau cu vibrații."</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Stare:</b> promovată la prestabilită"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stare:</b> setată ca Silențioasă"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Alege aplicația pentru a adăuga comenzi"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{S-a adăugat # comandă.}few{S-au adăugat # comenzi.}other{S-au adăugat # de comenzi.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Eliminată"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Adaugi <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Când adaugi <xliff:g id="APPNAME">%s</xliff:g>, aplicația poate să adauge comenzi și conținut pe acest panou. În anumite aplicații, poți să alegi comenzile care se afișează aici."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Marcată ca preferată"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Marcată ca preferată, poziția <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"S-a anulat marcarea ca preferată"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Eroare, încearcă din nou"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Adaugă comenzi"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Editează comenzile"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Adaugă o aplicație"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Adaugă ieșiri"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grup"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"S-a selectat un dispozitiv"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> baterie rămasă"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conectează-ți creionul la un încărcător"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Nivelul bateriei creionului este scăzut"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Cameră video"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nu poți iniția apeluri din acest profil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Politica privind activitatea îți permite să efectuezi apeluri telefonice numai din profilul de serviciu"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Comută la profilul de serviciu"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Închide"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index d4dddbeefe3a..e55572c09471 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Чтобы добавить виджеты управления, выберите приложение"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Добавлен # элемент управления.}one{Добавлен # элемент управления.}few{Добавлено # элемента управления.}many{Добавлено # элементов управления.}other{Добавлено # элемента управления.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Удалено"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Добавить приложение \"<xliff:g id="APPNAME">%s</xliff:g>\"?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Приложение \"<xliff:g id="APPNAME">%s</xliff:g>\" может добавить на эту панель элементы управления и контент. Некоторые приложения позволяют выбирать, какие элементы будут здесь показаны."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Добавлено в избранное"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Добавлено в избранное на позицию <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Не добавлено в избранное"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Ошибка. Повторите попытку."</string> <string name="controls_menu_add" msgid="4447246119229920050">"Добавить виджеты"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Изменить виджеты"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Добавить приложение"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Добавление устройств вывода"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Группа"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Выбрано 1 устройство"</string> @@ -1013,7 +1016,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Отмена"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Перевернуть сейчас"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Разложите телефон, чтобы селфи получилось лучше"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Перевернули телефон передним экраном к себе?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Перейти на передний экран?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Используйте основную камеру с широкоугольным объективом и высоким разрешением."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Этот экран отключится"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Складное устройство в разложенном виде"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Согласно правилам вашей организации вы можете совершать телефонные звонки только из рабочего профиля."</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Перейти в рабочий профиль"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Закрыть"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 838f4ee132c6..8ea1695d4c8c 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"පාලන එක් කිරීමට යෙදුම තෝරා ගන්න"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# පාලනයක් එක් කර ඇත.}one{පාලන #ක් එක් කර ඇත.}other{පාලන #ක් එක් කර ඇත.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ඉවත් කළා"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ප්රියතම කළා"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ප්රියතම කළා, තත්ත්ව <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ප්රියතම වෙතින් ඉවත් කළා"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"දෝෂයකි, නැවත උත්සාහ කරන්න"</string> <string name="controls_menu_add" msgid="4447246119229920050">"පාලන එක් කරන්න"</string> <string name="controls_menu_edit" msgid="890623986951347062">"පාලන සංස්කරණය කරන්න"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"ප්රතිදාන එක් කරන්න"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"සමූහය"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"උපාංග 1ක් තෝරන ලදී"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"ඔබේ වැඩ ප්රතිපත්තිය ඔබට කාර්යාල පැතිකඩෙන් පමණක් දුරකථන ඇමතුම් ලබා ගැනීමට ඉඩ සලසයි"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"කාර්යාල පැතිකඩ වෙත මාරු වන්න"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"වසන්න"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 92448f85a157..e321fcbff274 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Vyberte aplikáciu, ktorej ovládače si chcete pridať"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Bol pridaný # ovládací prvok.}few{Boli pridané # ovládacie prvky.}many{# controls added.}other{Bolo pridaných # ovládacích prvkov.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Odstránené"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Chcete pridať aplikáciu <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Keď pridáte aplikáciu <xliff:g id="APPNAME">%s</xliff:g>, bude môcť pridať ovládanie a obsah na tento panel. V prípade niektorých aplikácií môžete vybrať, ktoré ovládacie prvky sa tu majú zobraziť."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Pridané medzi obľúbené"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Pridané medzi obľúbené, pozícia <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Odstránené z obľúbených"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Chyba, skúste to znova"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Pridať ovládače"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Upraviť ovládače"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Pridať aplikáciu"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Pridanie výstupov"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Skupina"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 vybrané zariadenie"</string> @@ -1011,9 +1014,9 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• K dispozícii je minimálne jedno zariadenie"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Pridržte skratku"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Zrušiť"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Prevráťte"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Otočiť"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Ak chcete lepšie selfie, rozložte telefón"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Prevrátiť na pred. obrazovku pre lepšie selfie?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Otočiť na prednú obrazovku pre lepšie selfie?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Pomocou zadného fotoaparátu vytvorte širšiu fotku s vyšším rozlíšením."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Táto obrazovka sa vypne"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Rozloženie skladacieho zariadenia"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"Pracovné pravidlá vám umožňujú telefonovať iba v pracovnom profile"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"Prepnúť na pracovný profil"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zavrieť"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 4658ba68f36c..a5989bdba1d9 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Samodejno"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Brez zvočnega opozarjanja ali vibriranja."</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Brez zvočnega opozarjanja ali vibriranja, prikaz nižje v razdelku Pogovor."</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Zvonjenje ali vibriranje je omogočeno na podlagi nastavitev naprave."</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Zvonjenje ali vibriranje je omogočeno na podlagi nastavitev naprave. Pogovori v aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> so privzeto prikazani v oblačkih."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Naj sistem določi, ali ob prejemu tega obvestila naprava predvaja zvok ali zavibrira"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Stanje:</b> Uvrščeno med privzeta obvestila"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Stanje:</b> Uvrščeno med obvestila brez zvoka"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Izberite aplikacijo za dodajanje kontrolnikov"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontrolnik je dodan.}one{# kontrolnik je dodan.}two{# kontrolnika sta dodana.}few{# kontrolniki so dodani.}other{# kontrolnikov je dodanih.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Odstranjeno"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Dodano med priljubljene"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Dodano med priljubljene, položaj <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Odstranjeno iz priljubljenih"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Napaka, poskusite znova"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Dodajte kontrolnike"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Uredite kontrolnike"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Dodajanje izhodov"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Skupina"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Izbrana je ena naprava"</string> @@ -1013,7 +1017,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Na voljo mora biti vsaj ena naprava."</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Pridržite bližnjico"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Prekliči"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Obrnite"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Obrni"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Razprite telefon za boljši selfi"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Obrnite telefon na sprednji zaslon za boljši selfi"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Uporabite hrbtni fotoaparat, da posnamete širšo sliko višje ločljivosti."</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostanek energije baterije: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Povežite pisalo s polnilnikom."</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Skoraj prazna baterija pisala"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Ni mogoče klicati iz tega profila"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Službeni pravilnik dovoljuje opravljanje telefonskih klicev le iz delovnega profila."</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Preklopi na delovni profil"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Zapri"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 98bff8bcfaa3..a6db9966624a 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatike"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Asnjë tingull ose dridhje"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Asnjë tingull ose dridhje dhe shfaqet më poshtë në seksionin e bisedave"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Mund të bjerë zilja ose të dridhet në bazë të cilësimeve të pajisjes"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Mund të bjerë zilja ose të dridhet në bazë të cilësimeve të pajisjes. Bisedat nga flluska e <xliff:g id="APP_NAME">%1$s</xliff:g> si parazgjedhje."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Kërkoji sistemit të përcaktojë nëse ky njoftim duhet të lëshojë tingull apo dridhje"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Statusi:</b> Promovuar si parazgjedhje"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Statusi:</b> Ulur në nivel si në heshtje"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Zgjidh aplikacionin për të shtuar kontrollet"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{U shtua # kontroll.}other{U shtuan # kontrolle.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"E hequr"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Të shtohet <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Kur shton <xliff:g id="APPNAME">%s</xliff:g>, ai mund t\'i shtojë kontrolle dhe përmbajtje këtij paneli. Në disa aplikacione, mund të zgjedhësh se cilat kontrolle shfaqen këtu."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"E shtuar te të preferuarat"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"E shtuar te të preferuarat, pozicioni <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"E hequr nga të preferuarat"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Gabim, provo sërish"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Shto kontrollet"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Modifiko kontrollet"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Shto një aplikacion"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Shto daljet"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupi"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 pajisje e zgjedhur"</string> @@ -1013,7 +1014,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Ofrohet të paktën një pajisje"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Prek dhe mbaj shtypur shkurtoren"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Anulo"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"U kthye tani"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Ktheje tani"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Shpalos telefonin për një selfi më të mirë"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Të kthehet tek ekrani para për selfi më të mirë?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Përdor lenten e kamerës së pasme për një fotografi më të gjerë me rezolucion më të lartë."</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Përqindja e mbetur e baterisë: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Lidhe stilolapsin me një karikues"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Bateria e stilolapsit në nivel të ulët"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Nuk mund të telefonosh nga ky profil"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Politika jote e punës të lejon të bësh telefonata vetëm nga profili i punës"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Kalo te profili i punës"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Mbyll"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 597065595771..a3ed992a3680 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Аутоматска"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Без звука и вибрирања"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Без звука и вибрирања и приказује се у наставку одељка за конверзације"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Може да звони или вибрира у зависности од подешавања уређаја"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Може да звони или вибрира у зависности од подешавања уређаја. Конверзације из апликације <xliff:g id="APP_NAME">%1$s</xliff:g> подразумевано се приказују у облачићима."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Нека систем утврди да ли ово обавештење треба да емитује звук или да вибрира"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Статус:</b> Унапређено у Подразумевано"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус:</b> Деградирано у Нечујно"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Одаберите апликацију за додавање контрола"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# контрола је додата.}one{# контрола је додата.}few{# контроле су додате.}other{# контрола је додато.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Уклоњено"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Желите ли да додате <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Када додате апликацију <xliff:g id="APPNAME">%s</xliff:g>, она може да додаје контроле и садржај у ово окно. У неким апликацијама можете да изаберете које ће се контроле овде приказивати."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Означено је као омиљено"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Означено је као омиљено, <xliff:g id="NUMBER">%d</xliff:g>. позиција"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Уклоњено је из омиљених"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Грешка. Пробајте поново"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Додај контроле"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Измени контроле"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Додај апликацију"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Додајте излазе"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Група"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Изабран је 1 уређај"</string> @@ -1013,7 +1014,7 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• да је доступан барем један уређај"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Додирните и задржите пречицу"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Откажи"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Обрните"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Обрни"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Отворите телефон за бољи селфи"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Желите да обрнете на предњи екран за бољи селфи?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Користите задњу камеру да бисте снимили ширу слику са вишом резолуцијом."</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Преостало је још<xliff:g id="PERCENTAGE">%s</xliff:g> батерије"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Повежите писаљку са пуњачем"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Низак ниво батерије писаљке"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Видео камера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Не можете да упућујете позиве са овог профила"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Смернице за посао вам омогућавају да телефонирате само са пословног профила"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Пређи на пословни профил"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Затвори"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 097af7266775..41fe5020b534 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatiskt"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Inga ljud eller vibrationer"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Inga ljud eller vibrationer och visas längre ned bland konversationerna"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Kan ringa eller vibrera beroende på inställningarna på enheten"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Kan ringa eller vibrera beroende på inställningarna på enheten. Konversationer från <xliff:g id="APP_NAME">%1$s</xliff:g> visas i bubblor som standard."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Låt systemet avgöra om den här aviseringen ska låta eller vibrera"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Ändrad till Standard"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Ändrad till Tyst"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Välj en app om du vill lägga till snabbkontroller"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontroll har lagts till.}other{# kontroller har lagts till.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Har tagits bort"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Har lagts till som favorit"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Har lagts till som favorit, plats <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Har tagits bort från favoriter"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Fel, försök igen"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Lägg till snabbkontroller"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Redigera snabbkontroller"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Lägg till utgångar"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupp"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 enhet har valts"</string> @@ -1015,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Avbryt"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Vänd nu"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Vik upp telefonen för att ta en bättre selfie"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Vill du ta en bättre selfie med främre skärmen?"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Vill du ta en bättre selfie med främre kameran?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Använd den bakre kameran för att ta ett mer vidsträckt foto med högre upplösning."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Den här skärmen inaktiveras"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"En vikbar enhet viks upp"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> av batteriet återstår"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Anslut e-pennan till en laddare"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"E-pennans batterinivå är låg"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Det går inte att ringa från den här profilen"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Jobbprincipen tillåter endast att du ringer telefonsamtal från jobbprofilen"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Byt till jobbprofilen"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Stäng"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 94812c59c461..a126e7e7bca9 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Otomatiki"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Hakuna sauti wala mtetemo"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Hakuna sauti wala mtetemo na huonekana upande wa chini katika sehemu ya mazungumzo"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Huenda ikalia au kutetema kulingana na mipangilio ya kifaa"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Huenda ikalia au kutetema kulingana na mipangilio ya kifaa. Mazungumzo kutoka kiputo cha <xliff:g id="APP_NAME">%1$s</xliff:g> kwa chaguomsingi."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Ruhusu mfumo ubainishe iwapo arifa hii inapaswa kutoa sauti au mtetemo"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Hali:</b> Imepandishwa Hadhi Kuwa Chaguomsingi"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Imeshushwa Hadhi Kuwa Kimya"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Chagua programu ili uweke vidhibiti"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Umeweka kidhibiti #.}other{Umeweka vidhibiti #.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Kimeondolewa"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Kimewekwa kwenye vipendwa"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Kimewekwa kwenye vipendwa, nafasi ya <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Kimeondolewa kwenye vipendwa"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Hitilafu, jaribu tena"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Weka vidhibiti"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Badilisha vidhibiti"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Weka vifaa vya kutoa sauti"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Kikundi"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Umechagua kifaa 1"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Chaji ya betri imesalia <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Unganisha stylus yako kwenye chaja"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Chaji ya betri ya Stylus imepungua"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Kamera ya kuchukulia video"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Huwezi kupiga simu kutoka kwenye wasifu huu"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Sera ya mahali pako pa kazi inakuruhusu upige simu kutoka kwenye wasifu wa kazini pekee"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Tumia wasifu wa kazini"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Funga"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 1ca016ac1c90..a5528a1cabea 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"தானியங்கு"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"ஒலி / அதிர்வு இல்லை"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"ஒலி / அதிர்வு இல்லாமல் உரையாடல் பிரிவின் கீழ்ப் பகுதியில் தோன்றும்"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"சாதன அமைப்புகளைப் பொறுத்து ஒலிக்கக்கூடும் அல்லது அதிர்வடையக்கூடும்"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"சாதன அமைப்புகளைப் பொறுத்து ஒலிக்கக்கூடும் அல்லது அதிர்வடையக்கூடும். இயல்பாக, <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸில் பெறப்படும் உரையாடல் அறிவிப்புகள் குமிழ்களாகத் தோன்றும்."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"இந்த அறிவிப்பு ஒலி எழுப்ப வேண்டுமா அதிர வேண்டுமா என்பதை சிஸ்டம் தீர்மானிக்கும்"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>நிலை:</b> இயல்புநிலைக்கு உயர்த்தி அமைக்கப்பட்டது"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>நிலை:</b> சைலன்ட் நிலைக்குக் குறைத்து அமைக்கப்பட்டது"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"கட்டுப்பாடுகளைச் சேர்க்க வேண்டிய ஆப்ஸைத் தேர்ந்தெடுங்கள்"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# கட்டுப்பாடு சேர்க்கப்பட்டது.}other{# கட்டுப்பாடுகள் சேர்க்கப்பட்டன.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"அகற்றப்பட்டது"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"பிடித்தவற்றில் சேர்க்கப்பட்டது"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"பிடித்தவற்றில் சேர்க்கப்பட்டது, நிலை <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"பிடித்தவற்றிலிருந்து நீக்கப்பட்டது"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"பிழை, மீண்டும் முயலவும்"</string> <string name="controls_menu_add" msgid="4447246119229920050">"கட்டுப்பாடுகளைச் சேர்த்தல்"</string> <string name="controls_menu_edit" msgid="890623986951347062">"கட்டுப்பாடுகளை மாற்றுதல்"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"அவுட்புட்களைச் சேர்த்தல்"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"குழு"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 சாதனம் தேர்ந்தெடுக்கப்பட்டுள்ளது"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> பேட்டரி மீதமுள்ளது"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"உங்கள் ஸ்டைலஸைச் சார்ஜருடன் இணையுங்கள்"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"ஸ்டைலஸின் பேட்டரி குறைவாக உள்ளது"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"வீடியோ கேமரா"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"இந்தக் கணக்கிலிருந்து அழைக்க முடியாது"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"உங்கள் பணிக் கொள்கையின்படி நீங்கள் பணிக் கணக்கில் இருந்து மட்டுமே ஃபோன் அழைப்புகளைச் செய்ய முடியும்"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"பணிக் கணக்கிற்கு மாறு"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"மூடுக"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 766ebcafa3e2..1b82e39e7b6c 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -800,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"కంట్రోల్స్ను యాడ్ చేయడానికి యాప్ను ఎంచుకోండి"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# కంట్రోల్ జోడించబడింది.}other{# కంట్రోల్స్ జోడించబడ్డాయి.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"తీసివేయబడింది"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ఇష్టమైనదిగా గుర్తు పెట్టబడింది"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"<xliff:g id="NUMBER">%d</xliff:g>వ స్థానంలో ఇష్టమైనదిగా గుర్తు పెట్టబడింది"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ఇష్టమైనదిగా పెట్టిన గుర్తు తీసివేయబడింది"</string> @@ -866,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"ఎర్రర్, మళ్లీ ప్రయత్నించండి"</string> <string name="controls_menu_add" msgid="4447246119229920050">"కంట్రోల్స్ను జోడించండి"</string> <string name="controls_menu_edit" msgid="890623986951347062">"కంట్రోల్స్ను ఎడిట్ చేయండి"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"అవుట్పుట్లను జోడించండి"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"గ్రూప్"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 పరికరం ఎంచుకోబడింది"</string> @@ -1014,7 +1020,7 @@ <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"ఇప్పుడే తిప్పండి"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"మెరుగైన సెల్ఫీ కోసం ఫోన్ను అన్ఫోల్డ్ చేయండి"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"మంచి సెల్ఫీ కోసం ముందు వైపు డిస్ప్లేకు తిప్పాలా?"</string> - <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"అధిక రిజల్యూషన్తో పెద్ద ఫోటో కోసం వెనుక వైపున ఉన్న కెమెరాను ఉపయోగించండి."</string> + <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"వెనుక వైపున ఉన్న కెమెరాను ఉపయోగించి అధిక రిజల్యూషన్ గల, మరింత వెడల్పైన ఫోటోను పొందండి."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ ఈ స్క్రీన్ ఆఫ్ అవుతుంది"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"మడవగల పరికరం విప్పబడుతోంది"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"మడవగల పరికరం చుట్టూ తిప్పబడుతోంది"</string> @@ -1026,4 +1032,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"మీ వర్క్ పాలసీ, మిమ్మల్ని వర్క్ ప్రొఫైల్ నుండి మాత్రమే ఫోన్ కాల్స్ చేయడానికి అనుమతిస్తుంది"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"వర్క్ ప్రొఫైల్కు మారండి"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"మూసివేయండి"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 5a58355161e6..28bb38825374 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"เลือกแอปเพื่อเพิ่มตัวควบคุม"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{เพิ่มตัวควบคุม # ตัวแล้ว}other{เพิ่มตัวควบคุม # ตัวแล้ว}}"</string> <string name="controls_removed" msgid="3731789252222856959">"นำออกแล้ว"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"เพิ่ม <xliff:g id="APPNAME">%s</xliff:g> ไหม"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"เมื่อเพิ่ม <xliff:g id="APPNAME">%s</xliff:g> คุณจะเพิ่มการควบคุมและเนื้อหาไปยังแผงนี้ได้ ในบางแอป คุณเลือกได้ว่าต้องการให้การควบคุมใดปรากฏขึ้นที่นี่"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"ตั้งเป็นรายการโปรดแล้ว"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"ตั้งเป็นรายการโปรดแล้ว โดยอยู่ลำดับที่ <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"นำออกจากรายการโปรดแล้ว"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"พบข้อผิดพลาด โปรดลองอีกครั้ง"</string> <string name="controls_menu_add" msgid="4447246119229920050">"เพิ่มตัวควบคุม"</string> <string name="controls_menu_edit" msgid="890623986951347062">"แก้ไขตัวควบคุม"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"เพิ่มแอป"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"เพิ่มเอาต์พุต"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"กลุ่ม"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"เลือกอุปกรณ์ไว้ 1 รายการ"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"นโยบายการทำงานอนุญาตให้คุณโทรออกได้จากโปรไฟล์งานเท่านั้น"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"สลับไปใช้โปรไฟล์งาน"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"ปิด"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index b07ad7b1837c..7387289f4ccf 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Awtomatiko"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Walang tunog o pag-vibrate"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Walang tunog o pag-vibrate at lumalabas nang mas mababa sa seksyon ng pag-uusap"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Puwedeng mag-ring o mag-vibrate batay sa mga setting ng device"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Puwedeng mag-ring o mag-vibrate batay sa mga setting ng device. Mga pag-uusap mula sa <xliff:g id="APP_NAME">%1$s</xliff:g> bubble bilang default."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Ipatukoy sa system kung dapat gumawa ng tunog o pag-vibrate ang notification na ito"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Na-promote sa Default"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Na-demote sa Naka-silent"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Pumili ng app para magdagdag ng mga kontrol"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Nagdagdag ng # kontrol.}one{Nagdagdag ng # kontrol.}other{Nagdagdag ng # na kontrol.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Inalis"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Idagdag ang <xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Kapag idinagdag mo ang <xliff:g id="APPNAME">%s</xliff:g>, puwede itong magdagdag ng mga kontrol at content sa panel na ito. Sa ilang app, puwede mong piliin kung aling mga kontrol ang lalabas dito."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Ginawang paborito"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Ginawang paborito, posisyon <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Inalis sa paborito"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Nagka-error, subukan ulit"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Magdagdag ng mga kontrol"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Mag-edit ng mga kontrol"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Magdagdag ng app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Magdagdag ng mga output"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grupo"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 device ang napili"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> baterya na lang ang natitira"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ikonekta sa charger ang iyong stylus"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Paubos na ang baterya ng stylus"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Video camera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Hindi puwedeng tumawag mula sa profile na ito"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Pinapayagan ka ng iyong patakaran sa trabaho na tumawag lang mula sa profile sa trabaho"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Lumipat sa profile sa trabaho"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Isara"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 07cec1aa5230..7c5552d3ab30 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Otomatik"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Sessiz veya titreşim yok"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ses veya titreşim yok, görüşme bölümünün altında görünür"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Cihaz ayarlarına bağlı olarak zili çalabilir veya titreyebilir"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Cihaz ayarlarına bağlı olarak zili çalabilir veya titreyebilir <xliff:g id="APP_NAME">%1$s</xliff:g> adlı uygulamadan görüşmeler varsayılan olarak baloncukla gösterilir."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Bu bildirimin ses çıkarması veya titreşmesi gerekip gerekmediğine sistem karar versin"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Durum:</b> Varsayılana yükseltildi"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Durum:</b> Sessize Düşürüldü"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Denetim eklemek için uygulama seçin"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kontrol eklendi.}other{# kontrol eklendi.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Kaldırıldı"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favoriler listesine eklendi"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favorilere eklendi, konum: <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Favorilerden kaldırıldı"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Hata, yeniden deneyin"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Denetim ekle"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Denetimleri düzenle"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Çıkışlar ekleyin"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Grup"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 cihaz seçildi"</string> @@ -1017,20 +1021,17 @@ <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Daha iyi selfie çekmek için telefonu açın"</string> <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Daha iyi bir selfie için ön ekrana geçilsin mi?"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Daha yüksek çözünürlüğe sahip daha büyük bir fotoğraf için arka yüz kamerasını kullanın."</string> - <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ * Bu ekran kapatılacak"</b></string> + <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Bu ekran kapatılacak"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Katlanabilir cihaz açılıyor"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Katlanabilir cihaz döndürülüyor"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> pil kaldı"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ekran kaleminizi bir şarj cihazına bağlayın"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Ekran kaleminin pil seviyesi düşük"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Video kamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Bu profilden telefon araması yapılamıyor"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"İşletme politikanız yalnızca iş profilinden telefon araması yapmanıza izin veriyor"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"İş profiline geç"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Kapat"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 804d2c1a28be..0a93ec6af07e 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматично"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Без звуку чи вібрації"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Без звуку чи вібрації, з\'являється нижче в розділі розмов"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Дзвінок або вібрація залежно від налаштувань пристрою"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Може дзвонити або вібрувати залежно від налаштувань пристрою. Показує спливаючі розмови з додатка <xliff:g id="APP_NAME">%1$s</xliff:g> за умовчанням."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Дозволити системі визначати, чи має сповіщення супроводжуватися звуком або вібрацією"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Статус</b>: підвищено до \"За умовчанням\""</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Статус</b>: знижено до \"Без звуку\""</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Виберіть, для якого додатка налаштувати елементи керування"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Додано # елемент керування.}one{Додано # елемент керування.}few{Додано # елементи керування.}many{Додано # елементів керування.}other{Додано # елемента керування.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Вилучено"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Додано у вибране"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Додано у вибране, позиція <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Видалено з вибраного"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Помилка. Спробуйте знову"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Додати елементи керування"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Змінити елементи керування"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Додати пристрої виводу"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Група"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Вибрано 1 пристрій"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Заряд акумулятора: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Підключіть стилус до зарядного пристрою"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Низький заряд акумулятора стилуса"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Відеокамера"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Неможливо телефонувати з цього профілю"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Відповідно до правил організації ви можете телефонувати лише з робочого профілю"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Перейти в робочий профіль"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Закрити"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index dde5323ab23d..ad845f0ed720 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"کنٹرولز شامل کرنے کے لیے ایپ منتخب کریں"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# کنٹرول کو شامل کیا گیا۔}other{# کنٹرولز کو شامل کیا گیا۔}}"</string> <string name="controls_removed" msgid="3731789252222856959">"ہٹا دیا گیا"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> کو شامل کریں؟"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"جب آپ <xliff:g id="APPNAME">%s</xliff:g> کو شامل کرتے ہیں، تو یہ اس پینل میں کنٹرولز اور مواد کو شامل کر سکتا ہے۔ کچھ ایپس میں، آپ یہ منتخب کر سکتے ہیں کہ کون سے کنٹرولز یہاں ظاہر ہوں۔"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"پسند کردہ"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"پسند کردہ، پوزیشن <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"ناپسند کردہ"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"خرابی، دوبارہ کوشش کریں"</string> <string name="controls_menu_add" msgid="4447246119229920050">"کنٹرولز شامل کریں"</string> <string name="controls_menu_edit" msgid="890623986951347062">"کنٹرولز میں ترمیم کریں"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"ایپ شامل کریں"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"آؤٹ پٹس شامل کریں"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"گروپ"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 آلہ منتخب کیا گیا"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"آپ کے کام سے متعلق پالیسی آپ کو صرف دفتری پروفائل سے فون کالز کرنے کی اجازت دیتی ہے"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"دفتری پروفائل پر سوئچ کریں"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"بند کریں"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 5b60765c1d40..4927ec239bfb 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Avtomatik"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Tovush yoki tebranishsiz"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Tovush yoki tebranishsiz hamda suhbatlar ruknining pastida chiqadi"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Qurilma sozlamalari asosida jiringlashi yoki tebranishi mumkin"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Qurilma sozlamalari asosida jiringlashi yoki tebranishi mumkin. <xliff:g id="APP_NAME">%1$s</xliff:g> suhbatlari standart holatda bulutcha shaklida chiqadi."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Bu bildirishnoma jiringlashi yoki tebranishini hal qilsin"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Holati:</b> Birlamchi darajaga chiqarildi"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Holati:</b> Sokin darajaga tushirildi"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Boshqaruv elementlarini kiritish uchun ilovani tanlang"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# ta boshqaruv elementi kiritildi.}other{# ta boshqaruv elementi kiritildi.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Olib tashlandi"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Saralanganlarga kiritilgan"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Saralanganlarga kiritilgan, <xliff:g id="NUMBER">%d</xliff:g>-joy"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Saralanganlardan olib tashlangan"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Xato, qayta urining"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Element kiritish"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Elementlarni tahrirlash"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Chiquvchi qurilmani kiritish"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Guruh"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 ta qurilma tanlandi"</string> @@ -1013,24 +1017,21 @@ <string name="keyguard_affordance_enablement_dialog_home_instruction_2" msgid="8308525385889021652">"• Kamida bitta qurilma mavjud"</string> <string name="keyguard_affordance_press_too_short" msgid="8145437175134998864">"Bosib turish yorligʻi"</string> <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"Bekor qilish"</string> - <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Hozir aylantirish"</string> + <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"Almashtirish"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"Yaxshiroq selfi olish uchun telefonni yoying"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Old ekran sizga qaragan holda aylantirdingizmi?"</string> - <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Keng va yuqori tiniqlikdagi suratga olish uchun orqa kameradan foydalaning."</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"Yaxshiroq selfi uchun old ekranga almashilsinmi?"</string> + <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"Keng burchakli va yuqori aniqlikda suratga olish uchun orqa kameradan foydalaning."</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ Bu ekran oʻchiriladi"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"Buklanadigan qurilma ochilmoqda"</string> <string name="rear_display_accessibility_unfolded_animation" msgid="1946153682258289040">"Buklanadigan qurilma aylantirilmoqda"</string> <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batareya quvvati: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Stilusni quvvat manbaiga ulang"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Stilus batareyasi kam"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Videokamera"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Bu profildan chaqiruv qilish imkonsiz"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Ishga oid siyosatingiz faqat ish profilidan telefon chaqiruvlarini amalga oshirish imkonini beradi"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Ish profiliga almashish"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Yopish"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index d7ce218d85a3..016c83419de7 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Tự động"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Không phát âm thanh hoặc rung"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Không phát âm thanh hoặc rung và xuất hiện phía dưới trong phần cuộc trò chuyện"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Có thể đổ chuông hoặc rung tuỳ theo chế độ cài đặt trên thiết bị"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Có thể đổ chuông hoặc rung tuỳ theo chế độ cài đặt trên thiết bị. Theo mặc định, các cuộc trò chuyện từ <xliff:g id="APP_NAME">%1$s</xliff:g> sẽ hiển thị dưới dạng bong bóng."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Cho phép hệ thống quyết định xem thông báo này phát âm thanh hay rung"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Trạng thái:</b> Đã thay đổi thành Mặc định"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Trạng thái:</b> Đã thay đổi thành Im lặng"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Chọn ứng dụng để thêm các tùy chọn điều khiển"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{Đã thêm # chế độ điều khiển.}other{Đã thêm # chế độ điều khiển.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Đã xóa"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Được yêu thích"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Được yêu thích, vị trí số <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Không được yêu thích"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"Lỗi, hãy thử lại"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Thêm các tùy chọn điều khiển"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Chỉnh sửa tùy chọn điều khiển"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Thêm thiết bị đầu ra"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Nhóm"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"Đã chọn 1 thiết bị"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Còn <xliff:g id="PERCENTAGE">%s</xliff:g> pin"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Hãy kết nối bút cảm ứng với bộ sạc"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Bút cảm ứng bị yếu pin"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Máy quay video"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Không thể gọi điện từ hồ sơ này"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Chính sách của nơi làm việc chỉ cho phép bạn gọi điện thoại từ hồ sơ công việc"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Chuyển sang hồ sơ công việc"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Đóng"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index a94c411be2ab..15c834cfb137 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"自动"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"不发出提示音，也不振动"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"不发出提示音，也不振动；显示在对话部分的靠下位置"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"可能会响铃或振动，取决于设备设置"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"可能会响铃或振动，取决于设备设置。默认情况下，来自<xliff:g id="APP_NAME">%1$s</xliff:g>的对话会以对话泡的形式显示。"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"让系统决定是否应让设备在收到此通知时发出提示音或振动"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>状态</b>：已提升为“默认”"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>状态</b>：已降低为“静音”"</string> @@ -802,6 +800,10 @@ <string name="controls_providers_title" msgid="6879775889857085056">"选择要添加控制器的应用"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{已添加 # 个控件。}other{已添加 # 个控件。}}"</string> <string name="controls_removed" msgid="3731789252222856959">"已移除"</string> + <!-- no translation found for controls_panel_authorization_title (267429338785864842) --> + <skip /> + <!-- no translation found for controls_panel_authorization (4540047176861801815) --> + <skip /> <string name="accessibility_control_favorite" msgid="8694362691985545985">"已收藏"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"已收藏，位置：<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"已取消收藏"</string> @@ -868,6 +870,8 @@ <string name="controls_error_failed" msgid="960228639198558525">"出现错误，请重试"</string> <string name="controls_menu_add" msgid="4447246119229920050">"添加控制器"</string> <string name="controls_menu_edit" msgid="890623986951347062">"修改控制器"</string> + <!-- no translation found for controls_menu_add_another_app (8661172304650786705) --> + <skip /> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"添加输出设备"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"群组"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"已选择 1 个设备"</string> @@ -1015,7 +1019,7 @@ <string name="rear_display_bottom_sheet_cancel" msgid="3461468855493357248">"取消"</string> <string name="rear_display_bottom_sheet_confirm" msgid="4383356544661421206">"立即翻转"</string> <string name="rear_display_fold_bottom_sheet_title" msgid="6081542277622721548">"展开手机可拍出更好的自拍照"</string> - <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"要翻转到外屏以拍出更好的自拍照吗？"</string> + <string name="rear_display_unfold_bottom_sheet_title" msgid="2137403802960396357">"翻转到外屏后自拍效果更好，要试试吗？"</string> <string name="rear_display_bottom_sheet_description" msgid="1852662982816810352">"您可以使用后置摄像头拍摄视角更广、分辨率更高的照片。"</string> <string name="rear_display_bottom_sheet_warning" msgid="800995919558238930"><b>"✱ 此屏幕将会关闭"</b></string> <string name="rear_display_accessibility_folded_animation" msgid="1538121649587978179">"正在展开可折叠设备"</string> @@ -1023,14 +1027,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"电池还剩 <xliff:g id="PERCENTAGE">%s</xliff:g> 的电量"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"请将触控笔连接充电器"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"触控笔电池电量低"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"摄像机"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"无法通过这份资料拨打电话"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"根据您的工作政策，您只能通过工作资料拨打电话"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"切换到工作资料"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"关闭"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index c0fb5b13036b..8aa29763046d 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -532,8 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"自動"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"無音效或震動"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"無音效或震動，並在對話部分的較低位置顯示"</string> - <string name="notification_channel_summary_default" msgid="777294388712200605">"根據裝置的設定響鈴或震動"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"根據裝置的設定響鈴或震動。根據預設，來自「<xliff:g id="APP_NAME">%1$s</xliff:g>」的對話會以對話框形式顯示。"</string> + <string name="notification_channel_summary_default" msgid="777294388712200605">"可能會根據裝置設定發出鈴聲或震動"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"可能會根據裝置設定發出鈴聲或震動。根據預設，來自 <xliff:g id="APP_NAME">%1$s</xliff:g> 的對話會以對話氣泡顯示。"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"由系統判斷是否要讓此通知發出音效或震動"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>狀態：</b>已提升為預設"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>狀態：</b>已降低為靜音"</string> @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"選擇要新增控制項的應用程式"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{已新增 # 個控制項。}other{已新增 # 個控制項。}}"</string> <string name="controls_removed" msgid="3731789252222856959">"已移除"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"要新增「<xliff:g id="APPNAME">%s</xliff:g>」嗎？"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"當你新增「<xliff:g id="APPNAME">%s</xliff:g>」時，應用程式也可將控制選項及內容新增到這個面板。某些應用程式可讓你選擇要顯示在這裡的控制選項。"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"已加入收藏"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"已加入至收藏位置 <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"已取消收藏"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"發生錯誤，請重試"</string> <string name="controls_menu_add" msgid="4447246119229920050">"新增控制項"</string> <string name="controls_menu_edit" msgid="890623986951347062">"編輯控制項"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"新增應用程式"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"新增輸出裝置"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"群組"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"已選取 1 部裝置"</string> @@ -1022,8 +1025,10 @@ <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"將觸控筆連接充電器"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"觸控筆電量不足"</string> <string name="video_camera" msgid="7654002575156149298">"攝影機"</string> - <string name="call_from_work_profile_title" msgid="6991157106804289643">"無法透過這個資料夾撥打電話"</string> - <string name="call_from_work_profile_text" msgid="3458704745640229638">"貴公司政策僅允許透過工作資料夾撥打電話"</string> - <string name="call_from_work_profile_action" msgid="2937701298133010724">"切換至工作資料夾"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"無法透過此設定檔撥打電話"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"您的公司政策只允許透過工作設定檔撥打電話"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"切換至工作設定檔"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"關閉"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 48dc5bf573d1..321821c7fd41 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -800,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"選擇應用程式以新增控制項"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{已新增 # 個控制項。}other{已新增 # 個控制項。}}"</string> <string name="controls_removed" msgid="3731789252222856959">"已移除"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"要新增「<xliff:g id="APPNAME">%s</xliff:g>」嗎？"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"當你新增「<xliff:g id="APPNAME">%s</xliff:g>」時，應用程式也可將控制選項及內容新增到這個面板。某些應用程式可讓你選擇要顯示在這裡的控制選項。"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"已加入收藏"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"已加入收藏，位置 <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"從收藏中移除"</string> @@ -866,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"發生錯誤，請再試一次"</string> <string name="controls_menu_add" msgid="4447246119229920050">"新增控制項"</string> <string name="controls_menu_edit" msgid="890623986951347062">"編輯控制項"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"新增應用程式"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"新增輸出裝置"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"群組"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"已選取 1 部裝置"</string> @@ -1026,4 +1029,6 @@ <string name="call_from_work_profile_text" msgid="3458704745640229638">"貴公司政策僅允許透過工作資料夾撥打電話"</string> <string name="call_from_work_profile_action" msgid="2937701298133010724">"切換至工作資料夾"</string> <string name="call_from_work_profile_close" msgid="7927067108901068098">"關閉"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 88c00a8b35f4..c094acf0dd1f 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -532,10 +532,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Okuzenzekelayo"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Awukho umsindo noma ukudlidliza"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Awukho umsindo noma ukudlidliza futhi ivela ngezansi esigabeni sengxoxo"</string> - <!-- no translation found for notification_channel_summary_default (777294388712200605) --> - <skip /> - <!-- no translation found for notification_channel_summary_default_with_bubbles (3482483084451555344) --> - <skip /> + <string name="notification_channel_summary_default" msgid="777294388712200605">"Ingase ikhale noma idlidlize ngokusekelwe kumasethingi edivayisi"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="3482483084451555344">"Ingase ikhale noma idlidlize kuya ngamasethingi wedivayisi. Izingxoxo ezivela ku-<xliff:g id="APP_NAME">%1$s</xliff:g> ziba yibhamuza ngokuzenzakalela."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Vumela isistimu inqume uma lesi saziso kufanele senze umsindo noma sidlidlize"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Isimo:</b> Siphromothelwe Kokuzenzakalelayo"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Isimo:</b> Sehliselwe Kokuthulile"</string> @@ -802,6 +800,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"Khetha uhlelo lokusebenza ukwengeza izilawuli"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{ulawulo olu-# olwengeziwe.}one{ukulawulwa okungu-# okwengeziwe.}other{ukulawulwa okungu-# okwengeziwe.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Isusiwe"</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"Engeza i-<xliff:g id="APPNAME">%s</xliff:g>?"</string> + <string name="controls_panel_authorization" msgid="4540047176861801815">"Uma wengeza i-<xliff:g id="APPNAME">%s</xliff:g>, ingangeza izilawuli nokuqukethwe kuleli phaneli. Kwamanye ama-app, ungakhetha ukuthi yiziphi izilawuli eziboniswa lapha."</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Kwenziwe intandokazi"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Kwenziwe intandokazi, isimo esiyi-<xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Akwenziwanga intandokazi"</string> @@ -868,6 +868,7 @@ <string name="controls_error_failed" msgid="960228639198558525">"Iphutha, zama futhi"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Engeza Izilawuli"</string> <string name="controls_menu_edit" msgid="890623986951347062">"Hlela izilawuli"</string> + <string name="controls_menu_add_another_app" msgid="8661172304650786705">"Engeza i-app"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Engeza okukhiphayo"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Iqembu"</string> <string name="media_output_dialog_single_device" msgid="3102758980643351058">"idivayisi ekhethiwe e-1"</string> @@ -1023,14 +1024,11 @@ <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ibhethri elisele"</string> <string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Xhuma i-stylus yakho kushaja"</string> <string name="stylus_battery_low" msgid="7134370101603167096">"Ibhethri le-stylus liphansi"</string> - <!-- no translation found for video_camera (7654002575156149298) --> - <skip /> - <!-- no translation found for call_from_work_profile_title (6991157106804289643) --> - <skip /> - <!-- no translation found for call_from_work_profile_text (3458704745640229638) --> - <skip /> - <!-- no translation found for call_from_work_profile_action (2937701298133010724) --> - <skip /> - <!-- no translation found for call_from_work_profile_close (7927067108901068098) --> + <string name="video_camera" msgid="7654002575156149298">"Ikhamera yevidiyo"</string> + <string name="call_from_work_profile_title" msgid="6991157106804289643">"Ayikwazi ukufonela le phrofayela"</string> + <string name="call_from_work_profile_text" msgid="3458704745640229638">"Inqubomgomo yakho yomsebenzi ikuvumela ukuthi wenze amakholi wefoni kuphela ngephrofayela yomsebenzi"</string> + <string name="call_from_work_profile_action" msgid="2937701298133010724">"Shintshela kuphrofayela yomsebenzi"</string> + <string name="call_from_work_profile_close" msgid="7927067108901068098">"Vala"</string> + <!-- no translation found for lock_screen_settings (9197175446592718435) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 1826c00b506f..371f00189ad6 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -828,4 +828,8 @@ <string name="config_wallpaperPickerPackage" translatable="false"> com.android.wallpaper </string> + + <!-- Whether the floating rotation button should be on the left/right in the device's natural + orientation --> + <bool name="floating_rotation_button_position_left">true</bool> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index dfc01501a999..2b0021b26f19 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -337,7 +337,7 @@ <!-- Used for both start and bottom margin of the preview, relative to the action container --> <dimen name="overlay_preview_container_margin">8dp</dimen> <dimen name="overlay_action_container_margin_horizontal">8dp</dimen> - <dimen name="overlay_action_container_margin_bottom">4dp</dimen> + <dimen name="overlay_action_container_margin_bottom">6dp</dimen> <dimen name="overlay_bg_protection_height">242dp</dimen> <dimen name="overlay_action_container_corner_radius">18dp</dimen> <dimen name="overlay_action_container_padding_vertical">4dp</dimen> @@ -1068,8 +1068,13 @@ <!-- Size of Smartspace media recommendations cards in the QSPanel carousel --> <dimen name="qs_media_rec_icon_top_margin">16dp</dimen> <dimen name="qs_media_rec_album_size">88dp</dimen> + <dimen name="qs_media_rec_album_width">110dp</dimen> + <dimen name="qs_media_rec_album_height_expanded">108dp</dimen> + <dimen name="qs_media_rec_album_height_collapsed">77dp</dimen> <dimen name="qs_media_rec_album_side_margin">16dp</dimen> <dimen name="qs_media_rec_album_bottom_margin">8dp</dimen> + <dimen name="qs_media_rec_album_title_bottom_margin">22dp</dimen> + <dimen name="qs_media_rec_album_subtitle_height">12dp</dimen> <!-- Media tap-to-transfer chip for sender device --> <dimen name="media_ttt_chip_outer_padding">16dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index e60835cc5ea4..227b00ee6aa2 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -240,9 +240,13 @@ <!-- Content description for the right boundary of the screenshot being cropped, with the current position as a percentage. [CHAR LIMIT=NONE] --> <string name="screenshot_right_boundary_pct">Right boundary <xliff:g id="percent" example="50">%1$d</xliff:g> percent</string> <!-- Notification displayed when a screenshot is saved in a work profile. [CHAR LIMIT=NONE] --> - <string name="screenshot_work_profile_notification">Work screenshots are saved in the <xliff:g id="app" example="Work Files">%1$s</xliff:g> app</string> + <string name="screenshot_work_profile_notification">Saved in <xliff:g id="app" example="Files">%1$s</xliff:g> in the work profile</string> <!-- Default name referring to the app on the device that lets the user browse stored files. [CHAR LIMIT=NONE] --> <string name="screenshot_default_files_app_name">Files</string> + <!-- A notice shown to the user to indicate that an app has detected the screenshot that the user has just taken. [CHAR LIMIT=75] --> + <string name="screenshot_detected_template"><xliff:g id="appName" example="Google Chrome">%1$s</xliff:g> detected this screenshot.</string> + <!-- A notice shown to the user to indicate that multiple apps have detected the screenshot that the user has just taken. [CHAR LIMIT=75] --> + <string name="screenshot_detected_multiple_template"><xliff:g id="appName" example="Google Chrome">%1$s</xliff:g> and other open apps detected this screenshot.</string> <!-- Notification title displayed for screen recording [CHAR LIMIT=50]--> <string name="screenrecord_name">Screen Recorder</string> @@ -2360,6 +2364,8 @@ <string name="controls_media_smartspace_rec_item_description">Play <xliff:g id="song_name" example="Daily mix">%1$s</xliff:g> by <xliff:g id="artist_name" example="Various artists">%2$s</xliff:g> from <xliff:g id="app_label" example="Spotify">%3$s</xliff:g></string> <!-- Description for Smartspace recommendation's media item which doesn't have artist info, including information for the media's title and the source app [CHAR LIMIT=NONE]--> <string name="controls_media_smartspace_rec_item_no_artist_description">Play <xliff:g id="song_name" example="Daily mix">%1$s</xliff:g> from <xliff:g id="app_label" example="Spotify">%2$s</xliff:g></string> + <!-- Header title for Smartspace recommendation card within media controls. [CHAR_LIMIT=30] --> + <string name="controls_media_smartspace_rec_header">For You</string> <!--- ****** Media tap-to-transfer ****** --> <!-- Text for a button to undo the media transfer. [CHAR LIMIT=20] --> @@ -2428,6 +2434,8 @@ <string name="media_output_group_title_speakers_and_displays">Speakers & Displays</string> <!-- Title for Suggested Devices group. [CHAR LIMIT=NONE] --> <string name="media_output_group_title_suggested_device">Suggested Devices</string> + <!-- Sub status indicates device need premium account. [CHAR LIMIT=NONE] --> + <string name="media_output_status_require_premium">Requires premium account</string> <!-- Media Output Broadcast Dialog --> <!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] --> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 9846fc251a27..58b0234023ae 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -678,6 +678,17 @@ <style name="MediaPlayer.Recommendation"/> + <style name="MediaPlayer.Recommendation.Header"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginTop">@dimen/qs_media_padding</item> + <item name="android:layout_marginStart">@dimen/qs_media_padding</item> + <item name="android:fontFamily">=@*android:string/config_headlineFontFamilyMedium</item> + <item name="android:singleLine">true</item> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> + <style name="MediaPlayer.Recommendation.AlbumContainer"> <item name="android:layout_width">@dimen/qs_media_rec_album_size</item> <item name="android:layout_height">@dimen/qs_media_rec_album_size</item> @@ -686,6 +697,12 @@ <item name="android:layout_marginBottom">@dimen/qs_media_rec_album_bottom_margin</item> </style> + <style name="MediaPlayer.Recommendation.AlbumContainer.Updated"> + <item name="android:layout_width">@dimen/qs_media_rec_album_width</item> + <item name="android:background">@drawable/qs_media_light_source</item> + <item name="android:layout_marginTop">@dimen/qs_media_info_spacing</item> + </style> + <style name="MediaPlayer.Recommendation.Album"> <item name="android:backgroundTint">@color/media_player_album_bg</item> </style> diff --git a/packages/SystemUI/res/xml/media_recommendations_view_collapsed.xml b/packages/SystemUI/res/xml/media_recommendations_view_collapsed.xml new file mode 100644 index 000000000000..d3be3c7de5ad --- /dev/null +++ b/packages/SystemUI/res/xml/media_recommendations_view_collapsed.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<ConstraintSet + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + > + + <Constraint + android:id="@+id/sizing_view" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_media_session_height_collapsed" + /> + + <Constraint + android:id="@+id/media_rec_title" + style="@style/MediaPlayer.Recommendation.Header" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> + + <Constraint + android:id="@+id/media_cover1_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_collapsed" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + android:layout_marginStart="@dimen/qs_media_padding" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/media_cover2_container"/> + + + <Constraint + android:id="@+id/media_cover2_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_collapsed" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toEndOf="@id/media_cover1_container" + app:layout_constraintEnd_toStartOf="@id/media_cover3_container"/> + + <Constraint + android:id="@+id/media_cover3_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_collapsed" + android:layout_marginEnd="@dimen/qs_media_padding" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toEndOf="@id/media_cover2_container" + app:layout_constraintEnd_toEndOf="parent"/> + + +</ConstraintSet> diff --git a/packages/SystemUI/res/xml/media_recommendations_view_expanded.xml b/packages/SystemUI/res/xml/media_recommendations_view_expanded.xml new file mode 100644 index 000000000000..88c70552e9e8 --- /dev/null +++ b/packages/SystemUI/res/xml/media_recommendations_view_expanded.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<ConstraintSet + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + > + + <Constraint + android:id="@+id/sizing_view" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_media_session_height_expanded" + /> + + <Constraint + android:id="@+id/media_rec_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/qs_media_padding" + android:layout_marginStart="@dimen/qs_media_padding" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:singleLine="true" + android:textSize="14sp" + android:textColor="@color/notification_primary_text_color"/> + + <Constraint + android:id="@+id/media_cover1_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_expanded" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + android:layout_marginStart="@dimen/qs_media_padding" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/media_cover2_container"/> + + + <Constraint + android:id="@+id/media_cover2_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_expanded" + android:layout_marginEnd="@dimen/qs_media_info_spacing" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toEndOf="@id/media_cover1_container" + app:layout_constraintEnd_toStartOf="@id/media_cover3_container"/> + + <Constraint + android:id="@+id/media_cover3_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer.Updated" + android:layout_height="@dimen/qs_media_rec_album_height_expanded" + android:layout_marginEnd="@dimen/qs_media_padding" + app:layout_constraintTop_toBottomOf="@+id/media_rec_title" + app:layout_constraintStart_toEndOf="@id/media_cover2_container" + app:layout_constraintEnd_toEndOf="parent"/> + + +</ConstraintSet> diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt index 196f7f05d20d..c9a25b067b94 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt @@ -47,10 +47,6 @@ interface ResourceFlag<T> : Flag<T> { val resourceId: Int } -interface DeviceConfigFlag<T> : Flag<T> { - val default: T -} - interface SysPropFlag<T> : Flag<T> { val default: T } @@ -80,8 +76,8 @@ abstract class BooleanFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readBoolean(), teamfood = parcel.readBoolean(), overridden = parcel.readBoolean() @@ -137,21 +133,6 @@ data class ResourceBooleanFlag constructor( ) : ResourceFlag<Boolean> /** - * A Flag that can reads its overrides from DeviceConfig. - * - * This is generally useful for flags that come from or are used _outside_ of SystemUI. - * - * Prefer [UnreleasedFlag] and [ReleasedFlag]. - */ -data class DeviceConfigBooleanFlag constructor( - override val id: Int, - override val name: String, - override val namespace: String, - override val default: Boolean = false, - override val teamfood: Boolean = false -) : DeviceConfigFlag<Boolean> - -/** * A Flag that can reads its overrides from System Properties. * * This is generally useful for flags that come from or are used _outside_ of SystemUI. @@ -186,8 +167,8 @@ data class StringFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readString() ?: "" ) @@ -226,8 +207,8 @@ data class IntFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readInt() ) @@ -266,8 +247,8 @@ data class LongFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readLong() ) @@ -298,8 +279,8 @@ data class FloatFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readFloat() ) @@ -338,8 +319,8 @@ data class DoubleFlag constructor( private constructor(parcel: Parcel) : this( id = parcel.readInt(), - name = parcel.readString(), - namespace = parcel.readString(), + name = parcel.readString() ?: "", + namespace = parcel.readString() ?: "", default = parcel.readDouble() ) diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagListenable.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagListenable.kt index 195ba46515cd..72a4fabf1f0d 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagListenable.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagListenable.kt @@ -34,7 +34,7 @@ interface FlagListenable { /** An event representing the change */ interface FlagEvent { /** the id of the flag which changed */ - val flagId: Int + val flagName: String /** if all listeners alerted invoke this method, the restart will be skipped */ fun requestNoRestart() } diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt index d85292a90d63..da1641c326de 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt @@ -39,7 +39,7 @@ class FlagManager constructor( const val ACTION_GET_FLAGS = "com.android.systemui.action.GET_FLAGS" const val FLAGS_PERMISSION = "com.android.systemui.permission.FLAGS" const val ACTION_SYSUI_STARTED = "com.android.systemui.STARTED" - const val EXTRA_ID = "id" + const val EXTRA_NAME = "name" const val EXTRA_VALUE = "value" const val EXTRA_FLAGS = "flags" private const val SETTINGS_PREFIX = "systemui/flags" @@ -56,7 +56,7 @@ class FlagManager constructor( * that the restart be suppressed */ var onSettingsChangedAction: Consumer<Boolean>? = null - var clearCacheAction: Consumer<Int>? = null + var clearCacheAction: Consumer<String>? = null private val listeners: MutableSet<PerFlagListener> = mutableSetOf() private val settingsObserver: ContentObserver = SettingsObserver() @@ -96,35 +96,42 @@ class FlagManager constructor( * Returns the stored value or null if not set. * This API is used by TheFlippinApp. */ - fun isEnabled(id: Int): Boolean? = readFlagValue(id, BooleanFlagSerializer) + fun isEnabled(name: String): Boolean? = readFlagValue(name, BooleanFlagSerializer) /** * Sets the value of a boolean flag. * This API is used by TheFlippinApp. */ - fun setFlagValue(id: Int, enabled: Boolean) { - val intent = createIntent(id) + fun setFlagValue(name: String, enabled: Boolean) { + val intent = createIntent(name) intent.putExtra(EXTRA_VALUE, enabled) context.sendBroadcast(intent) } - fun eraseFlag(id: Int) { - val intent = createIntent(id) + fun eraseFlag(name: String) { + val intent = createIntent(name) context.sendBroadcast(intent) } /** Returns the stored value or null if not set. */ + // TODO(b/265188950): Remove method this once ids are fully deprecated. fun <T> readFlagValue(id: Int, serializer: FlagSerializer<T>): T? { - val data = settings.getString(idToSettingsKey(id)) + val data = settings.getStringFromSecure(idToSettingsKey(id)) + return serializer.fromSettingsData(data) + } + + /** Returns the stored value or null if not set. */ + fun <T> readFlagValue(name: String, serializer: FlagSerializer<T>): T? { + val data = settings.getString(nameToSettingsKey(name)) return serializer.fromSettingsData(data) } override fun addListener(flag: Flag<*>, listener: FlagListenable.Listener) { synchronized(listeners) { val registerNeeded = listeners.isEmpty() - listeners.add(PerFlagListener(flag.id, listener)) + listeners.add(PerFlagListener(flag.name, listener)) if (registerNeeded) { settings.registerContentObserver(SETTINGS_PREFIX, true, settingsObserver) } @@ -143,38 +150,38 @@ class FlagManager constructor( } } - private fun createIntent(id: Int): Intent { + private fun createIntent(name: String): Intent { val intent = Intent(ACTION_SET_FLAG) intent.setPackage(RECEIVING_PACKAGE) - intent.putExtra(EXTRA_ID, id) + intent.putExtra(EXTRA_NAME, name) return intent } + // TODO(b/265188950): Remove method this once ids are fully deprecated. fun idToSettingsKey(id: Int): String { return "$SETTINGS_PREFIX/$id" } + fun nameToSettingsKey(name: String): String { + return "$SETTINGS_PREFIX/$name" + } + inner class SettingsObserver : ContentObserver(handler) { override fun onChange(selfChange: Boolean, uri: Uri?) { if (uri == null) { return } val parts = uri.pathSegments - val idStr = parts[parts.size - 1] - val id = try { - idStr.toInt() - } catch (e: NumberFormatException) { - return - } - clearCacheAction?.accept(id) - dispatchListenersAndMaybeRestart(id, onSettingsChangedAction) + val name = parts[parts.size - 1] + clearCacheAction?.accept(name) + dispatchListenersAndMaybeRestart(name, onSettingsChangedAction) } } - fun dispatchListenersAndMaybeRestart(id: Int, restartAction: Consumer<Boolean>?) { + fun dispatchListenersAndMaybeRestart(name: String, restartAction: Consumer<Boolean>?) { val filteredListeners: List<FlagListenable.Listener> = synchronized(listeners) { - listeners.mapNotNull { if (it.id == id) it.listener else null } + listeners.mapNotNull { if (it.name == name) it.listener else null } } // If there are no listeners, there's nothing to dispatch to, and nothing to suppress it. if (filteredListeners.isEmpty()) { @@ -185,7 +192,7 @@ class FlagManager constructor( val suppressRestartList: List<Boolean> = filteredListeners.map { listener -> var didRequestNoRestart = false val event = object : FlagListenable.FlagEvent { - override val flagId = id + override val flagName = name override fun requestNoRestart() { didRequestNoRestart = true } @@ -198,7 +205,7 @@ class FlagManager constructor( restartAction?.accept(suppressRestart) } - private data class PerFlagListener(val id: Int, val listener: FlagListenable.Listener) + private data class PerFlagListener(val name: String, val listener: FlagListenable.Listener) } class NoFlagResultsException : Exception( diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt index 742bb0b6f954..6beb8518ab67 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt @@ -22,7 +22,10 @@ import android.provider.Settings class FlagSettingsHelper(private val contentResolver: ContentResolver) { - fun getString(key: String): String? = Settings.Secure.getString(contentResolver, key) + // TODO(b/265188950): Remove method this once ids are fully deprecated. + fun getStringFromSecure(key: String): String? = Settings.Secure.getString(contentResolver, key) + + fun getString(key: String): String? = Settings.Global.getString(contentResolver, key) fun registerContentObserver( name: String, diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java index 857cc4620ebd..5d036fbe5e52 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java @@ -35,6 +35,7 @@ import android.view.WindowManager.LayoutParams; import android.view.animation.AccelerateDecelerateInterpolator; import android.widget.FrameLayout; +import androidx.annotation.BoolRes; import androidx.core.view.OneShotPreDrawListener; import com.android.systemui.shared.rotation.FloatingRotationButtonPositionCalculator.Position; @@ -65,6 +66,8 @@ public class FloatingRotationButton implements RotationButton { private final int mTaskbarBottomMarginResource; @DimenRes private final int mButtonDiameterResource; + @BoolRes + private final int mFloatingRotationBtnPositionLeftResource; private AnimatedVectorDrawable mAnimatedDrawable; private boolean mIsShowing; @@ -84,7 +87,7 @@ public class FloatingRotationButton implements RotationButton { @LayoutRes int layout, @IdRes int keyButtonId, @DimenRes int minMargin, @DimenRes int roundedContentPadding, @DimenRes int taskbarLeftMargin, @DimenRes int taskbarBottomMargin, @DimenRes int buttonDiameter, - @DimenRes int rippleMaxWidth) { + @DimenRes int rippleMaxWidth, @BoolRes int floatingRotationBtnPositionLeftResource) { mWindowManager = context.getSystemService(WindowManager.class); mKeyButtonContainer = (ViewGroup) LayoutInflater.from(context).inflate(layout, null); mKeyButtonView = mKeyButtonContainer.findViewById(keyButtonId); @@ -100,6 +103,7 @@ public class FloatingRotationButton implements RotationButton { mTaskbarLeftMarginResource = taskbarLeftMargin; mTaskbarBottomMarginResource = taskbarBottomMargin; mButtonDiameterResource = buttonDiameter; + mFloatingRotationBtnPositionLeftResource = floatingRotationBtnPositionLeftResource; updateDimensionResources(); } @@ -116,8 +120,11 @@ public class FloatingRotationButton implements RotationButton { int taskbarMarginBottom = res.getDimensionPixelSize(mTaskbarBottomMarginResource); + boolean floatingRotationButtonPositionLeft = + res.getBoolean(mFloatingRotationBtnPositionLeftResource); + mPositionCalculator = new FloatingRotationButtonPositionCalculator(defaultMargin, - taskbarMarginLeft, taskbarMarginBottom); + taskbarMarginLeft, taskbarMarginBottom, floatingRotationButtonPositionLeft); final int diameter = res.getDimensionPixelSize(mButtonDiameterResource); mContainerSize = diameter + Math.max(defaultMargin, Math.max(taskbarMarginLeft, diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt index ec3c073dc68d..40e43a94ab17 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt @@ -10,7 +10,8 @@ import android.view.Surface class FloatingRotationButtonPositionCalculator( private val defaultMargin: Int, private val taskbarMarginLeft: Int, - private val taskbarMarginBottom: Int + private val taskbarMarginBottom: Int, + private val floatingRotationButtonPositionLeft: Boolean ) { fun calculatePosition( @@ -18,7 +19,6 @@ class FloatingRotationButtonPositionCalculator( taskbarVisible: Boolean, taskbarStashed: Boolean ): Position { - val isTaskbarSide = currentRotation == Surface.ROTATION_0 || currentRotation == Surface.ROTATION_90 val useTaskbarMargin = isTaskbarSide && taskbarVisible && !taskbarStashed @@ -55,11 +55,21 @@ class FloatingRotationButtonPositionCalculator( ) private fun resolveGravity(rotation: Int): Int = - when (rotation) { - Surface.ROTATION_0 -> Gravity.BOTTOM or Gravity.LEFT - Surface.ROTATION_90 -> Gravity.BOTTOM or Gravity.RIGHT - Surface.ROTATION_180 -> Gravity.TOP or Gravity.RIGHT - Surface.ROTATION_270 -> Gravity.TOP or Gravity.LEFT - else -> throw IllegalArgumentException("Invalid rotation $rotation") + if (floatingRotationButtonPositionLeft) { + when (rotation) { + Surface.ROTATION_0 -> Gravity.BOTTOM or Gravity.LEFT + Surface.ROTATION_90 -> Gravity.BOTTOM or Gravity.RIGHT + Surface.ROTATION_180 -> Gravity.TOP or Gravity.RIGHT + Surface.ROTATION_270 -> Gravity.TOP or Gravity.LEFT + else -> throw IllegalArgumentException("Invalid rotation $rotation") + } + } else { + when (rotation) { + Surface.ROTATION_0 -> Gravity.BOTTOM or Gravity.RIGHT + Surface.ROTATION_90 -> Gravity.TOP or Gravity.RIGHT + Surface.ROTATION_180 -> Gravity.TOP or Gravity.LEFT + Surface.ROTATION_270 -> Gravity.BOTTOM or Gravity.LEFT + else -> throw IllegalArgumentException("Invalid rotation $rotation") + } } } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java index 766266d9cc94..037a71ea3eac 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java @@ -112,7 +112,8 @@ public class QuickStepContract { public static final int SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 25; // Freeform windows are showing in desktop mode public static final int SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE = 1 << 26; - + // Device dreaming state + public static final int SYSUI_STATE_DEVICE_DREAMING = 1 << 27; @Retention(RetentionPolicy.SOURCE) @IntDef({SYSUI_STATE_SCREEN_PINNING, @@ -141,7 +142,8 @@ public class QuickStepContract { SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED, SYSUI_STATE_IMMERSIVE_MODE, SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING, - SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE + SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE, + SYSUI_STATE_DEVICE_DREAMING }) public @interface SystemUiStateFlags {} @@ -179,6 +181,7 @@ public class QuickStepContract { str.add((flags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0 ? "vis_win_showing" : ""); str.add((flags & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0 ? "freeform_active_in_desktop_mode" : ""); + str.add((flags & SYSUI_STATE_DEVICE_DREAMING) != 0 ? "device_dreaming" : ""); return str.toString(); } diff --git a/packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt b/packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt index 05372fec7211..31234cf2ab53 100644 --- a/packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt +++ b/packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt @@ -35,7 +35,7 @@ object FlagsFactory { teamfood: Boolean = false ): UnreleasedFlag { val flag = UnreleasedFlag(id = id, name = name, namespace = namespace, teamfood = teamfood) - FlagsFactory.checkForDupesAndAdd(flag) + checkForDupesAndAdd(flag) return flag } @@ -46,7 +46,7 @@ object FlagsFactory { teamfood: Boolean = false ): ReleasedFlag { val flag = ReleasedFlag(id = id, name = name, namespace = namespace, teamfood = teamfood) - FlagsFactory.checkForDupesAndAdd(flag) + checkForDupesAndAdd(flag) return flag } @@ -65,7 +65,7 @@ object FlagsFactory { resourceId = resourceId, teamfood = teamfood ) - FlagsFactory.checkForDupesAndAdd(flag) + checkForDupesAndAdd(flag) return flag } @@ -77,18 +77,13 @@ object FlagsFactory { ): SysPropBooleanFlag { val flag = SysPropBooleanFlag(id = id, name = name, namespace = "systemui", default = default) - FlagsFactory.checkForDupesAndAdd(flag) + checkForDupesAndAdd(flag) return flag } private fun checkForDupesAndAdd(flag: Flag<*>) { if (flagMap.containsKey(flag.name)) { - throw IllegalArgumentException("Name {flag.name} is already registered") - } - flagMap.forEach { - if (it.value.id == flag.id) { - throw IllegalArgumentException("Name {flag.id} is already registered") - } + throw IllegalArgumentException("Name {$flag.name} is already registered") } flagMap[flag.name] = flag } diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index 1680b477c7cf..7a094a76d048 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -25,6 +25,7 @@ import android.text.format.DateFormat import android.util.TypedValue import android.view.View import android.widget.FrameLayout +import android.view.ViewTreeObserver import androidx.annotation.VisibleForTesting import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle @@ -42,19 +43,21 @@ import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.log.dagger.KeyguardSmallClockLog import com.android.systemui.log.dagger.KeyguardLargeClockLog import com.android.systemui.plugins.ClockController +import com.android.systemui.plugins.ClockFaceController +import com.android.systemui.plugins.ClockTickRate import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.plugins.log.LogLevel.DEBUG import com.android.systemui.shared.regionsampling.RegionSampler import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback import com.android.systemui.statusbar.policy.ConfigurationController +import com.android.systemui.util.concurrency.DelayableExecutor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DisposableHandle import kotlinx.coroutines.Job import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch -import java.io.PrintWriter import java.util.Locale import java.util.TimeZone import java.util.concurrent.Executor @@ -73,7 +76,7 @@ open class ClockEventController @Inject constructor( private val configurationController: ConfigurationController, @Main private val resources: Resources, private val context: Context, - @Main private val mainExecutor: Executor, + @Main private val mainExecutor: DelayableExecutor, @Background private val bgExecutor: Executor, @KeyguardSmallClockLog private val smallLogBuffer: LogBuffer?, @KeyguardLargeClockLog private val largeLogBuffer: LogBuffer?, @@ -95,6 +98,7 @@ open class ClockEventController @Inject constructor( clock?.largeClock?.view?.addOnLayoutChangeListener(mLayoutChangedListener) } updateFontSizes() + updateTimeListeners() } } @@ -209,6 +213,10 @@ open class ClockEventController @Inject constructor( } var regionSampler: RegionSampler? = null + var smallTimeListener: TimeListener? = null + var largeTimeListener: TimeListener? = null + val shouldTimeListenerRun: Boolean + get() = isKeyguardVisible && dozeAmount < DOZE_TICKRATE_THRESHOLD private var smallClockIsDark = true private var largeClockIsDark = true @@ -247,6 +255,9 @@ open class ClockEventController @Inject constructor( clock?.animations?.doze(if (isDozing) 1f else 0f) } } + + smallTimeListener?.update(shouldTimeListenerRun) + largeTimeListener?.update(shouldTimeListenerRun) } override fun onTimeFormatChanged(timeFormat: String) { @@ -286,6 +297,8 @@ open class ClockEventController @Inject constructor( } } } + smallTimeListener?.update(shouldTimeListenerRun) + largeTimeListener?.update(shouldTimeListenerRun) } fun unregisterListeners() { @@ -300,6 +313,25 @@ open class ClockEventController @Inject constructor( batteryController.removeCallback(batteryCallback) keyguardUpdateMonitor.removeCallback(keyguardUpdateMonitorCallback) regionSampler?.stopRegionSampler() + smallTimeListener?.stop() + largeTimeListener?.stop() + } + + private fun updateTimeListeners() { + smallTimeListener?.stop() + largeTimeListener?.stop() + + smallTimeListener = null + largeTimeListener = null + + clock?.smallClock?.let { + smallTimeListener = TimeListener(it, mainExecutor) + smallTimeListener?.update(shouldTimeListenerRun) + } + clock?.largeClock?.let { + largeTimeListener = TimeListener(it, mainExecutor) + largeTimeListener?.update(shouldTimeListenerRun) + } } private fun updateFontSizes() { @@ -309,21 +341,18 @@ open class ClockEventController @Inject constructor( resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat()) } - /** - * Dump information for debugging - */ - fun dump(pw: PrintWriter) { - pw.println(this) - clock?.dump(pw) - regionSampler?.dump(pw) + private fun handleDoze(doze: Float) { + dozeAmount = doze + clock?.animations?.doze(dozeAmount) + smallTimeListener?.update(doze < DOZE_TICKRATE_THRESHOLD) + largeTimeListener?.update(doze < DOZE_TICKRATE_THRESHOLD) } @VisibleForTesting internal fun listenForDozeAmount(scope: CoroutineScope): Job { return scope.launch { keyguardInteractor.dozeAmount.collect { - dozeAmount = it - clock?.animations?.doze(dozeAmount) + handleDoze(it) } } } @@ -332,8 +361,7 @@ open class ClockEventController @Inject constructor( internal fun listenForDozeAmountTransition(scope: CoroutineScope): Job { return scope.launch { keyguardTransitionInteractor.dozeAmountTransition.collect { - dozeAmount = it.value - clock?.animations?.doze(dozeAmount) + handleDoze(it.value) } } } @@ -348,8 +376,7 @@ open class ClockEventController @Inject constructor( keyguardTransitionInteractor.anyStateToAodTransition.filter { it.transitionState == TransitionState.FINISHED }.collect { - dozeAmount = 1f - clock?.animations?.doze(dozeAmount) + handleDoze(1f) } } } @@ -369,7 +396,54 @@ open class ClockEventController @Inject constructor( } } + class TimeListener(val clockFace: ClockFaceController, val executor: DelayableExecutor) { + val predrawListener = ViewTreeObserver.OnPreDrawListener { + clockFace.events.onTimeTick() + true + } + + val secondsRunnable = object : Runnable { + override fun run() { + if (!isRunning) { + return + } + + executor.executeDelayed(this, 990) + clockFace.events.onTimeTick() + } + } + + var isRunning: Boolean = false + private set + + fun start() { + if (isRunning) { + return + } + + isRunning = true + when (clockFace.events.tickRate) { + ClockTickRate.PER_MINUTE -> {/* Handled by KeyguardClockSwitchController */} + ClockTickRate.PER_SECOND -> executor.execute(secondsRunnable) + ClockTickRate.PER_FRAME -> { + clockFace.view.viewTreeObserver.addOnPreDrawListener(predrawListener) + clockFace.view.invalidate() + } + } + } + + fun stop() { + if (!isRunning) { return } + + isRunning = false + clockFace.view.viewTreeObserver.removeOnPreDrawListener(predrawListener) + } + + fun update(shouldRun: Boolean) = if (shouldRun) start() else stop() + } + companion object { private val TAG = ClockEventController::class.simpleName!! + private val DOZE_TICKRATE_THRESHOLD = 0.99f } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java index 7da27b1d6898..baaef1983e9c 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java @@ -103,6 +103,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey @Override public void reset() { + super.reset(); // start fresh mDismissing = false; mView.resetPasswordText(false /* animate */, false /* announce */); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 71cd18dd9703..a148aa10024a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -45,6 +45,7 @@ import com.android.systemui.plugins.log.LogBuffer; import com.android.systemui.plugins.log.LogLevel; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shared.clocks.ClockRegistry; +import com.android.systemui.shared.regionsampling.RegionSampler; import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; @@ -88,7 +89,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private final ClockRegistry.ClockChangeListener mClockChangedListener; private ViewGroup mStatusArea; - // If set will replace keyguard_slice_view + + // If the SMARTSPACE flag is set, keyguard_slice_view is replaced by the following views. + private ViewGroup mDateWeatherView; + private View mWeatherView; private View mSmartspaceView; private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController; @@ -192,10 +196,17 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS if (mSmartspaceController.isEnabled()) { View ksv = mView.findViewById(R.id.keyguard_slice_view); - int ksvIndex = mStatusArea.indexOfChild(ksv); + int viewIndex = mStatusArea.indexOfChild(ksv); ksv.setVisibility(View.GONE); - addSmartspaceView(ksvIndex); + // TODO(b/261757708): add content observer for the Settings toggle and add/remove + // weather according to the Settings. + if (mSmartspaceController.isDateWeatherDecoupled()) { + addDateWeatherView(viewIndex); + viewIndex += 1; + } + + addSmartspaceView(viewIndex); } mSecureSettings.registerContentObserverForUser( @@ -229,6 +240,14 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS void onLocaleListChanged() { if (mSmartspaceController.isEnabled()) { + if (mSmartspaceController.isDateWeatherDecoupled()) { + mDateWeatherView.removeView(mWeatherView); + int index = mStatusArea.indexOfChild(mDateWeatherView); + if (index >= 0) { + mStatusArea.removeView(mDateWeatherView); + addDateWeatherView(index); + } + } int index = mStatusArea.indexOfChild(mSmartspaceView); if (index >= 0) { mStatusArea.removeView(mSmartspaceView); @@ -237,6 +256,30 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } } + private void addDateWeatherView(int index) { + mDateWeatherView = (ViewGroup) mSmartspaceController.buildAndConnectDateView(mView); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + MATCH_PARENT, WRAP_CONTENT); + mStatusArea.addView(mDateWeatherView, index, lp); + int startPadding = getContext().getResources().getDimensionPixelSize( + R.dimen.below_clock_padding_start); + int endPadding = getContext().getResources().getDimensionPixelSize( + R.dimen.below_clock_padding_end); + mDateWeatherView.setPaddingRelative(startPadding, 0, endPadding, 0); + + addWeatherView(); + } + + private void addWeatherView() { + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + WRAP_CONTENT, WRAP_CONTENT); + mWeatherView = mSmartspaceController.buildAndConnectWeatherView(mView); + // Place weather right after the date, before the extras + final int index = mDateWeatherView.getChildCount() == 0 ? 0 : 1; + mDateWeatherView.addView(mWeatherView, index, lp); + mWeatherView.setPaddingRelative(0, 0, 4, 0); + } + private void addSmartspaceView(int index) { mSmartspaceView = mSmartspaceController.buildAndConnectView(mView); LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( @@ -301,7 +344,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS } ClockController clock = getClock(); if (clock != null) { - clock.getEvents().onTimeTick(); + clock.getSmallClock().getEvents().onTimeTick(); + clock.getLargeClock().getEvents().onTimeTick(); } } @@ -424,6 +468,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS if (clock != null) { clock.dump(pw); } + final RegionSampler regionSampler = mClockEventController.getRegionSampler(); + if (regionSampler != null) { + regionSampler.dump(pw); + } } /** Gets the animations for the current clock. */ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java index 02776a295359..ec8fa921c6fa 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java @@ -15,8 +15,6 @@ */ package com.android.keyguard; -import static android.view.Display.DEFAULT_DISPLAY; - import android.app.Presentation; import android.content.Context; import android.graphics.Color; @@ -37,9 +35,11 @@ import android.view.WindowManager; import com.android.internal.annotations.VisibleForTesting; import com.android.keyguard.dagger.KeyguardStatusViewComponent; import com.android.systemui.R; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.UiBackground; import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationBarView; +import com.android.systemui.settings.DisplayTracker; import java.util.concurrent.Executor; @@ -53,6 +53,7 @@ public class KeyguardDisplayManager { private MediaRouter mMediaRouter = null; private final DisplayManager mDisplayService; + private final DisplayTracker mDisplayTracker; private final Lazy<NavigationBarController> mNavigationBarControllerLazy; private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory; private final Context mContext; @@ -62,46 +63,43 @@ public class KeyguardDisplayManager { private final SparseArray<Presentation> mPresentations = new SparseArray<>(); - private final DisplayManager.DisplayListener mDisplayListener = - new DisplayManager.DisplayListener() { - - @Override - public void onDisplayAdded(int displayId) { - Trace.beginSection( - "KeyguardDisplayManager#onDisplayAdded(displayId=" + displayId + ")"); - final Display display = mDisplayService.getDisplay(displayId); - if (mShowing) { - updateNavigationBarVisibility(displayId, false /* navBarVisible */); - showPresentation(display); - } - Trace.endSection(); - } - - @Override - public void onDisplayChanged(int displayId) { - - } + private final DisplayTracker.Callback mDisplayCallback = + new DisplayTracker.Callback() { + @Override + public void onDisplayAdded(int displayId) { + Trace.beginSection( + "KeyguardDisplayManager#onDisplayAdded(displayId=" + displayId + ")"); + final Display display = mDisplayService.getDisplay(displayId); + if (mShowing) { + updateNavigationBarVisibility(displayId, false /* navBarVisible */); + showPresentation(display); + } + Trace.endSection(); + } - @Override - public void onDisplayRemoved(int displayId) { - Trace.beginSection( - "KeyguardDisplayManager#onDisplayRemoved(displayId=" + displayId + ")"); - hidePresentation(displayId); - Trace.endSection(); - } - }; + @Override + public void onDisplayRemoved(int displayId) { + Trace.beginSection( + "KeyguardDisplayManager#onDisplayRemoved(displayId=" + displayId + ")"); + hidePresentation(displayId); + Trace.endSection(); + } + }; @Inject public KeyguardDisplayManager(Context context, Lazy<NavigationBarController> navigationBarControllerLazy, KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory, + DisplayTracker displayTracker, + @Main Executor mainExecutor, @UiBackground Executor uiBgExecutor) { mContext = context; mNavigationBarControllerLazy = navigationBarControllerLazy; mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory; uiBgExecutor.execute(() -> mMediaRouter = mContext.getSystemService(MediaRouter.class)); mDisplayService = mContext.getSystemService(DisplayManager.class); - mDisplayService.registerDisplayListener(mDisplayListener, null /* handler */); + mDisplayTracker = displayTracker; + mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor); } private boolean isKeyguardShowable(Display display) { @@ -109,7 +107,7 @@ public class KeyguardDisplayManager { if (DEBUG) Log.i(TAG, "Cannot show Keyguard on null display"); return false; } - if (display.getDisplayId() == DEFAULT_DISPLAY) { + if (display.getDisplayId() == mDisplayTracker.getDefaultDisplayId()) { if (DEBUG) Log.i(TAG, "Do not show KeyguardPresentation on the default display"); return false; } @@ -224,7 +222,7 @@ public class KeyguardDisplayManager { protected boolean updateDisplays(boolean showing) { boolean changed = false; if (showing) { - final Display[] displays = mDisplayService.getDisplays(); + final Display[] displays = mDisplayTracker.getAllDisplays(); for (Display display : displays) { int displayId = display.getDisplayId(); updateNavigationBarVisibility(displayId, false /* navBarVisible */); @@ -247,7 +245,7 @@ public class KeyguardDisplayManager { // term solution in R. private void updateNavigationBarVisibility(int displayId, boolean navBarVisible) { // Leave this task to {@link StatusBarKeyguardViewManager} - if (displayId == DEFAULT_DISPLAY) return; + if (displayId == mDisplayTracker.getDefaultDisplayId()) return; NavigationBarView navBarView = mNavigationBarControllerLazy.get() .getNavigationBarView(displayId); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java index 08e9cf60a65a..2a389b6132e9 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java @@ -19,6 +19,7 @@ package com.android.keyguard; import android.content.Context; import android.graphics.Canvas; import android.util.AttributeSet; +import android.view.MotionEvent; import android.widget.FrameLayout; /** @@ -33,7 +34,7 @@ import android.widget.FrameLayout; public class KeyguardHostView extends FrameLayout { protected ViewMediatorCallback mViewMediatorCallback; - + private boolean mIsInteractable; public KeyguardHostView(Context context) { this(context, null); @@ -54,4 +55,24 @@ public class KeyguardHostView extends FrameLayout { public void setViewMediatorCallback(ViewMediatorCallback viewMediatorCallback) { mViewMediatorCallback = viewMediatorCallback; } + + /** Set true if the view can be interacted with */ + public void setInteractable(boolean isInteractable) { + mIsInteractable = isInteractable; + } + + /** + * Make sure to disallow touches while transitioning the bouncer, otherwise + * it can remain interactable even when barely visible. + */ + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + return !mIsInteractable; + } + + /** True to consume any events that are sent to it */ + @Override + public boolean onTouchEvent(MotionEvent ev) { + return true; + } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java index ea84438bf4ba..61394035d731 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java @@ -527,4 +527,9 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> mKeyguardSecurityContainerController.updateKeyguardPosition(x); } } + + /** Set true if the view can be interacted with */ + public void setInteractable(boolean isInteractable) { + mView.setInteractable(isInteractable); + } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java index d1c9a3090860..b143c5b90373 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java @@ -121,6 +121,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> @Override public void reset() { + mMessageAreaController.setMessage("", false); } @Override diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 5fd2fabfe8ab..9f07a20ce812 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -92,6 +92,7 @@ import com.android.internal.util.UserIcons; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardSecurityModel.SecurityMode; import com.android.settingslib.Utils; +import com.android.settingslib.drawable.CircleFramedDrawable; import com.android.systemui.Gefingerpoken; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; @@ -999,8 +1000,10 @@ public class KeyguardSecurityContainer extends ConstraintLayout { private Drawable findUserIcon(int userId) { Bitmap userIcon = UserManager.get(mView.getContext()).getUserIcon(userId); if (userIcon != null) { - return new BitmapDrawable(userIcon); + return CircleFramedDrawable.getInstance(mView.getContext(), + userIcon); } + return UserIcons.getDefaultUserIcon(mResources, userId, false); } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java index 0b2b1214e599..e3de8c7e5671 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java @@ -17,7 +17,6 @@ package com.android.keyguard; import static android.app.slice.Slice.HINT_LIST_ITEM; -import static android.view.Display.DEFAULT_DISPLAY; import android.app.PendingIntent; import android.net.Uri; @@ -43,6 +42,7 @@ import com.android.systemui.Dumpable; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardSliceProvider; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.tuner.TunerService; import com.android.systemui.util.ViewController; @@ -64,6 +64,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie private final ConfigurationController mConfigurationController; private final TunerService mTunerService; private final DumpManager mDumpManager; + private final DisplayTracker mDisplayTracker; private int mDisplayId; private LiveData<Slice> mLiveData; private Uri mKeyguardSliceUri; @@ -108,12 +109,14 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie ActivityStarter activityStarter, ConfigurationController configurationController, TunerService tunerService, - DumpManager dumpManager) { + DumpManager dumpManager, + DisplayTracker displayTracker) { super(keyguardSliceView); mActivityStarter = activityStarter; mConfigurationController = configurationController; mTunerService = tunerService; mDumpManager = dumpManager; + mDisplayTracker = displayTracker; } @Override @@ -124,7 +127,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie } mTunerService.addTunable(mTunable, Settings.Secure.KEYGUARD_SLICE_URI); // Make sure we always have the most current slice - if (mDisplayId == DEFAULT_DISPLAY && mLiveData != null) { + if (mDisplayId == mDisplayTracker.getDefaultDisplayId() && mLiveData != null) { mLiveData.observeForever(mObserver); } mConfigurationController.addCallback(mConfigurationListener); @@ -137,7 +140,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie @Override protected void onViewDetached() { // TODO(b/117344873) Remove below work around after this issue be fixed. - if (mDisplayId == DEFAULT_DISPLAY) { + if (mDisplayId == mDisplayTracker.getDefaultDisplayId()) { mLiveData.removeObserver(mObserver); } mTunerService.removeTunable(mTunable); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index ceb5ff9d0a8c..54886c3e2080 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1937,6 +1937,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } } mGoingToSleep = true; + // Resetting assistant visibility state as the device is going to sleep now. + // TaskStackChangeListener gets triggered a little late when we transition to AoD, + // which results in face auth running once on AoD. + mAssistantVisible = false; + mLogger.d("Started going to sleep, mGoingToSleep=true, mAssistantVisible=false"); updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE, FACE_AUTH_UPDATED_GOING_TO_SLEEP); } @@ -3330,7 +3335,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab /** * Handle {@link #MSG_KEYGUARD_RESET} */ - private void handleKeyguardReset() { + @VisibleForTesting + protected void handleKeyguardReset() { mLogger.d("handleKeyguardReset"); updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE, FACE_AUTH_UPDATED_KEYGUARD_RESET); diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index 1322f16a5a59..8071a5de1ce9 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -429,6 +429,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme pw.println(" mStatusBarState: " + StatusBarState.toString(mStatusBarState)); pw.println(" mInterpolatedDarkAmount: " + mInterpolatedDarkAmount); pw.println(" mSensorTouchLocation: " + mSensorTouchLocation); + pw.println(" mDefaultPaddingPx: " + mDefaultPaddingPx); if (mView != null) { mView.dump(pw, args); diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java index 0cbf8bc07edf..5ad21df1e652 100644 --- a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java +++ b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java @@ -20,13 +20,13 @@ import android.view.ViewGroup; import com.android.keyguard.KeyguardHostViewController; import com.android.systemui.dagger.qualifiers.RootView; -import com.android.systemui.statusbar.phone.KeyguardBouncer; +import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; import dagger.BindsInstance; import dagger.Subcomponent; /** - * Dagger Subcomponent for the {@link KeyguardBouncer}. + * Dagger Subcomponent for the {@link PrimaryBouncerInteractor}. */ @Subcomponent(modules = {KeyguardBouncerModule.class}) @KeyguardBouncerScope diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java index ef067b89f9c7..cb7a0a9b1653 100644 --- a/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java +++ b/packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java @@ -29,7 +29,7 @@ import com.android.keyguard.KeyguardSecurityViewFlipper; import com.android.systemui.R; import com.android.systemui.biometrics.SideFpsController; import com.android.systemui.dagger.qualifiers.RootView; -import com.android.systemui.statusbar.phone.KeyguardBouncer; +import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; import java.util.Optional; @@ -39,7 +39,7 @@ import dagger.Module; import dagger.Provides; /** - * Module to create and access view related to the {@link KeyguardBouncer}. + * Module to create and access view related to the {@link PrimaryBouncerInteractor}. */ @Module public interface KeyguardBouncerModule { diff --git a/packages/SystemUI/src/com/android/systemui/ChooserSelector.kt b/packages/SystemUI/src/com/android/systemui/ChooserSelector.kt index 9ac45b3c77cc..227f0ace33dd 100644 --- a/packages/SystemUI/src/com/android/systemui/ChooserSelector.kt +++ b/packages/SystemUI/src/com/android/systemui/ChooserSelector.kt @@ -34,7 +34,7 @@ class ChooserSelector @Inject constructor( override fun start() { coroutineScope.launch { val listener = FlagListenable.Listener { event -> - if (event.flagId == Flags.CHOOSER_UNBUNDLED.id) { + if (event.flagName == Flags.CHOOSER_UNBUNDLED.name) { launch { updateUnbundledChooserEnabled() } event.requestNoRestart() } diff --git a/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt b/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt index 3e0fa455d39e..54939fdb78fb 100644 --- a/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt +++ b/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt @@ -35,6 +35,7 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.settingslib.Utils import com.android.systemui.animation.Interpolators +import com.android.systemui.log.ScreenDecorationsLogger import com.android.systemui.plugins.statusbar.StatusBarStateController import java.util.concurrent.Executor @@ -47,7 +48,8 @@ class FaceScanningOverlay( pos: Int, val statusBarStateController: StatusBarStateController, val keyguardUpdateMonitor: KeyguardUpdateMonitor, - val mainExecutor: Executor + val mainExecutor: Executor, + val logger: ScreenDecorationsLogger, ) : ScreenDecorations.DisplayCutoutView(context, pos) { private var showScanningAnim = false private val rimPaint = Paint() @@ -55,6 +57,7 @@ class FaceScanningOverlay( private var rimAnimator: AnimatorSet? = null private val rimRect = RectF() private var cameraProtectionColor = Color.BLACK + var faceScanningAnimColor = Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColorAccent) private var cameraProtectionAnimator: ValueAnimator? = null @@ -175,15 +178,22 @@ class FaceScanningOverlay( } if (showScanningAnim) { // Make sure that our measured height encompasses the extra space for the animation - mTotalBounds.union(mBoundingRect) + mTotalBounds.set(mBoundingRect) mTotalBounds.union( rimRect.left.toInt(), rimRect.top.toInt(), rimRect.right.toInt(), rimRect.bottom.toInt()) - setMeasuredDimension( - resolveSizeAndState(mTotalBounds.width(), widthMeasureSpec, 0), - resolveSizeAndState(mTotalBounds.height(), heightMeasureSpec, 0)) + val measuredWidth = resolveSizeAndState(mTotalBounds.width(), widthMeasureSpec, 0) + val measuredHeight = resolveSizeAndState(mTotalBounds.height(), heightMeasureSpec, 0) + logger.boundingRect(rimRect, "onMeasure: Face scanning animation") + logger.boundingRect(mBoundingRect, "onMeasure: Display cutout view bounding rect") + logger.boundingRect(mTotalBounds, "onMeasure: TotalBounds") + logger.onMeasureDimensions(widthMeasureSpec, + heightMeasureSpec, + measuredWidth, + measuredHeight) + setMeasuredDimension(measuredWidth, measuredHeight) } else { setMeasuredDimension( resolveSizeAndState(mBoundingRect.width(), widthMeasureSpec, 0), diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index e6f559b3da5f..c1c7f2d892a6 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -36,10 +36,10 @@ import android.graphics.Path; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.hardware.display.DisplayManager; import android.hardware.graphics.common.AlphaInterpretation; import android.hardware.graphics.common.DisplayDecorationSupport; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.SystemProperties; import android.os.Trace; import android.provider.Settings.Secure; @@ -64,6 +64,7 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.util.Preconditions; import com.android.settingslib.Utils; +import com.android.systemui.biometrics.AuthController; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.decor.CutoutDecorProviderFactory; @@ -75,7 +76,9 @@ import com.android.systemui.decor.OverlayWindow; import com.android.systemui.decor.PrivacyDotDecorProviderFactory; import com.android.systemui.decor.RoundedCornerDecorProviderFactory; import com.android.systemui.decor.RoundedCornerResDelegate; +import com.android.systemui.log.ScreenDecorationsLogger; import com.android.systemui.qs.SettingObserver; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.events.PrivacyDotViewController; import com.android.systemui.tuner.TunerService; @@ -119,8 +122,20 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { R.id.display_cutout_right, R.id.display_cutout_bottom }; + private final ScreenDecorationsLogger mLogger; - private DisplayManager mDisplayManager; + private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() { + @Override + public void onFaceSensorLocationChanged() { + mLogger.onSensorLocationChanged(); + if (mExecutor != null) { + mExecutor.execute( + () -> updateOverlayProviderViews(new Integer[]{mFaceScanningViewId})); + } + } + }; + + private DisplayTracker mDisplayTracker; @VisibleForTesting protected boolean mIsRegistered; private final Context mContext; @@ -128,7 +143,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { private final TunerService mTunerService; private final SecureSettings mSecureSettings; @VisibleForTesting - DisplayManager.DisplayListener mDisplayListener; + DisplayTracker.Callback mDisplayListener; private CameraAvailabilityListener mCameraListener; private final UserTracker mUserTracker; private final PrivacyDotViewController mDotViewController; @@ -152,6 +167,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { private WindowManager mWindowManager; private int mRotation; private SettingObserver mColorInversionSetting; + @Nullable private DelayableExecutor mExecutor; private Handler mHandler; boolean mPendingConfigChange; @@ -171,6 +187,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { DisplayCutoutView overlay = (DisplayCutoutView) getOverlayView( mFaceScanningViewId); if (overlay != null) { + mLogger.cameraProtectionBoundsForScanningOverlay(bounds); overlay.setProtection(protectionPath, bounds); overlay.enableShowProtection(true); updateOverlayWindowVisibilityIfViewExists( @@ -183,6 +200,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { } if (mScreenDecorHwcLayer != null) { + mLogger.hwcLayerCameraProtectionBounds(bounds); mScreenDecorHwcLayer.setProtection(protectionPath, bounds); mScreenDecorHwcLayer.enableShowProtection(true); return; @@ -196,11 +214,12 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { } ++setProtectionCnt; final DisplayCutoutView dcv = (DisplayCutoutView) view; + mLogger.dcvCameraBounds(id, bounds); dcv.setProtection(protectionPath, bounds); dcv.enableShowProtection(true); } if (setProtectionCnt == 0) { - Log.e(TAG, "CutoutView not initialized showCameraProtection"); + mLogger.cutoutViewNotInitialized(); } } @@ -302,20 +321,26 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { SecureSettings secureSettings, TunerService tunerService, UserTracker userTracker, + DisplayTracker displayTracker, PrivacyDotViewController dotViewController, ThreadFactory threadFactory, PrivacyDotDecorProviderFactory dotFactory, - FaceScanningProviderFactory faceScanningFactory) { + FaceScanningProviderFactory faceScanningFactory, + ScreenDecorationsLogger logger, + AuthController authController) { mContext = context; mMainExecutor = mainExecutor; mSecureSettings = secureSettings; mTunerService = tunerService; mUserTracker = userTracker; + mDisplayTracker = displayTracker; mDotViewController = dotViewController; mThreadFactory = threadFactory; mDotFactory = dotFactory; mFaceScanningFactory = faceScanningFactory; mFaceScanningViewId = com.android.systemui.R.id.face_scanning_anim; + mLogger = logger; + authController.addCallback(mAuthControllerCallback); } @Override @@ -376,7 +401,6 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { private void startOnScreenDecorationsThread() { Trace.beginSection("ScreenDecorations#startOnScreenDecorationsThread"); mWindowManager = mContext.getSystemService(WindowManager.class); - mDisplayManager = mContext.getSystemService(DisplayManager.class); mContext.getDisplay().getDisplayInfo(mDisplayInfo); mRotation = mDisplayInfo.rotation; mDisplayMode = mDisplayInfo.getMode(); @@ -393,17 +417,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { setupDecorations(); setupCameraListener(); - mDisplayListener = new DisplayManager.DisplayListener() { - @Override - public void onDisplayAdded(int displayId) { - // do nothing - } - - @Override - public void onDisplayRemoved(int displayId) { - // do nothing - } - + mDisplayListener = new DisplayTracker.Callback() { @Override public void onDisplayChanged(int displayId) { mContext.getDisplay().getDisplayInfo(mDisplayInfo); @@ -474,8 +488,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { } } }; - - mDisplayManager.registerDisplayListener(mDisplayListener, mHandler); + mDisplayTracker.addDisplayChangeCallback(mDisplayListener, new HandlerExecutor(mHandler)); updateConfiguration(); Trace.endSection(); } @@ -1315,7 +1328,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { if (showProtection) { // Make sure that our measured height encompasses the protection - mTotalBounds.union(mBoundingRect); + mTotalBounds.set(mBoundingRect); mTotalBounds.union((int) protectionRect.left, (int) protectionRect.top, (int) protectionRect.right, (int) protectionRect.bottom); setMeasuredDimension( diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index 191ac76753bb..b62217f11132 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -40,6 +40,7 @@ import android.util.Log; import android.util.TimingsTraceLog; import android.view.SurfaceControl; import android.view.ThreadedRenderer; +import android.view.View; import com.android.internal.protolog.common.ProtoLog; import com.android.systemui.dagger.GlobalRootComponent; @@ -114,6 +115,11 @@ public class SystemUIApplication extends Application implements // the theme set there. setTheme(R.style.Theme_SystemUI); + View.setTraceLayoutSteps( + SystemProperties.getBoolean("persist.debug.trace_layouts", false)); + View.setTracedRequestLayoutClassClass( + SystemProperties.get("persist.debug.trace_request_layout_class", null)); + if (Process.myUserHandle().equals(UserHandle.SYSTEM)) { IntentFilter bootCompletedFilter = new IntentFilter(Intent.ACTION_LOCKED_BOOT_COMPLETED); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java index 4c9259889a37..ddac25b67766 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java @@ -36,7 +36,6 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.SystemClock; import android.util.Log; -import android.view.Display; import android.view.IWindowManager; import android.view.InputDevice; import android.view.KeyCharacterMap; @@ -50,6 +49,7 @@ import com.android.internal.util.ScreenshotHelper; import com.android.systemui.CoreStartable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.recents.Recents; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.CommandQueue; @@ -180,6 +180,7 @@ public class SystemActions implements CoreStartable { private final Context mContext; private final UserTracker mUserTracker; private final Optional<Recents> mRecentsOptional; + private final DisplayTracker mDisplayTracker; private Locale mLocale; private final AccessibilityManager mA11yManager; private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy; @@ -194,11 +195,13 @@ public class SystemActions implements CoreStartable { NotificationShadeWindowController notificationShadeController, ShadeController shadeController, Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy, - Optional<Recents> recentsOptional) { + Optional<Recents> recentsOptional, + DisplayTracker displayTracker) { mContext = context; mUserTracker = userTracker; mShadeController = shadeController; mRecentsOptional = recentsOptional; + mDisplayTracker = displayTracker; mReceiver = new SystemActionsBroadcastReceiver(); mLocale = mContext.getResources().getConfiguration().getLocales().get(0); mA11yManager = (AccessibilityManager) mContext.getSystemService( @@ -207,7 +210,8 @@ public class SystemActions implements CoreStartable { // Saving in instance variable since to prevent GC since // NotificationShadeWindowController.registerCallback() only keeps weak references. mNotificationShadeCallback = - (keyguardShowing, keyguardOccluded, bouncerShowing, mDozing, panelExpanded) -> + (keyguardShowing, keyguardOccluded, bouncerShowing, mDozing, panelExpanded, + isDreaming) -> registerOrUnregisterDismissNotificationShadeAction(); mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy; } @@ -522,7 +526,7 @@ public class SystemActions implements CoreStartable { private void handleAccessibilityButton() { AccessibilityManager.getInstance(mContext).notifyAccessibilityButtonClicked( - Display.DEFAULT_DISPLAY); + mDisplayTracker.getDefaultDisplayId()); } private void handleAccessibilityButtonChooser() { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java index ab11fcea7b28..b3574bfc83cd 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java @@ -39,6 +39,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.CommandQueue; import java.io.PrintWriter; @@ -62,6 +63,7 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba private final AccessibilityManager mAccessibilityManager; private final CommandQueue mCommandQueue; private final OverviewProxyService mOverviewProxyService; + private final DisplayTracker mDisplayTracker; private WindowMagnificationConnectionImpl mWindowMagnificationConnectionImpl; private SysUiState mSysUiState; @@ -102,7 +104,8 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba @Inject public WindowMagnification(Context context, @Main Handler mainHandler, CommandQueue commandQueue, ModeSwitchesController modeSwitchesController, - SysUiState sysUiState, OverviewProxyService overviewProxyService) { + SysUiState sysUiState, OverviewProxyService overviewProxyService, + DisplayTracker displayTracker) { mContext = context; mHandler = mainHandler; mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class); @@ -110,6 +113,7 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba mModeSwitchesController = modeSwitchesController; mSysUiState = sysUiState; mOverviewProxyService = overviewProxyService; + mDisplayTracker = displayTracker; mMagnificationControllerSupplier = new ControllerSupplier(context, mHandler, this, context.getSystemService(DisplayManager.class), sysUiState); } @@ -130,14 +134,14 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba private void updateSysUiStateFlag() { //TODO(b/187510533): support multi-display once SysuiState supports it. final WindowMagnificationController controller = - mMagnificationControllerSupplier.valueAt(Display.DEFAULT_DISPLAY); + mMagnificationControllerSupplier.valueAt(mDisplayTracker.getDefaultDisplayId()); if (controller != null) { controller.updateSysUIStateFlag(); } else { // The instance is initialized when there is an IPC request. Considering // self-crash cases, we need to reset the flag in such situation. mSysUiState.setFlag(SYSUI_STATE_MAGNIFICATION_OVERLAP, false) - .commitUpdate(Display.DEFAULT_DISPLAY); + .commitUpdate(mDisplayTracker.getDefaultDisplayId()); } } diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index da2e28c5522f..1ea173ea9f48 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -1,7 +1,5 @@ package com.android.systemui.assist; -import static android.view.Display.DEFAULT_DISPLAY; - import static com.android.systemui.DejankUtils.whitelistIpcs; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED; @@ -35,6 +33,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.DeviceProvisionedController; @@ -122,6 +121,7 @@ public class AssistManager { protected final Lazy<SysUiState> mSysUiState; protected final AssistLogger mAssistLogger; private final UserTracker mUserTracker; + private final DisplayTracker mDisplayTracker; private final SecureSettings mSecureSettings; private final DeviceProvisionedController mDeviceProvisionedController; @@ -141,6 +141,7 @@ public class AssistManager { AssistLogger assistLogger, @Main Handler uiHandler, UserTracker userTracker, + DisplayTracker displayTracker, SecureSettings secureSettings) { mContext = context; mDeviceProvisionedController = controller; @@ -150,6 +151,7 @@ public class AssistManager { mPhoneStateMonitor = phoneStateMonitor; mAssistLogger = assistLogger; mUserTracker = userTracker; + mDisplayTracker = displayTracker; mSecureSettings = secureSettings; registerVoiceInteractionSessionListener(); @@ -214,7 +216,7 @@ public class AssistManager { .setFlag( SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED, hints.getBoolean(CONSTRAINED_KEY, false)) - .commitUpdate(DEFAULT_DISPLAY); + .commitUpdate(mDisplayTracker.getDefaultDisplayId()); } } }); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index 68e1f72d042a..febf75e90a14 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -847,7 +847,7 @@ public class AuthContainerView extends LinearLayout final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL, + WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, windowFlags, PixelFormat.TRANSLUCENT); lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt index 4b57d455a137..53ab6d63c62d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt @@ -55,11 +55,11 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at private val fadeDuration = 83L private val retractDuration = 400L private var alphaInDuration: Long = 0 - private var unlockedRippleInProgress: Boolean = false private val dwellShader = DwellRippleShader() private val dwellPaint = Paint() private val rippleShader = RippleShader() private val ripplePaint = Paint() + private var unlockedRippleAnimator: AnimatorSet? = null private var fadeDwellAnimator: Animator? = null private var retractDwellAnimator: Animator? = null private var dwellPulseOutAnimator: Animator? = null @@ -86,7 +86,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at init { rippleShader.color = 0xffffffff.toInt() // default color - rippleShader.progress = 0f + rippleShader.rawProgress = 0f rippleShader.sparkleStrength = RIPPLE_SPARKLE_STRENGTH ripplePaint.shader = rippleShader @@ -205,7 +205,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at * Plays a ripple animation that grows to the dwellRadius with distortion. */ fun startDwellRipple(isDozing: Boolean) { - if (unlockedRippleInProgress || dwellPulseOutAnimator?.isRunning == true) { + if (unlockedRippleAnimator?.isRunning == true || dwellPulseOutAnimator?.isRunning == true) { return } @@ -262,16 +262,14 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at * Ripple that bursts outwards from the position of the sensor to the edges of the screen */ fun startUnlockedRipple(onAnimationEnd: Runnable?) { - if (unlockedRippleInProgress) { - return // Ignore if ripple effect is already playing - } + unlockedRippleAnimator?.cancel() val rippleAnimator = ValueAnimator.ofFloat(0f, 1f).apply { interpolator = Interpolators.LINEAR_OUT_SLOW_IN duration = AuthRippleController.RIPPLE_ANIMATION_DURATION addUpdateListener { animator -> val now = animator.currentPlayTime - rippleShader.progress = animator.animatedValue as Float + rippleShader.rawProgress = animator.animatedValue as Float rippleShader.time = now.toFloat() invalidate() @@ -289,14 +287,13 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at } } - val animatorSet = AnimatorSet().apply { + unlockedRippleAnimator = AnimatorSet().apply { playTogether( rippleAnimator, alphaInAnimator ) addListener(object : AnimatorListenerAdapter() { override fun onAnimationStart(animation: Animator?) { - unlockedRippleInProgress = true rippleShader.rippleFill = false drawRipple = true visibility = VISIBLE @@ -304,13 +301,13 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at override fun onAnimationEnd(animation: Animator?) { onAnimationEnd?.run() - unlockedRippleInProgress = false drawRipple = false visibility = GONE + unlockedRippleAnimator = null } }) } - animatorSet.start() + unlockedRippleAnimator?.start() } fun resetRippleAlpha() { @@ -345,7 +342,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at override fun onDraw(canvas: Canvas?) { // To reduce overdraw, we mask the effect to a circle whose radius is big enough to cover // the active effect area. Values here should be kept in sync with the - // animation implementation in the ripple shader. + // animation implementation in the ripple shader. (Twice bigger) if (drawDwell) { val maskRadius = (1 - (1 - dwellShader.progress) * (1 - dwellShader.progress) * (1 - dwellShader.progress)) * dwellRadius * 2f @@ -354,10 +351,8 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at } if (drawRipple) { - val mask = (1 - (1 - rippleShader.progress) * (1 - rippleShader.progress) * - (1 - rippleShader.progress)) * radius * 2f canvas?.drawCircle(origin.x.toFloat(), origin.y.toFloat(), - mask, ripplePaint) + rippleShader.currentWidth, ripplePaint) } } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt index 6f594d5eb0e2..c799e91ad36b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt @@ -54,12 +54,18 @@ import com.android.internal.annotations.VisibleForTesting import com.android.systemui.Dumpable import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.recents.OverviewProxyService import com.android.systemui.util.concurrency.DelayableExecutor import java.io.PrintWriter import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch private const val TAG = "SideFpsController" @@ -79,6 +85,9 @@ constructor( displayManager: DisplayManager, @Main private val mainExecutor: DelayableExecutor, @Main private val handler: Handler, + private val alternateBouncerInteractor: AlternateBouncerInteractor, + @Application private val scope: CoroutineScope, + private val featureFlags: FeatureFlags, dumpManager: DumpManager ) : Dumpable { val requests: HashSet<SideFpsUiRequestSource> = HashSet() @@ -168,9 +177,26 @@ constructor( } ) overviewProxyService.addCallback(overviewProxyListener) + listenForAlternateBouncerVisibility() + dumpManager.registerDumpable(this) } + private fun listenForAlternateBouncerVisibility() { + alternateBouncerInteractor.setAlternateBouncerUIAvailable(true) + if (featureFlags.isEnabled(Flags.MODERN_ALTERNATE_BOUNCER)) { + scope.launch { + alternateBouncerInteractor.isVisible.collect { isVisible: Boolean -> + if (isVisible) { + show(SideFpsUiRequestSource.ALTERNATE_BOUNCER) + } else { + hide(SideFpsUiRequestSource.ALTERNATE_BOUNCER) + } + } + } + } + } + /** Shows the side fps overlay if not already shown. */ fun show(request: SideFpsUiRequestSource) { requests.add(request) @@ -423,4 +449,5 @@ enum class SideFpsUiRequestSource { AUTO_SHOW, /** Pin, pattern or password bouncer */ PRIMARY_BOUNCER, + ALTERNATE_BOUNCER } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt index 63a1b76b8103..addbee954fea 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt @@ -32,9 +32,7 @@ import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionListener @@ -84,7 +82,6 @@ constructor( ) { private val useExpandedOverlay: Boolean = featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION) - private val isModernBouncerEnabled: Boolean = featureFlags.isEnabled(Flags.MODERN_BOUNCER) private val isModernAlternateBouncerEnabled: Boolean = featureFlags.isEnabled(Flags.MODERN_ALTERNATE_BOUNCER) private var showingUdfpsBouncer = false @@ -110,12 +107,6 @@ constructor( ) } } - /** - * Hidden amount of input (pin/pattern/password) bouncer. This is used - * [KeyguardBouncerConstants.EXPANSION_VISIBLE] (0f) to - * [KeyguardBouncerConstants.EXPANSION_HIDDEN] (1f). Only used for the non-modernBouncer. - */ - private var inputBouncerHiddenAmount = KeyguardBouncerConstants.EXPANSION_HIDDEN private var inputBouncerExpansion = 0f // only used for modernBouncer private val stateListener: StatusBarStateController.StateListener = @@ -149,21 +140,6 @@ constructor( } } - private val mPrimaryBouncerExpansionCallback: PrimaryBouncerExpansionCallback = - object : PrimaryBouncerExpansionCallback { - override fun onExpansionChanged(expansion: Float) { - inputBouncerHiddenAmount = expansion - updateAlpha() - updatePauseAuth() - } - - override fun onVisibilityChanged(isVisible: Boolean) { - updateBouncerHiddenAmount() - updateAlpha() - updatePauseAuth() - } - } - private val configurationListener: ConfigurationController.ConfigurationListener = object : ConfigurationController.ConfigurationListener { override fun onUiModeChanged() { @@ -269,15 +245,13 @@ constructor( } init { - if (isModernBouncerEnabled || isModernAlternateBouncerEnabled) { - view.repeatWhenAttached { - // repeatOnLifecycle CREATED (as opposed to STARTED) because the Bouncer expansion - // can make the view not visible; and we still want to listen for events - // that may make the view visible again. - repeatOnLifecycle(Lifecycle.State.CREATED) { - if (isModernBouncerEnabled) listenForBouncerExpansion(this) - if (isModernAlternateBouncerEnabled) listenForAlternateBouncerVisibility(this) - } + view.repeatWhenAttached { + // repeatOnLifecycle CREATED (as opposed to STARTED) because the Bouncer expansion + // can make the view not visible; and we still want to listen for events + // that may make the view visible again. + repeatOnLifecycle(Lifecycle.State.CREATED) { + listenForBouncerExpansion(this) + if (isModernAlternateBouncerEnabled) listenForAlternateBouncerVisibility(this) } } } @@ -315,14 +289,6 @@ constructor( statusBarState = statusBarStateController.state qsExpansion = keyguardViewManager.qsExpansion keyguardViewManager.addCallback(statusBarKeyguardViewManagerCallback) - if (!isModernBouncerEnabled) { - val bouncer = keyguardViewManager.primaryBouncer - bouncer?.expansion?.let { - mPrimaryBouncerExpansionCallback.onExpansionChanged(it) - bouncer.addBouncerExpansionCallback(mPrimaryBouncerExpansionCallback) - } - updateBouncerHiddenAmount() - } configurationController.addCallback(configurationListener) shadeExpansionStateManager.addExpansionListener(shadeExpansionListener) updateScaleFactor() @@ -352,16 +318,10 @@ constructor( } activityLaunchAnimator.removeListener(activityLaunchAnimatorListener) keyguardViewManager.removeCallback(statusBarKeyguardViewManagerCallback) - if (!isModernBouncerEnabled) { - keyguardViewManager.primaryBouncer?.removeBouncerExpansionCallback( - mPrimaryBouncerExpansionCallback - ) - } } override fun dump(pw: PrintWriter, args: Array<String>) { super.dump(pw, args) - pw.println("isModernBouncerEnabled=$isModernBouncerEnabled") pw.println("isModernAlternateBouncerEnabled=$isModernAlternateBouncerEnabled") pw.println("showingUdfpsAltBouncer=$showingUdfpsBouncer") pw.println( @@ -381,11 +341,7 @@ constructor( pw.println("udfpsRequestedByApp=$udfpsRequested") pw.println("launchTransitionFadingAway=$launchTransitionFadingAway") pw.println("lastDozeAmount=$lastDozeAmount") - if (isModernBouncerEnabled) { - pw.println("inputBouncerExpansion=$inputBouncerExpansion") - } else { - pw.println("inputBouncerHiddenAmount=$inputBouncerHiddenAmount") - } + pw.println("inputBouncerExpansion=$inputBouncerExpansion") view.dump(pw) } @@ -412,7 +368,6 @@ constructor( } else { keyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false) } - updateBouncerHiddenAmount() updateAlpha() updatePauseAuth() return true @@ -453,19 +408,11 @@ constructor( } fun isBouncerExpansionGreaterThan(bouncerExpansionThreshold: Float): Boolean { - return if (isModernBouncerEnabled) { - inputBouncerExpansion >= bouncerExpansionThreshold - } else { - inputBouncerHiddenAmount < bouncerExpansionThreshold - } + return inputBouncerExpansion >= bouncerExpansionThreshold } fun isInputBouncerFullyVisible(): Boolean { - return if (isModernBouncerEnabled) { - inputBouncerExpansion == 1f - } else { - keyguardViewManager.isBouncerShowing && !alternateBouncerInteractor.isVisibleState() - } + return inputBouncerExpansion == 1f } override fun listenForTouchesOutsideView(): Boolean { @@ -517,11 +464,7 @@ constructor( } private fun getInputBouncerHiddenAmt(): Float { - return if (isModernBouncerEnabled) { - 1f - inputBouncerExpansion - } else { - inputBouncerHiddenAmount - } + return 1f - inputBouncerExpansion } /** Update the scale factor based on the device's resolution. */ @@ -529,19 +472,6 @@ constructor( udfpsController.mOverlayParams?.scaleFactor?.let { view.setScaleFactor(it) } } - private fun updateBouncerHiddenAmount() { - if (isModernBouncerEnabled) { - return - } - val altBouncerShowing = alternateBouncerInteractor.isVisibleState() - if (altBouncerShowing || !keyguardViewManager.primaryBouncerIsOrWillBeShowing()) { - inputBouncerHiddenAmount = 1f - } else if (keyguardViewManager.isBouncerShowing) { - // input bouncer is fully showing - inputBouncerHiddenAmount = 0f - } - } - private val legacyAlternateBouncer: LegacyAlternateBouncer = object : LegacyAlternateBouncer { override fun showAlternateBouncer(): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java index 805a20a6d965..1c26841a00be 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java @@ -18,7 +18,6 @@ package com.android.systemui.clipboardoverlay; import static android.content.ClipDescription.CLASSIFICATION_COMPLETE; -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_ENABLED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_UPDATED; import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN; @@ -29,7 +28,6 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.os.SystemProperties; -import android.provider.DeviceConfig; import android.provider.Settings; import android.util.Log; @@ -37,9 +35,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.UiEventLogger; import com.android.systemui.CoreStartable; import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; -import com.android.systemui.util.DeviceConfigProxy; import javax.inject.Inject; import javax.inject.Provider; @@ -59,42 +54,28 @@ public class ClipboardListener implements "com.android.systemui.SUPPRESS_CLIPBOARD_OVERLAY"; private final Context mContext; - private final DeviceConfigProxy mDeviceConfig; private final Provider<ClipboardOverlayController> mOverlayProvider; - private final ClipboardOverlayControllerLegacyFactory mOverlayFactory; private final ClipboardToast mClipboardToast; private final ClipboardManager mClipboardManager; private final UiEventLogger mUiEventLogger; - private final FeatureFlags mFeatureFlags; - private boolean mUsingNewOverlay; private ClipboardOverlay mClipboardOverlay; @Inject - public ClipboardListener(Context context, DeviceConfigProxy deviceConfigProxy, + public ClipboardListener(Context context, Provider<ClipboardOverlayController> clipboardOverlayControllerProvider, - ClipboardOverlayControllerLegacyFactory overlayFactory, ClipboardToast clipboardToast, ClipboardManager clipboardManager, - UiEventLogger uiEventLogger, - FeatureFlags featureFlags) { + UiEventLogger uiEventLogger) { mContext = context; - mDeviceConfig = deviceConfigProxy; mOverlayProvider = clipboardOverlayControllerProvider; - mOverlayFactory = overlayFactory; mClipboardToast = clipboardToast; mClipboardManager = clipboardManager; mUiEventLogger = uiEventLogger; - mFeatureFlags = featureFlags; - - mUsingNewOverlay = mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR); } @Override public void start() { - if (mDeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, true)) { - mClipboardManager.addPrimaryClipChangedListener(this); - } + mClipboardManager.addPrimaryClipChangedListener(this); } @Override @@ -120,14 +101,8 @@ public class ClipboardListener implements return; } - boolean enabled = mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR); - if (mClipboardOverlay == null || enabled != mUsingNewOverlay) { - mUsingNewOverlay = enabled; - if (enabled) { - mClipboardOverlay = mOverlayProvider.get(); - } else { - mClipboardOverlay = mOverlayFactory.create(mContext); - } + if (mClipboardOverlay == null) { + mClipboardOverlay = mOverlayProvider.get(); mUiEventLogger.log(CLIPBOARD_OVERLAY_ENTERED, 0, clipSource); } else { mUiEventLogger.log(CLIPBOARD_OVERLAY_UPDATED, 0, clipSource); diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java index f97d6af632b0..8c8ee8a325a0 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java @@ -17,7 +17,6 @@ package com.android.systemui.clipboardoverlay; import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS; @@ -72,6 +71,7 @@ import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule.Overl import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.screenshot.TimeoutHandler; +import com.android.systemui.settings.DisplayTracker; import java.io.IOException; import java.util.Optional; @@ -96,6 +96,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv private final ClipboardLogger mClipboardLogger; private final BroadcastDispatcher mBroadcastDispatcher; private final DisplayManager mDisplayManager; + private final DisplayTracker mDisplayTracker; private final ClipboardOverlayWindow mWindow; private final TimeoutHandler mTimeoutHandler; private final ClipboardOverlayUtils mClipboardUtils; @@ -186,9 +187,11 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv FeatureFlags featureFlags, ClipboardOverlayUtils clipboardUtils, @Background Executor bgExecutor, - UiEventLogger uiEventLogger) { + UiEventLogger uiEventLogger, + DisplayTracker displayTracker) { mBroadcastDispatcher = broadcastDispatcher; mDisplayManager = requireNonNull(context.getSystemService(DisplayManager.class)); + mDisplayTracker = displayTracker; final Context displayContext = context.createDisplayContext(getDefaultDisplay()); mContext = displayContext.createWindowContext(TYPE_SCREENSHOT, null); @@ -514,7 +517,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv } private Display getDefaultDisplay() { - return mDisplayManager.getDisplay(DEFAULT_DISPLAY); + return mDisplayManager.getDisplay(mDisplayTracker.getDefaultDisplayId()); } static class ClipboardLogger { diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacy.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacy.java deleted file mode 100644 index 3a040829ba0c..000000000000 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacy.java +++ /dev/null @@ -1,963 +0,0 @@ -/* - * Copyright (C) 2021 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.clipboardoverlay; - -import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS; -import static android.content.res.Configuration.ORIENTATION_PORTRAIT; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; - -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS; -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_TAPPED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISSED_OTHER; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EDIT_TAPPED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_REMOTE_COPY_TAPPED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHARE_TAPPED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TAP_OUTSIDE; -import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TIMED_OUT; - -import static java.util.Objects.requireNonNull; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; -import android.animation.TimeInterpolator; -import android.animation.ValueAnimator; -import android.annotation.MainThread; -import android.app.ICompatCameraControlCallback; -import android.app.RemoteAction; -import android.content.BroadcastReceiver; -import android.content.ClipData; -import android.content.ClipDescription; -import android.content.ComponentName; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.PackageManager; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Insets; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Region; -import android.graphics.drawable.Icon; -import android.hardware.display.DisplayManager; -import android.hardware.input.InputManager; -import android.net.Uri; -import android.os.AsyncTask; -import android.os.Looper; -import android.provider.DeviceConfig; -import android.text.TextUtils; -import android.util.DisplayMetrics; -import android.util.Log; -import android.util.MathUtils; -import android.util.Size; -import android.util.TypedValue; -import android.view.Display; -import android.view.DisplayCutout; -import android.view.Gravity; -import android.view.InputEvent; -import android.view.InputEventReceiver; -import android.view.InputMonitor; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewRootImpl; -import android.view.ViewTreeObserver; -import android.view.WindowInsets; -import android.view.WindowManager; -import android.view.accessibility.AccessibilityManager; -import android.view.animation.LinearInterpolator; -import android.view.animation.PathInterpolator; -import android.view.textclassifier.TextClassification; -import android.view.textclassifier.TextClassificationManager; -import android.view.textclassifier.TextClassifier; -import android.view.textclassifier.TextLinks; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.core.view.ViewCompat; -import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; - -import com.android.internal.logging.UiEventLogger; -import com.android.internal.policy.PhoneWindow; -import com.android.systemui.R; -import com.android.systemui.broadcast.BroadcastDispatcher; -import com.android.systemui.broadcast.BroadcastSender; -import com.android.systemui.screenshot.DraggableConstraintLayout; -import com.android.systemui.screenshot.FloatingWindowUtil; -import com.android.systemui.screenshot.OverlayActionChip; -import com.android.systemui.screenshot.TimeoutHandler; - -import java.io.IOException; -import java.util.ArrayList; - -/** - * Controls state and UI for the overlay that appears when something is added to the clipboard - */ -public class ClipboardOverlayControllerLegacy implements ClipboardListener.ClipboardOverlay { - private static final String TAG = "ClipboardOverlayCtrlr"; - private static final String REMOTE_COPY_ACTION = "android.intent.action.REMOTE_COPY"; - - /** Constants for screenshot/copy deconflicting */ - public static final String SCREENSHOT_ACTION = "com.android.systemui.SCREENSHOT"; - public static final String SELF_PERMISSION = "com.android.systemui.permission.SELF"; - public static final String COPY_OVERLAY_ACTION = "com.android.systemui.COPY"; - - private static final String EXTRA_EDIT_SOURCE_CLIPBOARD = "edit_source_clipboard"; - - private static final int CLIPBOARD_DEFAULT_TIMEOUT_MILLIS = 6000; - private static final int SWIPE_PADDING_DP = 12; // extra padding around views to allow swipe - private static final int FONT_SEARCH_STEP_PX = 4; - - private final Context mContext; - private final ClipboardLogger mClipboardLogger; - private final BroadcastDispatcher mBroadcastDispatcher; - private final DisplayManager mDisplayManager; - private final DisplayMetrics mDisplayMetrics; - private final WindowManager mWindowManager; - private final WindowManager.LayoutParams mWindowLayoutParams; - private final PhoneWindow mWindow; - private final TimeoutHandler mTimeoutHandler; - private final AccessibilityManager mAccessibilityManager; - private final TextClassifier mTextClassifier; - - private final DraggableConstraintLayout mView; - private final View mClipboardPreview; - private final ImageView mImagePreview; - private final TextView mTextPreview; - private final TextView mHiddenPreview; - private final View mPreviewBorder; - private final OverlayActionChip mEditChip; - private final OverlayActionChip mShareChip; - private final OverlayActionChip mRemoteCopyChip; - private final View mActionContainerBackground; - private final View mDismissButton; - private final LinearLayout mActionContainer; - private final ArrayList<OverlayActionChip> mActionChips = new ArrayList<>(); - - private Runnable mOnSessionCompleteListener; - - private InputMonitor mInputMonitor; - private InputEventReceiver mInputEventReceiver; - - private BroadcastReceiver mCloseDialogsReceiver; - private BroadcastReceiver mScreenshotReceiver; - - private boolean mBlockAttach = false; - private Animator mExitAnimator; - private Animator mEnterAnimator; - private final int mOrientation; - private boolean mKeyboardVisible; - - - public ClipboardOverlayControllerLegacy(Context context, - BroadcastDispatcher broadcastDispatcher, - BroadcastSender broadcastSender, - TimeoutHandler timeoutHandler, UiEventLogger uiEventLogger) { - mBroadcastDispatcher = broadcastDispatcher; - mDisplayManager = requireNonNull(context.getSystemService(DisplayManager.class)); - final Context displayContext = context.createDisplayContext(getDefaultDisplay()); - mContext = displayContext.createWindowContext(TYPE_SCREENSHOT, null); - - mClipboardLogger = new ClipboardLogger(uiEventLogger); - - mAccessibilityManager = AccessibilityManager.getInstance(mContext); - mTextClassifier = requireNonNull(context.getSystemService(TextClassificationManager.class)) - .getTextClassifier(); - - mWindowManager = mContext.getSystemService(WindowManager.class); - - mDisplayMetrics = new DisplayMetrics(); - mContext.getDisplay().getRealMetrics(mDisplayMetrics); - - mTimeoutHandler = timeoutHandler; - mTimeoutHandler.setDefaultTimeoutMillis(CLIPBOARD_DEFAULT_TIMEOUT_MILLIS); - - // Setup the window that we are going to use - mWindowLayoutParams = FloatingWindowUtil.getFloatingWindowParams(); - mWindowLayoutParams.setTitle("ClipboardOverlay"); - - mWindow = FloatingWindowUtil.getFloatingWindow(mContext); - mWindow.setWindowManager(mWindowManager, null, null); - - setWindowFocusable(false); - - mView = (DraggableConstraintLayout) - LayoutInflater.from(mContext).inflate(R.layout.clipboard_overlay_legacy, null); - mActionContainerBackground = - requireNonNull(mView.findViewById(R.id.actions_container_background)); - mActionContainer = requireNonNull(mView.findViewById(R.id.actions)); - mClipboardPreview = requireNonNull(mView.findViewById(R.id.clipboard_preview)); - mImagePreview = requireNonNull(mView.findViewById(R.id.image_preview)); - mTextPreview = requireNonNull(mView.findViewById(R.id.text_preview)); - mHiddenPreview = requireNonNull(mView.findViewById(R.id.hidden_preview)); - mPreviewBorder = requireNonNull(mView.findViewById(R.id.preview_border)); - mEditChip = requireNonNull(mView.findViewById(R.id.edit_chip)); - mShareChip = requireNonNull(mView.findViewById(R.id.share_chip)); - mRemoteCopyChip = requireNonNull(mView.findViewById(R.id.remote_copy_chip)); - mEditChip.setAlpha(1); - mShareChip.setAlpha(1); - mRemoteCopyChip.setAlpha(1); - mDismissButton = requireNonNull(mView.findViewById(R.id.dismiss_button)); - - mShareChip.setContentDescription(mContext.getString(com.android.internal.R.string.share)); - mView.setCallbacks(new DraggableConstraintLayout.SwipeDismissCallbacks() { - @Override - public void onInteraction() { - mTimeoutHandler.resetTimeout(); - } - - @Override - public void onSwipeDismissInitiated(Animator animator) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_SWIPE_DISMISSED); - mExitAnimator = animator; - } - - @Override - public void onDismissComplete() { - hideImmediate(); - } - }); - - mTextPreview.getViewTreeObserver().addOnPreDrawListener(() -> { - int availableHeight = mTextPreview.getHeight() - - (mTextPreview.getPaddingTop() + mTextPreview.getPaddingBottom()); - mTextPreview.setMaxLines(availableHeight / mTextPreview.getLineHeight()); - return true; - }); - - mDismissButton.setOnClickListener(view -> { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISS_TAPPED); - animateOut(); - }); - - mEditChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_edit), true); - mRemoteCopyChip.setIcon( - Icon.createWithResource(mContext, R.drawable.ic_baseline_devices_24), true); - mShareChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_share), true); - mOrientation = mContext.getResources().getConfiguration().orientation; - - attachWindow(); - withWindowAttached(() -> { - mWindow.setContentView(mView); - WindowInsets insets = mWindowManager.getCurrentWindowMetrics().getWindowInsets(); - mKeyboardVisible = insets.isVisible(WindowInsets.Type.ime()); - updateInsets(insets); - mWindow.peekDecorView().getViewTreeObserver().addOnGlobalLayoutListener( - new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - WindowInsets insets = - mWindowManager.getCurrentWindowMetrics().getWindowInsets(); - boolean keyboardVisible = insets.isVisible(WindowInsets.Type.ime()); - if (keyboardVisible != mKeyboardVisible) { - mKeyboardVisible = keyboardVisible; - updateInsets(insets); - } - } - }); - mWindow.peekDecorView().getViewRootImpl().setActivityConfigCallback( - new ViewRootImpl.ActivityConfigCallback() { - @Override - public void onConfigurationChanged(Configuration overrideConfig, - int newDisplayId) { - if (mContext.getResources().getConfiguration().orientation - != mOrientation) { - mClipboardLogger.logSessionComplete( - CLIPBOARD_OVERLAY_DISMISSED_OTHER); - hideImmediate(); - } - } - - @Override - public void requestCompatCameraControl( - boolean showControl, boolean transformationApplied, - ICompatCameraControlCallback callback) { - Log.w(TAG, "unexpected requestCompatCameraControl call"); - } - }); - }); - - mTimeoutHandler.setOnTimeoutRunnable(() -> { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_TIMED_OUT); - animateOut(); - }); - - mCloseDialogsReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISSED_OTHER); - animateOut(); - } - } - }; - - mBroadcastDispatcher.registerReceiver(mCloseDialogsReceiver, - new IntentFilter(ACTION_CLOSE_SYSTEM_DIALOGS)); - mScreenshotReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (SCREENSHOT_ACTION.equals(intent.getAction())) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISSED_OTHER); - animateOut(); - } - } - }; - - mBroadcastDispatcher.registerReceiver(mScreenshotReceiver, - new IntentFilter(SCREENSHOT_ACTION), null, null, Context.RECEIVER_EXPORTED, - SELF_PERMISSION); - monitorOutsideTouches(); - - Intent copyIntent = new Intent(COPY_OVERLAY_ACTION); - // Set package name so the system knows it's safe - copyIntent.setPackage(mContext.getPackageName()); - broadcastSender.sendBroadcast(copyIntent, SELF_PERMISSION); - } - - @Override // ClipboardListener.ClipboardOverlay - public void setClipData(ClipData clipData, String clipSource) { - if (mExitAnimator != null && mExitAnimator.isRunning()) { - mExitAnimator.cancel(); - } - reset(); - String accessibilityAnnouncement; - - boolean isSensitive = clipData != null && clipData.getDescription().getExtras() != null - && clipData.getDescription().getExtras() - .getBoolean(ClipDescription.EXTRA_IS_SENSITIVE); - if (clipData == null || clipData.getItemCount() == 0) { - showTextPreview( - mContext.getResources().getString(R.string.clipboard_overlay_text_copied), - mTextPreview); - accessibilityAnnouncement = mContext.getString(R.string.clipboard_content_copied); - } else if (!TextUtils.isEmpty(clipData.getItemAt(0).getText())) { - ClipData.Item item = clipData.getItemAt(0); - if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, - CLIPBOARD_OVERLAY_SHOW_ACTIONS, false)) { - if (item.getTextLinks() != null) { - AsyncTask.execute(() -> classifyText(clipData.getItemAt(0), clipSource)); - } - } - if (isSensitive) { - showEditableText( - mContext.getResources().getString(R.string.clipboard_asterisks), true); - } else { - showEditableText(item.getText(), false); - } - showShareChip(clipData); - accessibilityAnnouncement = mContext.getString(R.string.clipboard_text_copied); - } else if (clipData.getItemAt(0).getUri() != null) { - if (tryShowEditableImage(clipData.getItemAt(0).getUri(), isSensitive)) { - showShareChip(clipData); - accessibilityAnnouncement = mContext.getString(R.string.clipboard_image_copied); - } else { - accessibilityAnnouncement = mContext.getString(R.string.clipboard_content_copied); - } - } else { - showTextPreview( - mContext.getResources().getString(R.string.clipboard_overlay_text_copied), - mTextPreview); - accessibilityAnnouncement = mContext.getString(R.string.clipboard_content_copied); - } - Intent remoteCopyIntent = IntentCreator.getRemoteCopyIntent(clipData, mContext); - // Only show remote copy if it's available. - PackageManager packageManager = mContext.getPackageManager(); - if (packageManager.resolveActivity( - remoteCopyIntent, PackageManager.ResolveInfoFlags.of(0)) != null) { - mRemoteCopyChip.setContentDescription( - mContext.getString(R.string.clipboard_send_nearby_description)); - mRemoteCopyChip.setVisibility(View.VISIBLE); - mRemoteCopyChip.setOnClickListener((v) -> { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_REMOTE_COPY_TAPPED); - mContext.startActivity(remoteCopyIntent); - animateOut(); - }); - mActionContainerBackground.setVisibility(View.VISIBLE); - } else { - mRemoteCopyChip.setVisibility(View.GONE); - } - withWindowAttached(() -> { - if (mEnterAnimator == null || !mEnterAnimator.isRunning()) { - mView.post(this::animateIn); - } - mView.announceForAccessibility(accessibilityAnnouncement); - }); - mTimeoutHandler.resetTimeout(); - } - - @Override // ClipboardListener.ClipboardOverlay - public void setOnSessionCompleteListener(Runnable runnable) { - mOnSessionCompleteListener = runnable; - } - - private void classifyText(ClipData.Item item, String source) { - ArrayList<RemoteAction> actions = new ArrayList<>(); - for (TextLinks.TextLink link : item.getTextLinks().getLinks()) { - TextClassification classification = mTextClassifier.classifyText( - item.getText(), link.getStart(), link.getEnd(), null); - actions.addAll(classification.getActions()); - } - mView.post(() -> { - resetActionChips(); - if (actions.size() > 0) { - mActionContainerBackground.setVisibility(View.VISIBLE); - for (RemoteAction action : actions) { - Intent targetIntent = action.getActionIntent().getIntent(); - ComponentName component = targetIntent.getComponent(); - if (component != null && !TextUtils.equals(source, - component.getPackageName())) { - OverlayActionChip chip = constructActionChip(action); - mActionContainer.addView(chip); - mActionChips.add(chip); - break; // only show at most one action chip - } - } - } - }); - } - - private void showShareChip(ClipData clip) { - mShareChip.setVisibility(View.VISIBLE); - mActionContainerBackground.setVisibility(View.VISIBLE); - mShareChip.setOnClickListener((v) -> shareContent(clip)); - } - - private OverlayActionChip constructActionChip(RemoteAction action) { - OverlayActionChip chip = (OverlayActionChip) LayoutInflater.from(mContext).inflate( - R.layout.overlay_action_chip, mActionContainer, false); - chip.setText(action.getTitle()); - chip.setContentDescription(action.getTitle()); - chip.setIcon(action.getIcon(), false); - chip.setPendingIntent(action.getActionIntent(), () -> { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_ACTION_TAPPED); - animateOut(); - }); - chip.setAlpha(1); - return chip; - } - - private void monitorOutsideTouches() { - InputManager inputManager = mContext.getSystemService(InputManager.class); - mInputMonitor = inputManager.monitorGestureInput("clipboard overlay", 0); - mInputEventReceiver = new InputEventReceiver(mInputMonitor.getInputChannel(), - Looper.getMainLooper()) { - @Override - public void onInputEvent(InputEvent event) { - if (event instanceof MotionEvent) { - MotionEvent motionEvent = (MotionEvent) event; - if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) { - Region touchRegion = new Region(); - - final Rect tmpRect = new Rect(); - mPreviewBorder.getBoundsOnScreen(tmpRect); - tmpRect.inset( - (int) FloatingWindowUtil.dpToPx(mDisplayMetrics, -SWIPE_PADDING_DP), - (int) FloatingWindowUtil.dpToPx(mDisplayMetrics, - -SWIPE_PADDING_DP)); - touchRegion.op(tmpRect, Region.Op.UNION); - mActionContainerBackground.getBoundsOnScreen(tmpRect); - tmpRect.inset( - (int) FloatingWindowUtil.dpToPx(mDisplayMetrics, -SWIPE_PADDING_DP), - (int) FloatingWindowUtil.dpToPx(mDisplayMetrics, - -SWIPE_PADDING_DP)); - touchRegion.op(tmpRect, Region.Op.UNION); - mDismissButton.getBoundsOnScreen(tmpRect); - touchRegion.op(tmpRect, Region.Op.UNION); - if (!touchRegion.contains( - (int) motionEvent.getRawX(), (int) motionEvent.getRawY())) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_TAP_OUTSIDE); - animateOut(); - } - } - } - finishInputEvent(event, true /* handled */); - } - }; - } - - private void editImage(Uri uri) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_EDIT_TAPPED); - mContext.startActivity(IntentCreator.getImageEditIntent(uri, mContext)); - animateOut(); - } - - private void editText() { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_EDIT_TAPPED); - mContext.startActivity(IntentCreator.getTextEditorIntent(mContext)); - animateOut(); - } - - private void shareContent(ClipData clip) { - mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_SHARE_TAPPED); - mContext.startActivity(IntentCreator.getShareIntent(clip, mContext)); - animateOut(); - } - - private void showSinglePreview(View v) { - mTextPreview.setVisibility(View.GONE); - mImagePreview.setVisibility(View.GONE); - mHiddenPreview.setVisibility(View.GONE); - v.setVisibility(View.VISIBLE); - } - - private void showTextPreview(CharSequence text, TextView textView) { - showSinglePreview(textView); - final CharSequence truncatedText = text.subSequence(0, Math.min(500, text.length())); - textView.setText(truncatedText); - updateTextSize(truncatedText, textView); - - textView.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - if (right - left != oldRight - oldLeft) { - updateTextSize(truncatedText, textView); - } - }); - mEditChip.setVisibility(View.GONE); - } - - private void updateTextSize(CharSequence text, TextView textView) { - Paint paint = new Paint(textView.getPaint()); - Resources res = textView.getResources(); - float minFontSize = res.getDimensionPixelSize(R.dimen.clipboard_overlay_min_font); - float maxFontSize = res.getDimensionPixelSize(R.dimen.clipboard_overlay_max_font); - if (isOneWord(text) && fitsInView(text, textView, paint, minFontSize)) { - // If the text is a single word and would fit within the TextView at the min font size, - // find the biggest font size that will fit. - float fontSizePx = minFontSize; - while (fontSizePx + FONT_SEARCH_STEP_PX < maxFontSize - && fitsInView(text, textView, paint, fontSizePx + FONT_SEARCH_STEP_PX)) { - fontSizePx += FONT_SEARCH_STEP_PX; - } - // Need to turn off autosizing, otherwise setTextSize is a no-op. - textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_NONE); - // It's possible to hit the max font size and not fill the width, so centering - // horizontally looks better in this case. - textView.setGravity(Gravity.CENTER); - textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, (int) fontSizePx); - } else { - // Otherwise just stick with autosize. - textView.setAutoSizeTextTypeUniformWithConfiguration((int) minFontSize, - (int) maxFontSize, FONT_SEARCH_STEP_PX, TypedValue.COMPLEX_UNIT_PX); - textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.START); - } - } - - private static boolean fitsInView(CharSequence text, TextView textView, Paint paint, - float fontSizePx) { - paint.setTextSize(fontSizePx); - float size = paint.measureText(text.toString()); - float availableWidth = textView.getWidth() - textView.getPaddingLeft() - - textView.getPaddingRight(); - return size < availableWidth; - } - - private static boolean isOneWord(CharSequence text) { - return text.toString().split("\\s+", 2).length == 1; - } - - private void showEditableText(CharSequence text, boolean hidden) { - TextView textView = hidden ? mHiddenPreview : mTextPreview; - showTextPreview(text, textView); - View.OnClickListener listener = v -> editText(); - setAccessibilityActionToEdit(textView); - if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, - CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON, false)) { - mEditChip.setVisibility(View.VISIBLE); - mActionContainerBackground.setVisibility(View.VISIBLE); - mEditChip.setContentDescription( - mContext.getString(R.string.clipboard_edit_text_description)); - mEditChip.setOnClickListener(listener); - } - textView.setOnClickListener(listener); - } - - private boolean tryShowEditableImage(Uri uri, boolean isSensitive) { - View.OnClickListener listener = v -> editImage(uri); - ContentResolver resolver = mContext.getContentResolver(); - String mimeType = resolver.getType(uri); - boolean isEditableImage = mimeType != null && mimeType.startsWith("image"); - if (isSensitive) { - mHiddenPreview.setText(mContext.getString(R.string.clipboard_text_hidden)); - showSinglePreview(mHiddenPreview); - if (isEditableImage) { - mHiddenPreview.setOnClickListener(listener); - setAccessibilityActionToEdit(mHiddenPreview); - } - } else if (isEditableImage) { // if the MIMEtype is image, try to load - try { - int size = mContext.getResources().getDimensionPixelSize(R.dimen.overlay_x_scale); - // The width of the view is capped, height maintains aspect ratio, so allow it to be - // taller if needed. - Bitmap thumbnail = resolver.loadThumbnail(uri, new Size(size, size * 4), null); - showSinglePreview(mImagePreview); - mImagePreview.setImageBitmap(thumbnail); - mImagePreview.setOnClickListener(listener); - setAccessibilityActionToEdit(mImagePreview); - } catch (IOException e) { - Log.e(TAG, "Thumbnail loading failed", e); - showTextPreview( - mContext.getResources().getString(R.string.clipboard_overlay_text_copied), - mTextPreview); - isEditableImage = false; - } - } else { - showTextPreview( - mContext.getResources().getString(R.string.clipboard_overlay_text_copied), - mTextPreview); - } - if (isEditableImage && DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON, false)) { - mEditChip.setVisibility(View.VISIBLE); - mActionContainerBackground.setVisibility(View.VISIBLE); - mEditChip.setOnClickListener(listener); - mEditChip.setContentDescription( - mContext.getString(R.string.clipboard_edit_image_description)); - } - return isEditableImage; - } - - private void setAccessibilityActionToEdit(View view) { - ViewCompat.replaceAccessibilityAction(view, - AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CLICK, - mContext.getString(R.string.clipboard_edit), null); - } - - private void animateIn() { - if (mAccessibilityManager.isEnabled()) { - mDismissButton.setVisibility(View.VISIBLE); - } - mEnterAnimator = getEnterAnimation(); - mEnterAnimator.start(); - } - - private void animateOut() { - if (mExitAnimator != null && mExitAnimator.isRunning()) { - return; - } - Animator anim = getExitAnimation(); - anim.addListener(new AnimatorListenerAdapter() { - private boolean mCancelled; - - @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); - mCancelled = true; - } - - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - if (!mCancelled) { - hideImmediate(); - } - } - }); - mExitAnimator = anim; - anim.start(); - } - - private Animator getEnterAnimation() { - TimeInterpolator linearInterpolator = new LinearInterpolator(); - TimeInterpolator scaleInterpolator = new PathInterpolator(0, 0, 0, 1f); - AnimatorSet enterAnim = new AnimatorSet(); - - ValueAnimator rootAnim = ValueAnimator.ofFloat(0, 1); - rootAnim.setInterpolator(linearInterpolator); - rootAnim.setDuration(66); - rootAnim.addUpdateListener(animation -> { - mView.setAlpha(animation.getAnimatedFraction()); - }); - - ValueAnimator scaleAnim = ValueAnimator.ofFloat(0, 1); - scaleAnim.setInterpolator(scaleInterpolator); - scaleAnim.setDuration(333); - scaleAnim.addUpdateListener(animation -> { - float previewScale = MathUtils.lerp(.9f, 1f, animation.getAnimatedFraction()); - mClipboardPreview.setScaleX(previewScale); - mClipboardPreview.setScaleY(previewScale); - mPreviewBorder.setScaleX(previewScale); - mPreviewBorder.setScaleY(previewScale); - - float pivotX = mClipboardPreview.getWidth() / 2f + mClipboardPreview.getX(); - mActionContainerBackground.setPivotX(pivotX - mActionContainerBackground.getX()); - mActionContainer.setPivotX(pivotX - ((View) mActionContainer.getParent()).getX()); - float actionsScaleX = MathUtils.lerp(.7f, 1f, animation.getAnimatedFraction()); - float actionsScaleY = MathUtils.lerp(.9f, 1f, animation.getAnimatedFraction()); - mActionContainer.setScaleX(actionsScaleX); - mActionContainer.setScaleY(actionsScaleY); - mActionContainerBackground.setScaleX(actionsScaleX); - mActionContainerBackground.setScaleY(actionsScaleY); - }); - - ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1); - alphaAnim.setInterpolator(linearInterpolator); - alphaAnim.setDuration(283); - alphaAnim.addUpdateListener(animation -> { - float alpha = animation.getAnimatedFraction(); - mClipboardPreview.setAlpha(alpha); - mPreviewBorder.setAlpha(alpha); - mDismissButton.setAlpha(alpha); - mActionContainer.setAlpha(alpha); - }); - - mActionContainer.setAlpha(0); - mPreviewBorder.setAlpha(0); - mClipboardPreview.setAlpha(0); - enterAnim.play(rootAnim).with(scaleAnim); - enterAnim.play(alphaAnim).after(50).after(rootAnim); - - enterAnim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - mView.setAlpha(1); - mTimeoutHandler.resetTimeout(); - } - }); - return enterAnim; - } - - private Animator getExitAnimation() { - TimeInterpolator linearInterpolator = new LinearInterpolator(); - TimeInterpolator scaleInterpolator = new PathInterpolator(.3f, 0, 1f, 1f); - AnimatorSet exitAnim = new AnimatorSet(); - - ValueAnimator rootAnim = ValueAnimator.ofFloat(0, 1); - rootAnim.setInterpolator(linearInterpolator); - rootAnim.setDuration(100); - rootAnim.addUpdateListener(anim -> mView.setAlpha(1 - anim.getAnimatedFraction())); - - ValueAnimator scaleAnim = ValueAnimator.ofFloat(0, 1); - scaleAnim.setInterpolator(scaleInterpolator); - scaleAnim.setDuration(250); - scaleAnim.addUpdateListener(animation -> { - float previewScale = MathUtils.lerp(1f, .9f, animation.getAnimatedFraction()); - mClipboardPreview.setScaleX(previewScale); - mClipboardPreview.setScaleY(previewScale); - mPreviewBorder.setScaleX(previewScale); - mPreviewBorder.setScaleY(previewScale); - - float pivotX = mClipboardPreview.getWidth() / 2f + mClipboardPreview.getX(); - mActionContainerBackground.setPivotX(pivotX - mActionContainerBackground.getX()); - mActionContainer.setPivotX(pivotX - ((View) mActionContainer.getParent()).getX()); - float actionScaleX = MathUtils.lerp(1f, .8f, animation.getAnimatedFraction()); - float actionScaleY = MathUtils.lerp(1f, .9f, animation.getAnimatedFraction()); - mActionContainer.setScaleX(actionScaleX); - mActionContainer.setScaleY(actionScaleY); - mActionContainerBackground.setScaleX(actionScaleX); - mActionContainerBackground.setScaleY(actionScaleY); - }); - - ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1); - alphaAnim.setInterpolator(linearInterpolator); - alphaAnim.setDuration(166); - alphaAnim.addUpdateListener(animation -> { - float alpha = 1 - animation.getAnimatedFraction(); - mClipboardPreview.setAlpha(alpha); - mPreviewBorder.setAlpha(alpha); - mDismissButton.setAlpha(alpha); - mActionContainer.setAlpha(alpha); - }); - - exitAnim.play(alphaAnim).with(scaleAnim); - exitAnim.play(rootAnim).after(150).after(alphaAnim); - return exitAnim; - } - - private void hideImmediate() { - // Note this may be called multiple times if multiple dismissal events happen at the same - // time. - mTimeoutHandler.cancelTimeout(); - final View decorView = mWindow.peekDecorView(); - if (decorView != null && decorView.isAttachedToWindow()) { - mWindowManager.removeViewImmediate(decorView); - } - if (mCloseDialogsReceiver != null) { - mBroadcastDispatcher.unregisterReceiver(mCloseDialogsReceiver); - mCloseDialogsReceiver = null; - } - if (mScreenshotReceiver != null) { - mBroadcastDispatcher.unregisterReceiver(mScreenshotReceiver); - mScreenshotReceiver = null; - } - if (mInputEventReceiver != null) { - mInputEventReceiver.dispose(); - mInputEventReceiver = null; - } - if (mInputMonitor != null) { - mInputMonitor.dispose(); - mInputMonitor = null; - } - if (mOnSessionCompleteListener != null) { - mOnSessionCompleteListener.run(); - } - } - - private void resetActionChips() { - for (OverlayActionChip chip : mActionChips) { - mActionContainer.removeView(chip); - } - mActionChips.clear(); - } - - private void reset() { - mView.setTranslationX(0); - mView.setAlpha(0); - mActionContainerBackground.setVisibility(View.GONE); - mShareChip.setVisibility(View.GONE); - mEditChip.setVisibility(View.GONE); - mRemoteCopyChip.setVisibility(View.GONE); - resetActionChips(); - mTimeoutHandler.cancelTimeout(); - mClipboardLogger.reset(); - } - - @MainThread - private void attachWindow() { - View decorView = mWindow.getDecorView(); - if (decorView.isAttachedToWindow() || mBlockAttach) { - return; - } - mBlockAttach = true; - mWindowManager.addView(decorView, mWindowLayoutParams); - decorView.requestApplyInsets(); - mView.requestApplyInsets(); - decorView.getViewTreeObserver().addOnWindowAttachListener( - new ViewTreeObserver.OnWindowAttachListener() { - @Override - public void onWindowAttached() { - mBlockAttach = false; - } - - @Override - public void onWindowDetached() { - } - } - ); - } - - private void withWindowAttached(Runnable action) { - View decorView = mWindow.getDecorView(); - if (decorView.isAttachedToWindow()) { - action.run(); - } else { - decorView.getViewTreeObserver().addOnWindowAttachListener( - new ViewTreeObserver.OnWindowAttachListener() { - @Override - public void onWindowAttached() { - mBlockAttach = false; - decorView.getViewTreeObserver().removeOnWindowAttachListener(this); - action.run(); - } - - @Override - public void onWindowDetached() { - } - }); - } - } - - private void updateInsets(WindowInsets insets) { - int orientation = mContext.getResources().getConfiguration().orientation; - FrameLayout.LayoutParams p = (FrameLayout.LayoutParams) mView.getLayoutParams(); - if (p == null) { - return; - } - DisplayCutout cutout = insets.getDisplayCutout(); - Insets navBarInsets = insets.getInsets(WindowInsets.Type.navigationBars()); - Insets imeInsets = insets.getInsets(WindowInsets.Type.ime()); - if (cutout == null) { - p.setMargins(0, 0, 0, Math.max(imeInsets.bottom, navBarInsets.bottom)); - } else { - Insets waterfall = cutout.getWaterfallInsets(); - if (orientation == ORIENTATION_PORTRAIT) { - p.setMargins( - waterfall.left, - Math.max(cutout.getSafeInsetTop(), waterfall.top), - waterfall.right, - Math.max(imeInsets.bottom, - Math.max(cutout.getSafeInsetBottom(), - Math.max(navBarInsets.bottom, waterfall.bottom)))); - } else { - p.setMargins( - waterfall.left, - waterfall.top, - waterfall.right, - Math.max(imeInsets.bottom, - Math.max(navBarInsets.bottom, waterfall.bottom))); - } - } - mView.setLayoutParams(p); - mView.requestLayout(); - } - - private Display getDefaultDisplay() { - return mDisplayManager.getDisplay(DEFAULT_DISPLAY); - } - - /** - * Updates the window focusability. If the window is already showing, then it updates the - * window immediately, otherwise the layout params will be applied when the window is next - * shown. - */ - private void setWindowFocusable(boolean focusable) { - int flags = mWindowLayoutParams.flags; - if (focusable) { - mWindowLayoutParams.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; - } else { - mWindowLayoutParams.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; - } - if (mWindowLayoutParams.flags == flags) { - return; - } - final View decorView = mWindow.peekDecorView(); - if (decorView != null && decorView.isAttachedToWindow()) { - mWindowManager.updateViewLayout(decorView, mWindowLayoutParams); - } - } - - static class ClipboardLogger { - private final UiEventLogger mUiEventLogger; - private boolean mGuarded = false; - - ClipboardLogger(UiEventLogger uiEventLogger) { - mUiEventLogger = uiEventLogger; - } - - void logSessionComplete(@NonNull UiEventLogger.UiEventEnum event) { - if (!mGuarded) { - mGuarded = true; - mUiEventLogger.log(event); - } - } - - void reset() { - mGuarded = false; - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacyFactory.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacyFactory.java deleted file mode 100644 index 0d989a78947d..000000000000 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerLegacyFactory.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.clipboardoverlay; - -import android.content.Context; - -import com.android.internal.logging.UiEventLogger; -import com.android.systemui.broadcast.BroadcastDispatcher; -import com.android.systemui.broadcast.BroadcastSender; -import com.android.systemui.dagger.SysUISingleton; -import com.android.systemui.screenshot.TimeoutHandler; - -import javax.inject.Inject; - -/** - * A factory that churns out ClipboardOverlayControllerLegacys on demand. - */ -@SysUISingleton -public class ClipboardOverlayControllerLegacyFactory { - - private final UiEventLogger mUiEventLogger; - private final BroadcastDispatcher mBroadcastDispatcher; - private final BroadcastSender mBroadcastSender; - - @Inject - public ClipboardOverlayControllerLegacyFactory(BroadcastDispatcher broadcastDispatcher, - BroadcastSender broadcastSender, UiEventLogger uiEventLogger) { - this.mBroadcastDispatcher = broadcastDispatcher; - this.mBroadcastSender = broadcastSender; - this.mUiEventLogger = uiEventLogger; - } - - /** - * One new ClipboardOverlayControllerLegacy, coming right up! - */ - public ClipboardOverlayControllerLegacy create(Context context) { - return new ClipboardOverlayControllerLegacy(context, mBroadcastDispatcher, mBroadcastSender, - new TimeoutHandler(context), mUiEventLogger); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java index 22448130f7e5..09b2e44c1be1 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java @@ -16,7 +16,6 @@ package com.android.systemui.clipboardoverlay.dagger; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -28,6 +27,7 @@ import android.view.LayoutInflater; import com.android.systemui.R; import com.android.systemui.clipboardoverlay.ClipboardOverlayView; +import com.android.systemui.settings.DisplayTracker; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -46,8 +46,9 @@ public interface ClipboardOverlayModule { */ @Provides @OverlayWindowContext - static Context provideWindowContext(DisplayManager displayManager, Context context) { - Display display = displayManager.getDisplay(DEFAULT_DISPLAY); + static Context provideWindowContext(DisplayManager displayManager, + DisplayTracker displayTracker, Context context) { + Display display = displayManager.getDisplay(displayTracker.getDefaultDisplayId()); return context.createWindowContext(display, TYPE_SCREENSHOT, null); } diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableConstraintLayout.kt b/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableConstraintLayout.kt new file mode 100644 index 000000000000..9763665c5b7c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableConstraintLayout.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.common.ui.view + +import android.content.Context +import android.util.AttributeSet +import androidx.constraintlayout.widget.ConstraintLayout +import com.android.systemui.animation.LaunchableView +import com.android.systemui.animation.LaunchableViewDelegate + +/** A [ConstraintLayout] that also implements [LaunchableView]. */ +open class LaunchableConstraintLayout : ConstraintLayout, LaunchableView { + private val delegate = + LaunchableViewDelegate( + this, + superSetVisibility = { super.setVisibility(it) }, + ) + + constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int + ) : super(context, attrs, defStyleAttr) + + constructor( + context: Context, + attrs: AttributeSet?, + defStyleAttr: Int, + defStyleRes: Int + ) : super(context, attrs, defStyleAttr, defStyleRes) + + override fun setShouldBlockVisibilityChanges(block: Boolean) { + delegate.setShouldBlockVisibilityChanges(block) + } + + override fun setVisibility(visibility: Int) { + delegate.setVisibility(visibility) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableLinearLayout.kt b/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableLinearLayout.kt index ddde6280f3a2..2edac528b037 100644 --- a/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableLinearLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableLinearLayout.kt @@ -23,7 +23,7 @@ import com.android.systemui.animation.LaunchableView import com.android.systemui.animation.LaunchableViewDelegate /** A [LinearLayout] that also implements [LaunchableView]. */ -class LaunchableLinearLayout : LinearLayout, LaunchableView { +open class LaunchableLinearLayout : LinearLayout, LaunchableView { private val delegate = LaunchableViewDelegate( this, diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt index 54587b20c7e1..3808e73ca085 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt @@ -189,9 +189,9 @@ open class ControlsProviderSelectorActivity @Inject constructor( authorizedPanelsRepository.addAuthorizedPanels( setOf(serviceInfo.componentName.packageName) ) - animateExitAndFinish() val selected = SelectedItem.PanelItem(appName, componentName) controlsController.setPreferredSelection(selected) + animateExitAndFinish() openControlsOrigin() } dialog = null diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt index 966dbf1a9694..58f4835a01ee 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt @@ -25,8 +25,10 @@ import android.app.PendingIntent import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.pm.PackageManager import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable +import android.os.Trace import android.service.controls.Control import android.service.controls.ControlsProviderService import android.util.Log @@ -38,6 +40,7 @@ import android.view.animation.AccelerateInterpolator import android.view.animation.DecelerateInterpolator import android.widget.AdapterView import android.widget.ArrayAdapter +import android.widget.BaseAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout @@ -90,6 +93,7 @@ private data class ControlKey(val componentName: ComponentName, val controlId: S class ControlsUiControllerImpl @Inject constructor ( val controlsController: Lazy<ControlsController>, val context: Context, + private val packageManager: PackageManager, @Main val uiExecutor: DelayableExecutor, @Background val bgExecutor: DelayableExecutor, val controlsListingController: Lazy<ControlsListingController>, @@ -113,6 +117,11 @@ class ControlsUiControllerImpl @Inject constructor ( private const val PREF_IS_PANEL = "controls_is_panel" private const val FADE_IN_MILLIS = 200L + + private const val OPEN_APP_ID = 0L + private const val ADD_CONTROLS_ID = 1L + private const val ADD_APP_ID = 2L + private const val EDIT_CONTROLS_ID = 3L } private var selectedItem: SelectedItem = SelectedItem.EMPTY_SELECTION @@ -140,6 +149,9 @@ class ControlsUiControllerImpl @Inject constructor ( it.getTitle() } + private var openAppIntent: Intent? = null + private var overflowMenuAdapter: BaseAdapter? = null + private val onSeedingComplete = Consumer<Boolean> { accepted -> if (accepted) { @@ -213,9 +225,12 @@ class ControlsUiControllerImpl @Inject constructor ( activityContext: Context ) { Log.d(ControlsUiController.TAG, "show()") + Trace.instant(Trace.TRACE_TAG_APP, "ControlsUiControllerImpl#show") this.parent = parent this.onDismiss = onDismiss this.activityContext = activityContext + this.openAppIntent = null + this.overflowMenuAdapter = null hidden = false retainCache = false @@ -306,6 +321,12 @@ class ControlsUiControllerImpl @Inject constructor ( startTargetedActivity(si, ControlsEditingActivity::class.java) } + private fun startDefaultActivity() { + openAppIntent?.let { + startActivity(it, animateExtra = false) + } + } + private fun startTargetedActivity(si: StructureInfo, klazz: Class<*>) { val i = Intent(activityContext, klazz) putIntentExtras(i, si) @@ -329,9 +350,11 @@ class ControlsUiControllerImpl @Inject constructor ( startActivity(i) } - private fun startActivity(intent: Intent) { + private fun startActivity(intent: Intent, animateExtra: Boolean = true) { // Force animations when transitioning from a dialog to an activity - intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true) + if (animateExtra) { + intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true) + } if (keyguardStateController.isShowing()) { activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */) @@ -383,8 +406,31 @@ class ControlsUiControllerImpl @Inject constructor ( Log.w(ControlsUiController.TAG, "Not TaskViewFactory to display panel $selectionItem") } + bgExecutor.execute { + val intent = Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_LAUNCHER) + .setPackage(selectionItem.componentName.packageName) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or + Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) + val intents = packageManager + .queryIntentActivities(intent, PackageManager.ResolveInfoFlags.of(0L)) + intents.firstOrNull { it.activityInfo.exported }?.let { resolved -> + intent.setPackage(null) + intent.setComponent(resolved.activityInfo.componentName) + openAppIntent = intent + parent.post { + // This will call show on the PopupWindow in the same thread, so make sure this + // happens in the view thread. + overflowMenuAdapter?.notifyDataSetChanged() + } + } + } createDropDown(panelsAndStructures, selectionItem) - createMenu() + + val currentApps = panelsAndStructures.map { it.componentName }.toSet() + val allApps = controlsListingController.get() + .getCurrentServices().map { it.componentName }.toSet() + createMenu(extraApps = (allApps - currentApps).isNotEmpty()) } private fun createPanelView(componentName: ComponentName) { @@ -423,28 +469,41 @@ class ControlsUiControllerImpl @Inject constructor ( } } - private fun createMenu() { + private fun createMenu(extraApps: Boolean) { val isPanel = selectedItem is SelectedItem.PanelItem val selectedStructure = (selectedItem as? SelectedItem.StructureItem)?.structure ?: EMPTY_STRUCTURE val newFlows = featureFlags.isEnabled(Flags.CONTROLS_MANAGEMENT_NEW_FLOWS) - val addControlsId = if (newFlows || isPanel) { - R.string.controls_menu_add_another_app - } else { - R.string.controls_menu_add + + val items = buildList { + add(OverflowMenuAdapter.MenuItem( + context.getText(R.string.controls_open_app), + OPEN_APP_ID + )) + if (newFlows || isPanel) { + if (extraApps) { + add(OverflowMenuAdapter.MenuItem( + context.getText(R.string.controls_menu_add_another_app), + ADD_APP_ID + )) + } + } else { + add(OverflowMenuAdapter.MenuItem( + context.getText(R.string.controls_menu_add), + ADD_CONTROLS_ID + )) + } + if (!isPanel) { + add(OverflowMenuAdapter.MenuItem( + context.getText(R.string.controls_menu_edit), + EDIT_CONTROLS_ID + )) + } } - val items = if (isPanel) { - arrayOf( - context.resources.getString(addControlsId), - ) - } else { - arrayOf( - context.resources.getString(addControlsId), - context.resources.getString(R.string.controls_menu_edit) - ) + val adapter = OverflowMenuAdapter(context, R.layout.controls_more_item, items) { position -> + getItemId(position) != OPEN_APP_ID || openAppIntent != null } - var adapter = ArrayAdapter<String>(context, R.layout.controls_more_item, items) val anchor = parent.requireViewById<ImageView>(R.id.controls_more) anchor.setOnClickListener(object : View.OnClickListener { @@ -462,25 +521,21 @@ class ControlsUiControllerImpl @Inject constructor ( pos: Int, id: Long ) { - when (pos) { - // 0: Add Control - 0 -> { - if (isPanel || newFlows) { - startProviderSelectorActivity() - } else { - startFavoritingActivity(selectedStructure) - } - } - // 1: Edit controls - 1 -> startEditingActivity(selectedStructure) + when (id) { + OPEN_APP_ID -> startDefaultActivity() + ADD_APP_ID -> startProviderSelectorActivity() + ADD_CONTROLS_ID -> startFavoritingActivity(selectedStructure) + EDIT_CONTROLS_ID -> startEditingActivity(selectedStructure) } dismiss() } }) show() + listView?.post { listView?.requestAccessibilityFocus() } } } }) + overflowMenuAdapter = adapter } private fun createDropDown(items: List<SelectionItem>, selected: SelectionItem) { @@ -542,6 +597,7 @@ class ControlsUiControllerImpl @Inject constructor ( } }) show() + listView?.post { listView?.requestAccessibilityFocus() } } } }) @@ -631,7 +687,7 @@ class ControlsUiControllerImpl @Inject constructor ( .putString(PREF_COMPONENT, selectedItem.componentName.flattenToString()) .putString(PREF_STRUCTURE_OR_APP_NAME, selectedItem.name.toString()) .putBoolean(PREF_IS_PANEL, selectedItem is SelectedItem.PanelItem) - .commit() + .apply() } private fun maybeUpdateSelectedItem(item: SelectionItem): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/OverflowMenuAdapter.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/OverflowMenuAdapter.kt new file mode 100644 index 000000000000..6b84e360eb80 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/OverflowMenuAdapter.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.controls.ui + +import android.content.Context +import android.widget.ArrayAdapter +import androidx.annotation.LayoutRes + +open class OverflowMenuAdapter( + context: Context, + @LayoutRes layoutId: Int, + itemsWithIds: List<MenuItem>, + private val isEnabledInternal: OverflowMenuAdapter.(Int) -> Boolean +) : ArrayAdapter<CharSequence>(context, layoutId, itemsWithIds.map(MenuItem::text)) { + + private val ids = itemsWithIds.map(MenuItem::id) + + override fun getItemId(position: Int): Long { + return ids[position] + } + + override fun isEnabled(position: Int): Boolean { + return isEnabledInternal(position) + } + + data class MenuItem(val text: CharSequence, val id: Long) +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt index f5764c2fdc04..3b6ab20e39d4 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt @@ -27,6 +27,7 @@ import android.content.Intent import android.graphics.Color import android.graphics.drawable.ShapeDrawable import android.graphics.drawable.shapes.RoundRectShape +import android.os.Trace import com.android.systemui.R import com.android.systemui.util.boundsOnScreen import com.android.wm.shell.TaskView @@ -84,6 +85,7 @@ class PanelTaskViewController( options, taskView.boundsOnScreen ) + Trace.instant(Trace.TRACE_TAG_APP, "PanelTaskViewController - startActivity") } } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt index 8e9992fdd296..2dfcf70177fe 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt @@ -27,9 +27,11 @@ import com.android.systemui.accessibility.WindowMagnification import com.android.systemui.biometrics.AuthController import com.android.systemui.clipboardoverlay.ClipboardListener import com.android.systemui.dagger.qualifiers.PerUser +import com.android.systemui.dreams.DreamMonitor import com.android.systemui.globalactions.GlobalActionsComponent import com.android.systemui.keyboard.KeyboardUI import com.android.systemui.keyguard.KeyguardViewMediator +import com.android.systemui.keyguard.data.quickaffordance.MuteQuickAffordanceCoreStartable import com.android.systemui.log.SessionTracker import com.android.systemui.media.dialog.MediaOutputSwitcherDialogUI import com.android.systemui.media.RingtonePlayer @@ -286,4 +288,18 @@ abstract class SystemUICoreStartableModule { @IntoMap @ClassKey(StylusUsiPowerStartable::class) abstract fun bindStylusUsiPowerStartable(sysui: StylusUsiPowerStartable): CoreStartable + + /** Inject into MuteQuickAffordanceCoreStartable*/ + @Binds + @IntoMap + @ClassKey(MuteQuickAffordanceCoreStartable::class) + abstract fun bindMuteQuickAffordanceCoreStartable( + sysui: MuteQuickAffordanceCoreStartable + ): CoreStartable + + /**Inject into DreamMonitor */ + @Binds + @IntoMap + @ClassKey(DreamMonitor::class) + abstract fun bindDreamMonitor(sysui: DreamMonitor): CoreStartable } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 2d0dfa1d921b..6274a26682f4 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -63,6 +63,7 @@ import com.android.systemui.qs.footer.dagger.FooterActionsModule; import com.android.systemui.recents.Recents; import com.android.systemui.screenshot.dagger.ScreenshotModule; import com.android.systemui.security.data.repository.SecurityRepositoryModule; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.dagger.MultiUserUtilsModule; import com.android.systemui.shade.ShadeController; import com.android.systemui.smartspace.dagger.SmartspaceModule; @@ -107,6 +108,8 @@ import com.android.wm.shell.bubbles.Bubbles; import java.util.Optional; import java.util.concurrent.Executor; +import javax.inject.Named; + import dagger.Binds; import dagger.BindsOptionalOf; import dagger.Module; @@ -196,8 +199,8 @@ public abstract class SystemUIModule { @SysUISingleton @Provides - static SysUiState provideSysUiState(DumpManager dumpManager) { - final SysUiState state = new SysUiState(); + static SysUiState provideSysUiState(DisplayTracker displayTracker, DumpManager dumpManager) { + final SysUiState state = new SysUiState(displayTracker); dumpManager.registerDumpable(state); return state; } @@ -215,6 +218,14 @@ public abstract class SystemUIModule { abstract BcSmartspaceConfigPlugin optionalBcSmartspaceConfigPlugin(); @BindsOptionalOf + @Named(SmartspaceModule.DATE_SMARTSPACE_DATA_PLUGIN) + abstract BcSmartspaceDataPlugin optionalDateSmartspaceConfigPlugin(); + + @BindsOptionalOf + @Named(SmartspaceModule.WEATHER_SMARTSPACE_DATA_PLUGIN) + abstract BcSmartspaceDataPlugin optionalWeatherSmartspaceConfigPlugin(); + + @BindsOptionalOf abstract Recents optionalRecents(); @BindsOptionalOf diff --git a/packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt b/packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt index 976afd457f79..88c0c50d09a5 100644 --- a/packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt @@ -34,6 +34,7 @@ import com.android.systemui.FaceScanningOverlay import com.android.systemui.biometrics.AuthController import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.log.ScreenDecorationsLogger import com.android.systemui.plugins.statusbar.StatusBarStateController import java.util.concurrent.Executor import javax.inject.Inject @@ -45,6 +46,7 @@ class FaceScanningProviderFactory @Inject constructor( private val statusBarStateController: StatusBarStateController, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, @Main private val mainExecutor: Executor, + private val logger: ScreenDecorationsLogger, ) : DecorProviderFactory() { private val display = context.display private val displayInfo = DisplayInfo() @@ -82,7 +84,8 @@ class FaceScanningProviderFactory @Inject constructor( authController, statusBarStateController, keyguardUpdateMonitor, - mainExecutor + mainExecutor, + logger, ) ) } @@ -104,7 +107,8 @@ class FaceScanningOverlayProviderImpl( private val authController: AuthController, private val statusBarStateController: StatusBarStateController, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, - private val mainExecutor: Executor + private val mainExecutor: Executor, + private val logger: ScreenDecorationsLogger, ) : BoundDecorProvider() { override val viewId: Int = com.android.systemui.R.id.face_scanning_anim @@ -136,7 +140,8 @@ class FaceScanningOverlayProviderImpl( alignedBound, statusBarStateController, keyguardUpdateMonitor, - mainExecutor + mainExecutor, + logger, ) view.id = viewId view.setColor(tintColor) @@ -155,8 +160,9 @@ class FaceScanningOverlayProviderImpl( layoutParams.let { lp -> lp.width = ViewGroup.LayoutParams.MATCH_PARENT lp.height = ViewGroup.LayoutParams.MATCH_PARENT + logger.faceSensorLocation(authController.faceSensorLocation) authController.faceSensorLocation?.y?.let { faceAuthSensorHeight -> - val faceScanningHeight = (faceAuthSensorHeight * 2).toInt() + val faceScanningHeight = (faceAuthSensorHeight * 2) when (rotation) { Surface.ROTATION_0, Surface.ROTATION_180 -> lp.height = faceScanningHeight diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamMonitor.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamMonitor.java new file mode 100644 index 000000000000..102f2082ebd1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamMonitor.java @@ -0,0 +1,58 @@ +/* + * 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.dreams; + +import android.util.Log; + +import com.android.systemui.CoreStartable; +import com.android.systemui.dreams.callbacks.DreamStatusBarStateCallback; +import com.android.systemui.dreams.conditions.DreamCondition; +import com.android.systemui.shared.condition.Monitor; + +import javax.inject.Inject; + +/** + * A {@link CoreStartable} to retain a monitor for tracking dreaming. + */ +public class DreamMonitor implements CoreStartable { + private static final String TAG = "DreamMonitor"; + + // We retain a reference to the monitor so it is not garbage-collected. + private final Monitor mConditionMonitor; + private final DreamCondition mDreamCondition; + private final DreamStatusBarStateCallback mCallback; + + + @Inject + public DreamMonitor(Monitor monitor, DreamCondition dreamCondition, + DreamStatusBarStateCallback callback) { + mConditionMonitor = monitor; + mDreamCondition = dreamCondition; + mCallback = callback; + + } + @Override + public void start() { + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, "started"); + } + + mConditionMonitor.addSubscription(new Monitor.Subscription.Builder(mCallback) + .addCondition(mDreamCondition) + .build()); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt index c882f8adceb6..c3bd5d96590e 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt @@ -182,6 +182,18 @@ constructor( } } + /** + * Ends the dream content and dream overlay animations, if they're currently running. + * @see [AnimatorSet.end] + */ + fun endAnimations() { + mAnimator = + mAnimator?.let { + it.end() + null + } + } + private fun blurAnimator( view: View, fromBlurRadius: Float, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index 33c8379d2e5c..50cfb6a905c9 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -37,11 +37,11 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.complication.ComplicationHostViewController; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.dagger.DreamOverlayModule; +import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; +import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.statusbar.BlurUtils; -import com.android.systemui.statusbar.phone.KeyguardBouncer; -import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.util.ViewController; import com.android.systemui.util.concurrency.DelayableExecutor; @@ -56,7 +56,6 @@ import javax.inject.Named; @DreamOverlayComponent.DreamOverlayScope public class DreamOverlayContainerViewController extends ViewController<DreamOverlayContainerView> { private final DreamOverlayStatusBarViewController mStatusBarViewController; - private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final BlurUtils mBlurUtils; private final DreamOverlayAnimationsController mDreamOverlayAnimationsController; private final DreamOverlayStateController mStateController; @@ -85,6 +84,22 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve private long mJitterStartTimeMillis; private boolean mBouncerAnimating; + private boolean mWakingUpFromSwipe; + + private final BouncerlessScrimController mBouncerlessScrimController; + + private final BouncerlessScrimController.Callback mBouncerlessExpansionCallback = + new BouncerlessScrimController.Callback() { + @Override + public void onExpansion(ShadeExpansionChangeEvent event) { + updateTransitionState(event.getFraction()); + } + + @Override + public void onWakeup() { + mWakingUpFromSwipe = true; + } + }; private final PrimaryBouncerExpansionCallback mBouncerExpansionCallback = @@ -127,13 +142,29 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve } }; + /** + * If true, overlay entry animations should be skipped once. + * + * This is turned on when exiting low light and should be turned off once the entry animations + * are skipped once. + */ + private boolean mSkipEntryAnimations; + + private final DreamOverlayStateController.Callback + mDreamOverlayStateCallback = + new DreamOverlayStateController.Callback() { + @Override + public void onExitLowLight() { + mSkipEntryAnimations = true; + } + }; + @Inject public DreamOverlayContainerViewController( DreamOverlayContainerView containerView, ComplicationHostViewController complicationHostViewController, @Named(DreamOverlayModule.DREAM_OVERLAY_CONTENT_VIEW) ViewGroup contentView, DreamOverlayStatusBarViewController statusBarViewController, - StatusBarKeyguardViewManager statusBarKeyguardViewManager, BlurUtils blurUtils, @Main Handler handler, @Main Resources resources, @@ -143,15 +174,18 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve @Named(DreamOverlayModule.MILLIS_UNTIL_FULL_JITTER) long millisUntilFullJitter, PrimaryBouncerCallbackInteractor primaryBouncerCallbackInteractor, DreamOverlayAnimationsController animationsController, - DreamOverlayStateController stateController) { + DreamOverlayStateController stateController, + BouncerlessScrimController bouncerlessScrimController) { super(containerView); mDreamOverlayContentView = contentView; mStatusBarViewController = statusBarViewController; - mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; mBlurUtils = blurUtils; mDreamOverlayAnimationsController = animationsController; mStateController = stateController; + mBouncerlessScrimController = bouncerlessScrimController; + mBouncerlessScrimController.addCallback(mBouncerlessExpansionCallback); + mComplicationHostViewController = complicationHostViewController; mDreamOverlayMaxTranslationY = resources.getDimensionPixelSize( R.dimen.dream_overlay_y_offset); @@ -170,6 +204,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve @Override protected void onInit() { + mStateController.addCallback(mDreamOverlayStateCallback); mStatusBarViewController.init(); mComplicationHostViewController.init(); mDreamOverlayAnimationsController.init(mView); @@ -177,27 +212,27 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve @Override protected void onViewAttached() { + mWakingUpFromSwipe = false; mJitterStartTimeMillis = System.currentTimeMillis(); mHandler.postDelayed(this::updateBurnInOffsets, mBurnInProtectionUpdateInterval); - final KeyguardBouncer bouncer = mStatusBarKeyguardViewManager.getPrimaryBouncer(); - if (bouncer != null) { - bouncer.addBouncerExpansionCallback(mBouncerExpansionCallback); - } mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mBouncerExpansionCallback); // Start dream entry animations. Skip animations for low light clock. if (!mStateController.isLowLightActive()) { mDreamOverlayAnimationsController.startEntryAnimations(); + + if (mSkipEntryAnimations) { + // If we're transitioning from the low light dream back to the user dream, skip the + // overlay animations and show immediately. + mDreamOverlayAnimationsController.endAnimations(); + mSkipEntryAnimations = false; + } } } @Override protected void onViewDetached() { mHandler.removeCallbacks(this::updateBurnInOffsets); - final KeyguardBouncer bouncer = mStatusBarKeyguardViewManager.getPrimaryBouncer(); - if (bouncer != null) { - bouncer.removeBouncerExpansionCallback(mBouncerExpansionCallback); - } mPrimaryBouncerCallbackInteractor.removeBouncerExpansionCallback(mBouncerExpansionCallback); mDreamOverlayAnimationsController.cancelAnimations(); @@ -266,6 +301,13 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve */ public void wakeUp(@NonNull Runnable onAnimationEnd, @NonNull DelayableExecutor callbackExecutor) { + // When swiping causes wakeup, do not run any animations as the dream should exit as soon + // as possible. + if (mWakingUpFromSwipe) { + onAnimationEnd.run(); + return; + } + mDreamOverlayAnimationsController.wakeUp(onAnimationEnd, callbackExecutor); } } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java index ccfdd0966e98..2c7ecb1182f2 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java @@ -83,6 +83,12 @@ public class DreamOverlayStateController implements */ default void onAvailableComplicationTypesChanged() { } + + /** + * Called when the low light dream is exiting and transitioning back to the user dream. + */ + default void onExitLowLight() { + } } private final Executor mExecutor; @@ -278,6 +284,10 @@ public class DreamOverlayStateController implements * @param active {@code true} if low light mode is active, {@code false} otherwise. */ public void setLowLightActive(boolean active) { + if (isLowLightActive() && !active) { + // Notify that we're exiting low light only on the transition from active to not active. + mCallbacks.forEach(Callback::onExitLowLight); + } modifyState(active ? OP_SET_STATE : OP_CLEAR_STATE, STATE_LOW_LIGHT_ACTIVE); } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/callbacks/DreamStatusBarStateCallback.java b/packages/SystemUI/src/com/android/systemui/dreams/callbacks/DreamStatusBarStateCallback.java new file mode 100644 index 000000000000..c8c9470f9bf2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/callbacks/DreamStatusBarStateCallback.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.dreams.callbacks; + +import android.util.Log; + +import com.android.systemui.shared.condition.Monitor; +import com.android.systemui.statusbar.SysuiStatusBarStateController; + +import javax.inject.Inject; + +/** + * A callback that informs {@link SysuiStatusBarStateController} when the dream state has changed. + */ +public class DreamStatusBarStateCallback implements Monitor.Callback { + private static final String TAG = "DreamStatusBarCallback"; + + private final SysuiStatusBarStateController mStateController; + + @Inject + public DreamStatusBarStateCallback(SysuiStatusBarStateController statusBarStateController) { + mStateController = statusBarStateController; + } + + @Override + public void onConditionsChanged(boolean allConditionsMet) { + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, "onConditionChanged:" + allConditionsMet); + } + + mStateController.setIsDreaming(allConditionsMet); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/conditions/DreamCondition.java b/packages/SystemUI/src/com/android/systemui/dreams/conditions/DreamCondition.java new file mode 100644 index 000000000000..2befce7065ec --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/conditions/DreamCondition.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.dreams.conditions; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.text.TextUtils; + +import com.android.systemui.shared.condition.Condition; + +import javax.inject.Inject; + +/** + * {@link DreamCondition} provides a signal when a dream begins and ends. + */ +public class DreamCondition extends Condition { + private final Context mContext; + + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + processIntent(intent); + } + }; + + @Inject + public DreamCondition(Context context) { + mContext = context; + } + + private void processIntent(Intent intent) { + // In the case of a non-existent sticky broadcast, ignore when there is no intent. + if (intent == null) { + return; + } + if (TextUtils.equals(intent.getAction(), Intent.ACTION_DREAMING_STARTED)) { + updateCondition(true); + } else if (TextUtils.equals(intent.getAction(), Intent.ACTION_DREAMING_STOPPED)) { + updateCondition(false); + } else { + throw new IllegalStateException("unexpected intent:" + intent); + } + } + + @Override + protected void start() { + final IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_DREAMING_STARTED); + filter.addAction(Intent.ACTION_DREAMING_STOPPED); + final Intent stickyIntent = mContext.registerReceiver(mReceiver, filter); + processIntent(stickyIntent); + } + + @Override + protected void stop() { + mContext.unregisterReceiver(mReceiver); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java index e7b29bb84b3d..0ab8c8e42b03 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java @@ -28,6 +28,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.DreamOverlayNotificationCountProvider; import com.android.systemui.dreams.DreamOverlayService; import com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule; +import com.android.systemui.dreams.touch.scrim.dagger.ScrimModule; import java.util.Optional; @@ -42,6 +43,7 @@ import dagger.Provides; @Module(includes = { RegisteredComplicationsModule.class, LowLightDreamModule.class, + ScrimModule.class }, subcomponents = { DreamOverlayComponent.class, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java index 44207f4aecf5..73c2289ad6bd 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java @@ -36,11 +36,12 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; +import com.android.systemui.dreams.touch.scrim.ScrimController; +import com.android.systemui.dreams.touch.scrim.ScrimManager; import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; -import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.wm.shell.animation.FlingAnimationUtils; import java.util.Optional; @@ -78,7 +79,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { private final NotificationShadeWindowController mNotificationShadeWindowController; private final float mBouncerZoneScreenPercentage; - private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + private final ScrimManager mScrimManager; + private ScrimController mCurrentScrimController; private float mCurrentExpansion; private final Optional<CentralSurfaces> mCentralSurfaces; @@ -90,6 +92,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { private final DisplayMetrics mDisplayMetrics; private Boolean mCapture; + private Boolean mExpanded; private boolean mBouncerInitiallyShowing; @@ -101,6 +104,17 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { private final UiEventLogger mUiEventLogger; + private final ScrimManager.Callback mScrimManagerCallback = new ScrimManager.Callback() { + @Override + public void onScrimControllerChanged(ScrimController controller) { + if (mCurrentScrimController != null) { + mCurrentScrimController.reset(); + } + + mCurrentScrimController = controller; + } + }; + private final GestureDetector.OnGestureListener mOnGestureListener = new GestureDetector.SimpleOnGestureListener() { @Override @@ -115,8 +129,10 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { .orElse(false); if (mCapture) { + // reset expanding + mExpanded = false; // Since the user is dragging the bouncer up, set scrimmed to false. - mStatusBarKeyguardViewManager.showPrimaryBouncer(false); + mCurrentScrimController.show(); } } @@ -157,10 +173,10 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { ShadeExpansionChangeEvent event = new ShadeExpansionChangeEvent( /* fraction= */ mCurrentExpansion, - /* expanded= */ false, + /* expanded= */ mExpanded, /* tracking= */ true, /* dragDownPxAmount= */ dragDownAmount); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(event); + mCurrentScrimController.expand(event); } @@ -187,7 +203,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { @Inject public BouncerSwipeTouchHandler( DisplayMetrics displayMetrics, - StatusBarKeyguardViewManager statusBarKeyguardViewManager, + ScrimManager scrimManager, Optional<CentralSurfaces> centralSurfaces, NotificationShadeWindowController notificationShadeWindowController, ValueAnimatorCreator valueAnimatorCreator, @@ -200,7 +216,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { UiEventLogger uiEventLogger) { mDisplayMetrics = displayMetrics; mCentralSurfaces = centralSurfaces; - mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; + mScrimManager = scrimManager; mNotificationShadeWindowController = notificationShadeWindowController; mBouncerZoneScreenPercentage = swipeRegionPercentage; mFlingAnimationUtils = flingAnimationUtils; @@ -234,9 +250,12 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { mTouchSession = session; mVelocityTracker.clear(); mNotificationShadeWindowController.setForcePluginOpen(true, this); + mScrimManager.addCallback(mScrimManagerCallback); + mCurrentScrimController = mScrimManager.getCurrentController(); session.registerCallback(() -> { mVelocityTracker.recycle(); + mScrimManager.removeCallback(mScrimManagerCallback); mCapture = null; mNotificationShadeWindowController.setForcePluginOpen(false, this); }); @@ -273,9 +292,10 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { final float velocityVector = (float) Math.hypot(horizontalVelocity, verticalVelocity); - final float expansion = flingRevealsOverlay(verticalVelocity, velocityVector) - ? KeyguardBouncerConstants.EXPANSION_HIDDEN - : KeyguardBouncerConstants.EXPANSION_VISIBLE; + mExpanded = !flingRevealsOverlay(verticalVelocity, velocityVector); + final float expansion = mExpanded + ? KeyguardBouncerConstants.EXPANSION_VISIBLE + : KeyguardBouncerConstants.EXPANSION_HIDDEN; // Log the swiping up to show Bouncer event. if (!mBouncerInitiallyShowing @@ -286,7 +306,7 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { flingToExpansion(verticalVelocity, expansion); if (expansion == KeyguardBouncerConstants.EXPANSION_HIDDEN) { - mStatusBarKeyguardViewManager.reset(false); + mCurrentScrimController.reset(); } break; default: diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/InputSession.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/InputSession.java index 43827573470f..e1d03392044a 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/InputSession.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/InputSession.java @@ -21,10 +21,10 @@ import static com.android.systemui.dreams.touch.dagger.DreamTouchModule.PILFER_O import android.os.Looper; import android.view.Choreographer; -import android.view.Display; import android.view.GestureDetector; import android.view.MotionEvent; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.system.InputChannelCompat; import com.android.systemui.shared.system.InputMonitorCompat; @@ -55,8 +55,9 @@ public class InputSession { public InputSession(@Named(INPUT_SESSION_NAME) String sessionName, InputChannelCompat.InputEventListener inputEventListener, GestureDetector.OnGestureListener gestureListener, + DisplayTracker displayTracker, @Named(PILFER_ON_GESTURE_CONSUME) boolean pilferOnGestureConsume) { - mInputMonitor = new InputMonitorCompat(sessionName, Display.DEFAULT_DISPLAY); + mInputMonitor = new InputMonitorCompat(sessionName, displayTracker.getDefaultDisplayId()); mGestureDetector = new GestureDetector(gestureListener); mInputEventReceiver = mInputMonitor.getInputReceiver(Looper.getMainLooper(), diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerScrimController.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerScrimController.java new file mode 100644 index 000000000000..f5bbba780b27 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerScrimController.java @@ -0,0 +1,49 @@ +/* + * 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.dreams.touch.scrim; + +import com.android.systemui.shade.ShadeExpansionChangeEvent; +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; + +import javax.inject.Inject; + +/** + * Implementation for handling swipe movements on the overlay when the keyguard is present. + */ +public class BouncerScrimController implements ScrimController { + private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + + @Inject + BouncerScrimController(StatusBarKeyguardViewManager statusBarKeyguardViewManager) { + mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; + } + + @Override + public void show() { + mStatusBarKeyguardViewManager.showBouncer(false); + } + + @Override + public void expand(ShadeExpansionChangeEvent event) { + mStatusBarKeyguardViewManager.onPanelExpansionChanged(event); + } + + @Override + public void reset() { + mStatusBarKeyguardViewManager.reset(false); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimController.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimController.java new file mode 100644 index 000000000000..01e4d04dcc2c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimController.java @@ -0,0 +1,91 @@ +/* + * 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.dreams.touch.scrim; + +import android.os.PowerManager; +import android.os.SystemClock; + +import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.shade.ShadeExpansionChangeEvent; +import com.android.systemui.unfold.util.CallbackController; + +import java.util.HashSet; +import java.util.concurrent.Executor; + +import javax.inject.Inject; + +/** + * {@link BouncerlessScrimController} handles scrim progression when no keyguard is set. When + * fully expanded, the controller dismisses the dream. + */ +@SysUISingleton +public class BouncerlessScrimController implements ScrimController, + CallbackController<BouncerlessScrimController.Callback> { + private static final String TAG = "BLScrimController"; + + /** + * {@link Callback} allows {@link BouncerlessScrimController} clients to be informed of + * expansion progression and wakeup + */ + public interface Callback { + /** + * Invoked when there is a change to the scrim expansion. + */ + void onExpansion(ShadeExpansionChangeEvent event); + + /** + * Invoked after {@link BouncerlessScrimController} has started waking up the device. + */ + void onWakeup(); + } + + private final Executor mExecutor; + private final PowerManager mPowerManager; + + @Override + public void addCallback(Callback listener) { + mExecutor.execute(() -> mCallbacks.add(listener)); + } + + @Override + public void removeCallback(Callback listener) { + mExecutor.execute(() -> mCallbacks.remove(listener)); + } + + private final HashSet<Callback> mCallbacks; + + + @Inject + public BouncerlessScrimController(@Main Executor executor, + PowerManager powerManager) { + mExecutor = executor; + mPowerManager = powerManager; + mCallbacks = new HashSet<>(); + } + + @Override + public void expand(ShadeExpansionChangeEvent event) { + if (event.getExpanded()) { + mPowerManager.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, + "com.android.systemui:SwipeUp"); + mExecutor.execute(() -> mCallbacks.forEach(callback -> callback.onWakeup())); + } else { + mExecutor.execute(() -> mCallbacks.forEach(callback -> callback.onExpansion(event))); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimController.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimController.java new file mode 100644 index 000000000000..61629ef79637 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimController.java @@ -0,0 +1,44 @@ +/* + * 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.dreams.touch.scrim; + +import com.android.systemui.shade.ShadeExpansionChangeEvent; + +/** + * {@link ScrimController} provides an interface for the different consumers of scrolling/expansion + * events over the dream. + */ +public interface ScrimController { + /** + * Called at the start of expansion before any expansion amount updates. + */ + default void show() { + } + + /** + * Called for every expansion update. + * @param event {@link ShadeExpansionChangeEvent} detailing the change. + */ + default void expand(ShadeExpansionChangeEvent event) { + } + + /** + * Called at the end of the movement. + */ + default void reset() { + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimManager.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimManager.java new file mode 100644 index 000000000000..0d0dff6c8fb0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/ScrimManager.java @@ -0,0 +1,112 @@ +/* + * 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.dreams.touch.scrim; + +import static com.android.systemui.dreams.touch.scrim.dagger.ScrimModule.BOUNCERLESS_SCRIM_CONTROLLER; +import static com.android.systemui.dreams.touch.scrim.dagger.ScrimModule.BOUNCER_SCRIM_CONTROLLER; + +import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.statusbar.policy.KeyguardStateController; + +import java.util.HashSet; +import java.util.concurrent.Executor; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * {@link ScrimManager} helps manage multiple {@link ScrimController} instances, specifying the + * appropriate one to use at the current moment and managing the handoff between controllers. + */ +public class ScrimManager { + private final ScrimController mBouncerScrimController; + private final ScrimController mBouncerlessScrimController; + private final KeyguardStateController mKeyguardStateController; + private final Executor mExecutor; + + private ScrimController mCurrentController; + private final HashSet<Callback> mCallbacks; + + /** + * Interface implemented for receiving updates to the active {@link ScrimController}. + */ + public interface Callback { + /** + * Invoked when the controller changes. + * @param controller The currently active {@link ScrimController}. + */ + void onScrimControllerChanged(ScrimController controller); + } + + private final KeyguardStateController.Callback mKeyguardStateCallback = + new KeyguardStateController.Callback() { + @Override + public void onKeyguardShowingChanged() { + mExecutor.execute(() -> updateController()); + } + }; + + @Inject + ScrimManager(@Main Executor executor, + @Named(BOUNCER_SCRIM_CONTROLLER) ScrimController bouncerScrimController, + @Named(BOUNCERLESS_SCRIM_CONTROLLER)ScrimController bouncerlessScrimController, + KeyguardStateController keyguardStateController) { + mExecutor = executor; + mCallbacks = new HashSet<>(); + mBouncerlessScrimController = bouncerlessScrimController; + mBouncerScrimController = bouncerScrimController; + mKeyguardStateController = keyguardStateController; + + mKeyguardStateController.addCallback(mKeyguardStateCallback); + updateController(); + } + + private void updateController() { + final ScrimController existingController = mCurrentController; + mCurrentController = mKeyguardStateController.canDismissLockScreen() + ? mBouncerlessScrimController + : mBouncerScrimController; + + if (existingController == mCurrentController) { + return; + } + + mCallbacks.forEach(callback -> callback.onScrimControllerChanged(mCurrentController)); + } + + /** + * Adds a {@link Callback} to receive future changes to the active {@link ScrimController}. + */ + public void addCallback(Callback callback) { + mExecutor.execute(() -> mCallbacks.add(callback)); + } + + /** + * Removes the {@link Callback} from receiving further updates. + */ + public void removeCallback(Callback callback) { + mExecutor.execute(() -> mCallbacks.remove(callback)); + } + + /** + * Returns the currently get {@link ScrimController}. + * @return + */ + public ScrimController getCurrentController() { + return mCurrentController; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/dagger/ScrimModule.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/dagger/ScrimModule.java new file mode 100644 index 000000000000..40bc0ea6e95e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/scrim/dagger/ScrimModule.java @@ -0,0 +1,51 @@ +/* + * 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.dreams.touch.scrim.dagger; + +import com.android.systemui.dreams.touch.scrim.BouncerScrimController; +import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; +import com.android.systemui.dreams.touch.scrim.ScrimController; + +import javax.inject.Named; + +import dagger.Module; +import dagger.Provides; + +/** + * Module for scrim related dependencies. + */ +@Module +public interface ScrimModule { + String BOUNCERLESS_SCRIM_CONTROLLER = "bouncerless_scrim_controller"; + String BOUNCER_SCRIM_CONTROLLER = "bouncer_scrim_controller"; + + /** */ + @Provides + @Named(BOUNCERLESS_SCRIM_CONTROLLER) + static ScrimController providesBouncerlessScrimController( + BouncerlessScrimController controller) { + return controller; + } + + /** */ + @Provides + @Named(BOUNCER_SCRIM_CONTROLLER) + static ScrimController providesBouncerScrimController( + BouncerScrimController controller) { + return controller; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java index d1a14a1ba65f..4bac69776319 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java +++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java @@ -19,7 +19,7 @@ package com.android.systemui.flags; import static com.android.systemui.flags.FlagManager.ACTION_GET_FLAGS; import static com.android.systemui.flags.FlagManager.ACTION_SET_FLAG; import static com.android.systemui.flags.FlagManager.EXTRA_FLAGS; -import static com.android.systemui.flags.FlagManager.EXTRA_ID; +import static com.android.systemui.flags.FlagManager.EXTRA_NAME; import static com.android.systemui.flags.FlagManager.EXTRA_VALUE; import static com.android.systemui.flags.FlagsCommonModule.ALL_FLAGS; @@ -39,6 +39,7 @@ import androidx.annotation.Nullable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.util.settings.GlobalSettings; import com.android.systemui.util.settings.SecureSettings; import org.jetbrains.annotations.NotNull; @@ -72,14 +73,15 @@ public class FeatureFlagsDebug implements FeatureFlags { private final FlagManager mFlagManager; private final Context mContext; + private final GlobalSettings mGlobalSettings; private final SecureSettings mSecureSettings; private final Resources mResources; private final SystemPropertiesHelper mSystemProperties; private final ServerFlagReader mServerFlagReader; - private final Map<Integer, Flag<?>> mAllFlags; - private final Map<Integer, Boolean> mBooleanFlagCache = new TreeMap<>(); - private final Map<Integer, String> mStringFlagCache = new TreeMap<>(); - private final Map<Integer, Integer> mIntFlagCache = new TreeMap<>(); + private final Map<String, Flag<?>> mAllFlags; + private final Map<String, Boolean> mBooleanFlagCache = new TreeMap<>(); + private final Map<String, String> mStringFlagCache = new TreeMap<>(); + private final Map<String, Integer> mIntFlagCache = new TreeMap<>(); private final Restarter mRestarter; private final ServerFlagReader.ChangeListener mOnPropertiesChanged = @@ -94,14 +96,16 @@ public class FeatureFlagsDebug implements FeatureFlags { public FeatureFlagsDebug( FlagManager flagManager, Context context, + GlobalSettings globalSettings, SecureSettings secureSettings, SystemPropertiesHelper systemProperties, @Main Resources resources, ServerFlagReader serverFlagReader, - @Named(ALL_FLAGS) Map<Integer, Flag<?>> allFlags, + @Named(ALL_FLAGS) Map<String, Flag<?>> allFlags, Restarter restarter) { mFlagManager = flagManager; mContext = context; + mGlobalSettings = globalSettings; mSecureSettings = secureSettings; mResources = resources; mSystemProperties = systemProperties; @@ -133,96 +137,103 @@ public class FeatureFlagsDebug implements FeatureFlags { } private boolean isEnabledInternal(@NotNull BooleanFlag flag) { - int id = flag.getId(); - if (!mBooleanFlagCache.containsKey(id)) { - mBooleanFlagCache.put(id, + String name = flag.getName(); + if (!mBooleanFlagCache.containsKey(name)) { + mBooleanFlagCache.put(name, readBooleanFlagInternal(flag, flag.getDefault())); } - return mBooleanFlagCache.get(id); + return mBooleanFlagCache.get(name); } @Override public boolean isEnabled(@NonNull ResourceBooleanFlag flag) { - int id = flag.getId(); - if (!mBooleanFlagCache.containsKey(id)) { - mBooleanFlagCache.put(id, + String name = flag.getName(); + if (!mBooleanFlagCache.containsKey(name)) { + mBooleanFlagCache.put(name, readBooleanFlagInternal(flag, mResources.getBoolean(flag.getResourceId()))); } - return mBooleanFlagCache.get(id); + return mBooleanFlagCache.get(name); } @Override public boolean isEnabled(@NonNull SysPropBooleanFlag flag) { - int id = flag.getId(); - if (!mBooleanFlagCache.containsKey(id)) { + String name = flag.getName(); + if (!mBooleanFlagCache.containsKey(name)) { // Use #readFlagValue to get the default. That will allow it to fall through to // teamfood if need be. mBooleanFlagCache.put( - id, + name, mSystemProperties.getBoolean( flag.getName(), readBooleanFlagInternal(flag, flag.getDefault()))); } - return mBooleanFlagCache.get(id); + return mBooleanFlagCache.get(name); } @NonNull @Override public String getString(@NonNull StringFlag flag) { - int id = flag.getId(); - if (!mStringFlagCache.containsKey(id)) { - mStringFlagCache.put(id, - readFlagValueInternal(id, flag.getDefault(), StringFlagSerializer.INSTANCE)); + String name = flag.getName(); + if (!mStringFlagCache.containsKey(name)) { + mStringFlagCache.put(name, + readFlagValueInternal( + flag.getId(), name, flag.getDefault(), StringFlagSerializer.INSTANCE)); } - return mStringFlagCache.get(id); + return mStringFlagCache.get(name); } @NonNull @Override public String getString(@NonNull ResourceStringFlag flag) { - int id = flag.getId(); - if (!mStringFlagCache.containsKey(id)) { - mStringFlagCache.put(id, - readFlagValueInternal(id, mResources.getString(flag.getResourceId()), + String name = flag.getName(); + if (!mStringFlagCache.containsKey(name)) { + mStringFlagCache.put(name, + readFlagValueInternal( + flag.getId(), name, mResources.getString(flag.getResourceId()), StringFlagSerializer.INSTANCE)); } - return mStringFlagCache.get(id); + return mStringFlagCache.get(name); } @NonNull @Override public int getInt(@NonNull IntFlag flag) { - int id = flag.getId(); - if (!mIntFlagCache.containsKey(id)) { - mIntFlagCache.put(id, - readFlagValueInternal(id, flag.getDefault(), IntFlagSerializer.INSTANCE)); + String name = flag.getName(); + if (!mIntFlagCache.containsKey(name)) { + mIntFlagCache.put(name, + readFlagValueInternal( + flag.getId(), name, flag.getDefault(), IntFlagSerializer.INSTANCE)); } - return mIntFlagCache.get(id); + return mIntFlagCache.get(name); } @NonNull @Override public int getInt(@NonNull ResourceIntFlag flag) { - int id = flag.getId(); - if (!mIntFlagCache.containsKey(id)) { - mIntFlagCache.put(id, - readFlagValueInternal(id, mResources.getInteger(flag.getResourceId()), + String name = flag.getName(); + if (!mIntFlagCache.containsKey(name)) { + mIntFlagCache.put(name, + readFlagValueInternal( + flag.getId(), name, mResources.getInteger(flag.getResourceId()), IntFlagSerializer.INSTANCE)); } - return mIntFlagCache.get(id); + return mIntFlagCache.get(name); } /** Specific override for Boolean flags that checks against the teamfood list.*/ private boolean readBooleanFlagInternal(Flag<Boolean> flag, boolean defaultValue) { - Boolean result = readBooleanFlagOverride(flag.getId()); + Boolean result = readBooleanFlagOverride(flag.getName()); + if (result == null) { + result = readBooleanFlagOverride(flag.getId()); + } boolean hasServerOverride = mServerFlagReader.hasOverride( flag.getNamespace(), flag.getName()); @@ -231,7 +242,7 @@ public class FeatureFlagsDebug implements FeatureFlags { if (!hasServerOverride && !defaultValue && result == null - && flag.getId() != Flags.TEAMFOOD.getId() + && !flag.getName().equals(Flags.TEAMFOOD.getName()) && flag.getTeamfood()) { return isEnabled(Flags.TEAMFOOD); } @@ -244,16 +255,31 @@ public class FeatureFlagsDebug implements FeatureFlags { return readFlagValueInternal(id, BooleanFlagSerializer.INSTANCE); } + private Boolean readBooleanFlagOverride(String name) { + return readFlagValueInternal(name, BooleanFlagSerializer.INSTANCE); + } + + // TODO(b/265188950): Remove id from this method once ids are fully deprecated. @NonNull private <T> T readFlagValueInternal( - int id, @NonNull T defaultValue, FlagSerializer<T> serializer) { + int id, String name, @NonNull T defaultValue, FlagSerializer<T> serializer) { requireNonNull(defaultValue, "defaultValue"); - T result = readFlagValueInternal(id, serializer); - return result == null ? defaultValue : result; + T resultForName = readFlagValueInternal(name, serializer); + if (resultForName == null) { + T resultForId = readFlagValueInternal(id, serializer); + if (resultForId == null) { + return defaultValue; + } else { + setFlagValue(name, resultForId, serializer); + return resultForId; + } + } + return resultForName; } /** Returns the stored value or null if not set. */ + // TODO(b/265188950): Remove method this once ids are fully deprecated. @Nullable private <T> T readFlagValueInternal(int id, FlagSerializer<T> serializer) { try { @@ -264,51 +290,71 @@ public class FeatureFlagsDebug implements FeatureFlags { return null; } - private <T> void setFlagValue(int id, @NonNull T value, FlagSerializer<T> serializer) { + /** Returns the stored value or null if not set. */ + @Nullable + private <T> T readFlagValueInternal(String name, FlagSerializer<T> serializer) { + try { + return mFlagManager.readFlagValue(name, serializer); + } catch (Exception e) { + eraseInternal(name); + } + return null; + } + + private <T> void setFlagValue(String name, @NonNull T value, FlagSerializer<T> serializer) { requireNonNull(value, "Cannot set a null value"); - T currentValue = readFlagValueInternal(id, serializer); + T currentValue = readFlagValueInternal(name, serializer); if (Objects.equals(currentValue, value)) { - Log.i(TAG, "Flag id " + id + " is already " + value); + Log.i(TAG, "Flag id " + name + " is already " + value); return; } final String data = serializer.toSettingsData(value); if (data == null) { - Log.w(TAG, "Failed to set id " + id + " to " + value); + Log.w(TAG, "Failed to set id " + name + " to " + value); return; } - mSecureSettings.putStringForUser(mFlagManager.idToSettingsKey(id), data, + mGlobalSettings.putStringForUser(mFlagManager.nameToSettingsKey(name), data, UserHandle.USER_CURRENT); - Log.i(TAG, "Set id " + id + " to " + value); - removeFromCache(id); - mFlagManager.dispatchListenersAndMaybeRestart(id, this::restartSystemUI); + Log.i(TAG, "Set id " + name + " to " + value); + removeFromCache(name); + mFlagManager.dispatchListenersAndMaybeRestart(name, this::restartSystemUI); } <T> void eraseFlag(Flag<T> flag) { if (flag instanceof SysPropFlag) { mSystemProperties.erase(((SysPropFlag<T>) flag).getName()); - dispatchListenersAndMaybeRestart(flag.getId(), this::restartAndroid); + dispatchListenersAndMaybeRestart(flag.getName(), this::restartAndroid); } else { - eraseFlag(flag.getId()); + eraseFlag(flag.getName()); } } /** Erase a flag's overridden value if there is one. */ - private void eraseFlag(int id) { - eraseInternal(id); - removeFromCache(id); - dispatchListenersAndMaybeRestart(id, this::restartSystemUI); + private void eraseFlag(String name) { + eraseInternal(name); + removeFromCache(name); + dispatchListenersAndMaybeRestart(name, this::restartSystemUI); } - private void dispatchListenersAndMaybeRestart(int id, Consumer<Boolean> restartAction) { - mFlagManager.dispatchListenersAndMaybeRestart(id, restartAction); + private void dispatchListenersAndMaybeRestart(String name, Consumer<Boolean> restartAction) { + mFlagManager.dispatchListenersAndMaybeRestart(name, restartAction); } - /** Works just like {@link #eraseFlag(int)} except that it doesn't restart SystemUI. */ + /** Works just like {@link #eraseFlag(String)} except that it doesn't restart SystemUI. */ + // TODO(b/265188950): Remove method this once ids are fully deprecated. private void eraseInternal(int id) { - // We can't actually "erase" things from sysprops, but we can set them to empty! - mSecureSettings.putStringForUser(mFlagManager.idToSettingsKey(id), "", + // We can't actually "erase" things from settings, but we can set them to empty! + mGlobalSettings.putStringForUser(mFlagManager.idToSettingsKey(id), "", + UserHandle.USER_CURRENT); + Log.i(TAG, "Erase name " + id); + } + + /** Works just like {@link #eraseFlag(String)} except that it doesn't restart SystemUI. */ + private void eraseInternal(String name) { + // We can't actually "erase" things from settings, but we can set them to empty! + mGlobalSettings.putStringForUser(mFlagManager.nameToSettingsKey(name), "", UserHandle.USER_CURRENT); - Log.i(TAG, "Erase id " + id); + Log.i(TAG, "Erase name " + name); } @Override @@ -339,13 +385,13 @@ public class FeatureFlagsDebug implements FeatureFlags { void setBooleanFlagInternal(Flag<?> flag, boolean value) { if (flag instanceof BooleanFlag) { - setFlagValue(flag.getId(), value, BooleanFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, BooleanFlagSerializer.INSTANCE); } else if (flag instanceof ResourceBooleanFlag) { - setFlagValue(flag.getId(), value, BooleanFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, BooleanFlagSerializer.INSTANCE); } else if (flag instanceof SysPropBooleanFlag) { // Store SysProp flags in SystemProperties where they can read by outside parties. mSystemProperties.setBoolean(((SysPropBooleanFlag) flag).getName(), value); - dispatchListenersAndMaybeRestart(flag.getId(), + dispatchListenersAndMaybeRestart(flag.getName(), FeatureFlagsDebug.this::restartAndroid); } else { throw new IllegalArgumentException("Unknown flag type"); @@ -354,9 +400,9 @@ public class FeatureFlagsDebug implements FeatureFlags { void setStringFlagInternal(Flag<?> flag, String value) { if (flag instanceof StringFlag) { - setFlagValue(flag.getId(), value, StringFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, StringFlagSerializer.INSTANCE); } else if (flag instanceof ResourceStringFlag) { - setFlagValue(flag.getId(), value, StringFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, StringFlagSerializer.INSTANCE); } else { throw new IllegalArgumentException("Unknown flag type"); } @@ -364,9 +410,9 @@ public class FeatureFlagsDebug implements FeatureFlags { void setIntFlagInternal(Flag<?> flag, int value) { if (flag instanceof IntFlag) { - setFlagValue(flag.getId(), value, IntFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, IntFlagSerializer.INSTANCE); } else if (flag instanceof ResourceIntFlag) { - setFlagValue(flag.getId(), value, IntFlagSerializer.INSTANCE); + setFlagValue(flag.getName(), value, IntFlagSerializer.INSTANCE); } else { throw new IllegalArgumentException("Unknown flag type"); } @@ -405,17 +451,17 @@ public class FeatureFlagsDebug implements FeatureFlags { Log.w(TAG, "No extras"); return; } - int id = extras.getInt(EXTRA_ID); - if (id <= 0) { - Log.w(TAG, "ID not set or less than or equal to 0: " + id); + String name = extras.getString(EXTRA_NAME); + if (name == null || name.isEmpty()) { + Log.w(TAG, "NAME not set or is empty: " + name); return; } - if (!mAllFlags.containsKey(id)) { - Log.w(TAG, "Tried to set unknown id: " + id); + if (!mAllFlags.containsKey(name)) { + Log.w(TAG, "Tried to set unknown name: " + name); return; } - Flag<?> flag = mAllFlags.get(id); + Flag<?> flag = mAllFlags.get(name); if (!extras.containsKey(EXTRA_VALUE)) { eraseFlag(flag); @@ -452,13 +498,16 @@ public class FeatureFlagsDebug implements FeatureFlags { if (f instanceof ReleasedFlag) { enabled = isEnabled((ReleasedFlag) f); - overridden = readBooleanFlagOverride(f.getId()) != null; + overridden = readBooleanFlagOverride(f.getName()) != null + || readBooleanFlagOverride(f.getId()) != null; } else if (f instanceof UnreleasedFlag) { enabled = isEnabled((UnreleasedFlag) f); - overridden = readBooleanFlagOverride(f.getId()) != null; + overridden = readBooleanFlagOverride(f.getName()) != null + || readBooleanFlagOverride(f.getId()) != null; } else if (f instanceof ResourceBooleanFlag) { enabled = isEnabled((ResourceBooleanFlag) f); - overridden = readBooleanFlagOverride(f.getId()) != null; + overridden = readBooleanFlagOverride(f.getName()) != null + || readBooleanFlagOverride(f.getId()) != null; } else if (f instanceof SysPropBooleanFlag) { // TODO(b/223379190): Teamfood not supported for sysprop flags yet. enabled = isEnabled((SysPropBooleanFlag) f); @@ -480,9 +529,9 @@ public class FeatureFlagsDebug implements FeatureFlags { } }; - private void removeFromCache(int id) { - mBooleanFlagCache.remove(id); - mStringFlagCache.remove(id); + private void removeFromCache(String name) { + mBooleanFlagCache.remove(name); + mStringFlagCache.remove(name); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java index 8bddacc4e32c..7e1423706fc9 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java +++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java @@ -21,18 +21,16 @@ import static com.android.systemui.flags.FlagsCommonModule.ALL_FLAGS; import static java.util.Objects.requireNonNull; import android.content.res.Resources; -import android.util.SparseArray; -import android.util.SparseBooleanArray; import androidx.annotation.NonNull; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.util.DeviceConfigProxy; import org.jetbrains.annotations.NotNull; import java.io.PrintWriter; +import java.util.HashMap; import java.util.Map; import javax.inject.Inject; @@ -50,12 +48,11 @@ public class FeatureFlagsRelease implements FeatureFlags { private final Resources mResources; private final SystemPropertiesHelper mSystemProperties; - private final DeviceConfigProxy mDeviceConfigProxy; private final ServerFlagReader mServerFlagReader; private final Restarter mRestarter; - private final Map<Integer, Flag<?>> mAllFlags; - SparseBooleanArray mBooleanCache = new SparseBooleanArray(); - SparseArray<String> mStringCache = new SparseArray<>(); + private final Map<String, Flag<?>> mAllFlags; + private final Map<String, Boolean> mBooleanCache = new HashMap<>(); + private final Map<String, String> mStringCache = new HashMap<>(); private final ServerFlagReader.ChangeListener mOnPropertiesChanged = new ServerFlagReader.ChangeListener() { @@ -69,13 +66,11 @@ public class FeatureFlagsRelease implements FeatureFlags { public FeatureFlagsRelease( @Main Resources resources, SystemPropertiesHelper systemProperties, - DeviceConfigProxy deviceConfigProxy, ServerFlagReader serverFlagReader, - @Named(ALL_FLAGS) Map<Integer, Flag<?>> allFlags, + @Named(ALL_FLAGS) Map<String, Flag<?>> allFlags, Restarter restarter) { mResources = resources; mSystemProperties = systemProperties; - mDeviceConfigProxy = deviceConfigProxy; mServerFlagReader = serverFlagReader; mAllFlags = allFlags; mRestarter = restarter; @@ -106,50 +101,48 @@ public class FeatureFlagsRelease implements FeatureFlags { @Override public boolean isEnabled(ResourceBooleanFlag flag) { - int cacheIndex = mBooleanCache.indexOfKey(flag.getId()); - if (cacheIndex < 0) { - return isEnabled(flag.getId(), mResources.getBoolean(flag.getResourceId())); + if (!mBooleanCache.containsKey(flag.getName())) { + return isEnabled(flag.getName(), mResources.getBoolean(flag.getResourceId())); } - return mBooleanCache.valueAt(cacheIndex); + return mBooleanCache.get(flag.getName()); } @Override public boolean isEnabled(SysPropBooleanFlag flag) { - int cacheIndex = mBooleanCache.indexOfKey(flag.getId()); - if (cacheIndex < 0) { + if (!mBooleanCache.containsKey(flag.getName())) { return isEnabled( - flag.getId(), mSystemProperties.getBoolean(flag.getName(), flag.getDefault())); + flag.getName(), + mSystemProperties.getBoolean(flag.getName(), flag.getDefault())); } - return mBooleanCache.valueAt(cacheIndex); + return mBooleanCache.get(flag.getName()); } - private boolean isEnabled(int key, boolean defaultValue) { - mBooleanCache.append(key, defaultValue); + private boolean isEnabled(String name, boolean defaultValue) { + mBooleanCache.put(name, defaultValue); return defaultValue; } @NonNull @Override public String getString(@NonNull StringFlag flag) { - return getString(flag.getId(), flag.getDefault()); + return getString(flag.getName(), flag.getDefault()); } @NonNull @Override public String getString(@NonNull ResourceStringFlag flag) { - int cacheIndex = mStringCache.indexOfKey(flag.getId()); - if (cacheIndex < 0) { - return getString(flag.getId(), + if (!mStringCache.containsKey(flag.getName())) { + return getString(flag.getName(), requireNonNull(mResources.getString(flag.getResourceId()))); } - return mStringCache.valueAt(cacheIndex); + return mStringCache.get(flag.getName()); } - private String getString(int key, String defaultValue) { - mStringCache.append(key, defaultValue); + private String getString(String name, String defaultValue) { + mStringCache.put(name, defaultValue); return defaultValue; } @@ -169,11 +162,17 @@ public class FeatureFlagsRelease implements FeatureFlags { public void dump(@NonNull PrintWriter pw, @NonNull String[] args) { pw.println("can override: false"); Map<String, Flag<?>> knownFlags = FlagsFactory.INSTANCE.getKnownFlags(); + pw.println("Booleans: "); for (Map.Entry<String, Flag<?>> nameToFlag : knownFlags.entrySet()) { Flag<?> flag = nameToFlag.getValue(); - int id = flag.getId(); + if (!(flag instanceof BooleanFlag) + || !(flag instanceof ResourceBooleanFlag) + || !(flag instanceof SysPropBooleanFlag)) { + continue; + } + boolean def = false; - if (mBooleanCache.indexOfKey(flag.getId()) < 0) { + if (!mBooleanCache.containsKey(flag.getName())) { if (flag instanceof SysPropBooleanFlag) { SysPropBooleanFlag f = (SysPropBooleanFlag) flag; def = mSystemProperties.getBoolean(f.getName(), f.getDefault()); @@ -185,15 +184,32 @@ public class FeatureFlagsRelease implements FeatureFlags { def = f.getDefault(); } } - pw.println(" sysui_flag_" + id + ": " + (mBooleanCache.get(id, def))); + pw.println( + " " + flag.getName() + ": " + + (mBooleanCache.getOrDefault(flag.getName(), def))); } - int numStrings = mStringCache.size(); - pw.println("Strings: " + numStrings); - for (int i = 0; i < numStrings; i++) { - final int id = mStringCache.keyAt(i); - final String value = mStringCache.valueAt(i); - final int length = value.length(); - pw.println(" sysui_flag_" + id + ": [length=" + length + "] \"" + value + "\""); + + pw.println("Strings: "); + for (Map.Entry<String, Flag<?>> nameToFlag : knownFlags.entrySet()) { + Flag<?> flag = nameToFlag.getValue(); + if (!(flag instanceof StringFlag) + || !(flag instanceof ResourceStringFlag)) { + continue; + } + + String def = ""; + if (!mBooleanCache.containsKey(flag.getName())) { + if (flag instanceof ResourceStringFlag) { + ResourceStringFlag f = (ResourceStringFlag) flag; + def = mResources.getString(f.getResourceId()); + } else if (flag instanceof StringFlag) { + StringFlag f = (StringFlag) flag; + def = f.getDefault(); + } + } + String value = mStringCache.getOrDefault(flag.getName(), def); + pw.println( + " " + flag.getName() + ": [length=" + value.length() + "] \"" + value + "\""); } } } diff --git a/packages/SystemUI/src/com/android/systemui/flags/FlagCommand.java b/packages/SystemUI/src/com/android/systemui/flags/FlagCommand.java index b7fc0e41ea69..daf9429344a7 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FlagCommand.java +++ b/packages/SystemUI/src/com/android/systemui/flags/FlagCommand.java @@ -39,12 +39,12 @@ public class FlagCommand implements Command { private final List<String> mOffCommands = List.of("false", "off", "0", "disable"); private final List<String> mSetCommands = List.of("set", "put"); private final FeatureFlagsDebug mFeatureFlags; - private final Map<Integer, Flag<?>> mAllFlags; + private final Map<String, Flag<?>> mAllFlags; @Inject FlagCommand( FeatureFlagsDebug featureFlags, - @Named(ALL_FLAGS) Map<Integer, Flag<?>> allFlags + @Named(ALL_FLAGS) Map<String, Flag<?>> allFlags ) { mFeatureFlags = featureFlags; mAllFlags = allFlags; @@ -53,30 +53,22 @@ public class FlagCommand implements Command { @Override public void execute(@NonNull PrintWriter pw, @NonNull List<String> args) { if (args.size() == 0) { - pw.println("Error: no flag id supplied"); + pw.println("Error: no flag name supplied"); help(pw); pw.println(); printKnownFlags(pw); return; } - int id = 0; - try { - id = Integer.parseInt(args.get(0)); - if (!mAllFlags.containsKey(id)) { - pw.println("Unknown flag id: " + id); - pw.println(); - printKnownFlags(pw); - return; - } - } catch (NumberFormatException e) { - id = flagNameToId(args.get(0)); - if (id == 0) { - pw.println("Invalid flag. Must an integer id or flag name: " + args.get(0)); - return; - } + String name = args.get(0); + if (!mAllFlags.containsKey(name)) { + pw.println("Unknown flag name: " + name); + pw.println(); + printKnownFlags(pw); + return; } - Flag<?> flag = mAllFlags.get(id); + + Flag<?> flag = mAllFlags.get(name); String cmd = ""; if (args.size() > 1) { @@ -117,7 +109,7 @@ public class FlagCommand implements Command { return; } - pw.println("Flag " + id + " is " + newValue); + pw.println("Flag " + name + " is " + newValue); pw.flush(); // Next command will restart sysui, so flush before we do so. if (shouldSet) { mFeatureFlags.setBooleanFlagInternal(flag, newValue); @@ -136,11 +128,11 @@ public class FlagCommand implements Command { return; } String value = args.get(2); - pw.println("Setting Flag " + id + " to " + value); + pw.println("Setting Flag " + name + " to " + value); pw.flush(); // Next command will restart sysui, so flush before we do so. mFeatureFlags.setStringFlagInternal(flag, args.get(2)); } else { - pw.println("Flag " + id + " is " + getStringFlag(flag)); + pw.println("Flag " + name + " is " + getStringFlag(flag)); } return; } else if (isIntFlag(flag)) { @@ -155,11 +147,11 @@ public class FlagCommand implements Command { return; } int value = Integer.parseInt(args.get(2)); - pw.println("Setting Flag " + id + " to " + value); + pw.println("Setting Flag " + name + " to " + value); pw.flush(); // Next command will restart sysui, so flush before we do so. mFeatureFlags.setIntFlagInternal(flag, value); } else { - pw.println("Flag " + id + " is " + getIntFlag(flag)); + pw.println("Flag " + name + " is " + getIntFlag(flag)); } return; } @@ -182,8 +174,7 @@ public class FlagCommand implements Command { private boolean isBooleanFlag(Flag<?> flag) { return (flag instanceof BooleanFlag) || (flag instanceof ResourceBooleanFlag) - || (flag instanceof SysPropFlag) - || (flag instanceof DeviceConfigBooleanFlag); + || (flag instanceof SysPropFlag); } private boolean isBooleanFlagEnabled(Flag<?> flag) { @@ -252,15 +243,14 @@ public class FlagCommand implements Command { for (int i = 0; i < longestFieldName - "Flag Name".length() + 1; i++) { pw.print(" "); } - pw.println("ID Value"); + pw.println(" Value"); for (int i = 0; i < longestFieldName; i++) { pw.print("="); } - pw.println(" ==== ========"); + pw.println(" ========"); for (String fieldName : fields.keySet()) { Flag<?> flag = fields.get(fieldName); - int id = flag.getId(); - if (id == 0 || !mAllFlags.containsKey(id)) { + if (!mAllFlags.containsKey(flag.getName())) { continue; } pw.print(fieldName); @@ -268,9 +258,9 @@ public class FlagCommand implements Command { for (int i = 0; i < longestFieldName - fieldWidth + 1; i++) { pw.print(" "); } - pw.printf("%-4d ", id); + pw.print(" "); if (isBooleanFlag(flag)) { - pw.println(isBooleanFlagEnabled(mAllFlags.get(id))); + pw.println(isBooleanFlagEnabled(flag)); } else if (isStringFlag(flag)) { pw.println(getStringFlag(flag)); } else if (isIntFlag(flag)) { diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 1213ecdd2b59..661b202eb7c2 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -128,13 +128,6 @@ object Flags { val LOCKSCREEN_CUSTOM_CLOCKS = unreleasedFlag(207, "lockscreen_custom_clocks", teamfood = true) /** - * Flag to enable the usage of the new bouncer data source. This is a refactor of and eventual - * replacement of KeyguardBouncer.java. - */ - // TODO(b/254512385): Tracking Bug - @JvmField val MODERN_BOUNCER = releasedFlag(208, "modern_bouncer") - - /** * Whether the clock on a wide lock screen should use the new "stepping" animation for moving * the digits when the clock moves. */ @@ -345,8 +338,7 @@ object Flags { // TODO(b/254513168): Tracking Bug @JvmField val UMO_SURFACE_RIPPLE = unreleasedFlag(907, "umo_surface_ripple") - @JvmField - val MEDIA_FALSING_PENALTY = unreleasedFlag(908, "media_falsing_media", teamfood = true) + @JvmField val MEDIA_FALSING_PENALTY = releasedFlag(908, "media_falsing_media") // TODO(b/261734857): Tracking Bug @JvmField val UMO_TURBULENCE_NOISE = unreleasedFlag(909, "umo_turbulence_noise") @@ -365,6 +357,16 @@ object Flags { // TODO(b/266157412): Tracking Bug val MEDIA_RETAIN_SESSIONS = unreleasedFlag(913, "media_retain_sessions") + // TODO(b/266739309): Tracking Bug + @JvmField + val MEDIA_RECOMMENDATION_CARD_UPDATE = unreleasedFlag(914, "media_recommendation_card_update") + + // TODO(b/267007629): Tracking Bug + val MEDIA_RESUME_PROGRESS = unreleasedFlag(915, "media_resume_progress") + + // TODO(b/267166152) : Tracking Bug + val MEDIA_RETAIN_RECOMMENDATIONS = unreleasedFlag(916, "media_retain_recommendations") + // 1000 - dock val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging") @@ -452,6 +454,12 @@ object Flags { val ENABLE_PIP_SIZE_LARGE_SCREEN = sysPropBooleanFlag(1114, "persist.wm.debug.enable_pip_size_large_screen", default = false) + // TODO(b/265998256): Tracking bug + @Keep + @JvmField + val ENABLE_PIP_APP_ICON_OVERLAY = + sysPropBooleanFlag(1115, "persist.wm.debug.enable_pip_app_icon_overlay", default = false) + // 1200 - predictive back @Keep @JvmField @@ -461,7 +469,7 @@ object Flags { @Keep @JvmField val WM_ENABLE_PREDICTIVE_BACK_ANIM = - sysPropBooleanFlag(1201, "persist.wm.debug.predictive_back_anim", default = false) + sysPropBooleanFlag(1201, "persist.wm.debug.predictive_back_anim", default = true) @Keep @JvmField @@ -494,7 +502,7 @@ object Flags { // TODO(b/238475428): Tracking Bug @JvmField val WM_SHADE_ANIMATE_BACK_GESTURE = - unreleasedFlag(1208, "persist.wm.debug.shade_animate_back_gesture", teamfood = true) + unreleasedFlag(1208, "persist.wm.debug.shade_animate_back_gesture", teamfood = false) // TODO(b/265639042): Tracking Bug @JvmField @@ -510,6 +518,9 @@ object Flags { // TODO(b/264916608): Tracking Bug @JvmField val SCREENSHOT_METADATA = unreleasedFlag(1302, "screenshot_metadata") + // TODO(b/266955521): Tracking bug + @JvmField val SCREENSHOT_DETECTION = unreleasedFlag(1303, "screenshot_detection") + // 1400 - columbus // TODO(b/254512756): Tracking Bug val QUICK_TAP_IN_PCC = releasedFlag(1400, "quick_tap_in_pcc") @@ -518,17 +529,25 @@ object Flags { val QUICK_TAP_FLOW_FRAMEWORK = unreleasedFlag(1401, "quick_tap_flow_framework", teamfood = false) - // 1500 - chooser + // 1500 - chooser aka sharesheet // TODO(b/254512507): Tracking Bug val CHOOSER_UNBUNDLED = unreleasedFlag(1500, "chooser_unbundled", teamfood = true) + // TODO(b/266983432) Tracking Bug + val SHARESHEET_CUSTOM_ACTIONS = unreleasedFlag(1501, "sharesheet_custom_actions") + + // TODO(b/266982749) Tracking Bug + val SHARESHEET_RESELECTION_ACTION = unreleasedFlag(1502, "sharesheet_reselection_action") + + // TODO(b/266983474) Tracking Bug + val SHARESHEET_IMAGE_AND_TEXT_PREVIEW = unreleasedFlag(1503, "sharesheet_image_text_preview") + // 1600 - accessibility @JvmField val A11Y_FLOATING_MENU_FLING_SPRING_ANIMATIONS = unreleasedFlag(1600, "a11y_floating_menu_fling_spring_animations") // 1700 - clipboard - @JvmField val CLIPBOARD_OVERLAY_REFACTOR = releasedFlag(1700, "clipboard_overlay_refactor") @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior") // 1800 - shade container @@ -541,7 +560,7 @@ object Flags { @JvmField val NOTE_TASKS = unreleasedFlag(1900, "keycode_flag") // 2000 - device controls - @Keep @JvmField val USE_APP_PANELS = unreleasedFlag(2000, "use_app_panels", teamfood = true) + @Keep @JvmField val USE_APP_PANELS = releasedFlag(2000, "use_app_panels", teamfood = true) @JvmField val APP_PANELS_ALL_APPS_ALLOWED = diff --git a/packages/SystemUI/src/com/android/systemui/flags/FlagsCommonModule.kt b/packages/SystemUI/src/com/android/systemui/flags/FlagsCommonModule.kt index 8442230fc5b1..0054d266c283 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FlagsCommonModule.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/FlagsCommonModule.kt @@ -28,8 +28,8 @@ interface FlagsCommonModule { @JvmStatic @Provides @Named(ALL_FLAGS) - fun providesAllFlags(): Map<Int, Flag<*>> { - return FlagsFactory.knownFlags.map { it.value.id to it.value }.toMap() + fun providesAllFlags(): Map<String, Flag<*>> { + return FlagsFactory.knownFlags } } } diff --git a/packages/SystemUI/src/com/android/systemui/flags/ServerFlagReader.kt b/packages/SystemUI/src/com/android/systemui/flags/ServerFlagReader.kt index ae05c4656349..a02b795f074e 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/ServerFlagReader.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/ServerFlagReader.kt @@ -54,10 +54,11 @@ class ServerFlagReaderImpl @Inject constructor( return } + for ((listener, flags) in listeners) { propLoop@ for (propName in properties.keyset) { for (flag in flags) { - if (propName == getServerOverrideName(flag.id)) { + if (propName == getServerOverrideName(flag.id) || propName == flag.name) { listener.onChange() break@propLoop } diff --git a/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java b/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java index 18fb423b87a5..98896b118331 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java @@ -37,9 +37,14 @@ public class ExtensionFragmentListener<T extends FragmentBase> implements Consum private final int mId; private String mOldClass; - private ExtensionFragmentListener(View view, String tag, int id, Extension<T> extension) { + private ExtensionFragmentListener( + FragmentService fragmentService, + View view, + String tag, + int id, + Extension<T> extension) { mTag = tag; - mFragmentHostManager = FragmentHostManager.get(view); + mFragmentHostManager = fragmentService.getFragmentHostManager(view); mExtension = extension; mId = id; mFragmentHostManager.getFragmentManager().beginTransaction() @@ -61,8 +66,13 @@ public class ExtensionFragmentListener<T extends FragmentBase> implements Consum mExtension.clearItem(true); } - public static <T> void attachExtensonToFragment(View view, String tag, int id, + public static <T> void attachExtensonToFragment( + FragmentService fragmentService, + View view, + String tag, + int id, Extension<T> extension) { - extension.addCallback(new ExtensionFragmentListener(view, tag, id, extension)); + extension.addCallback( + new ExtensionFragmentListener(fragmentService, view, tag, id, extension)); } } diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index 9c7411bf3649..6a27ee7c0c89 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -36,7 +36,6 @@ import android.view.View; import androidx.annotation.NonNull; import com.android.settingslib.applications.InterestingConfigChanges; -import com.android.systemui.Dependency; import com.android.systemui.plugins.Plugin; import com.android.systemui.util.leak.LeakDetector; @@ -46,12 +45,17 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; + public class FragmentHostManager { private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Context mContext; private final HashMap<String, ArrayList<FragmentListener>> mListeners = new HashMap<>(); private final View mRootView; + private final LeakDetector mLeakDetector; private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE | ActivityInfo.CONFIG_ASSETS_PATHS); @@ -61,14 +65,24 @@ public class FragmentHostManager { private FragmentController mFragments; private FragmentLifecycleCallbacks mLifecycleCallbacks; - FragmentHostManager(FragmentService manager, View rootView) { + @AssistedInject + FragmentHostManager( + @Assisted View rootView, + FragmentService manager, + LeakDetector leakDetector) { mContext = rootView.getContext(); mManager = manager; mRootView = rootView; + mLeakDetector = leakDetector; mConfigChanges.applyNewConfig(mContext.getResources()); createFragmentHost(null); } + @AssistedFactory + public interface Factory { + FragmentHostManager create(View rootView); + } + private void createFragmentHost(Parcelable savedState) { mFragments = FragmentController.createController(new HostCallbacks()); mFragments.attachHost(null); @@ -86,7 +100,7 @@ public class FragmentHostManager { @Override public void onFragmentDestroyed(FragmentManager fm, Fragment f) { - Dependency.get(LeakDetector.class).trackGarbage(f); + mLeakDetector.trackGarbage(f); } }; mFragments.getFragmentManager().registerFragmentLifecycleCallbacks(mLifecycleCallbacks, @@ -211,19 +225,6 @@ public class FragmentHostManager { } } - public static FragmentHostManager get(View view) { - try { - return Dependency.get(FragmentService.class).getFragmentHostManager(view); - } catch (ClassCastException e) { - // TODO: Some auto handling here? - throw e; - } - } - - public static void removeAndDestroy(View view) { - Dependency.get(FragmentService.class).removeAndDestroy(view); - } - public void reloadFragments() { Trace.beginSection("FrargmentHostManager#reloadFragments"); // Save the old state. diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java index fe945fb2fa28..d302b13a68b6 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java @@ -53,6 +53,7 @@ public class FragmentService implements Dumpable { */ private final ArrayMap<String, FragmentInstantiationInfo> mInjectionMap = new ArrayMap<>(); private final Handler mHandler = new Handler(); + private final FragmentHostManager.Factory mFragmentHostManagerFactory; private ConfigurationController.ConfigurationListener mConfigurationListener = new ConfigurationController.ConfigurationListener() { @@ -67,8 +68,10 @@ public class FragmentService implements Dumpable { @Inject public FragmentService( FragmentCreator.Factory fragmentCreatorFactory, + FragmentHostManager.Factory fragmentHostManagerFactory, ConfigurationController configurationController, DumpManager dumpManager) { + mFragmentHostManagerFactory = fragmentHostManagerFactory; addFragmentInstantiationProvider(fragmentCreatorFactory.build()); configurationController.addCallback(mConfigurationListener); @@ -152,7 +155,7 @@ public class FragmentService implements Dumpable { public FragmentHostState(View view) { mView = view; - mFragmentHostManager = new FragmentHostManager(FragmentService.this, mView); + mFragmentHostManager = mFragmentHostManagerFactory.create(mView); } public void sendConfigurationChange(Configuration newConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt b/packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt index 482138e6c277..680c504d50fc 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt @@ -31,10 +31,12 @@ import android.os.Bundle import android.util.Log import com.android.systemui.SystemUIAppComponentFactoryBase import com.android.systemui.SystemUIAppComponentFactoryBase.ContextAvailableCallback +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.domain.interactor.KeyguardQuickAffordanceInteractor import com.android.systemui.keyguard.ui.preview.KeyguardRemotePreviewManager import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.runBlocking class CustomizationProvider : @@ -42,6 +44,7 @@ class CustomizationProvider : @Inject lateinit var interactor: KeyguardQuickAffordanceInteractor @Inject lateinit var previewManager: KeyguardRemotePreviewManager + @Inject @Main lateinit var mainDispatcher: CoroutineDispatcher private lateinit var contextAvailableCallback: ContextAvailableCallback @@ -138,12 +141,14 @@ class CustomizationProvider : selectionArgs: Array<out String>?, sortOrder: String?, ): Cursor? { - return when (uriMatcher.match(uri)) { - MATCH_CODE_ALL_AFFORDANCES -> runBlocking { queryAffordances() } - MATCH_CODE_ALL_SLOTS -> querySlots() - MATCH_CODE_ALL_SELECTIONS -> runBlocking { querySelections() } - MATCH_CODE_ALL_FLAGS -> queryFlags() - else -> null + return runBlocking(mainDispatcher) { + when (uriMatcher.match(uri)) { + MATCH_CODE_ALL_AFFORDANCES -> queryAffordances() + MATCH_CODE_ALL_SLOTS -> querySlots() + MATCH_CODE_ALL_SELECTIONS -> querySelections() + MATCH_CODE_ALL_FLAGS -> queryFlags() + else -> null + } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index f4a1227a467c..47872d2d68bb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -17,7 +17,6 @@ package com.android.systemui.keyguard; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.view.WindowManager.TRANSIT_CLOSE; @@ -80,6 +79,7 @@ import com.android.internal.policy.IKeyguardService; import com.android.internal.policy.IKeyguardStateCallback; import com.android.keyguard.mediator.ScreenOnCoordinator; import com.android.systemui.SystemUIApplication; +import com.android.systemui.settings.DisplayTracker; import com.android.wm.shell.transition.ShellTransitions; import com.android.wm.shell.transition.Transitions; @@ -123,6 +123,7 @@ public class KeyguardService extends Service { private final KeyguardLifecyclesDispatcher mKeyguardLifecyclesDispatcher; private final ScreenOnCoordinator mScreenOnCoordinator; private final ShellTransitions mShellTransitions; + private final DisplayTracker mDisplayTracker; private static int newModeToLegacyMode(int newMode) { switch (newMode) { @@ -286,12 +287,14 @@ public class KeyguardService extends Service { public KeyguardService(KeyguardViewMediator keyguardViewMediator, KeyguardLifecyclesDispatcher keyguardLifecyclesDispatcher, ScreenOnCoordinator screenOnCoordinator, - ShellTransitions shellTransitions) { + ShellTransitions shellTransitions, + DisplayTracker displayTracker) { super(); mKeyguardViewMediator = keyguardViewMediator; mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher; mScreenOnCoordinator = screenOnCoordinator; mShellTransitions = shellTransitions; + mDisplayTracker = displayTracker; } @Override @@ -328,7 +331,7 @@ public class KeyguardService extends Service { unoccludeAnimationAdapter); } ActivityTaskManager.getInstance().registerRemoteAnimationsForDisplay( - DEFAULT_DISPLAY, definition); + mDisplayTracker.getDefaultDisplayId(), definition); return; } if (sEnableRemoteKeyguardGoingAwayAnimation) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt index 76c2430e37ad..80675d373b8e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt @@ -29,6 +29,7 @@ object BuiltInKeyguardQuickAffordanceKeys { const val DO_NOT_DISTURB = "do_not_disturb" const val FLASHLIGHT = "flashlight" const val HOME_CONTROLS = "home" + const val MUTE = "mute" const val QR_CODE_SCANNER = "qr_code_scanner" const val QUICK_ACCESS_WALLET = "wallet" const val VIDEO_CAMERA = "video_camera" diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfig.kt index f6e6d6b7dc1b..5a9f7752277e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfig.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.data.quickaffordance import android.app.StatusBarManager import android.content.Context +import android.content.pm.PackageManager import com.android.systemui.R import com.android.systemui.animation.Expandable import com.android.systemui.camera.CameraGestureHelper @@ -26,7 +27,6 @@ import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.statusbar.StatusBarState import dagger.Lazy import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -37,6 +37,7 @@ class CameraQuickAffordanceConfig @Inject constructor( @Application private val context: Context, + private val packageManager: PackageManager, private val cameraGestureHelper: Lazy<CameraGestureHelper>, ) : KeyguardQuickAffordanceConfig { @@ -79,6 +80,6 @@ constructor( } private fun isLaunchable(): Boolean { - return cameraGestureHelper.get().canCameraGestureBeLaunched(StatusBarState.KEYGUARD) + return packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt index a1cce5c670ba..45561959a7df 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt @@ -33,12 +33,13 @@ interface KeyguardDataQuickAffordanceModule { @Provides @ElementsIntoSet fun quickAffordanceConfigs( + camera: CameraQuickAffordanceConfig, doNotDisturb: DoNotDisturbQuickAffordanceConfig, flashlight: FlashlightQuickAffordanceConfig, home: HomeControlsKeyguardQuickAffordanceConfig, + mute: MuteQuickAffordanceConfig, quickAccessWallet: QuickAccessWalletKeyguardQuickAffordanceConfig, qrCodeScanner: QrCodeScannerKeyguardQuickAffordanceConfig, - camera: CameraQuickAffordanceConfig, videoCamera: VideoCameraQuickAffordanceConfig, ): Set<KeyguardQuickAffordanceConfig> { return setOf( @@ -46,6 +47,7 @@ interface KeyguardDataQuickAffordanceModule { doNotDisturb, flashlight, home, + mute, quickAccessWallet, qrCodeScanner, videoCamera, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt new file mode 100644 index 000000000000..d085db9a1eda --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.data.quickaffordance + +import android.content.Context +import android.media.AudioManager +import androidx.lifecycle.LiveData +import androidx.lifecycle.Observer +import com.android.systemui.R +import com.android.systemui.animation.Expandable +import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.common.shared.model.ContentDescription +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.shared.quickaffordance.ActivationState +import com.android.systemui.settings.UserFileManager +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.RingerModeTracker +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.onStart +import javax.inject.Inject + +@SysUISingleton +class MuteQuickAffordanceConfig @Inject constructor( + context: Context, + private val userTracker: UserTracker, + private val userFileManager: UserFileManager, + private val ringerModeTracker: RingerModeTracker, + private val audioManager: AudioManager, +) : KeyguardQuickAffordanceConfig { + + private var previousNonSilentMode: Int = DEFAULT_LAST_NON_SILENT_VALUE + + override val key: String = BuiltInKeyguardQuickAffordanceKeys.MUTE + + override val pickerName: String = context.getString(R.string.volume_ringer_status_silent) + + override val pickerIconResourceId: Int = R.drawable.ic_notifications_silence + + override val lockScreenState: Flow<KeyguardQuickAffordanceConfig.LockScreenState> = + ringerModeTracker.ringerModeInternal.asFlow() + .onStart { emit(getLastNonSilentRingerMode()) } + .distinctUntilChanged() + .onEach { mode -> + // only remember last non-SILENT ringer mode + if (mode != null && mode != AudioManager.RINGER_MODE_SILENT) { + previousNonSilentMode = mode + } + } + .map { mode -> + val (activationState, contentDescriptionRes) = when { + audioManager.isVolumeFixed -> + ActivationState.NotSupported to + R.string.volume_ringer_hint_mute + mode == AudioManager.RINGER_MODE_SILENT -> + ActivationState.Active to + R.string.volume_ringer_hint_mute + else -> + ActivationState.Inactive to + R.string.volume_ringer_hint_unmute + } + + KeyguardQuickAffordanceConfig.LockScreenState.Visible( + Icon.Resource( + R.drawable.ic_notifications_silence, + ContentDescription.Resource(contentDescriptionRes), + ), + activationState, + ) + } + + override fun onTriggered( + expandable: Expandable? + ): KeyguardQuickAffordanceConfig.OnTriggeredResult { + val newRingerMode: Int + val currentRingerMode = + ringerModeTracker.ringerModeInternal.value ?: DEFAULT_LAST_NON_SILENT_VALUE + if (currentRingerMode == AudioManager.RINGER_MODE_SILENT) { + newRingerMode = previousNonSilentMode + } else { + previousNonSilentMode = currentRingerMode + newRingerMode = AudioManager.RINGER_MODE_SILENT + } + + if (currentRingerMode != newRingerMode) { + audioManager.ringerModeInternal = newRingerMode + } + return KeyguardQuickAffordanceConfig.OnTriggeredResult.Handled + } + + override suspend fun getPickerScreenState(): KeyguardQuickAffordanceConfig.PickerScreenState = + if (audioManager.isVolumeFixed) { + KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice + } else { + KeyguardQuickAffordanceConfig.PickerScreenState.Default() + } + + /** + * Gets the last non-silent ringer mode from shared-preferences if it exists. This is + * cached by [MuteQuickAffordanceCoreStartable] while this affordance is selected + */ + private fun getLastNonSilentRingerMode(): Int = + userFileManager.getSharedPreferences( + MUTE_QUICK_AFFORDANCE_PREFS_FILE_NAME, + Context.MODE_PRIVATE, + userTracker.userId + ).getInt( + LAST_NON_SILENT_RINGER_MODE_KEY, + ringerModeTracker.ringerModeInternal.value ?: DEFAULT_LAST_NON_SILENT_VALUE + ) + + private fun <T> LiveData<T>.asFlow(): Flow<T?> = + conflatedCallbackFlow { + val observer = Observer { value: T -> trySend(value) } + observeForever(observer) + send(value) + awaitClose { removeObserver(observer) } + } + + companion object { + const val LAST_NON_SILENT_RINGER_MODE_KEY = "key_last_non_silent_ringer_mode" + const val MUTE_QUICK_AFFORDANCE_PREFS_FILE_NAME = "quick_affordance_mute_ringer_mode_cache" + private const val DEFAULT_LAST_NON_SILENT_VALUE = AudioManager.RINGER_MODE_NORMAL + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartable.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartable.kt new file mode 100644 index 000000000000..12a6310ccc85 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartable.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.data.quickaffordance + +import android.content.Context +import android.media.AudioManager +import androidx.lifecycle.Observer +import com.android.systemui.CoreStartable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository +import com.android.systemui.settings.UserFileManager +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.RingerModeTracker +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import javax.inject.Inject + +/** + * Store previous non-silent Ringer Mode into shared prefs to be used for Mute Lockscreen Shortcut + */ +@SysUISingleton +class MuteQuickAffordanceCoreStartable @Inject constructor( + private val featureFlags: FeatureFlags, + private val userTracker: UserTracker, + private val ringerModeTracker: RingerModeTracker, + private val userFileManager: UserFileManager, + private val keyguardQuickAffordanceRepository: KeyguardQuickAffordanceRepository, + @Application private val coroutineScope: CoroutineScope, +) : CoreStartable { + + private val observer = Observer(this::updateLastNonSilentRingerMode) + + override fun start() { + if (!featureFlags.isEnabled(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES)) return + + // only listen to ringerModeInternal changes when Mute is one of the selected affordances + keyguardQuickAffordanceRepository + .selections + .map { selections -> + // determines if Mute is selected in any lockscreen shortcut position + val muteSelected: Boolean = selections.values.any { configList -> + configList.any { config -> + config.key == BuiltInKeyguardQuickAffordanceKeys.MUTE + } + } + if (muteSelected) { + ringerModeTracker.ringerModeInternal.observeForever(observer) + } else { + ringerModeTracker.ringerModeInternal.removeObserver(observer) + } + } + .launchIn(coroutineScope) + } + + private fun updateLastNonSilentRingerMode(lastRingerMode: Int) { + if (AudioManager.RINGER_MODE_SILENT != lastRingerMode) { + userFileManager.getSharedPreferences( + MuteQuickAffordanceConfig.MUTE_QUICK_AFFORDANCE_PREFS_FILE_NAME, + Context.MODE_PRIVATE, + userTracker.userId + ) + .edit() + .putInt(MuteQuickAffordanceConfig.LAST_NON_SILENT_RINGER_MODE_KEY, lastRingerMode) + .apply() + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt index 25d8f4021f87..0af596a53a4d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt @@ -47,12 +47,13 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.transformLatest /** - * Acts as source of truth for biometric features. + * Acts as source of truth for biometric authentication related settings like enrollments, device + * policy, etc. * * Abstracts-away data sources and their schemas so the rest of the app doesn't need to worry about * upstream changes. */ -interface BiometricRepository { +interface BiometricSettingsRepository { /** Whether any fingerprints are enrolled for the current user. */ val isFingerprintEnrolled: StateFlow<Boolean> @@ -68,7 +69,7 @@ interface BiometricRepository { } @SysUISingleton -class BiometricRepositoryImpl +class BiometricSettingsRepositoryImpl @Inject constructor( context: Context, @@ -80,7 +81,7 @@ constructor( @Application scope: CoroutineScope, @Background backgroundDispatcher: CoroutineDispatcher, @Main looper: Looper, -) : BiometricRepository { +) : BiometricSettingsRepository { /** UserId of the current selected user. */ private val selectedUserId: Flow<Int> = @@ -88,7 +89,7 @@ constructor( override val isFingerprintEnrolled: StateFlow<Boolean> = selectedUserId - .flatMapLatest { userId -> + .flatMapLatest { conflatedCallbackFlow { val callback = object : AuthController.Callback { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt index 08edbc6d0163..b3a9cf58310a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt @@ -22,14 +22,18 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn /** Encapsulates state about device entry fingerprint auth mechanism. */ interface DeviceEntryFingerprintAuthRepository { /** Whether the device entry fingerprint auth is locked out. */ - val isLockedOut: Flow<Boolean> + val isLockedOut: StateFlow<Boolean> } /** @@ -44,29 +48,34 @@ class DeviceEntryFingerprintAuthRepositoryImpl @Inject constructor( val keyguardUpdateMonitor: KeyguardUpdateMonitor, + @Application scope: CoroutineScope, ) : DeviceEntryFingerprintAuthRepository { - override val isLockedOut: Flow<Boolean> = conflatedCallbackFlow { - val sendLockoutUpdate = - fun() { - trySendWithFailureLogging( - keyguardUpdateMonitor.isFingerprintLockedOut, - TAG, - "onLockedOutStateChanged" - ) - } - val callback = - object : KeyguardUpdateMonitorCallback() { - override fun onLockedOutStateChanged(biometricSourceType: BiometricSourceType?) { - if (biometricSourceType == BiometricSourceType.FINGERPRINT) { - sendLockoutUpdate() + override val isLockedOut: StateFlow<Boolean> = + conflatedCallbackFlow { + val sendLockoutUpdate = + fun() { + trySendWithFailureLogging( + keyguardUpdateMonitor.isFingerprintLockedOut, + TAG, + "onLockedOutStateChanged" + ) + } + val callback = + object : KeyguardUpdateMonitorCallback() { + override fun onLockedOutStateChanged( + biometricSourceType: BiometricSourceType? + ) { + if (biometricSourceType == BiometricSourceType.FINGERPRINT) { + sendLockoutUpdate() + } + } } - } + keyguardUpdateMonitor.registerCallback(callback) + sendLockoutUpdate() + awaitClose { keyguardUpdateMonitor.removeCallback(callback) } } - keyguardUpdateMonitor.registerCallback(callback) - sendLockoutUpdate() - awaitClose { keyguardUpdateMonitor.removeCallback(callback) } - } + .stateIn(scope, started = SharingStarted.Eagerly, initialValue = false) companion object { const val TAG = "DeviceEntryFingerprintAuthRepositoryImpl" diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt index 41574d18e2c7..4ac6ac8d9cce 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt @@ -26,7 +26,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel import com.android.systemui.log.dagger.BouncerLog import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.log.table.logDiffsForTable -import com.android.systemui.statusbar.phone.KeyguardBouncer import com.android.systemui.util.time.SystemClock import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -42,31 +41,96 @@ import kotlinx.coroutines.flow.map * * Make sure to add newly added flows to the logger. */ +interface KeyguardBouncerRepository { + /** Values associated with the PrimaryBouncer (pin/pattern/password) input. */ + val primaryBouncerVisible: StateFlow<Boolean> + val primaryBouncerShow: StateFlow<KeyguardBouncerModel?> + val primaryBouncerShowingSoon: StateFlow<Boolean> + val primaryBouncerHide: StateFlow<Boolean> + val primaryBouncerStartingToHide: StateFlow<Boolean> + val primaryBouncerStartingDisappearAnimation: StateFlow<Runnable?> + /** Determines if we want to instantaneously show the primary bouncer instead of translating. */ + val primaryBouncerScrimmed: StateFlow<Boolean> + /** + * Set how much of the notification panel is showing on the screen. + * ``` + * 0f = panel fully hidden = bouncer fully showing + * 1f = panel fully showing = bouncer fully hidden + * ``` + */ + val panelExpansionAmount: StateFlow<Float> + val keyguardPosition: StateFlow<Float> + val onScreenTurnedOff: StateFlow<Boolean> + val isBackButtonEnabled: StateFlow<Boolean?> + /** Determines if user is already unlocked */ + val keyguardAuthenticated: StateFlow<Boolean?> + val showMessage: StateFlow<BouncerShowMessageModel?> + val resourceUpdateRequests: StateFlow<Boolean> + val bouncerPromptReason: Int + val bouncerErrorMessage: CharSequence? + val isAlternateBouncerVisible: StateFlow<Boolean> + val isAlternateBouncerUIAvailable: StateFlow<Boolean> + var lastAlternateBouncerVisibleTime: Long + + fun setPrimaryScrimmed(isScrimmed: Boolean) + + fun setPrimaryVisible(isVisible: Boolean) + + fun setPrimaryShow(keyguardBouncerModel: KeyguardBouncerModel?) + + fun setPrimaryShowingSoon(showingSoon: Boolean) + + fun setPrimaryHide(hide: Boolean) + + fun setPrimaryStartingToHide(startingToHide: Boolean) + + fun setPrimaryStartDisappearAnimation(runnable: Runnable?) + + fun setPanelExpansion(panelExpansion: Float) + + fun setKeyguardPosition(keyguardPosition: Float) + + fun setResourceUpdateRequests(willUpdateResources: Boolean) + + fun setShowMessage(bouncerShowMessageModel: BouncerShowMessageModel?) + + fun setKeyguardAuthenticated(keyguardAuthenticated: Boolean?) + + fun setIsBackButtonEnabled(isBackButtonEnabled: Boolean) + + fun setOnScreenTurnedOff(onScreenTurnedOff: Boolean) + + fun setAlternateVisible(isVisible: Boolean) + + fun setAlternateBouncerUIAvailable(isAvailable: Boolean) +} + @SysUISingleton -class KeyguardBouncerRepository +class KeyguardBouncerRepositoryImpl @Inject constructor( private val viewMediatorCallback: ViewMediatorCallback, private val clock: SystemClock, @Application private val applicationScope: CoroutineScope, @BouncerLog private val buffer: TableLogBuffer, -) { +) : KeyguardBouncerRepository { /** Values associated with the PrimaryBouncer (pin/pattern/password) input. */ private val _primaryBouncerVisible = MutableStateFlow(false) - val primaryBouncerVisible = _primaryBouncerVisible.asStateFlow() + override val primaryBouncerVisible = _primaryBouncerVisible.asStateFlow() private val _primaryBouncerShow = MutableStateFlow<KeyguardBouncerModel?>(null) - val primaryBouncerShow = _primaryBouncerShow.asStateFlow() + override val primaryBouncerShow = _primaryBouncerShow.asStateFlow() private val _primaryBouncerShowingSoon = MutableStateFlow(false) - val primaryBouncerShowingSoon = _primaryBouncerShowingSoon.asStateFlow() + override val primaryBouncerShowingSoon = _primaryBouncerShowingSoon.asStateFlow() private val _primaryBouncerHide = MutableStateFlow(false) - val primaryBouncerHide = _primaryBouncerHide.asStateFlow() + override val primaryBouncerHide = _primaryBouncerHide.asStateFlow() private val _primaryBouncerStartingToHide = MutableStateFlow(false) - val primaryBouncerStartingToHide = _primaryBouncerStartingToHide.asStateFlow() + override val primaryBouncerStartingToHide = _primaryBouncerStartingToHide.asStateFlow() private val _primaryBouncerDisappearAnimation = MutableStateFlow<Runnable?>(null) - val primaryBouncerStartingDisappearAnimation = _primaryBouncerDisappearAnimation.asStateFlow() + override val primaryBouncerStartingDisappearAnimation = + _primaryBouncerDisappearAnimation.asStateFlow() /** Determines if we want to instantaneously show the primary bouncer instead of translating. */ private val _primaryBouncerScrimmed = MutableStateFlow(false) - val primaryBouncerScrimmed = _primaryBouncerScrimmed.asStateFlow() + override val primaryBouncerScrimmed = _primaryBouncerScrimmed.asStateFlow() /** * Set how much of the notification panel is showing on the screen. * ``` @@ -75,23 +139,23 @@ constructor( * ``` */ private val _panelExpansionAmount = MutableStateFlow(EXPANSION_HIDDEN) - val panelExpansionAmount = _panelExpansionAmount.asStateFlow() + override val panelExpansionAmount = _panelExpansionAmount.asStateFlow() private val _keyguardPosition = MutableStateFlow(0f) - val keyguardPosition = _keyguardPosition.asStateFlow() + override val keyguardPosition = _keyguardPosition.asStateFlow() private val _onScreenTurnedOff = MutableStateFlow(false) - val onScreenTurnedOff = _onScreenTurnedOff.asStateFlow() + override val onScreenTurnedOff = _onScreenTurnedOff.asStateFlow() private val _isBackButtonEnabled = MutableStateFlow<Boolean?>(null) - val isBackButtonEnabled = _isBackButtonEnabled.asStateFlow() + override val isBackButtonEnabled = _isBackButtonEnabled.asStateFlow() private val _keyguardAuthenticated = MutableStateFlow<Boolean?>(null) /** Determines if user is already unlocked */ - val keyguardAuthenticated = _keyguardAuthenticated.asStateFlow() + override val keyguardAuthenticated = _keyguardAuthenticated.asStateFlow() private val _showMessage = MutableStateFlow<BouncerShowMessageModel?>(null) - val showMessage = _showMessage.asStateFlow() + override val showMessage = _showMessage.asStateFlow() private val _resourceUpdateRequests = MutableStateFlow(false) - val resourceUpdateRequests = _resourceUpdateRequests.asStateFlow() - val bouncerPromptReason: Int + override val resourceUpdateRequests = _resourceUpdateRequests.asStateFlow() + override val bouncerPromptReason: Int get() = viewMediatorCallback.bouncerPromptReason - val bouncerErrorMessage: CharSequence? + override val bouncerErrorMessage: CharSequence? get() = viewMediatorCallback.consumeCustomMessage() init { @@ -100,21 +164,21 @@ constructor( /** Values associated with the AlternateBouncer */ private val _isAlternateBouncerVisible = MutableStateFlow(false) - val isAlternateBouncerVisible = _isAlternateBouncerVisible.asStateFlow() - var lastAlternateBouncerVisibleTime: Long = NOT_VISIBLE + override val isAlternateBouncerVisible = _isAlternateBouncerVisible.asStateFlow() + override var lastAlternateBouncerVisibleTime: Long = NOT_VISIBLE private val _isAlternateBouncerUIAvailable = MutableStateFlow<Boolean>(false) - val isAlternateBouncerUIAvailable: StateFlow<Boolean> = + override val isAlternateBouncerUIAvailable: StateFlow<Boolean> = _isAlternateBouncerUIAvailable.asStateFlow() - fun setPrimaryScrimmed(isScrimmed: Boolean) { + override fun setPrimaryScrimmed(isScrimmed: Boolean) { _primaryBouncerScrimmed.value = isScrimmed } - fun setPrimaryVisible(isVisible: Boolean) { + override fun setPrimaryVisible(isVisible: Boolean) { _primaryBouncerVisible.value = isVisible } - fun setAlternateVisible(isVisible: Boolean) { + override fun setAlternateVisible(isVisible: Boolean) { if (isVisible && !_isAlternateBouncerVisible.value) { lastAlternateBouncerVisibleTime = clock.uptimeMillis() } else if (!isVisible) { @@ -123,55 +187,55 @@ constructor( _isAlternateBouncerVisible.value = isVisible } - fun setAlternateBouncerUIAvailable(isAvailable: Boolean) { + override fun setAlternateBouncerUIAvailable(isAvailable: Boolean) { _isAlternateBouncerUIAvailable.value = isAvailable } - fun setPrimaryShow(keyguardBouncerModel: KeyguardBouncerModel?) { + override fun setPrimaryShow(keyguardBouncerModel: KeyguardBouncerModel?) { _primaryBouncerShow.value = keyguardBouncerModel } - fun setPrimaryShowingSoon(showingSoon: Boolean) { + override fun setPrimaryShowingSoon(showingSoon: Boolean) { _primaryBouncerShowingSoon.value = showingSoon } - fun setPrimaryHide(hide: Boolean) { + override fun setPrimaryHide(hide: Boolean) { _primaryBouncerHide.value = hide } - fun setPrimaryStartingToHide(startingToHide: Boolean) { + override fun setPrimaryStartingToHide(startingToHide: Boolean) { _primaryBouncerStartingToHide.value = startingToHide } - fun setPrimaryStartDisappearAnimation(runnable: Runnable?) { + override fun setPrimaryStartDisappearAnimation(runnable: Runnable?) { _primaryBouncerDisappearAnimation.value = runnable } - fun setPanelExpansion(panelExpansion: Float) { + override fun setPanelExpansion(panelExpansion: Float) { _panelExpansionAmount.value = panelExpansion } - fun setKeyguardPosition(keyguardPosition: Float) { + override fun setKeyguardPosition(keyguardPosition: Float) { _keyguardPosition.value = keyguardPosition } - fun setResourceUpdateRequests(willUpdateResources: Boolean) { + override fun setResourceUpdateRequests(willUpdateResources: Boolean) { _resourceUpdateRequests.value = willUpdateResources } - fun setShowMessage(bouncerShowMessageModel: BouncerShowMessageModel?) { + override fun setShowMessage(bouncerShowMessageModel: BouncerShowMessageModel?) { _showMessage.value = bouncerShowMessageModel } - fun setKeyguardAuthenticated(keyguardAuthenticated: Boolean?) { + override fun setKeyguardAuthenticated(keyguardAuthenticated: Boolean?) { _keyguardAuthenticated.value = keyguardAuthenticated } - fun setIsBackButtonEnabled(isBackButtonEnabled: Boolean) { + override fun setIsBackButtonEnabled(isBackButtonEnabled: Boolean) { _isBackButtonEnabled.value = isBackButtonEnabled } - fun setOnScreenTurnedOff(onScreenTurnedOff: Boolean) { + override fun setOnScreenTurnedOff(onScreenTurnedOff: Boolean) { _onScreenTurnedOff.value = onScreenTurnedOff } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt index 2b2b9d0703fa..8ece3183fd56 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepository.kt @@ -146,7 +146,7 @@ constructor( * Returns a snapshot of the [KeyguardQuickAffordanceConfig] instances of the affordances at the * slot with the given ID. The configs are sorted in descending priority order. */ - fun getSelections(slotId: String): List<KeyguardQuickAffordanceConfig> { + fun getCurrentSelections(slotId: String): List<KeyguardQuickAffordanceConfig> { val selections = selectionManager.value.getSelections().getOrDefault(slotId, emptyList()) return configs.filter { selections.contains(it.key) } } @@ -155,7 +155,7 @@ constructor( * Returns a snapshot of the IDs of the selected affordances, indexed by slot ID. The configs * are sorted in descending priority order. */ - fun getSelections(): Map<String, List<String>> { + fun getCurrentSelections(): Map<String, List<String>> { return selectionManager.value.getSelections() } @@ -217,7 +217,7 @@ constructor( private inner class Dumpster : Dumpable { override fun dump(pw: PrintWriter, args: Array<out String>) { val slotPickerRepresentations = getSlotPickerRepresentations() - val selectionsBySlotId = getSelections() + val selectionsBySlotId = getCurrentSelections() pw.println("Slots & selections:") slotPickerRepresentations.forEach { slotPickerRepresentation -> val slotId = slotPickerRepresentation.id diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt index 4639597a9b8c..4a262f580749 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryModule.kt @@ -31,5 +31,16 @@ interface KeyguardRepositoryModule { @Binds fun lightRevealScrimRepository(impl: LightRevealScrimRepositoryImpl): LightRevealScrimRepository - @Binds fun biometricRepository(impl: BiometricRepositoryImpl): BiometricRepository + @Binds + fun biometricSettingsRepository( + impl: BiometricSettingsRepositoryImpl + ): BiometricSettingsRepository + + @Binds + fun deviceEntryFingerprintAuthRepository( + impl: DeviceEntryFingerprintAuthRepositoryImpl + ): DeviceEntryFingerprintAuthRepository + + @Binds + fun keyguardBouncerRepository(impl: KeyguardBouncerRepositoryImpl): KeyguardBouncerRepository } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt index 28c0b288147b..6452e0e094ce 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt @@ -20,7 +20,8 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.BiometricRepository +import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager.LegacyAlternateBouncer import com.android.systemui.util.time.SystemClock @@ -33,7 +34,8 @@ class AlternateBouncerInteractor @Inject constructor( private val bouncerRepository: KeyguardBouncerRepository, - private val biometricRepository: BiometricRepository, + private val biometricSettingsRepository: BiometricSettingsRepository, + private val deviceEntryFingerprintAuthRepository: DeviceEntryFingerprintAuthRepository, private val systemClock: SystemClock, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, featureFlags: FeatureFlags, @@ -97,9 +99,10 @@ constructor( fun canShowAlternateBouncerForFingerprint(): Boolean { return if (isModernAlternateBouncerEnabled) { bouncerRepository.isAlternateBouncerUIAvailable.value && - biometricRepository.isFingerprintEnrolled.value && - biometricRepository.isStrongBiometricAllowed.value && - biometricRepository.isFingerprintEnabledByDevicePolicy.value + biometricSettingsRepository.isFingerprintEnrolled.value && + biometricSettingsRepository.isStrongBiometricAllowed.value && + biometricSettingsRepository.isFingerprintEnabledByDevicePolicy.value && + !deviceEntryFingerprintAuthRepository.isLockedOut.value } else { legacyAlternateBouncer != null && keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(true) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt index ce61f2fec92f..86f65dde4031 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt @@ -21,6 +21,7 @@ import com.android.systemui.animation.Interpolators import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository +import com.android.systemui.keyguard.shared.model.BiometricUnlockModel.Companion.isWakeAndUnlock import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo import com.android.systemui.keyguard.shared.model.WakefulnessModel.Companion.isWakingOrStartingToWake @@ -44,6 +45,7 @@ constructor( override fun start() { listenForDozingToLockscreen() + listenForDozingToGone() } private fun listenForDozingToLockscreen() { @@ -68,6 +70,28 @@ constructor( } } + private fun listenForDozingToGone() { + scope.launch { + keyguardInteractor.biometricUnlockState + .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair) + .collect { (biometricUnlockState, lastStartedTransition) -> + if ( + lastStartedTransition.to == KeyguardState.DOZING && + isWakeAndUnlock(biometricUnlockState) + ) { + keyguardTransitionRepository.startTransition( + TransitionInfo( + name, + KeyguardState.DOZING, + KeyguardState.GONE, + getAnimator(), + ) + ) + } + } + } + } + private fun getAnimator(duration: Duration = DEFAULT_DURATION): ValueAnimator { return ValueAnimator().apply { setInterpolator(Interpolators.LINEAR) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index 9ddc575307b5..57c3b3143c62 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -154,7 +154,7 @@ constructor( val slots = repository.get().getSlotPickerRepresentations() val slot = slots.find { it.id == slotId } ?: return false val selections = - repository.get().getSelections().getOrDefault(slotId, emptyList()).toMutableList() + repository.get().getCurrentSelections().getOrDefault(slotId, emptyList()).toMutableList() val alreadySelected = selections.remove(affordanceId) if (!alreadySelected) { while (selections.size > 0 && selections.size >= slot.maxSelectedAffordances) { @@ -193,7 +193,7 @@ constructor( if (affordanceId.isNullOrEmpty()) { return if ( - repository.get().getSelections().getOrDefault(slotId, emptyList()).isEmpty() + repository.get().getCurrentSelections().getOrDefault(slotId, emptyList()).isEmpty() ) { false } else { @@ -203,7 +203,7 @@ constructor( } val selections = - repository.get().getSelections().getOrDefault(slotId, emptyList()).toMutableList() + repository.get().getCurrentSelections().getOrDefault(slotId, emptyList()).toMutableList() return if (selections.remove(affordanceId)) { repository .get() @@ -220,7 +220,7 @@ constructor( /** Returns affordance IDs indexed by slot ID, for all known slots. */ suspend fun getSelections(): Map<String, List<KeyguardQuickAffordancePickerRepresentation>> { val slots = repository.get().getSlotPickerRepresentations() - val selections = repository.get().getSelections() + val selections = repository.get().getCurrentSelections() val affordanceById = getAffordancePickerRepresentations().associateBy { affordance -> affordance.id } return slots.associate { slot -> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt index ad6dbea7ae43..53c80f65e44f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt @@ -19,7 +19,6 @@ package com.android.systemui.keyguard.domain.interactor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.KeyguardState.AOD import com.android.systemui.keyguard.shared.model.KeyguardState.BOUNCER @@ -31,9 +30,6 @@ import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionState.STARTED import com.android.systemui.keyguard.shared.model.TransitionStep import javax.inject.Inject -import kotlin.math.max -import kotlin.math.min -import kotlin.time.Duration import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map @@ -104,38 +100,4 @@ constructor( /* The last completed [KeyguardState] transition */ val finishedKeyguardState: Flow<KeyguardState> = finishedKeyguardTransitionStep.map { step -> step.to } - - /** - * Transitions will occur over a [totalDuration] with [TransitionStep]s being emitted in the - * range of [0, 1]. View animations should begin and end within a subset of this range. This - * function maps the [startTime] and [duration] into [0, 1], when this subset is valid. - */ - fun transitionStepAnimation( - flow: Flow<TransitionStep>, - params: AnimationParams, - totalDuration: Duration, - ): Flow<Float> { - val start = (params.startTime / totalDuration).toFloat() - val chunks = (totalDuration / params.duration).toFloat() - var isRunning = false - return flow - .map { step -> - val value = (step.value - start) * chunks - if (step.transitionState == STARTED) { - // When starting, make sure to always emit. If a transition is started from the - // middle, it is possible this animation is being skipped but we need to inform - // the ViewModels of the last update - isRunning = true - max(0f, min(1f, value)) - } else if (isRunning && value >= 1f) { - // Always send a final value of 1. Because of rounding, [value] may never be - // exactly 1. - isRunning = false - 1f - } else { - value - } - } - .filter { value -> value >= 0f && value <= 1f } - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt index a92540d733b5..96bf815b28d8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt @@ -113,6 +113,8 @@ constructor( 0f } } + /** Allow for interaction when just about fully visible */ + val isInteractable: Flow<Boolean> = bouncerExpansion.map { it > 0.9 } // TODO(b/243685699): Move isScrimmed logic to data layer. // TODO(b/243695312): Encapsulate all of the show logic for the bouncer. diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt index bb5ac84c6e54..8222dd54f46d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/KeyguardBouncerConstants.kt @@ -25,4 +25,5 @@ object KeyguardBouncerConstants { */ const val EXPANSION_HIDDEN = 1f const val EXPANSION_VISIBLE = 0f + const val ALPHA_EXPANSION_THRESHOLD = 0.95f } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt new file mode 100644 index 000000000000..ca1e27c9d19c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt @@ -0,0 +1,106 @@ +/* + * 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 + +import android.view.animation.Interpolator +import com.android.systemui.animation.Interpolators.LINEAR +import com.android.systemui.keyguard.shared.model.TransitionState.CANCELED +import com.android.systemui.keyguard.shared.model.TransitionState.FINISHED +import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING +import com.android.systemui.keyguard.shared.model.TransitionState.STARTED +import com.android.systemui.keyguard.shared.model.TransitionStep +import kotlin.math.max +import kotlin.math.min +import kotlin.time.Duration +import kotlin.time.Duration.Companion.milliseconds +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.map + +/** + * For the given transition params, construct a flow using [createFlow] for the specified portion of + * the overall transition. + */ +class KeyguardTransitionAnimationFlow( + private val transitionDuration: Duration, + private val transitionFlow: Flow<TransitionStep>, +) { + /** + * Transitions will occur over a [transitionDuration] with [TransitionStep]s being emitted in + * the range of [0, 1]. View animations should begin and end within a subset of this range. This + * function maps the [startTime] and [duration] into [0, 1], when this subset is valid. + */ + fun createFlow( + duration: Duration, + onStep: (Float) -> Float, + startTime: Duration = 0.milliseconds, + onCancel: (() -> Float)? = null, + onFinish: (() -> Float)? = null, + interpolator: Interpolator = LINEAR, + ): Flow<Float> { + if (!duration.isPositive()) { + throw IllegalArgumentException("duration must be a positive number: $duration") + } + if ((startTime + duration).compareTo(transitionDuration) > 0) { + throw IllegalArgumentException( + "startTime($startTime) + duration($duration) must be" + + " <= transitionDuration($transitionDuration)" + ) + } + + val start = (startTime / transitionDuration).toFloat() + val chunks = (transitionDuration / duration).toFloat() + var isComplete = true + + fun stepToValue(step: TransitionStep): Float? { + val value = (step.value - start) * chunks + return when (step.transitionState) { + // When starting, make sure to always emit. If a transition is started from the + // middle, it is possible this animation is being skipped but we need to inform + // the ViewModels of the last update + STARTED -> { + isComplete = false + 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 + 1f + } else if (value >= 0f) { + value + } else { + null + } + else -> null + }?.let { onStep(interpolator.getInterpolation(it)) } + } + + return transitionFlow + .map { step -> + when (step.transitionState) { + STARTED -> stepToValue(step) + RUNNING -> stepToValue(step) + CANCELED -> onCancel?.invoke() + FINISHED -> onFinish?.invoke() + } + } + .filterNotNull() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt index e9d7a5b8ed6f..3319f9d467ec 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt @@ -49,6 +49,7 @@ import kotlin.math.pow import kotlin.math.sqrt import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flatMapLatest @@ -163,12 +164,26 @@ object KeyguardBottomAreaViewBinder { ambientIndicationArea?.alpha = alpha indicationArea.alpha = alpha - startButton.alpha = alpha - endButton.alpha = alpha } } launch { + updateButtonAlpha( + view = startButton, + viewModel = viewModel.startButton, + alphaFlow = viewModel.alpha, + ) + } + + launch { + updateButtonAlpha( + view = endButton, + viewModel = viewModel.endButton, + alphaFlow = viewModel.alpha, + ) + } + + launch { viewModel.indicationAreaTranslationX.collect { translationX -> indicationArea.translationX = translationX ambientIndicationArea?.translationX = translationX @@ -321,7 +336,6 @@ object KeyguardBottomAreaViewBinder { .animate() .scaleX(if (viewModel.isSelected) SCALE_SELECTED_BUTTON else 1f) .scaleY(if (viewModel.isSelected) SCALE_SELECTED_BUTTON else 1f) - .alpha(if (viewModel.isDimmed) DIM_ALPHA else 1f) .start() view.isClickable = viewModel.isClickable @@ -341,6 +355,17 @@ object KeyguardBottomAreaViewBinder { view.isSelected = viewModel.isSelected } + private suspend fun updateButtonAlpha( + view: View, + viewModel: Flow<KeyguardQuickAffordanceViewModel>, + alphaFlow: Flow<Float>, + ) { + combine(viewModel.map { it.isDimmed }, alphaFlow) { isDimmed, alpha -> + if (isDimmed) DIM_ALPHA else alpha + } + .collect { view.alpha = it } + } + private class OnTouchListener( private val view: View, private val viewModel: KeyguardQuickAffordanceViewModel, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt index 5e46c5d1f67a..9f09d53c99f3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt @@ -106,13 +106,6 @@ object KeyguardBouncerViewBinder { hostViewController.appear( SystemBarUtils.getStatusBarHeight(view.context) ) - } - } - - launch { - viewModel.showWithFullExpansion.collect { model -> - hostViewController.resetSecurityContainer() - hostViewController.showPromptReason(model.promptReason) hostViewController.onResume() } } @@ -161,6 +154,12 @@ object KeyguardBouncerViewBinder { } launch { + viewModel.isInteractable.collect { isInteractable -> + hostViewController.setInteractable(isInteractable) + } + } + + launch { viewModel.isBouncerVisible .filter { !it } .collect { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt index 88085749ece0..adde595247f8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt @@ -177,7 +177,8 @@ constructor( val receiver = object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { - clockController.clock?.events?.onTimeTick() + clockController.clock?.smallClock?.events?.onTimeTick() + clockController.clock?.largeClock?.events?.onTimeTick() } } broadcastDispatcher.registerReceiver( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt index 6627865ecc79..8d6545a49a8a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModel.kt @@ -21,15 +21,10 @@ import com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor.Companion.TO_LOCKSCREEN_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams -import com.android.systemui.keyguard.shared.model.TransitionState.CANCELED -import com.android.systemui.keyguard.shared.model.TransitionState.FINISHED +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge /** * Breaks down DREAMING->LOCKSCREEN transition into discrete steps for corresponding views to @@ -41,39 +36,46 @@ class DreamingToLockscreenTransitionViewModel constructor( private val interactor: KeyguardTransitionInteractor, ) { + private val transitionAnimation = + KeyguardTransitionAnimationFlow( + transitionDuration = TO_LOCKSCREEN_DURATION, + transitionFlow = interactor.dreamingToLockscreenTransition, + ) /** Dream overlay y-translation on exit */ fun dreamOverlayTranslationY(translatePx: Int): Flow<Float> { - return flowForAnimation(DREAM_OVERLAY_TRANSLATION_Y).map { value -> - EMPHASIZED_ACCELERATE.getInterpolation(value) * translatePx - } + return transitionAnimation.createFlow( + duration = 600.milliseconds, + onStep = { it * translatePx }, + interpolator = EMPHASIZED_ACCELERATE, + ) } /** Dream overlay views alpha - fade out */ - val dreamOverlayAlpha: Flow<Float> = flowForAnimation(DREAM_OVERLAY_ALPHA).map { 1f - it } + val dreamOverlayAlpha: Flow<Float> = + transitionAnimation.createFlow( + duration = 250.milliseconds, + onStep = { 1f - it }, + ) /** Lockscreen views y-translation */ fun lockscreenTranslationY(translatePx: Int): Flow<Float> { - return merge( - flowForAnimation(LOCKSCREEN_TRANSLATION_Y).map { value -> - -translatePx + (EMPHASIZED_DECELERATE.getInterpolation(value) * translatePx) - }, - // On end, reset the translation to 0 - interactor.dreamingToLockscreenTransition - .filter { it.transitionState == FINISHED || it.transitionState == CANCELED } - .map { 0f } + return transitionAnimation.createFlow( + duration = TO_LOCKSCREEN_DURATION, + onStep = { value -> -translatePx + value * translatePx }, + // Reset on cancel or finish + onFinish = { 0f }, + onCancel = { 0f }, + interpolator = EMPHASIZED_DECELERATE, ) } /** Lockscreen views alpha */ - val lockscreenAlpha: Flow<Float> = flowForAnimation(LOCKSCREEN_ALPHA) - - private fun flowForAnimation(params: AnimationParams): Flow<Float> { - return interactor.transitionStepAnimation( - interactor.dreamingToLockscreenTransition, - params, - totalDuration = TO_LOCKSCREEN_DURATION + val lockscreenAlpha: Flow<Float> = + transitionAnimation.createFlow( + startTime = 233.milliseconds, + duration = 250.milliseconds, + onStep = { it }, ) - } companion object { /* Length of time before ending the dream activity, in order to start unoccluding */ @@ -81,11 +83,5 @@ constructor( @JvmField val LOCKSCREEN_ANIMATION_DURATION_MS = (TO_LOCKSCREEN_DURATION - DREAM_ANIMATION_DURATION).inWholeMilliseconds - - val DREAM_OVERLAY_TRANSLATION_Y = AnimationParams(duration = 600.milliseconds) - val DREAM_OVERLAY_ALPHA = AnimationParams(duration = 250.milliseconds) - val LOCKSCREEN_TRANSLATION_Y = AnimationParams(duration = TO_LOCKSCREEN_DURATION) - val LOCKSCREEN_ALPHA = - AnimationParams(startTime = 233.milliseconds, duration = 250.milliseconds) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModel.kt index 5a4796096eeb..f16827d4a54a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModel.kt @@ -20,15 +20,10 @@ import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromGoneTransitionInteractor.Companion.TO_DREAMING_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams -import com.android.systemui.keyguard.shared.model.TransitionState.CANCELED -import com.android.systemui.keyguard.shared.model.TransitionState.FINISHED +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge /** Breaks down GONE->DREAMING transition into discrete steps for corresponding views to consume. */ @SysUISingleton @@ -38,32 +33,28 @@ constructor( private val interactor: KeyguardTransitionInteractor, ) { + private val transitionAnimation = + KeyguardTransitionAnimationFlow( + transitionDuration = TO_DREAMING_DURATION, + transitionFlow = interactor.goneToDreamingTransition, + ) + /** Lockscreen views y-translation */ fun lockscreenTranslationY(translatePx: Int): Flow<Float> { - return merge( - flowForAnimation(LOCKSCREEN_TRANSLATION_Y).map { value -> - (EMPHASIZED_ACCELERATE.getInterpolation(value) * translatePx) - }, - // On end, reset the translation to 0 - interactor.goneToDreamingTransition - .filter { it.transitionState == FINISHED || it.transitionState == CANCELED } - .map { 0f } + return transitionAnimation.createFlow( + duration = 500.milliseconds, + onStep = { it * translatePx }, + // Reset on cancel or finish + onFinish = { 0f }, + onCancel = { 0f }, + interpolator = EMPHASIZED_ACCELERATE, ) } /** Lockscreen views alpha */ - val lockscreenAlpha: Flow<Float> = flowForAnimation(LOCKSCREEN_ALPHA).map { 1f - it } - - private fun flowForAnimation(params: AnimationParams): Flow<Float> { - return interactor.transitionStepAnimation( - interactor.goneToDreamingTransition, - params, - totalDuration = TO_DREAMING_DURATION + val lockscreenAlpha: Flow<Float> = + transitionAnimation.createFlow( + duration = 250.milliseconds, + onStep = { 1f - it }, ) - } - - companion object { - val LOCKSCREEN_TRANSLATION_Y = AnimationParams(duration = 500.milliseconds) - val LOCKSCREEN_ALPHA = AnimationParams(duration = 250.milliseconds) - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt index c6002d6db91a..b8b3a8e5db20 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModel.kt @@ -20,12 +20,10 @@ import android.view.View import com.android.systemui.keyguard.data.BouncerView import com.android.systemui.keyguard.data.BouncerViewDelegate import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel import javax.inject.Inject import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map /** Models UI state for the lock screen bouncer; handles user input. */ @@ -41,13 +39,12 @@ constructor( /** Observe on bouncer visibility. */ val isBouncerVisible: Flow<Boolean> = interactor.isVisible + /** Can the user interact with the view? */ + val isInteractable: Flow<Boolean> = interactor.isInteractable + /** Observe whether bouncer is showing. */ val show: Flow<KeyguardBouncerModel> = interactor.show - /** Observe visible expansion when bouncer is showing. */ - val showWithFullExpansion: Flow<KeyguardBouncerModel> = - interactor.show.filter { it.expansionAmount == EXPANSION_VISIBLE } - /** Observe whether bouncer is hiding. */ val hide: Flow<Unit> = interactor.hide diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt index e05adbdab583..bc9dc4f69102 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModel.kt @@ -20,15 +20,10 @@ import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor.Companion.TO_DREAMING_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams -import com.android.systemui.keyguard.shared.model.TransitionState.CANCELED -import com.android.systemui.keyguard.shared.model.TransitionState.FINISHED +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge /** * Breaks down LOCKSCREEN->DREAMING transition into discrete steps for corresponding views to @@ -40,35 +35,32 @@ class LockscreenToDreamingTransitionViewModel constructor( private val interactor: KeyguardTransitionInteractor, ) { + private val transitionAnimation = + KeyguardTransitionAnimationFlow( + transitionDuration = TO_DREAMING_DURATION, + transitionFlow = interactor.lockscreenToDreamingTransition, + ) /** Lockscreen views y-translation */ fun lockscreenTranslationY(translatePx: Int): Flow<Float> { - return merge( - flowForAnimation(LOCKSCREEN_TRANSLATION_Y).map { value -> - (EMPHASIZED_ACCELERATE.getInterpolation(value) * translatePx) - }, - // On end, reset the translation to 0 - interactor.lockscreenToDreamingTransition - .filter { it.transitionState == FINISHED || it.transitionState == CANCELED } - .map { 0f } + return transitionAnimation.createFlow( + duration = 500.milliseconds, + onStep = { it * translatePx }, + // Reset on cancel or finish + onFinish = { 0f }, + onCancel = { 0f }, + interpolator = EMPHASIZED_ACCELERATE, ) } /** Lockscreen views alpha */ - val lockscreenAlpha: Flow<Float> = flowForAnimation(LOCKSCREEN_ALPHA).map { 1f - it } - - private fun flowForAnimation(params: AnimationParams): Flow<Float> { - return interactor.transitionStepAnimation( - interactor.lockscreenToDreamingTransition, - params, - totalDuration = TO_DREAMING_DURATION + val lockscreenAlpha: Flow<Float> = + transitionAnimation.createFlow( + duration = 250.milliseconds, + onStep = { 1f - it }, ) - } companion object { @JvmField val DREAMING_ANIMATION_DURATION_MS = TO_DREAMING_DURATION.inWholeMilliseconds - - val LOCKSCREEN_TRANSLATION_Y = AnimationParams(duration = 500.milliseconds) - val LOCKSCREEN_ALPHA = AnimationParams(duration = 250.milliseconds) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt index 22d292e92856..a60665a81f0e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModel.kt @@ -20,14 +20,10 @@ import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor.Companion.TO_OCCLUDED_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams -import com.android.systemui.keyguard.shared.model.TransitionState +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge /** * Breaks down LOCKSCREEN->OCCLUDED transition into discrete steps for corresponding views to @@ -39,33 +35,28 @@ class LockscreenToOccludedTransitionViewModel constructor( private val interactor: KeyguardTransitionInteractor, ) { - - /** Lockscreen views y-translation */ - fun lockscreenTranslationY(translatePx: Int): Flow<Float> { - return merge( - flowForAnimation(LOCKSCREEN_TRANSLATION_Y).map { value -> - (EMPHASIZED_ACCELERATE.getInterpolation(value) * translatePx) - }, - // On end, reset the translation to 0 - interactor.lockscreenToOccludedTransition - .filter { step -> step.transitionState == TransitionState.FINISHED } - .map { 0f } + private val transitionAnimation = + KeyguardTransitionAnimationFlow( + transitionDuration = TO_OCCLUDED_DURATION, + transitionFlow = interactor.lockscreenToOccludedTransition, ) - } /** Lockscreen views alpha */ - val lockscreenAlpha: Flow<Float> = flowForAnimation(LOCKSCREEN_ALPHA).map { 1f - it } - - private fun flowForAnimation(params: AnimationParams): Flow<Float> { - return interactor.transitionStepAnimation( - interactor.lockscreenToOccludedTransition, - params, - totalDuration = TO_OCCLUDED_DURATION + val lockscreenAlpha: Flow<Float> = + transitionAnimation.createFlow( + duration = 250.milliseconds, + onStep = { 1f - it }, ) - } - companion object { - val LOCKSCREEN_TRANSLATION_Y = AnimationParams(duration = TO_OCCLUDED_DURATION) - val LOCKSCREEN_ALPHA = AnimationParams(duration = 250.milliseconds) + /** Lockscreen views y-translation */ + fun lockscreenTranslationY(translatePx: Int): Flow<Float> { + return transitionAnimation.createFlow( + duration = TO_OCCLUDED_DURATION, + onStep = { value -> value * translatePx }, + // Reset on cancel or finish + onFinish = { 0f }, + onCancel = { 0f }, + interpolator = EMPHASIZED_ACCELERATE, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt index e804562bc85f..5770f3ee8876 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt @@ -20,11 +20,10 @@ import com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromOccludedTransitionInteractor.Companion.TO_LOCKSCREEN_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map /** * Breaks down OCCLUDED->LOCKSCREEN transition into discrete steps for corresponding views to @@ -36,28 +35,26 @@ class OccludedToLockscreenTransitionViewModel constructor( private val interactor: KeyguardTransitionInteractor, ) { + private val transitionAnimation = + KeyguardTransitionAnimationFlow( + transitionDuration = TO_LOCKSCREEN_DURATION, + transitionFlow = interactor.occludedToLockscreenTransition, + ) + /** Lockscreen views y-translation */ fun lockscreenTranslationY(translatePx: Int): Flow<Float> { - return flowForAnimation(LOCKSCREEN_TRANSLATION_Y).map { value -> - -translatePx + (EMPHASIZED_DECELERATE.getInterpolation(value) * translatePx) - } + return transitionAnimation.createFlow( + duration = TO_LOCKSCREEN_DURATION, + onStep = { value -> -translatePx + value * translatePx }, + interpolator = EMPHASIZED_DECELERATE, + ) } /** Lockscreen views alpha */ - val lockscreenAlpha: Flow<Float> = flowForAnimation(LOCKSCREEN_ALPHA) - - private fun flowForAnimation(params: AnimationParams): Flow<Float> { - return interactor.transitionStepAnimation( - interactor.occludedToLockscreenTransition, - params, - totalDuration = TO_LOCKSCREEN_DURATION + val lockscreenAlpha: Flow<Float> = + transitionAnimation.createFlow( + startTime = 233.milliseconds, + duration = 250.milliseconds, + onStep = { it }, ) - } - - companion object { - @JvmField val LOCKSCREEN_ANIMATION_DURATION_MS = TO_LOCKSCREEN_DURATION.inWholeMilliseconds - val LOCKSCREEN_TRANSLATION_Y = AnimationParams(duration = TO_LOCKSCREEN_DURATION) - val LOCKSCREEN_ALPHA = - AnimationParams(startTime = 233.milliseconds, duration = 250.milliseconds) - } } diff --git a/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt b/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt new file mode 100644 index 000000000000..5acaa46c25d6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/ScreenDecorationsLogger.kt @@ -0,0 +1,135 @@ +/* + * 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.log + +import android.graphics.Point +import android.graphics.Rect +import android.graphics.RectF +import androidx.core.graphics.toRectF +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.dagger.ScreenDecorationsLog +import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.plugins.log.LogLevel.DEBUG +import com.android.systemui.plugins.log.LogLevel.ERROR +import javax.inject.Inject + +private const val TAG = "ScreenDecorationsLog" + +/** + * Helper class for logging for [com.android.systemui.ScreenDecorations] + * + * To enable logcat echoing for an entire buffer: + * + * ``` + * adb shell settings put global systemui/buffer/ScreenDecorationsLog <logLevel> + * + * ``` + */ +@SysUISingleton +class ScreenDecorationsLogger +@Inject +constructor( + @ScreenDecorationsLog private val logBuffer: LogBuffer, +) { + fun cameraProtectionBoundsForScanningOverlay(bounds: Rect) { + logBuffer.log( + TAG, + DEBUG, + { str1 = bounds.toShortString() }, + { "Face scanning overlay present camera protection bounds: $str1" } + ) + } + + fun hwcLayerCameraProtectionBounds(bounds: Rect) { + logBuffer.log( + TAG, + DEBUG, + { str1 = bounds.toShortString() }, + { "Hwc layer present camera protection bounds: $str1" } + ) + } + + fun dcvCameraBounds(id: Int, bounds: Rect) { + logBuffer.log( + TAG, + DEBUG, + { + str1 = bounds.toShortString() + int1 = id + }, + { "DisplayCutoutView id=$int1 present, camera protection bounds: $str1" } + ) + } + + fun cutoutViewNotInitialized() { + logBuffer.log(TAG, ERROR, "CutoutView not initialized showCameraProtection") + } + + fun boundingRect(boundingRectangle: RectF, context: String) { + logBuffer.log( + TAG, + DEBUG, + { + str1 = context + str2 = boundingRectangle.toShortString() + }, + { "Bounding rect $str1 : $str2" } + ) + } + + fun boundingRect(boundingRectangle: Rect, context: String) { + boundingRect(boundingRectangle.toRectF(), context) + } + + fun onMeasureDimensions( + widthMeasureSpec: Int, + heightMeasureSpec: Int, + measuredWidth: Int, + measuredHeight: Int + ) { + logBuffer.log( + TAG, + DEBUG, + { + long1 = widthMeasureSpec.toLong() + long2 = heightMeasureSpec.toLong() + int1 = measuredWidth + int2 = measuredHeight + }, + { + "Face scanning animation: widthMeasureSpec: $long1 measuredWidth: $int1, " + + "heightMeasureSpec: $long2 measuredHeight: $int2" + } + ) + } + + fun faceSensorLocation(faceSensorLocation: Point?) { + logBuffer.log( + TAG, + DEBUG, + { + int1 = faceSensorLocation?.y?.times(2) ?: 0 + str1 = "$faceSensorLocation" + }, + { "Reinflating view: Face sensor location: $str1, faceScanningHeight: $int1" } + ) + } + + fun onSensorLocationChanged() { + logBuffer.log(TAG, DEBUG, "AuthControllerCallback in ScreenDecorations triggered") + } +} 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 6c6f7e9744fe..41774800c527 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -350,6 +350,16 @@ public class LogModule { } /** + * Provides a {@link LogBuffer} for use by {@link com.android.systemui.ScreenDecorations}. + */ + @Provides + @SysUISingleton + @ScreenDecorationsLog + public static LogBuffer provideScreenDecorationsLog(LogBufferFactory factory) { + return factory.create("ScreenDecorationsLog", 200); + } + + /** * Provides a {@link LogBuffer} for bluetooth-related logs. */ @Provides diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/AnimationParams.kt b/packages/SystemUI/src/com/android/systemui/log/dagger/ScreenDecorationsLog.kt index 67733e905268..de2a8b679aec 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/AnimationParams.kt +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/ScreenDecorationsLog.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * 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. @@ -11,15 +11,15 @@ * 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 + * limitations under the License. */ -package com.android.systemui.keyguard.shared.model -import kotlin.time.Duration -import kotlin.time.Duration.Companion.milliseconds +package com.android.systemui.log.dagger -/** Animation parameters */ -data class AnimationParams( - val startTime: Duration = 0.milliseconds, - val duration: Duration, -) +import javax.inject.Qualifier + +/** A [com.android.systemui.log.LogBuffer] for ScreenDecorations added by SysUI. */ +@Qualifier +@MustBeDocumented +@Retention(AnnotationRetention.RUNTIME) +annotation class ScreenDecorationsLog diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/MediaData.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/MediaData.kt index be18cbec7163..b7a2522037af 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/MediaData.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/MediaData.kt @@ -92,6 +92,9 @@ data class MediaData( /** Whether explicit indicator exists */ val isExplicit: Boolean = false, + + /** Track progress (0 - 1) to display for players where [resumption] is true */ + val resumeProgress: Double? = null, ) { companion object { /** Media is playing on the local device */ diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt index bba5f350dd16..a057c9f22be3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt @@ -238,6 +238,24 @@ constructor( } /** + * Set the progress to a fixed percentage value that cannot be changed by the user. + * + * @param percent value between 0 and 1 + */ + fun updateStaticProgress(percent: Double) { + val position = (percent * 100).toInt() + _data = + Progress( + enabled = true, + seekAvailable = false, + playing = false, + scrubbing = false, + elapsedTime = position, + duration = 100, + ) + } + + /** * Puts the seek bar into a resumption state. * * This should be called when the media session behind the controller has been destroyed. diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/RecommendationViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/RecommendationViewHolder.kt index 1a10b18a5a69..70f2dee006ed 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/RecommendationViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/RecommendationViewHolder.kt @@ -20,7 +20,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView +import android.widget.SeekBar import android.widget.TextView +import com.android.internal.widget.CachingIconView import com.android.systemui.R import com.android.systemui.media.controls.models.GutsViewHolder import com.android.systemui.media.controls.ui.IlluminationDrawable @@ -29,18 +31,16 @@ import com.android.systemui.util.animation.TransitionLayout private const val TAG = "RecommendationViewHolder" /** ViewHolder for a Smartspace media recommendation. */ -class RecommendationViewHolder private constructor(itemView: View) { +class RecommendationViewHolder private constructor(itemView: View, updatedView: Boolean) { val recommendations = itemView as TransitionLayout // Recommendation screen - val cardIcon = itemView.requireViewById<ImageView>(R.id.recommendation_card_icon) - val mediaCoverItems = - listOf<ImageView>( - itemView.requireViewById(R.id.media_cover1), - itemView.requireViewById(R.id.media_cover2), - itemView.requireViewById(R.id.media_cover3) - ) + lateinit var cardIcon: ImageView + lateinit var mediaAppIcons: List<CachingIconView> + lateinit var mediaProgressBars: List<SeekBar> + lateinit var cardTitle: TextView + val mediaCoverContainers = listOf<ViewGroup>( itemView.requireViewById(R.id.media_cover1_container), @@ -48,21 +48,52 @@ class RecommendationViewHolder private constructor(itemView: View) { itemView.requireViewById(R.id.media_cover3_container) ) val mediaTitles: List<TextView> = - listOf( - itemView.requireViewById(R.id.media_title1), - itemView.requireViewById(R.id.media_title2), - itemView.requireViewById(R.id.media_title3) - ) + if (updatedView) { + mediaCoverContainers.map { it.requireViewById(R.id.media_title) } + } else { + listOf( + itemView.requireViewById(R.id.media_title1), + itemView.requireViewById(R.id.media_title2), + itemView.requireViewById(R.id.media_title3) + ) + } val mediaSubtitles: List<TextView> = - listOf( - itemView.requireViewById(R.id.media_subtitle1), - itemView.requireViewById(R.id.media_subtitle2), - itemView.requireViewById(R.id.media_subtitle3) - ) + if (updatedView) { + mediaCoverContainers.map { it.requireViewById(R.id.media_subtitle) } + } else { + listOf( + itemView.requireViewById(R.id.media_subtitle1), + itemView.requireViewById(R.id.media_subtitle2), + itemView.requireViewById(R.id.media_subtitle3) + ) + } + val mediaCoverItems: List<ImageView> = + if (updatedView) { + mediaCoverContainers.map { it.requireViewById(R.id.media_cover) } + } else { + listOf( + itemView.requireViewById(R.id.media_cover1), + itemView.requireViewById(R.id.media_cover2), + itemView.requireViewById(R.id.media_cover3) + ) + } val gutsViewHolder = GutsViewHolder(itemView) init { + if (updatedView) { + mediaAppIcons = mediaCoverContainers.map { it.requireViewById(R.id.media_rec_app_icon) } + cardTitle = itemView.requireViewById(R.id.media_rec_title) + mediaProgressBars = + mediaCoverContainers.map { + it.requireViewById<SeekBar?>(R.id.media_progress_bar).apply { + // Media playback is in the direction of tape, not time, so it stays LTR + layoutDirection = View.LAYOUT_DIRECTION_LTR + } + } + } else { + cardIcon = itemView.requireViewById<ImageView>(R.id.recommendation_card_icon) + } (recommendations.background as IlluminationDrawable).let { background -> mediaCoverContainers.forEach { background.registerLightSource(it) } background.registerLightSource(gutsViewHolder.cancel) @@ -83,36 +114,52 @@ class RecommendationViewHolder private constructor(itemView: View) { * @param parent Parent of inflated view. */ @JvmStatic - fun create(inflater: LayoutInflater, parent: ViewGroup): RecommendationViewHolder { + fun create( + inflater: LayoutInflater, + parent: ViewGroup, + updatedView: Boolean, + ): RecommendationViewHolder { val itemView = - inflater.inflate( - R.layout.media_smartspace_recommendations, - parent, - false /* attachToRoot */ - ) + if (updatedView) { + inflater.inflate( + R.layout.media_recommendations, + parent, + false /* attachToRoot */ + ) + } else { + inflater.inflate( + R.layout.media_smartspace_recommendations, + parent, + false /* attachToRoot */ + ) + } // Because this media view (a TransitionLayout) is used to measure and layout the views // in various states before being attached to its parent, we can't depend on the default // LAYOUT_DIRECTION_INHERIT to correctly resolve the ltr direction. itemView.layoutDirection = View.LAYOUT_DIRECTION_LOCALE - return RecommendationViewHolder(itemView) + return RecommendationViewHolder(itemView, updatedView) } // Res Ids for the control components on the recommendation view. val controlsIds = setOf( R.id.recommendation_card_icon, + R.id.media_rec_title, R.id.media_cover1, R.id.media_cover2, R.id.media_cover3, + R.id.media_cover, R.id.media_cover1_container, R.id.media_cover2_container, R.id.media_cover3_container, R.id.media_title1, R.id.media_title2, R.id.media_title3, + R.id.media_title, R.id.media_subtitle1, R.id.media_subtitle2, - R.id.media_subtitle3 + R.id.media_subtitle3, + R.id.media_subtitle, ) val mediaTitlesAndSubtitlesIds = @@ -120,9 +167,11 @@ class RecommendationViewHolder private constructor(itemView: View) { R.id.media_title1, R.id.media_title2, R.id.media_title3, + R.id.media_title, R.id.media_subtitle1, R.id.media_subtitle2, - R.id.media_subtitle3 + R.id.media_subtitle3, + R.id.media_subtitle, ) val mediaContainersIds = diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaData.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaData.kt index 1df42c641df6..dc7a4f18adbc 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaData.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaData.kt @@ -41,10 +41,12 @@ data class SmartspaceMediaData( val recommendations: List<SmartspaceAction>, /** Intent for the user's initiated dismissal. */ val dismissIntent: Intent?, - /** The timestamp in milliseconds that headphone is connected. */ + /** The timestamp in milliseconds that the card was generated */ val headphoneConnectionTimeMillis: Long, /** Instance ID for [MediaUiEventLogger] */ - val instanceId: InstanceId + val instanceId: InstanceId, + /** The timestamp in milliseconds indicating when the card should be removed */ + val expiryTimeMs: Long, ) { /** * Indicates if all the data is valid. @@ -86,5 +88,12 @@ data class SmartspaceMediaData( } } +/** Key for extras [SmartspaceMediaData.cardAction] indicating why the card was sent */ +const val EXTRA_KEY_TRIGGER_SOURCE = "MEDIA_RECOMMENDATION_TRIGGER_SOURCE" +/** Value for [EXTRA_KEY_TRIGGER_SOURCE] when the card is sent on headphone connection */ +const val EXTRA_VALUE_TRIGGER_HEADPHONE = "HEADPHONE_CONNECTION" +/** Value for key [EXTRA_KEY_TRIGGER_SOURCE] when the card is sent as a regular update */ +const val EXTRA_VALUE_TRIGGER_PERIODIC = "PERIODIC_TRIGGER" + const val NUM_REQUIRED_RECOMMENDATIONS = 3 private val TAG = SmartspaceMediaData::class.simpleName!! diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataFilter.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataFilter.kt index cf71d675865b..27f7b9736807 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataFilter.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataFilter.kt @@ -24,6 +24,7 @@ import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.media.controls.models.player.MediaData import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.NotificationLockscreenUserManager @@ -66,7 +67,8 @@ constructor( private val lockscreenUserManager: NotificationLockscreenUserManager, @Main private val executor: Executor, private val systemClock: SystemClock, - private val logger: MediaUiEventLogger + private val logger: MediaUiEventLogger, + private val mediaFlags: MediaFlags, ) : MediaDataManager.Listener { private val _listeners: MutableSet<MediaDataManager.Listener> = mutableSetOf() internal val listeners: Set<MediaDataManager.Listener> @@ -121,7 +123,9 @@ constructor( data: SmartspaceMediaData, shouldPrioritize: Boolean ) { - if (!data.isActive) { + // With persistent recommendation card, we could get a background update while inactive + // Otherwise, consider it an invalid update + if (!data.isActive && !mediaFlags.isPersistentSsCardEnabled()) { Log.d(TAG, "Inactive recommendation data. Skip triggering.") return } @@ -141,7 +145,7 @@ constructor( } } - val shouldReactivate = !hasActiveMedia() && hasAnyMedia() + val shouldReactivate = !hasActiveMedia() && hasAnyMedia() && data.isActive if (timeSinceActive < smartspaceMaxAgeMillis) { // It could happen there are existing active media resume cards, then we don't need to @@ -169,7 +173,7 @@ constructor( ) } } - } else { + } else if (data.isActive) { // Mark to prioritize Smartspace card if no recent media. shouldPrioritizeMutable = true } @@ -252,7 +256,7 @@ constructor( if (dismissIntent == null) { Log.w( TAG, - "Cannot create dismiss action click action: " + "extras missing dismiss_intent." + "Cannot create dismiss action click action: extras missing dismiss_intent." ) } else if ( dismissIntent.getComponent() != null && @@ -264,15 +268,21 @@ constructor( } else { broadcastSender.sendBroadcast(dismissIntent) } - smartspaceMediaData = - EMPTY_SMARTSPACE_MEDIA_DATA.copy( - targetId = smartspaceMediaData.targetId, - instanceId = smartspaceMediaData.instanceId + + if (mediaFlags.isPersistentSsCardEnabled()) { + smartspaceMediaData = smartspaceMediaData.copy(isActive = false) + mediaDataManager.setRecommendationInactive(smartspaceMediaData.targetId) + } else { + smartspaceMediaData = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId, + ) + mediaDataManager.dismissSmartspaceRecommendation( + smartspaceMediaData.targetId, + delay = 0L, ) - mediaDataManager.dismissSmartspaceRecommendation( - smartspaceMediaData.targetId, - delay = 0L - ) + } } } @@ -283,8 +293,15 @@ constructor( (smartspaceMediaData.isValid() || reactivatedKey != null)) /** Are there any media entries we should display? */ - fun hasAnyMediaOrRecommendation() = - userEntries.isNotEmpty() || (smartspaceMediaData.isActive && smartspaceMediaData.isValid()) + fun hasAnyMediaOrRecommendation(): Boolean { + val hasSmartspace = + if (mediaFlags.isPersistentSsCardEnabled()) { + smartspaceMediaData.isValid() + } else { + smartspaceMediaData.isActive && smartspaceMediaData.isValid() + } + return userEntries.isNotEmpty() || hasSmartspace + } /** Are there any media notifications active (excluding the recommendation)? */ fun hasActiveMedia() = userEntries.any { it.value.active } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt index b11f628623bb..0a948034ca78 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt @@ -49,7 +49,6 @@ import android.support.v4.media.MediaMetadataCompat import android.text.TextUtils import android.util.Log import androidx.media.utils.MediaConstants -import com.android.internal.annotations.VisibleForTesting import com.android.internal.logging.InstanceId import com.android.systemui.Dumpable import com.android.systemui.R @@ -63,10 +62,13 @@ import com.android.systemui.media.controls.models.player.MediaButton import com.android.systemui.media.controls.models.player.MediaData import com.android.systemui.media.controls.models.player.MediaDeviceData import com.android.systemui.media.controls.models.player.MediaViewHolder +import com.android.systemui.media.controls.models.recommendation.EXTRA_KEY_TRIGGER_SOURCE +import com.android.systemui.media.controls.models.recommendation.EXTRA_VALUE_TRIGGER_PERIODIC import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaDataProvider import com.android.systemui.media.controls.resume.MediaResumeListener import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaDataUtils import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.plugins.ActivityStarter @@ -118,7 +120,6 @@ private val LOADING = appUid = Process.INVALID_UID ) -@VisibleForTesting internal val EMPTY_SMARTSPACE_MEDIA_DATA = SmartspaceMediaData( targetId = "INVALID", @@ -128,7 +129,8 @@ internal val EMPTY_SMARTSPACE_MEDIA_DATA = recommendations = emptyList(), dismissIntent = null, headphoneConnectionTimeMillis = 0, - instanceId = InstanceId.fakeInstanceId(-1) + instanceId = InstanceId.fakeInstanceId(-1), + expiryTimeMs = 0, ) fun isMediaNotification(sbn: StatusBarNotification): Boolean { @@ -547,6 +549,11 @@ class MediaDataManager( if (DEBUG) Log.d(TAG, "Updating $key timedOut: $timedOut") onMediaDataLoaded(key, key, it) } + + if (key == smartspaceMediaData.targetId) { + if (DEBUG) Log.d(TAG, "smartspace card expired") + dismissSmartspaceRecommendation(key, delay = 0L) + } } /** Called when the player's [PlaybackState] has been updated with new actions and/or state */ @@ -604,8 +611,8 @@ class MediaDataManager( } /** - * Called whenever the recommendation has been expired, or swiped from QQS. This will make the - * recommendation view to not be shown anymore during this headphone connection session. + * Called whenever the recommendation has been expired or removed by the user. This will remove + * the recommendation card entirely from the carousel. */ fun dismissSmartspaceRecommendation(key: String, delay: Long) { if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { @@ -627,6 +634,23 @@ class MediaDataManager( ) } + /** Called when the recommendation card should no longer be visible in QQS or lockscreen */ + fun setRecommendationInactive(key: String) { + if (!mediaFlags.isPersistentSsCardEnabled()) { + Log.e(TAG, "Only persistent recommendation can be inactive!") + return + } + if (DEBUG) Log.d(TAG, "Setting smartspace recommendation inactive") + + if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { + // If this doesn't match, or we've already invalidated the data, no action needed + return + } + + smartspaceMediaData = smartspaceMediaData.copy(isActive = false) + notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) + } + private fun loadMediaDataInBgForResumption( userId: Int, desc: MediaDescription, @@ -667,6 +691,11 @@ class MediaDataManager( MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT && mediaFlags.isExplicitIndicatorEnabled() + val progress = + if (mediaFlags.isResumeProgressEnabled()) { + MediaDataUtils.getDescriptionProgress(desc.extras) + } else null + val mediaAction = getResumeMediaAction(resumeAction) val lastActive = systemClock.elapsedRealtime() foregroundExecutor.execute { @@ -697,6 +726,7 @@ class MediaDataManager( instanceId = instanceId, appUid = appUid, isExplicit = isExplicit, + resumeProgress = progress, ) ) } @@ -1258,12 +1288,25 @@ class MediaDataManager( if (DEBUG) { Log.d(TAG, "Set Smartspace media to be inactive for the data update") } - smartspaceMediaData = - EMPTY_SMARTSPACE_MEDIA_DATA.copy( - targetId = smartspaceMediaData.targetId, - instanceId = smartspaceMediaData.instanceId + if (mediaFlags.isPersistentSsCardEnabled()) { + // Smartspace uses this signal to hide the card (e.g. when it expires or user + // disconnects headphones), so treat as setting inactive when flag is on + smartspaceMediaData = smartspaceMediaData.copy(isActive = false) + notifySmartspaceMediaDataLoaded( + smartspaceMediaData.targetId, + smartspaceMediaData, + ) + } else { + smartspaceMediaData = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId, + ) + notifySmartspaceMediaDataRemoved( + smartspaceMediaData.targetId, + immediately = false, ) - notifySmartspaceMediaDataRemoved(smartspaceMediaData.targetId, immediately = false) + } } 1 -> { val newMediaTarget = mediaTargets.get(0) @@ -1272,7 +1315,7 @@ class MediaDataManager( return } if (DEBUG) Log.d(TAG, "Forwarding Smartspace media update.") - smartspaceMediaData = toSmartspaceMediaData(newMediaTarget, isActive = true) + smartspaceMediaData = toSmartspaceMediaData(newMediaTarget) notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) } else -> { @@ -1281,7 +1324,7 @@ class MediaDataManager( Log.wtf(TAG, "More than 1 Smartspace Media Update. Resetting the status...") notifySmartspaceMediaDataRemoved( smartspaceMediaData.targetId, - false /* immediately */ + immediately = false, ) smartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA } @@ -1487,21 +1530,28 @@ class MediaDataManager( } /** - * Converts the pass-in SmartspaceTarget to SmartspaceMediaData with the pass-in active status. + * Converts the pass-in SmartspaceTarget to SmartspaceMediaData * * @return An empty SmartspaceMediaData with the valid target Id is returned if the * SmartspaceTarget's data is invalid. */ - private fun toSmartspaceMediaData( - target: SmartspaceTarget, - isActive: Boolean - ): SmartspaceMediaData { + private fun toSmartspaceMediaData(target: SmartspaceTarget): SmartspaceMediaData { var dismissIntent: Intent? = null if (target.baseAction != null && target.baseAction.extras != null) { dismissIntent = target.baseAction.extras.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY) as Intent? } + + val isActive = + when { + !mediaFlags.isPersistentSsCardEnabled() -> true + target.baseAction == null -> true + else -> + target.baseAction.extras.getString(EXTRA_KEY_TRIGGER_SOURCE) != + EXTRA_VALUE_TRIGGER_PERIODIC + } + packageName(target)?.let { return SmartspaceMediaData( targetId = target.smartspaceTargetId, @@ -1511,7 +1561,8 @@ class MediaDataManager( recommendations = target.iconGrid, dismissIntent = dismissIntent, headphoneConnectionTimeMillis = target.creationTimeMillis, - instanceId = logger.getNewInstanceId() + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, ) } return EMPTY_SMARTSPACE_MEDIA_DATA.copy( @@ -1519,7 +1570,8 @@ class MediaDataManager( isActive = isActive, dismissIntent = dismissIntent, headphoneConnectionTimeMillis = target.creationTimeMillis, - instanceId = logger.getNewInstanceId() + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, ) } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListener.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListener.kt index a898b00790a9..aa46b14d11c1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListener.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListener.kt @@ -23,7 +23,9 @@ import com.android.internal.annotations.VisibleForTesting import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.media.controls.models.player.MediaData +import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState import com.android.systemui.statusbar.SysuiStatusBarStateController @@ -49,10 +51,12 @@ constructor( @Main private val mainExecutor: DelayableExecutor, private val logger: MediaTimeoutLogger, statusBarStateController: SysuiStatusBarStateController, - private val systemClock: SystemClock + private val systemClock: SystemClock, + private val mediaFlags: MediaFlags, ) : MediaDataManager.Listener { private val mediaListeners: MutableMap<String, PlaybackStateListener> = mutableMapOf() + private val recommendationListeners: MutableMap<String, RecommendationListener> = mutableMapOf() /** * Callback representing that a media object is now expired: @@ -93,6 +97,16 @@ constructor( listener.doTimeout() } } + + recommendationListeners.forEach { (key, listener) -> + if ( + listener.cancellation != null && + listener.expiration <= systemClock.currentTimeMillis() + ) { + logger.logTimeoutCancelled(key, "Timed out while dozing") + listener.doTimeout() + } + } } } } @@ -155,6 +169,30 @@ constructor( mediaListeners.remove(key)?.destroy() } + override fun onSmartspaceMediaDataLoaded( + key: String, + data: SmartspaceMediaData, + shouldPrioritize: Boolean + ) { + if (!mediaFlags.isPersistentSsCardEnabled()) return + + // First check if we already have a listener + recommendationListeners.get(key)?.let { + if (!it.destroyed) { + it.recommendationData = data + return + } + } + + // Otherwise, create a new one + recommendationListeners[key] = RecommendationListener(key, data) + } + + override fun onSmartspaceMediaDataRemoved(key: String, immediately: Boolean) { + if (!mediaFlags.isPersistentSsCardEnabled()) return + recommendationListeners.remove(key)?.destroy() + } + fun isTimedOut(key: String): Boolean { return mediaListeners[key]?.timedOut ?: false } @@ -335,4 +373,53 @@ constructor( } return true } + + /** Listens to changes in recommendation card data and schedules a timeout for its expiration */ + private inner class RecommendationListener(var key: String, data: SmartspaceMediaData) { + private var timedOut = false + var destroyed = false + var expiration = Long.MAX_VALUE + private set + var cancellation: Runnable? = null + private set + + var recommendationData: SmartspaceMediaData = data + set(value) { + destroyed = false + field = value + processUpdate() + } + + init { + recommendationData = data + } + + fun destroy() { + cancellation?.run() + cancellation = null + destroyed = true + } + + private fun processUpdate() { + if (recommendationData.expiryTimeMs != expiration) { + // The expiry time changed - cancel and reschedule + val timeout = + recommendationData.expiryTimeMs - + recommendationData.headphoneConnectionTimeMillis + logger.logRecommendationTimeoutScheduled(key, timeout) + cancellation?.run() + cancellation = mainExecutor.executeDelayed({ doTimeout() }, timeout) + expiration = recommendationData.expiryTimeMs + } + } + + fun doTimeout() { + cancellation?.run() + cancellation = null + logger.logTimeout(key) + timedOut = true + expiration = Long.MAX_VALUE + timeoutCallback(key, timedOut) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt index 8f3f0548230f..f731dc064355 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaTimeoutLogger.kt @@ -107,6 +107,17 @@ constructor(@MediaTimeoutListenerLog private val buffer: LogBuffer) { str1 = key str2 = reason }, - { "media timeout cancelled for $str1, reason: $str2" } + { "timeout cancelled for $str1, reason: $str2" } + ) + + fun logRecommendationTimeoutScheduled(key: String, timeout: Long) = + buffer.log( + TAG, + LogLevel.VERBOSE, + { + str1 = key + long1 = timeout + }, + { "recommendation timeout scheduled for $str1 in $long1 ms" } ) } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt index e7f7647797cd..fac1d5eae794 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt @@ -43,6 +43,7 @@ import com.android.systemui.media.controls.models.recommendation.RecommendationV import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.pipeline.MediaDataManager import com.android.systemui.media.controls.ui.MediaControlPanel.SMARTSPACE_CARD_DISMISS_EVENT +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.media.controls.util.SmallHash import com.android.systemui.plugins.ActivityStarter @@ -88,7 +89,8 @@ constructor( falsingManager: FalsingManager, dumpManager: DumpManager, private val logger: MediaUiEventLogger, - private val debugLogger: MediaCarouselControllerLogger + private val debugLogger: MediaCarouselControllerLogger, + private val mediaFlags: MediaFlags, ) : Dumpable { /** The current width of the carousel */ private var currentCarouselWidth: Int = 0 @@ -366,7 +368,7 @@ constructor( data: SmartspaceMediaData, shouldPrioritize: Boolean ) { - debugLogger.logRecommendationLoaded(key) + debugLogger.logRecommendationLoaded(key, data.isActive) // Log the case where the hidden media carousel with the existed inactive resume // media is shown by the Smartspace signal. if (data.isActive) { @@ -440,7 +442,12 @@ constructor( logSmartspaceImpression(mediaCarouselScrollHandler.qsExpanded) } } else { - onSmartspaceMediaDataRemoved(data.targetId, immediately = true) + if (!mediaFlags.isPersistentSsCardEnabled()) { + // Handle update to inactive as a removal + onSmartspaceMediaDataRemoved(data.targetId, immediately = true) + } else { + addSmartspaceMediaRecommendations(key, data, shouldPrioritize) + } } } @@ -631,7 +638,19 @@ constructor( ) = traceSection("MediaCarouselController#addSmartspaceMediaRecommendations") { if (DEBUG) Log.d(TAG, "Updating smartspace target in carousel") - if (MediaPlayerData.getMediaPlayer(key) != null) { + MediaPlayerData.getMediaPlayer(key)?.let { + if (mediaFlags.isPersistentSsCardEnabled()) { + // The card exists, but could have changed active state, so update for sorting + MediaPlayerData.addMediaRecommendation( + key, + data, + it, + shouldPrioritize, + systemClock, + debugLogger, + update = true, + ) + } Log.w(TAG, "Skip adding smartspace target in carousel") return } @@ -647,7 +666,11 @@ constructor( val newRecs = mediaControlPanelFactory.get() newRecs.attachRecommendation( - RecommendationViewHolder.create(LayoutInflater.from(context), mediaContent) + RecommendationViewHolder.create( + LayoutInflater.from(context), + mediaContent, + mediaFlags.isRecommendationCardUpdateEnabled() + ) ) newRecs.mediaViewController.sizeChangedListener = this::updateCarouselDimensions val lp = @@ -666,7 +689,7 @@ constructor( newRecs, shouldPrioritize, systemClock, - debugLogger + debugLogger, ) updatePlayerToState(newRecs, noAnimation = true) reorderAllPlayers(curVisibleMediaKey) @@ -1219,17 +1242,18 @@ internal object MediaPlayerData { player: MediaControlPanel, shouldPrioritize: Boolean, clock: SystemClock, - debugLogger: MediaCarouselControllerLogger? = null + debugLogger: MediaCarouselControllerLogger? = null, + update: Boolean = false ) { shouldPrioritizeSs = shouldPrioritize val removedPlayer = removeMediaPlayer(key) - if (removedPlayer != null && removedPlayer != player) { + if (!update && removedPlayer != null && removedPlayer != player) { debugLogger?.logPotentialMemoryLeak(key) } val sortKey = MediaSortKey( isSsMediaRec = true, - EMPTY.copy(isPlaying = false), + EMPTY.copy(active = data.isActive, isPlaying = false), key, clock.currentTimeMillis(), isSsReactivated = true diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt index eed1bd743938..35bda15ece92 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselControllerLogger.kt @@ -48,8 +48,16 @@ constructor(@MediaCarouselControllerLog private val buffer: LogBuffer) { fun logMediaRemoved(key: String) = buffer.log(TAG, LogLevel.DEBUG, { str1 = key }, { "removing player $str1" }) - fun logRecommendationLoaded(key: String) = - buffer.log(TAG, LogLevel.DEBUG, { str1 = key }, { "add recommendation $str1" }) + fun logRecommendationLoaded(key: String, isActive: Boolean) = + buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + bool1 = isActive + }, + { "add recommendation $str1, active $bool1" } + ) fun logRecommendationRemoved(key: String, immediately: Boolean) = buffer.log( diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java index 45d50f0e4976..0b4b668a0402 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java @@ -56,11 +56,13 @@ import android.view.ViewGroup; import android.view.animation.Interpolator; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.SeekBar; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.appcompat.content.res.AppCompatResources; import androidx.constraintlayout.widget.ConstraintSet; import com.android.internal.annotations.VisibleForTesting; @@ -114,8 +116,6 @@ import com.android.systemui.util.animation.TransitionLayout; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.time.SystemClock; -import dagger.Lazy; - import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; @@ -123,6 +123,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; +import dagger.Lazy; import kotlin.Triple; import kotlin.Unit; @@ -522,8 +523,13 @@ public class MediaControlPanel { } // Seek Bar - final MediaController controller = getController(); - mBackgroundExecutor.execute(() -> mSeekBarViewModel.updateController(controller)); + if (data.getResumption() && data.getResumeProgress() != null) { + double progress = data.getResumeProgress(); + mSeekBarViewModel.updateStaticProgress(progress); + } else { + final MediaController controller = getController(); + mBackgroundExecutor.execute(() -> mSeekBarViewModel.updateController(controller)); + } // Show the broadcast dialog button only when the le audio is enabled. mShowBroadcastDialogButton = @@ -728,9 +734,14 @@ public class MediaControlPanel { contentDescription = mRecommendationViewHolder.getGutsViewHolder().getGutsText().getText(); } else if (data != null) { - contentDescription = mContext.getString( - R.string.controls_media_smartspace_rec_description, - data.getAppName(mContext)); + if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + contentDescription = mContext.getString( + R.string.controls_media_smartspace_rec_header); + } else { + contentDescription = mContext.getString( + R.string.controls_media_smartspace_rec_description, + data.getAppName(mContext)); + } } else { contentDescription = null; } @@ -752,43 +763,16 @@ public class MediaControlPanel { int width = mMediaViewHolder.getAlbumView().getMeasuredWidth(); int height = mMediaViewHolder.getAlbumView().getMeasuredHeight(); - // WallpaperColors.fromBitmap takes a good amount of time. We do that work - // on the background executor to avoid stalling animations on the UI Thread. mBackgroundExecutor.execute(() -> { // Album art ColorScheme mutableColorScheme = null; Drawable artwork; boolean isArtworkBound; Icon artworkIcon = data.getArtwork(); - WallpaperColors wallpaperColors = null; - if (artworkIcon != null) { - if (artworkIcon.getType() == Icon.TYPE_BITMAP - || artworkIcon.getType() == Icon.TYPE_ADAPTIVE_BITMAP) { - // Avoids extra processing if this is already a valid bitmap - wallpaperColors = WallpaperColors - .fromBitmap(artworkIcon.getBitmap()); - } else { - Drawable artworkDrawable = artworkIcon.loadDrawable(mContext); - if (artworkDrawable != null) { - wallpaperColors = WallpaperColors - .fromDrawable(artworkIcon.loadDrawable(mContext)); - } - } - } + WallpaperColors wallpaperColors = getWallpaperColor(artworkIcon); if (wallpaperColors != null) { mutableColorScheme = new ColorScheme(wallpaperColors, true, Style.CONTENT); - Drawable albumArt = getScaledBackground(artworkIcon, width, height); - GradientDrawable gradient = (GradientDrawable) mContext - .getDrawable(R.drawable.qs_media_scrim); - gradient.setColors(new int[] { - ColorUtilKt.getColorWithAlpha( - MediaColorSchemesKt.backgroundStartFromScheme(mutableColorScheme), - 0.25f), - ColorUtilKt.getColorWithAlpha( - MediaColorSchemesKt.backgroundEndFromScheme(mutableColorScheme), - 0.9f), - }); - artwork = new LayerDrawable(new Drawable[] { albumArt, gradient }); + artwork = addGradientToIcon(artworkIcon, mutableColorScheme, width, height); isArtworkBound = true; } else { // If there's no artwork, use colors from the app icon @@ -867,6 +851,96 @@ public class MediaControlPanel { }); } + private void bindRecommendationArtwork( + SmartspaceAction recommendation, + String packageName, + int itemIndex + ) { + final int traceCookie = recommendation.hashCode(); + final String traceName = + "MediaControlPanel#bindRecommendationArtwork<" + packageName + ">"; + Trace.beginAsyncSection(traceName, traceCookie); + + // Capture width & height from views in foreground for artwork scaling in background + int width = mRecommendationViewHolder.getMediaCoverContainers().get(0).getMeasuredWidth(); + int height = mRecommendationViewHolder.getMediaCoverContainers().get(0).getMeasuredHeight(); + + mBackgroundExecutor.execute(() -> { + // Album art + ColorScheme mutableColorScheme = null; + Drawable artwork; + Icon artworkIcon = recommendation.getIcon(); + WallpaperColors wallpaperColors = getWallpaperColor(artworkIcon); + if (wallpaperColors != null) { + mutableColorScheme = new ColorScheme(wallpaperColors, true, Style.CONTENT); + artwork = addGradientToIcon(artworkIcon, mutableColorScheme, width, height); + } else { + artwork = new ColorDrawable(Color.TRANSPARENT); + } + + mMainExecutor.execute(() -> { + // Bind the artwork drawable to media cover. + ImageView mediaCover = + mRecommendationViewHolder.getMediaCoverItems().get(itemIndex); + mediaCover.setImageDrawable(artwork); + + // Set up the app icon. + ImageView appIconView = mRecommendationViewHolder.getMediaAppIcons().get(itemIndex); + appIconView.clearColorFilter(); + try { + Drawable icon = mContext.getPackageManager() + .getApplicationIcon(packageName); + appIconView.setImageDrawable(icon); + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Cannot find icon for package " + packageName, e); + appIconView.setImageResource(R.drawable.ic_music_note); + } + Trace.endAsyncSection(traceName, traceCookie); + }); + }); + } + + // This method should be called from a background thread. WallpaperColors.fromBitmap takes a + // good amount of time. We do that work on the background executor to avoid stalling animations + // on the UI Thread. + private WallpaperColors getWallpaperColor(Icon artworkIcon) { + if (artworkIcon != null) { + if (artworkIcon.getType() == Icon.TYPE_BITMAP + || artworkIcon.getType() == Icon.TYPE_ADAPTIVE_BITMAP) { + // Avoids extra processing if this is already a valid bitmap + return WallpaperColors + .fromBitmap(artworkIcon.getBitmap()); + } else { + Drawable artworkDrawable = artworkIcon.loadDrawable(mContext); + if (artworkDrawable != null) { + return WallpaperColors + .fromDrawable(artworkIcon.loadDrawable(mContext)); + } + } + } + return null; + } + + private LayerDrawable addGradientToIcon( + Icon artworkIcon, + ColorScheme mutableColorScheme, + int width, + int height + ) { + Drawable albumArt = getScaledBackground(artworkIcon, width, height); + GradientDrawable gradient = (GradientDrawable) AppCompatResources + .getDrawable(mContext, R.drawable.qs_media_scrim); + gradient.setColors(new int[] { + ColorUtilKt.getColorWithAlpha( + MediaColorSchemesKt.backgroundStartFromScheme(mutableColorScheme), + 0.25f), + ColorUtilKt.getColorWithAlpha( + MediaColorSchemesKt.backgroundEndFromScheme(mutableColorScheme), + 0.9f), + }); + return new LayerDrawable(new Drawable[] { albumArt, gradient }); + } + private void scaleTransitionDrawableLayer(TransitionDrawable transitionDrawable, int layer, int targetWidth, int targetHeight) { Drawable drawable = transitionDrawable.getDrawable(layer); @@ -1224,8 +1298,10 @@ public class MediaControlPanel { PackageManager packageManager = mContext.getPackageManager(); // Set up media source app's logo. Drawable icon = packageManager.getApplicationIcon(applicationInfo); - ImageView headerLogoImageView = mRecommendationViewHolder.getCardIcon(); - headerLogoImageView.setImageDrawable(icon); + if (!mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + ImageView headerLogoImageView = mRecommendationViewHolder.getCardIcon(); + headerLogoImageView.setImageDrawable(icon); + } fetchAndUpdateRecommendationColors(icon); // Set up media rec card's tap action if applicable. @@ -1245,7 +1321,15 @@ public class MediaControlPanel { // Set up media item cover. ImageView mediaCoverImageView = mediaCoverItems.get(itemIndex); - mediaCoverImageView.setImageIcon(recommendation.getIcon()); + if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + bindRecommendationArtwork( + recommendation, + data.getPackageName(), + itemIndex + ); + } else { + mediaCoverImageView.setImageIcon(recommendation.getIcon()); + } // Set up the media item's click listener if applicable. ViewGroup mediaCoverContainer = mediaCoverContainers.get(itemIndex); @@ -1275,7 +1359,6 @@ public class MediaControlPanel { recommendation.getTitle(), artistName, appName)); } - // Set up title CharSequence title = recommendation.getTitle(); hasTitle |= !TextUtils.isEmpty(title); @@ -1289,6 +1372,24 @@ public class MediaControlPanel { hasSubtitle |= !TextUtils.isEmpty(subtitle); TextView subtitleView = mRecommendationViewHolder.getMediaSubtitles().get(itemIndex); subtitleView.setText(subtitle); + + // Set up progress bar + if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + SeekBar mediaProgressBar = + mRecommendationViewHolder.getMediaProgressBars().get(itemIndex); + TextView mediaSubtitle = + mRecommendationViewHolder.getMediaSubtitles().get(itemIndex); + // show progress bar if the recommended album is played. + Double progress = MediaDataUtils.getDescriptionProgress(recommendation.getExtras()); + if (progress == null || progress <= 0.0) { + mediaProgressBar.setVisibility(View.GONE); + mediaSubtitle.setVisibility(View.VISIBLE); + } else { + mediaProgressBar.setProgress((int) (progress * 100)); + mediaProgressBar.setVisibility(View.VISIBLE); + mediaSubtitle.setVisibility(View.GONE); + } + } } mSmartspaceMediaItemsCount = NUM_REQUIRED_RECOMMENDATIONS; @@ -1353,12 +1454,22 @@ public class MediaControlPanel { int textPrimaryColor = MediaColorSchemesKt.textPrimaryFromScheme(colorScheme); int textSecondaryColor = MediaColorSchemesKt.textSecondaryFromScheme(colorScheme); + if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + mRecommendationViewHolder.getCardTitle().setTextColor(textPrimaryColor); + } + mRecommendationViewHolder.getRecommendations() .setBackgroundTintList(ColorStateList.valueOf(backgroundColor)); mRecommendationViewHolder.getMediaTitles().forEach( (title) -> title.setTextColor(textPrimaryColor)); mRecommendationViewHolder.getMediaSubtitles().forEach( (subtitle) -> subtitle.setTextColor(textSecondaryColor)); + if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) { + mRecommendationViewHolder.getMediaProgressBars().forEach( + (progressBar) -> progressBar.setProgressTintList( + ColorStateList.valueOf(textPrimaryColor)) + ); + } mRecommendationViewHolder.getGutsViewHolder().setColors(colorScheme); } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt index 2ec7be6eaa32..1e6002cdc717 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaViewController.kt @@ -25,6 +25,7 @@ import com.android.systemui.media.controls.models.GutsViewHolder import com.android.systemui.media.controls.models.player.MediaViewHolder import com.android.systemui.media.controls.models.recommendation.RecommendationViewHolder import com.android.systemui.media.controls.ui.MediaCarouselController.Companion.calculateAlpha +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.animation.MeasurementOutput import com.android.systemui.util.animation.TransitionLayout @@ -45,7 +46,8 @@ constructor( private val context: Context, private val configurationController: ConfigurationController, private val mediaHostStatesManager: MediaHostStatesManager, - private val logger: MediaViewLogger + private val logger: MediaViewLogger, + private val mediaFlags: MediaFlags, ) { /** @@ -646,8 +648,13 @@ constructor( expandedLayout.load(context, R.xml.media_session_expanded) } TYPE.RECOMMENDATION -> { - collapsedLayout.load(context, R.xml.media_recommendation_collapsed) - expandedLayout.load(context, R.xml.media_recommendation_expanded) + if (mediaFlags.isRecommendationCardUpdateEnabled()) { + collapsedLayout.load(context, R.xml.media_recommendations_view_collapsed) + expandedLayout.load(context, R.xml.media_recommendations_view_expanded) + } else { + collapsedLayout.load(context, R.xml.media_recommendation_collapsed) + expandedLayout.load(context, R.xml.media_recommendation_expanded) + } } } refreshState() diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaDataUtils.java b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaDataUtils.java index bcfceaa3205e..85282a1d6c12 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaDataUtils.java +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaDataUtils.java @@ -19,8 +19,12 @@ package com.android.systemui.media.controls.util; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.Bundle; import android.text.TextUtils; +import androidx.core.math.MathUtils; +import androidx.media.utils.MediaConstants; + /** * Utility class with common methods for media controls */ @@ -50,4 +54,35 @@ public class MediaDataUtils { : unknownName); return applicationName; } + + /** + * Check the bundle for extras indicating the progress percentage + * + * @param extras + * @return the progress value between 0-1 inclusive if prsent, otherwise null + */ + public static Double getDescriptionProgress(Bundle extras) { + if (!extras.containsKey(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS)) { + return null; + } + + int status = extras.getInt(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS); + switch (status) { + case MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED: + return 0.0; + case MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED: + return 1.0; + case MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED: { + if (extras + .containsKey(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE)) { + double percent = extras + .getDouble(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE); + return MathUtils.clamp(percent, 0.0, 1.0); + } else { + return 0.5; + } + } + } + return null; + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt index ab03930e42ac..c3fa76ec9433 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt @@ -51,4 +51,14 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { * whether the underlying notification was dismissed */ fun isRetainingPlayersEnabled() = featureFlags.isEnabled(Flags.MEDIA_RETAIN_SESSIONS) + + /** Check whether we show the updated recommendation card. */ + fun isRecommendationCardUpdateEnabled() = + featureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE) + + /** Check whether to get progress information for resume players */ + fun isResumeProgressEnabled() = featureFlags.isEnabled(Flags.MEDIA_RESUME_PROGRESS) + + /** If true, do not automatically dismiss the recommendation card */ + fun isPersistentSsCardEnabled() = featureFlags.isEnabled(Flags.MEDIA_RETAIN_RECOMMENDATIONS) } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 51b5a3d1a08c..769e0c8ab3c2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -16,17 +16,21 @@ package com.android.systemui.media.dialog; +import android.content.Context; import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; +import androidx.annotation.DoNotInline; import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import androidx.core.widget.CompoundButtonCompat; import androidx.recyclerview.widget.RecyclerView; @@ -186,6 +190,17 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { mCurrentActivePosition = position; updateFullItemClickListener(v -> onItemClick(v, device)); setSingleLineLayout(getItemTitle(device)); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU + && mController.isSubStatusSupported() && device.hasDisabledReason()) { + //update to subtext with device status + setUpDeviceIcon(device); + mSubTitleText.setText( + Api34Impl.composeDisabledReason(device.getDisableReason(), mContext)); + updateConnectionFailedStatusIcon(); + updateFullItemClickListener(null); + setTwoLineLayout(device, false /* bFocused */, false /* showSeekBar */, + false /* showProgressBar */, true /* showSubtitle */, + true /* showStatus */); } else if (device.getState() == MediaDeviceState.STATE_CONNECTING_FAILED) { setUpDeviceIcon(device); updateConnectionFailedStatusIcon(); @@ -389,4 +404,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { mTitleText.setText(groupDividerTitle); } } + + @RequiresApi(34) + private static class Api34Impl { + @DoNotInline + static String composeDisabledReason(int reason, Context context) { + return ""; + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java index 4e08050a6f65..dc75538c5d29 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -45,6 +45,7 @@ import android.widget.SeekBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; import com.android.settingslib.Utils; @@ -142,11 +143,12 @@ public abstract class MediaOutputBaseAdapter extends final TextView mVolumeValueText; final ImageView mTitleIcon; final ProgressBar mProgressBar; - final MediaOutputSeekbar mSeekBar; final LinearLayout mTwoLineLayout; final ImageView mStatusIcon; final CheckBox mCheckBox; final ViewGroup mEndTouchArea; + @VisibleForTesting + MediaOutputSeekbar mSeekBar; private String mDeviceId; private ValueAnimator mCornerAnimator; private ValueAnimator mVolumeAnimator; @@ -390,6 +392,7 @@ public abstract class MediaOutputBaseAdapter extends mTitleIcon.setVisibility(View.VISIBLE); mVolumeValueText.setVisibility(View.GONE); } + mController.logInteractionAdjustVolume(device); mIsDragging = false; } }); diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index f95da273fae6..5f5c686e36e2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -141,7 +141,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, @VisibleForTesting LocalMediaManager mLocalMediaManager; @VisibleForTesting - private MediaOutputMetricLogger mMetricLogger; + MediaOutputMetricLogger mMetricLogger; private int mCurrentState; private int mColorItemContent; @@ -757,6 +757,10 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, return mFeatureFlags.isEnabled(Flags.OUTPUT_SWITCHER_ROUTES_PROCESSING); } + public boolean isSubStatusSupported() { + return mFeatureFlags.isEnabled(Flags.OUTPUT_SWITCHER_DEVICE_STATUS); + } + List<MediaDevice> getGroupMediaDevices() { final List<MediaDevice> selectedDevices = getSelectedMediaDevice(); final List<MediaDevice> selectableDevices = getSelectableMediaDevice(); @@ -866,12 +870,15 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, } void adjustVolume(MediaDevice device, int volume) { - mMetricLogger.logInteractionAdjustVolume(device); ThreadUtils.postOnBackgroundThread(() -> { device.requestSetVolume(volume); }); } + void logInteractionAdjustVolume(MediaDevice device) { + mMetricLogger.logInteractionAdjustVolume(device); + } + String getPackageName() { return mPackageName; } diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt index f8785fcf5de0..f1acae8e2685 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt @@ -79,9 +79,9 @@ class ReceiverChipRippleView(context: Context?, attrs: AttributeSet?) : RippleVi animator.addUpdateListener { updateListener -> val now = updateListener.currentPlayTime val progress = updateListener.animatedValue as Float - rippleShader.progress = startingPercentage + (progress * (1 - startingPercentage)) - rippleShader.distortionStrength = 1 - rippleShader.progress - rippleShader.pixelDensity = 1 - rippleShader.progress + rippleShader.rawProgress = startingPercentage + (progress * (1 - startingPercentage)) + rippleShader.distortionStrength = 1 - rippleShader.rawProgress + rippleShader.pixelDensity = 1 - rippleShader.rawProgress rippleShader.time = now.toFloat() invalidate() } diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt index 1edb837f3ca9..e665d832a568 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt @@ -34,8 +34,8 @@ import com.android.systemui.mediaprojection.appselector.data.RecentTaskThumbnail import com.android.systemui.mediaprojection.appselector.data.ShellRecentTaskListProvider import com.android.systemui.mediaprojection.appselector.view.MediaProjectionRecentsViewController import com.android.systemui.mediaprojection.appselector.view.TaskPreviewSizeProvider -import com.android.systemui.settings.UserTracker -import com.android.systemui.shared.system.ActivityManagerWrapper +import com.android.systemui.mediaprojection.devicepolicy.MediaProjectionDevicePolicyModule +import com.android.systemui.mediaprojection.devicepolicy.PersonalProfile import com.android.systemui.statusbar.phone.ConfigurationControllerImpl import com.android.systemui.statusbar.policy.ConfigurationController import dagger.Binds @@ -54,13 +54,12 @@ import kotlinx.coroutines.SupervisorJob @Qualifier @Retention(AnnotationRetention.BINARY) annotation class HostUserHandle -@Qualifier @Retention(AnnotationRetention.BINARY) annotation class PersonalProfile - -@Qualifier @Retention(AnnotationRetention.BINARY) annotation class WorkProfile - @Retention(AnnotationRetention.RUNTIME) @Scope annotation class MediaProjectionAppSelectorScope -@Module(subcomponents = [MediaProjectionAppSelectorComponent::class]) +@Module( + subcomponents = [MediaProjectionAppSelectorComponent::class], + includes = [MediaProjectionDevicePolicyModule::class] +) interface MediaProjectionModule { @Binds @IntoMap @@ -110,20 +109,6 @@ interface MediaProjectionAppSelectorModule { ): ConfigurationController = ConfigurationControllerImpl(activity) @Provides - @PersonalProfile - @MediaProjectionAppSelectorScope - fun personalUserHandle(activityManagerWrapper: ActivityManagerWrapper): UserHandle { - // Current foreground user is the 'personal' profile - return UserHandle.of(activityManagerWrapper.currentUserId) - } - - @Provides - @WorkProfile - @MediaProjectionAppSelectorScope - fun workProfileUserHandle(userTracker: UserTracker): UserHandle? = - userTracker.userProfiles.find { it.isManagedProfile }?.userHandle - - @Provides @HostUserHandle @MediaProjectionAppSelectorScope fun hostUserHandle(activity: MediaProjectionAppSelectorActivity): UserHandle { diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionBlockerEmptyStateProvider.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionBlockerEmptyStateProvider.kt new file mode 100644 index 000000000000..829b0ddbe3a8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionBlockerEmptyStateProvider.kt @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.mediaprojection.appselector + +import android.content.Context +import android.os.UserHandle +import com.android.internal.R as AndroidR +import com.android.internal.app.AbstractMultiProfilePagerAdapter.EmptyState +import com.android.internal.app.AbstractMultiProfilePagerAdapter.EmptyStateProvider +import com.android.internal.app.ResolverListAdapter +import com.android.systemui.R +import com.android.systemui.mediaprojection.devicepolicy.PersonalProfile +import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver +import javax.inject.Inject + +@MediaProjectionAppSelectorScope +class MediaProjectionBlockerEmptyStateProvider +@Inject +constructor( + @HostUserHandle private val hostAppHandle: UserHandle, + @PersonalProfile private val personalProfileHandle: UserHandle, + private val policyResolver: ScreenCaptureDevicePolicyResolver, + private val context: Context +) : EmptyStateProvider { + + override fun getEmptyState(resolverListAdapter: ResolverListAdapter): EmptyState? { + val screenCaptureAllowed = + policyResolver.isScreenCaptureAllowed( + targetAppUserHandle = resolverListAdapter.userHandle, + hostAppUserHandle = hostAppHandle + ) + + val isHostAppInPersonalProfile = hostAppHandle == personalProfileHandle + + val subtitle = + if (isHostAppInPersonalProfile) { + AndroidR.string.resolver_cant_share_with_personal_apps_explanation + } else { + AndroidR.string.resolver_cant_share_with_work_apps_explanation + } + + if (!screenCaptureAllowed) { + return object : EmptyState { + override fun getSubtitle(): String = context.resources.getString(subtitle) + override fun getTitle(): String = + context.resources.getString( + R.string.screen_capturing_disabled_by_policy_dialog_title + ) + override fun onEmptyStateShown() { + // TODO(b/237397740) report analytics + } + override fun shouldSkipDataRebuild(): Boolean = true + } + } + return null + } +} diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/MediaProjectionDevicePolicyModule.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/MediaProjectionDevicePolicyModule.kt new file mode 100644 index 000000000000..13b71a727dd9 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/MediaProjectionDevicePolicyModule.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.mediaprojection.devicepolicy + +import android.os.UserHandle +import com.android.systemui.settings.UserTracker +import com.android.systemui.shared.system.ActivityManagerWrapper +import dagger.Module +import dagger.Provides +import javax.inject.Qualifier + +@Qualifier @Retention(AnnotationRetention.BINARY) annotation class WorkProfile + +@Qualifier @Retention(AnnotationRetention.BINARY) annotation class PersonalProfile + +/** Module for media projection device policy related dependencies */ +@Module +class MediaProjectionDevicePolicyModule { + @Provides + @PersonalProfile + fun personalUserHandle(activityManagerWrapper: ActivityManagerWrapper): UserHandle { + // Current foreground user is the 'personal' profile + return UserHandle.of(activityManagerWrapper.currentUserId) + } + + @Provides + @WorkProfile + fun workProfileUserHandle(userTracker: UserTracker): UserHandle? = + userTracker.userProfiles.find { it.isManagedProfile }?.userHandle +} diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolver.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolver.kt new file mode 100644 index 000000000000..6bd33e7e5c97 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolver.kt @@ -0,0 +1,125 @@ +/* + * 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.mediaprojection.devicepolicy + +import android.app.admin.DevicePolicyManager +import android.os.UserHandle +import android.os.UserManager +import javax.inject.Inject + +/** + * Utility class to resolve if screen capture allowed for a particular target app/host app pair. It + * caches the state of the policies, so you need to create a new instance of this class if you want + * to react to updated policies state. + */ +class ScreenCaptureDevicePolicyResolver +@Inject +constructor( + private val devicePolicyManager: DevicePolicyManager, + private val userManager: UserManager, + @PersonalProfile private val personalProfileUserHandle: UserHandle, + @WorkProfile private val workProfileUserHandle: UserHandle? +) { + + /** + * Returns true if [hostAppUserHandle] is allowed to perform screen capture of + * [targetAppUserHandle] + */ + fun isScreenCaptureAllowed( + targetAppUserHandle: UserHandle, + hostAppUserHandle: UserHandle, + ): Boolean { + if (hostAppUserHandle.isWorkProfile() && workProfileScreenCaptureDisabled) { + // Disable screen capturing as host apps should not capture the screen + return false + } + + if (!hostAppUserHandle.isWorkProfile() && personalProfileScreenCaptureDisabled) { + // Disable screen capturing as personal apps should not capture the screen + return false + } + + if (targetAppUserHandle.isWorkProfile()) { + // Work profile target + if (workProfileScreenCaptureDisabled) { + // Do not allow sharing work profile apps as work profile capturing is disabled + return false + } + } else { + // Personal profile target + if (hostAppUserHandle.isWorkProfile() && disallowSharingIntoManagedProfile) { + // Do not allow sharing of personal apps into work profile apps + return false + } + + if (personalProfileScreenCaptureDisabled) { + // Disable screen capturing as personal apps should not be captured + return false + } + } + + return true + } + + /** + * Returns true if [hostAppUserHandle] is NOT allowed to capture an app from any profile, + * could be useful to finish the screen capture flow as soon as possible when the screen + * could not be captured at all. + */ + fun isScreenCaptureCompletelyDisabled(hostAppUserHandle: UserHandle): Boolean { + val isWorkAppsCaptureDisabled = + if (workProfileUserHandle != null) { + !isScreenCaptureAllowed( + targetAppUserHandle = workProfileUserHandle, + hostAppUserHandle = hostAppUserHandle + ) + } else true + + val isPersonalAppsCaptureDisabled = + !isScreenCaptureAllowed( + targetAppUserHandle = personalProfileUserHandle, + hostAppUserHandle = hostAppUserHandle + ) + + return isWorkAppsCaptureDisabled && isPersonalAppsCaptureDisabled + } + + private val personalProfileScreenCaptureDisabled: Boolean by lazy { + devicePolicyManager.getScreenCaptureDisabled( + /* admin */ null, + personalProfileUserHandle.identifier + ) + } + + private val workProfileScreenCaptureDisabled: Boolean by lazy { + workProfileUserHandle?.let { + devicePolicyManager.getScreenCaptureDisabled(/* admin */ null, it.identifier) + } + ?: false + } + + private val disallowSharingIntoManagedProfile: Boolean by lazy { + workProfileUserHandle?.let { + userManager.hasUserRestrictionForUser( + UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, + it + ) + } + ?: false + } + + private fun UserHandle?.isWorkProfile(): Boolean = this == workProfileUserHandle +} diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDisabledDialog.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDisabledDialog.kt new file mode 100644 index 000000000000..a6b3da04ad80 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDisabledDialog.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.mediaprojection.devicepolicy + +import android.content.Context +import com.android.systemui.R +import com.android.systemui.statusbar.phone.SystemUIDialog + +/** Dialog that shows that screen capture is disabled on this device. */ +class ScreenCaptureDisabledDialog(context: Context) : SystemUIDialog(context) { + + init { + setTitle(context.getString(R.string.screen_capturing_disabled_by_policy_dialog_title)) + setMessage( + context.getString(R.string.screen_capturing_disabled_by_policy_dialog_description) + ) + setIcon(R.drawable.ic_cast) + setButton(BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> cancel() } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/model/SysUiState.java b/packages/SystemUI/src/com/android/systemui/model/SysUiState.java index 3ecf15471c31..8d809908d78b 100644 --- a/packages/SystemUI/src/com/android/systemui/model/SysUiState.java +++ b/packages/SystemUI/src/com/android/systemui/model/SysUiState.java @@ -16,13 +16,12 @@ package com.android.systemui.model; -import static android.view.Display.DEFAULT_DISPLAY; - import android.annotation.NonNull; import android.util.Log; import com.android.systemui.Dumpable; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.system.QuickStepContract; import java.io.PrintWriter; @@ -39,11 +38,16 @@ public class SysUiState implements Dumpable { private static final String TAG = SysUiState.class.getSimpleName(); public static final boolean DEBUG = false; + private final DisplayTracker mDisplayTracker; private @QuickStepContract.SystemUiStateFlags int mFlags; private final List<SysUiStateCallback> mCallbacks = new ArrayList<>(); private int mFlagsToSet = 0; private int mFlagsToClear = 0; + public SysUiState(DisplayTracker displayTracker) { + mDisplayTracker = displayTracker; + } + /** * Add listener to be notified of changes made to SysUI state. * The callback will also be called as part of this function. @@ -81,7 +85,7 @@ public class SysUiState implements Dumpable { } private void updateFlags(int displayId) { - if (displayId != DEFAULT_DISPLAY) { + if (displayId != mDisplayTracker.getDefaultDisplayId()) { // Ignore non-default displays for now Log.w(TAG, "Ignoring flag update for display: " + displayId, new Throwable()); return; diff --git a/packages/SystemUI/src/com/android/systemui/motiontool/MotionToolModule.kt b/packages/SystemUI/src/com/android/systemui/motiontool/MotionToolModule.kt index 1324d2c5c27b..c4a1ed4500ab 100644 --- a/packages/SystemUI/src/com/android/systemui/motiontool/MotionToolModule.kt +++ b/packages/SystemUI/src/com/android/systemui/motiontool/MotionToolModule.kt @@ -19,7 +19,6 @@ package com.android.systemui.motiontool import android.view.WindowManagerGlobal import com.android.app.motiontool.DdmHandleMotionTool import com.android.app.motiontool.MotionToolManager -import com.android.app.viewcapture.ViewCapture import com.android.systemui.CoreStartable import dagger.Binds import dagger.Module @@ -38,17 +37,12 @@ interface MotionToolModule { } @Provides - fun provideMotionToolManager( - viewCapture: ViewCapture, - windowManagerGlobal: WindowManagerGlobal - ): MotionToolManager { - return MotionToolManager.getInstance(viewCapture, windowManagerGlobal) + fun provideMotionToolManager(windowManagerGlobal: WindowManagerGlobal): MotionToolManager { + return MotionToolManager.getInstance(windowManagerGlobal) } @Provides fun provideWindowManagerGlobal(): WindowManagerGlobal = WindowManagerGlobal.getInstance() - - @Provides fun provideViewCapture(): ViewCapture = ViewCapture.getInstance() } @Binds diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index 5993e2eaadad..97c290d3e1f0 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -25,7 +25,6 @@ import static android.app.StatusBarManager.WindowType; import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.windowStateToString; import static android.app.WindowConfiguration.ROTATION_UNDEFINED; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.containsType; import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE; @@ -130,6 +129,7 @@ import com.android.systemui.navigationbar.gestural.QuickswitchOrientedNavHandle; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.recents.Recents; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserContextProvider; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.ShadeController; @@ -218,6 +218,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private final OnComputeInternalInsetsListener mOnComputeInternalInsetsListener; private final UserContextProvider mUserContextProvider; private final WakefulnessLifecycle mWakefulnessLifecycle; + private final DisplayTracker mDisplayTracker; private final RegionSamplingHelper mRegionSamplingHelper; private final int mNavColorSampleMargin; private NavigationBarFrame mFrame; @@ -461,7 +462,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public void onStartedWakingUp() { notifyScreenStateChanged(true); - if (isGesturalModeOnDefaultDisplay(getContext(), mNavBarMode)) { + if (isGesturalModeOnDefaultDisplay(getContext(), mDisplayTracker, + mNavBarMode)) { mRegionSamplingHelper.start(mSamplingBounds); } } @@ -545,7 +547,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements Optional<BackAnimation> backAnimation, UserContextProvider userContextProvider, WakefulnessLifecycle wakefulnessLifecycle, - TaskStackChangeListeners taskStackChangeListeners) { + TaskStackChangeListeners taskStackChangeListeners, + DisplayTracker displayTracker) { super(navigationBarView); mFrame = navigationBarFrame; mContext = context; @@ -585,6 +588,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mUserContextProvider = userContextProvider; mWakefulnessLifecycle = wakefulnessLifecycle; mTaskStackChangeListeners = taskStackChangeListeners; + mDisplayTracker = displayTracker; mNavColorSampleMargin = getResources() .getDimensionPixelSize(R.dimen.navigation_handle_sample_horizontal_margin); @@ -632,12 +636,14 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public boolean isSamplingEnabled() { - return isGesturalModeOnDefaultDisplay(getContext(), mNavBarMode); + return isGesturalModeOnDefaultDisplay(getContext(), mDisplayTracker, + mNavBarMode); } }, mainExecutor, bgExecutor); mView.setBackgroundExecutor(bgExecutor); mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler); + mView.setDisplayTracker(mDisplayTracker); mNavBarMode = mNavigationModeController.addListener(mModeChangedListener); } @@ -665,7 +671,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements getBarLayoutParams(mContext.getResources().getConfiguration().windowConfiguration .getRotation())); mDisplayId = mContext.getDisplayId(); - mIsOnDefaultDisplay = mDisplayId == DEFAULT_DISPLAY; + mIsOnDefaultDisplay = mDisplayId == mDisplayTracker.getDefaultDisplayId(); // Ensure we try to get currentSysuiState from navBarHelper before command queue callbacks // start firing, since the latter is source of truth @@ -1468,7 +1474,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private void onAccessibilityClick(View v) { final Display display = v.getDisplay(); mAccessibilityManager.notifyAccessibilityButtonClicked( - display != null ? display.getDisplayId() : DEFAULT_DISPLAY); + display != null ? display.getDisplayId() : mDisplayTracker.getDefaultDisplayId()); } private boolean onAccessibilityLongClick(View v) { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index dce69bb7ac1e..8c19111cab24 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -19,7 +19,6 @@ package com.android.systemui.navigationbar; import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU; import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE; import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR; -import static android.view.Display.DEFAULT_DISPLAY; import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG; import static com.android.systemui.shared.recents.utilities.Utilities.isTablet; @@ -55,6 +54,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.statusbar.CommandQueue; @@ -87,6 +87,7 @@ public class NavigationBarController implements private final NavigationBarComponent.Factory mNavigationBarComponentFactory; private FeatureFlags mFeatureFlags; private final SecureSettings mSecureSettings; + private final DisplayTracker mDisplayTracker; private final DisplayManager mDisplayManager; private final TaskbarDelegate mTaskbarDelegate; private int mNavMode; @@ -119,12 +120,14 @@ public class NavigationBarController implements Optional<Pip> pipOptional, Optional<BackAnimation> backAnimation, FeatureFlags featureFlags, - SecureSettings secureSettings) { + SecureSettings secureSettings, + DisplayTracker displayTracker) { mContext = context; mHandler = mainHandler; mNavigationBarComponentFactory = navigationBarComponentFactory; mFeatureFlags = featureFlags; mSecureSettings = secureSettings; + mDisplayTracker = displayTracker; mDisplayManager = mContext.getSystemService(DisplayManager.class); commandQueue.addCallback(this); configurationController.addCallback(this); @@ -296,9 +299,10 @@ public class NavigationBarController implements // Don't need to create nav bar on the default display if we initialize TaskBar. final boolean shouldCreateDefaultNavbar = includeDefaultDisplay && !initializeTaskbarIfNecessary(); - Display[] displays = mDisplayManager.getDisplays(); + Display[] displays = mDisplayTracker.getAllDisplays(); for (Display display : displays) { - if (shouldCreateDefaultNavbar || display.getDisplayId() != DEFAULT_DISPLAY) { + if (shouldCreateDefaultNavbar + || display.getDisplayId() != mDisplayTracker.getDefaultDisplayId()) { createNavigationBar(display, null /* savedState */, result); } } @@ -317,7 +321,7 @@ public class NavigationBarController implements } final int displayId = display.getDisplayId(); - final boolean isOnDefaultDisplay = displayId == DEFAULT_DISPLAY; + final boolean isOnDefaultDisplay = displayId == mDisplayTracker.getDefaultDisplayId(); // We may show TaskBar on the default display for large screen device. Don't need to create // navigation bar for this case. @@ -412,7 +416,7 @@ public class NavigationBarController implements /** @return {@link NavigationBarView} on the default display. */ public @Nullable NavigationBarView getDefaultNavigationBarView() { - return getNavigationBarView(DEFAULT_DISPLAY); + return getNavigationBarView(mDisplayTracker.getDefaultDisplayId()); } /** @@ -433,7 +437,8 @@ public class NavigationBarController implements final NavigationBarView navBarView = getNavigationBarView(displayId); if (navBarView != null) { navBarView.showPinningEnterExitToast(entering); - } else if (displayId == DEFAULT_DISPLAY && mTaskbarDelegate.isInitialized()) { + } else if (displayId == mDisplayTracker.getDefaultDisplayId() + && mTaskbarDelegate.isInitialized()) { mTaskbarDelegate.showPinningEnterExitToast(entering); } } @@ -442,7 +447,8 @@ public class NavigationBarController implements final NavigationBarView navBarView = getNavigationBarView(displayId); if (navBarView != null) { navBarView.showPinningEscapeToast(); - } else if (displayId == DEFAULT_DISPLAY && mTaskbarDelegate.isInitialized()) { + } else if (displayId == mDisplayTracker.getDefaultDisplayId() + && mTaskbarDelegate.isInitialized()) { mTaskbarDelegate.showPinningEscapeToast(); } } @@ -459,7 +465,7 @@ public class NavigationBarController implements /** @return {@link NavigationBar} on the default display. */ @Nullable public NavigationBar getDefaultNavigationBar() { - return mNavigationBars.get(DEFAULT_DISPLAY); + return mNavigationBars.get(mDisplayTracker.getDefaultDisplayId()); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java index 6793f0163c43..a4de9ffbfa51 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java @@ -24,7 +24,6 @@ import android.graphics.Rect; import android.os.Handler; import android.os.RemoteException; import android.util.SparseArray; -import android.view.Display; import android.view.IWallpaperVisibilityListener; import android.view.IWindowManager; import android.view.View; @@ -32,6 +31,7 @@ import android.view.View; import com.android.systemui.R; import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope; import com.android.systemui.navigationbar.buttons.ButtonDispatcher; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.phone.BarTransitions; import com.android.systemui.statusbar.phone.LightBarTransitionsController; @@ -65,6 +65,7 @@ public final class NavigationBarTransitions extends BarTransitions implements @org.jetbrains.annotations.NotNull private final IWindowManager mWindowManagerService; private final LightBarTransitionsController mLightTransitionsController; + private final DisplayTracker mDisplayTracker; private final boolean mAllowAutoDimWallpaperNotVisible; private boolean mWallpaperVisible; @@ -89,18 +90,20 @@ public final class NavigationBarTransitions extends BarTransitions implements public NavigationBarTransitions( NavigationBarView view, IWindowManager windowManagerService, - LightBarTransitionsController.Factory lightBarTransitionsControllerFactory) { + LightBarTransitionsController.Factory lightBarTransitionsControllerFactory, + DisplayTracker displayTracker) { super(view, R.drawable.nav_background); mView = view; mWindowManagerService = windowManagerService; mLightTransitionsController = lightBarTransitionsControllerFactory.create(this); + mDisplayTracker = displayTracker; mAllowAutoDimWallpaperNotVisible = view.getContext().getResources() .getBoolean(R.bool.config_navigation_bar_enable_auto_dim_no_visible_wallpaper); mDarkIntensityListeners = new ArrayList(); try { mWallpaperVisible = mWindowManagerService.registerWallpaperVisibilityListener( - mWallpaperVisibilityListener, Display.DEFAULT_DISPLAY); + mWallpaperVisibilityListener, mDisplayTracker.getDefaultDisplayId()); } catch (RemoteException e) { } mView.addOnLayoutChangeListener( @@ -126,7 +129,7 @@ public final class NavigationBarTransitions extends BarTransitions implements public void destroy() { try { mWindowManagerService.unregisterWallpaperVisibilityListener(mWallpaperVisibilityListener, - Display.DEFAULT_DISPLAY); + mDisplayTracker.getDefaultDisplayId()); } catch (RemoteException e) { } mLightTransitionsController.destroy(); @@ -135,7 +138,10 @@ public final class NavigationBarTransitions extends BarTransitions implements @Override public void setAutoDim(boolean autoDim) { // Ensure we aren't in gestural nav if we are triggering auto dim - if (autoDim && isGesturalModeOnDefaultDisplay(mView.getContext(), mNavBarMode)) return; + if (autoDim && isGesturalModeOnDefaultDisplay(mView.getContext(), mDisplayTracker, + mNavBarMode)) { + return; + } if (mAutoDim == autoDim) return; mAutoDim = autoDim; applyLightsOut(true, false); @@ -219,7 +225,7 @@ public final class NavigationBarTransitions extends BarTransitions implements @Override public int getTintAnimationDuration() { - if (isGesturalModeOnDefaultDisplay(mView.getContext(), mNavBarMode)) { + if (isGesturalModeOnDefaultDisplay(mView.getContext(), mDisplayTracker, mNavBarMode)) { return Math.max(DEFAULT_COLOR_ADAPT_TRANSITION_TIME, MIN_COLOR_ADAPT_TRANSITION_TIME); } return LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION; diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index 88c4fd524b79..63fb4996fbbf 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -16,13 +16,11 @@ package com.android.systemui.navigationbar; -import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED; import static android.inputmethodservice.InputMethodService.canImeRenderGesturalNavButtons; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SEARCH_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.isGesturalMode; @@ -75,13 +73,12 @@ import com.android.systemui.navigationbar.buttons.NearestTouchFrame; import com.android.systemui.navigationbar.buttons.RotationContextButton; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.recents.Recents; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shade.NotificationPanelViewController; import com.android.systemui.shared.rotation.FloatingRotationButton; import com.android.systemui.shared.rotation.RotationButton.RotationButtonUpdatesCallback; import com.android.systemui.shared.rotation.RotationButtonController; -import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; -import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.LightBarTransitionsController; @@ -127,6 +124,7 @@ public class NavigationBarView extends FrameLayout { private int mDarkIconColor; private EdgeBackGestureHandler mEdgeBackGestureHandler; + private DisplayTracker mDisplayTracker; private final DeadZone mDeadZone; private NavigationBarTransitions mBarTransitions; @Nullable @@ -303,7 +301,8 @@ public class NavigationBarView extends FrameLayout { R.dimen.floating_rotation_button_taskbar_left_margin, R.dimen.floating_rotation_button_taskbar_bottom_margin, R.dimen.floating_rotation_button_diameter, - R.dimen.key_button_ripple_max_width); + R.dimen.key_button_ripple_max_width, + R.bool.floating_rotation_button_position_left); mRotationButtonController = new RotationButtonController(mLightContext, mLightIconColor, mDarkIconColor, R.drawable.ic_sysbar_rotate_button_ccw_start_0, R.drawable.ic_sysbar_rotate_button_ccw_start_90, @@ -361,6 +360,10 @@ public class NavigationBarView extends FrameLayout { mBgExecutor = bgExecutor; } + public void setDisplayTracker(DisplayTracker displayTracker) { + mDisplayTracker = displayTracker; + } + public void setTouchHandler(Gefingerpoken touchHandler) { mTouchHandler = touchHandler; } @@ -558,7 +561,8 @@ public class NavigationBarView extends FrameLayout { } public void setBehavior(@Behavior int behavior) { - mRotationButtonController.onBehaviorChanged(Display.DEFAULT_DISPLAY, behavior); + mRotationButtonController.onBehaviorChanged(mDisplayTracker.getDefaultDisplayId(), + behavior); } @Override @@ -678,7 +682,7 @@ public class NavigationBarView extends FrameLayout { @VisibleForTesting boolean isRecentsButtonDisabled() { return mUseCarModeUi || !isOverviewEnabled() - || getContext().getDisplayId() != Display.DEFAULT_DISPLAY; + || getContext().getDisplayId() != mDisplayTracker.getDefaultDisplayId(); } private Display getContextDisplay() { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java index 1230708d780a..590efbb66454 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java @@ -16,8 +16,6 @@ package com.android.systemui.navigationbar.gestural; -import static android.view.Display.DEFAULT_DISPLAY; - import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE; import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG; @@ -56,6 +54,7 @@ import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.plugins.NavigationEdgeBackPlugin; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.navigationbar.RegionSamplingHelper; import com.android.systemui.statusbar.VibratorHelper; @@ -289,7 +288,8 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl Context context, LatencyTracker latencyTracker, VibratorHelper vibratorHelper, - @Background Executor backgroundExecutor) { + @Background Executor backgroundExecutor, + DisplayTracker displayTracker) { super(context); mWindowManager = context.getSystemService(WindowManager.class); @@ -365,7 +365,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl setVisibility(GONE); - boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY; + boolean isPrimaryDisplay = mContext.getDisplayId() == displayTracker.getDefaultDisplayId(); mRegionSamplingHelper = new RegionSamplingHelper(this, new RegionSamplingHelper.SamplingCallback() { @Override diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt index 2a6ca1acb38e..8ad2f867a073 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt @@ -17,11 +17,11 @@ package com.android.systemui.privacy import android.content.Context import android.util.AttributeSet import android.view.ViewGroup -import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout import com.android.settingslib.Utils import com.android.systemui.R +import com.android.systemui.animation.LaunchableFrameLayout import com.android.systemui.statusbar.events.BackgroundAnimatableView class OngoingPrivacyChip @JvmOverloads constructor( @@ -29,7 +29,7 @@ class OngoingPrivacyChip @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttrs: Int = 0, defStyleRes: Int = 0 -) : FrameLayout(context, attrs, defStyleAttrs, defStyleRes), BackgroundAnimatableView { +) : LaunchableFrameLayout(context, attrs, defStyleAttrs, defStyleRes), BackgroundAnimatableView { private var iconMargin = 0 private var iconSize = 0 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index 100853caa2d7..98af9dfe7f37 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -314,7 +314,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P if (!TILES_SETTING.equals(key)) { return; } - Log.d(TAG, "Recreating tiles"); if (newValue == null && UserManager.isDeviceInDemoMode(mContext)) { newValue = mContext.getResources().getString(R.string.quick_settings_tiles_retail_mode); } @@ -327,6 +326,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P } } if (tileSpecs.equals(mTileSpecs) && currentUser == mCurrentUser) return; + Log.d(TAG, "Recreating tiles: " + tileSpecs); mTiles.entrySet().stream().filter(tile -> !tileSpecs.contains(tile.getKey())).forEach( tile -> { Log.d(TAG, "Destroying tile: " + tile.getKey()); @@ -372,6 +372,8 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P Log.d(TAG, "Destroying not available tile: " + tileSpec); mQSLogger.logTileDestroyed(tileSpec, "Tile not available"); } + } else { + Log.d(TAG, "No factory for a spec: " + tileSpec); } } catch (Throwable t) { Log.w(TAG, "Error creating tile for spec: " + tileSpec, t); diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index cfda9fd6cb96..7c2536dac56e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -15,7 +15,6 @@ */ package com.android.systemui.qs.external; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; import android.app.PendingIntent; @@ -63,6 +62,7 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.settings.DisplayTracker; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; @@ -90,6 +90,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener private final TileServiceManager mServiceManager; private final int mUser; private final CustomTileStatePersister mCustomTileStatePersister; + private final DisplayTracker mDisplayTracker; @Nullable private android.graphics.drawable.Icon mDefaultIcon; @Nullable @@ -120,7 +121,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener String action, Context userContext, CustomTileStatePersister customTileStatePersister, - TileServices tileServices + TileServices tileServices, + DisplayTracker displayTracker ) { super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); @@ -135,6 +137,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener mServiceManager = tileServices.getTileWrapper(this); mService = mServiceManager.getTileService(); mCustomTileStatePersister = customTileStatePersister; + mDisplayTracker = displayTracker; } @Override @@ -310,7 +313,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener mIsShowingDialog = false; try { if (DEBUG) Log.d(TAG, "Removing token"); - mWindowManager.removeWindowToken(mToken, DEFAULT_DISPLAY); + mWindowManager.removeWindowToken(mToken, mDisplayTracker.getDefaultDisplayId()); } catch (RemoteException e) { } } @@ -335,7 +338,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener if (mIsTokenGranted && !mIsShowingDialog) { try { if (DEBUG) Log.d(TAG, "Removing token"); - mWindowManager.removeWindowToken(mToken, DEFAULT_DISPLAY); + mWindowManager.removeWindowToken(mToken, + mDisplayTracker.getDefaultDisplayId()); } catch (RemoteException e) { } mIsTokenGranted = false; @@ -354,7 +358,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener if (mIsTokenGranted) { try { if (DEBUG) Log.d(TAG, "Removing token"); - mWindowManager.removeWindowToken(mToken, DEFAULT_DISPLAY); + mWindowManager.removeWindowToken(mToken, mDisplayTracker.getDefaultDisplayId()); } catch (RemoteException e) { } } @@ -398,8 +402,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener mViewClicked = view; try { if (DEBUG) Log.d(TAG, "Adding token"); - mWindowManager.addWindowToken(mToken, TYPE_QS_DIALOG, DEFAULT_DISPLAY, - null /* options */); + mWindowManager.addWindowToken(mToken, TYPE_QS_DIALOG, + mDisplayTracker.getDefaultDisplayId(), null /* options */); mIsTokenGranted = true; } catch (RemoteException e) { } @@ -566,6 +570,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener final QSLogger mQSLogger; final CustomTileStatePersister mCustomTileStatePersister; private TileServices mTileServices; + final DisplayTracker mDisplayTracker; Context mUserContext; String mSpec = ""; @@ -581,7 +586,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener ActivityStarter activityStarter, QSLogger qsLogger, CustomTileStatePersister customTileStatePersister, - TileServices tileServices + TileServices tileServices, + DisplayTracker displayTracker ) { mQSHostLazy = hostLazy; mBackgroundLooper = backgroundLooper; @@ -593,6 +599,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener mQSLogger = qsLogger; mCustomTileStatePersister = customTileStatePersister; mTileServices = tileServices; + mDisplayTracker = displayTracker; } Builder setSpec(@NonNull String spec) { @@ -623,7 +630,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener action, mUserContext, mCustomTileStatePersister, - mTileServices + mTileServices, + mDisplayTracker ); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index 51de5227b7d4..b155e13489dd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -255,17 +255,19 @@ public class InternetTile extends QSTileImpl<SignalState> { Log.d(TAG, "setWifiIndicators: " + indicators); } mWifiInfo.mEnabled = indicators.enabled; - if (indicators.qsIcon == null) { - return; - } - mWifiInfo.mConnected = indicators.qsIcon.visible; - mWifiInfo.mWifiSignalIconId = indicators.qsIcon.icon; - mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription; - mWifiInfo.mEnabled = indicators.enabled; mWifiInfo.mSsid = indicators.description; mWifiInfo.mIsTransient = indicators.isTransient; mWifiInfo.mStatusLabel = indicators.statusLabel; - refreshState(mWifiInfo); + if (indicators.qsIcon != null) { + mWifiInfo.mConnected = indicators.qsIcon.visible; + mWifiInfo.mWifiSignalIconId = indicators.qsIcon.icon; + mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription; + refreshState(mWifiInfo); + } else { + mWifiInfo.mConnected = false; + mWifiInfo.mWifiSignalIconId = 0; + mWifiInfo.mWifiSignalContentDescription = null; + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 1151475f0fc3..a979e5a99fa8 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -17,7 +17,6 @@ package com.android.systemui.recents; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; @@ -30,6 +29,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNL import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_WINDOW_CORNER_RADIUS; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED; @@ -88,6 +88,7 @@ import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.buttons.KeyButtonView; import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.NotificationPanelViewController; import com.android.systemui.shared.recents.IOverviewProxy; @@ -144,6 +145,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private final UserTracker mUserTracker; private final KeyguardUnlockAnimationController mSysuiUnlockAnimationController; private final UiEventLogger mUiEventLogger; + private final DisplayTracker mDisplayTracker; private Region mActiveNavBarRegion; private SurfaceControl mNavigationBarSurface; @@ -225,11 +227,11 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void onImeSwitcherPressed() { - // TODO(b/204901476) We're intentionally using DEFAULT_DISPLAY for now since + // TODO(b/204901476) We're intentionally using the default display for now since // Launcher/Taskbar isn't display aware. mContext.getSystemService(InputMethodManager.class) .showInputMethodPickerFromSystem(true /* showAuxiliarySubtypes */, - DEFAULT_DISPLAY); + mDisplayTracker.getDefaultDisplayId()); mUiEventLogger.log(KeyButtonView.NavBarButtonEvent.NAVBAR_IME_SWITCHER_BUTTON_TAP); } @@ -507,6 +509,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis UserTracker userTracker, ScreenLifecycle screenLifecycle, UiEventLogger uiEventLogger, + DisplayTracker displayTracker, KeyguardUnlockAnimationController sysuiUnlockAnimationController, AssistUtils assistUtils, DumpManager dumpManager) { @@ -534,6 +537,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mSysUiState = sysUiState; mSysUiState.addCallback(this::notifySystemUiStateFlags); mUiEventLogger = uiEventLogger; + mDisplayTracker = displayTracker; dumpManager.registerDumpable(getClass().getSimpleName(), this); @@ -652,13 +656,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } private void onStatusBarStateChanged(boolean keyguardShowing, boolean keyguardOccluded, - boolean bouncerShowing, boolean isDozing, boolean panelExpanded) { + boolean bouncerShowing, boolean isDozing, boolean panelExpanded, boolean isDreaming) { mSysUiState.setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING, keyguardShowing && !keyguardOccluded) .setFlag(SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED, keyguardShowing && keyguardOccluded) .setFlag(SYSUI_STATE_BOUNCER_SHOWING, bouncerShowing) .setFlag(SYSUI_STATE_DEVICE_DOZING, isDozing) + .setFlag(SYSUI_STATE_DEVICE_DREAMING, isDreaming) .commitUpdate(mContext.getDisplayId()); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt index 01e32b7ada5f..aa8e2c039684 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt @@ -22,7 +22,6 @@ import android.os.Bundle import android.os.RemoteException import android.os.UserHandle import android.util.Log -import android.view.Display import android.view.IRemoteAnimationFinishedCallback import android.view.IRemoteAnimationRunner import android.view.RemoteAnimationAdapter @@ -33,6 +32,7 @@ import com.android.internal.infra.ServiceConnector import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.settings.DisplayTracker import javax.inject.Inject import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineDispatcher @@ -47,6 +47,7 @@ constructor( @Application private val applicationScope: CoroutineScope, @Main private val mainDispatcher: CoroutineDispatcher, private val context: Context, + private val displayTracker: DisplayTracker ) { /** * Execute the given intent with startActivity while performing operations for screenshot action @@ -82,7 +83,7 @@ constructor( val runner = RemoteAnimationAdapter(SCREENSHOT_REMOTE_RUNNER, 0, 0) try { WindowManagerGlobal.getWindowManagerService() - .overridePendingAppTransitionRemote(runner, Display.DEFAULT_DISPLAY) + .overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId) } catch (e: Exception) { Log.e(TAG, "Error overriding screenshot app transition", e) } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java b/packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java index 814b8e90e0dd..4f5cb72438bc 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java @@ -16,8 +16,6 @@ package com.android.systemui.screenshot; -import static android.view.Display.DEFAULT_DISPLAY; - import static com.android.systemui.screenshot.ScreenshotController.ACTION_TYPE_EDIT; import static com.android.systemui.screenshot.ScreenshotController.ACTION_TYPE_SHARE; import static com.android.systemui.screenshot.ScreenshotController.EXTRA_ACTION_INTENT; @@ -35,6 +33,7 @@ import android.util.Log; import android.view.RemoteAnimationAdapter; import android.view.WindowManagerGlobal; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -52,14 +51,17 @@ public class ActionProxyReceiver extends BroadcastReceiver { private final CentralSurfaces mCentralSurfaces; private final ActivityManagerWrapper mActivityManagerWrapper; private final ScreenshotSmartActions mScreenshotSmartActions; + private final DisplayTracker mDisplayTracker; @Inject public ActionProxyReceiver(Optional<CentralSurfaces> centralSurfacesOptional, ActivityManagerWrapper activityManagerWrapper, - ScreenshotSmartActions screenshotSmartActions) { + ScreenshotSmartActions screenshotSmartActions, + DisplayTracker displayTracker) { mCentralSurfaces = centralSurfacesOptional.orElse(null); mActivityManagerWrapper = activityManagerWrapper; mScreenshotSmartActions = screenshotSmartActions; + mDisplayTracker = displayTracker; } @Override @@ -78,7 +80,8 @@ public class ActionProxyReceiver extends BroadcastReceiver { ScreenshotController.SCREENSHOT_REMOTE_RUNNER, 0, 0); try { WindowManagerGlobal.getWindowManagerService() - .overridePendingAppTransitionRemote(runner, DEFAULT_DISPLAY); + .overridePendingAppTransitionRemote(runner, + mDisplayTracker.getDefaultDisplayId()); } catch (Exception e) { Log.e(TAG, "Error overriding screenshot app transition", e); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/MessageContainerController.kt b/packages/SystemUI/src/com/android/systemui/screenshot/MessageContainerController.kt new file mode 100644 index 000000000000..ad66514c689c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/MessageContainerController.kt @@ -0,0 +1,145 @@ +package com.android.systemui.screenshot + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.os.UserHandle +import android.view.View +import android.view.ViewGroup +import android.view.ViewGroup.MarginLayoutParams +import android.view.ViewTreeObserver +import android.view.animation.AccelerateDecelerateInterpolator +import androidx.constraintlayout.widget.Guideline +import com.android.systemui.R +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import javax.inject.Inject + +/** + * MessageContainerController controls the display of content in the screenshot message container. + */ +class MessageContainerController +@Inject +constructor( + private val workProfileMessageController: WorkProfileMessageController, + private val screenshotDetectionController: ScreenshotDetectionController, + private val featureFlags: FeatureFlags, +) { + private lateinit var container: ViewGroup + private lateinit var guideline: Guideline + private lateinit var workProfileFirstRunView: ViewGroup + private lateinit var detectionNoticeView: ViewGroup + private var animateOut: Animator? = null + + fun setView(screenshotView: ViewGroup) { + container = screenshotView.requireViewById(R.id.screenshot_message_container) + guideline = screenshotView.requireViewById(R.id.guideline) + + workProfileFirstRunView = container.requireViewById(R.id.work_profile_first_run) + detectionNoticeView = container.requireViewById(R.id.screenshot_detection_notice) + + // Restore to starting state. + container.visibility = View.GONE + guideline.setGuidelineEnd(0) + workProfileFirstRunView.visibility = View.GONE + detectionNoticeView.visibility = View.GONE + } + + // Minimal implementation for use when Flags.SCREENSHOT_METADATA isn't turned on. + fun onScreenshotTaken(userHandle: UserHandle) { + if (featureFlags.isEnabled(Flags.SCREENSHOT_WORK_PROFILE_POLICY)) { + val workProfileData = workProfileMessageController.onScreenshotTaken(userHandle) + if (workProfileData != null) { + workProfileFirstRunView.visibility = View.VISIBLE + detectionNoticeView.visibility = View.GONE + + workProfileMessageController.populateView( + workProfileFirstRunView, + workProfileData, + this::animateOutMessageContainer + ) + animateInMessageContainer() + } + } + } + + fun onScreenshotTaken(screenshot: ScreenshotData) { + if (featureFlags.isEnabled(Flags.SCREENSHOT_WORK_PROFILE_POLICY)) { + val workProfileData = + workProfileMessageController.onScreenshotTaken(screenshot.userHandle) + var notifiedApps: List<CharSequence> = listOf() + if (featureFlags.isEnabled(Flags.SCREENSHOT_DETECTION)) { + notifiedApps = screenshotDetectionController.maybeNotifyOfScreenshot(screenshot) + } + + // If work profile first run needs to show, bias towards that, otherwise show screenshot + // detection notification if needed. + if (workProfileData != null) { + workProfileFirstRunView.visibility = View.VISIBLE + detectionNoticeView.visibility = View.GONE + workProfileMessageController.populateView( + workProfileFirstRunView, + workProfileData, + this::animateOutMessageContainer + ) + animateInMessageContainer() + } else if (notifiedApps.isNotEmpty()) { + detectionNoticeView.visibility = View.VISIBLE + workProfileFirstRunView.visibility = View.GONE + screenshotDetectionController.populateView(detectionNoticeView, notifiedApps) + animateInMessageContainer() + } + } + } + + private fun animateInMessageContainer() { + if (container.visibility == View.VISIBLE) return + + // Need the container to be fully measured before animating in (to know animation offset + // destination) + container.visibility = View.VISIBLE + container.viewTreeObserver.addOnPreDrawListener( + object : ViewTreeObserver.OnPreDrawListener { + override fun onPreDraw(): Boolean { + container.viewTreeObserver.removeOnPreDrawListener(this) + getAnimator(true).start() + return false + } + } + ) + } + + private fun animateOutMessageContainer() { + if (animateOut != null) return + + animateOut = + getAnimator(false).apply { + addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + super.onAnimationEnd(animation) + container.visibility = View.GONE + animateOut = null + } + } + ) + start() + } + } + + private fun getAnimator(animateIn: Boolean): Animator { + val params = container.layoutParams as MarginLayoutParams + val offset = container.height + params.topMargin + params.bottomMargin + val anim = if (animateIn) ValueAnimator.ofFloat(0f, 1f) else ValueAnimator.ofFloat(1f, 0f) + with(anim) { + duration = ScreenshotView.SCREENSHOT_ACTIONS_EXPANSION_DURATION_MS + interpolator = AccelerateDecelerateInterpolator() + addUpdateListener { valueAnimator: ValueAnimator -> + val interpolation = valueAnimator.animatedValue as Float + guideline.setGuidelineEnd((interpolation * offset).toInt()) + container.alpha = interpolation + } + } + return anim + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index adff6e1757f6..72a8e23fbff5 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -17,7 +17,6 @@ package com.android.systemui.screenshot; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; import static com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY; @@ -102,6 +101,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition; import com.android.systemui.screenshot.TakeScreenshotService.RequestCallback; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.util.Assert; import com.google.common.util.concurrent.ListenableFuture; @@ -273,6 +273,7 @@ public class ScreenshotController { private final ScrollCaptureClient mScrollCaptureClient; private final PhoneWindow mWindow; private final DisplayManager mDisplayManager; + private final DisplayTracker mDisplayTracker; private final ScrollCaptureController mScrollCaptureController; private final LongScreenshotData mLongScreenshotHolder; private final boolean mIsLowRamDevice; @@ -281,7 +282,6 @@ public class ScreenshotController { private final TimeoutHandler mScreenshotHandler; private final ActionIntentExecutor mActionExecutor; private final UserManager mUserManager; - private final WorkProfileMessageController mWorkProfileMessageController; private final AssistContentRequester mAssistContentRequester; private final OnBackInvokedCallback mOnBackInvokedCallback = () -> { @@ -292,6 +292,7 @@ public class ScreenshotController { }; private ScreenshotView mScreenshotView; + private final MessageContainerController mMessageContainerController; private Bitmap mScreenBitmap; private SaveImageInBackgroundTask mSaveInBgTask; private boolean mScreenshotTakenInPortrait; @@ -330,8 +331,9 @@ public class ScreenshotController { ScreenshotNotificationSmartActionsProvider screenshotNotificationSmartActionsProvider, ActionIntentExecutor actionExecutor, UserManager userManager, - WorkProfileMessageController workProfileMessageController, - AssistContentRequester assistContentRequester + AssistContentRequester assistContentRequester, + MessageContainerController messageContainerController, + DisplayTracker displayTracker ) { mScreenshotSmartActions = screenshotSmartActions; mNotificationsController = screenshotNotificationsController; @@ -357,13 +359,14 @@ public class ScreenshotController { }); mDisplayManager = requireNonNull(context.getSystemService(DisplayManager.class)); + mDisplayTracker = displayTracker; final Context displayContext = context.createDisplayContext(getDefaultDisplay()); mContext = (WindowContext) displayContext.createWindowContext(TYPE_SCREENSHOT, null); mWindowManager = mContext.getSystemService(WindowManager.class); mFlags = flags; mActionExecutor = actionExecutor; mUserManager = userManager; - mWorkProfileMessageController = workProfileMessageController; + mMessageContainerController = messageContainerController; mAssistContentRequester = assistContentRequester; mAccessibilityManager = AccessibilityManager.getInstance(mContext); @@ -400,7 +403,8 @@ public class ScreenshotController { mCurrentRequestCallback = requestCallback; if (screenshot.getType() == WindowManager.TAKE_SCREENSHOT_FULLSCREEN) { Rect bounds = getFullScreenRect(); - screenshot.setBitmap(mImageCapture.captureDisplay(DEFAULT_DISPLAY, bounds)); + screenshot.setBitmap( + mImageCapture.captureDisplay(mDisplayTracker.getDefaultDisplayId(), bounds)); screenshot.setScreenBounds(bounds); } @@ -463,7 +467,11 @@ public class ScreenshotController { } } - prepareAnimation(screenshot.getScreenBounds(), showFlash); + prepareAnimation(screenshot.getScreenBounds(), showFlash, () -> { + if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { + mMessageContainerController.onScreenshotTaken(screenshot); + } + }); if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { mScreenshotView.badgeScreenshot(mContext.getPackageManager().getUserBadgedIcon( @@ -627,6 +635,9 @@ public class ScreenshotController { // Inflate the screenshot layout mScreenshotView = (ScreenshotView) LayoutInflater.from(mContext).inflate(R.layout.screenshot, null); + if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { + mMessageContainerController.setView(mScreenshotView); + } mScreenshotView.addOnAttachStateChangeListener( new View.OnAttachStateChangeListener() { @Override @@ -667,6 +678,7 @@ public class ScreenshotController { setWindowFocusable(false); } }, mActionExecutor, mFlags); + mScreenshotView.setDefaultDisplay(mDisplayTracker.getDefaultDisplayId()); mScreenshotView.setDefaultTimeoutMillis(mScreenshotHandler.getDefaultTimeoutMillis()); mScreenshotView.setOnKeyListener((v, keyCode, event) -> { @@ -700,7 +712,8 @@ public class ScreenshotController { // copy the input Rect, since SurfaceControl.screenshot can mutate it Rect screenRect = new Rect(crop); - Bitmap screenshot = mImageCapture.captureDisplay(DEFAULT_DISPLAY, crop); + Bitmap screenshot = mImageCapture.captureDisplay(mDisplayTracker.getDefaultDisplayId(), + crop); if (screenshot == null) { Log.e(TAG, "takeScreenshotInternal: Screenshot bitmap was null"); @@ -774,7 +787,11 @@ public class ScreenshotController { enqueueScrollCaptureRequest(owner); attachWindow(); - prepareAnimation(screenRect, showFlash); + prepareAnimation(screenRect, showFlash, () -> { + if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { + mMessageContainerController.onScreenshotTaken(owner); + } + }); if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { mScreenshotView.badgeScreenshot(mContext.getPackageManager().getUserBadgedIcon( @@ -791,7 +808,8 @@ public class ScreenshotController { mScreenshotHandler.cancelTimeout(); // restarted after animation } - private void prepareAnimation(Rect screenRect, boolean showFlash) { + private void prepareAnimation(Rect screenRect, boolean showFlash, + Runnable onAnimationComplete) { mScreenshotView.getViewTreeObserver().addOnPreDrawListener( new ViewTreeObserver.OnPreDrawListener() { @Override @@ -800,7 +818,7 @@ public class ScreenshotController { Log.d(TAG, "onPreDraw: startAnimation"); } mScreenshotView.getViewTreeObserver().removeOnPreDrawListener(this); - startAnimation(screenRect, showFlash); + startAnimation(screenRect, showFlash, onAnimationComplete); return true; } }); @@ -856,7 +874,7 @@ public class ScreenshotController { mLastScrollCaptureRequest.cancel(true); } final ListenableFuture<ScrollCaptureResponse> future = - mScrollCaptureClient.request(DEFAULT_DISPLAY); + mScrollCaptureClient.request(mDisplayTracker.getDefaultDisplayId()); mLastScrollCaptureRequest = future; mLastScrollCaptureRequest.addListener(() -> onScrollCaptureResponseReady(future, owner), mMainExecutor); @@ -887,7 +905,8 @@ public class ScreenshotController { mScreenshotView.showScrollChip(response.getPackageName(), /* onClick */ () -> { DisplayMetrics displayMetrics = new DisplayMetrics(); getDefaultDisplay().getRealMetrics(displayMetrics); - Bitmap newScreenshot = mImageCapture.captureDisplay(DEFAULT_DISPLAY, + Bitmap newScreenshot = mImageCapture.captureDisplay( + mDisplayTracker.getDefaultDisplayId(), new Rect(0, 0, displayMetrics.widthPixels, displayMetrics.heightPixels)); mScreenshotView.prepareScrollingTransition(response, mScreenBitmap, newScreenshot, @@ -951,7 +970,8 @@ public class ScreenshotController { SCREENSHOT_REMOTE_RUNNER, 0, 0); try { WindowManagerGlobal.getWindowManagerService() - .overridePendingAppTransitionRemote(runner, DEFAULT_DISPLAY); + .overridePendingAppTransitionRemote(runner, + mDisplayTracker.getDefaultDisplayId()); } catch (Exception e) { Log.e(TAG, "Error overriding screenshot app transition", e); } @@ -1079,13 +1099,22 @@ public class ScreenshotController { /** * Starts the animation after taking the screenshot */ - private void startAnimation(Rect screenRect, boolean showFlash) { + private void startAnimation(Rect screenRect, boolean showFlash, Runnable onAnimationComplete) { if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) { mScreenshotAnimation.cancel(); } mScreenshotAnimation = mScreenshotView.createScreenshotDropInAnimation(screenRect, showFlash); + if (onAnimationComplete != null) { + mScreenshotAnimation.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + onAnimationComplete.run(); + } + }); + } // Play the shutter sound to notify that we've taken a screenshot playCameraSound(); @@ -1184,9 +1213,6 @@ public class ScreenshotController { private void doPostAnimation(ScreenshotController.SavedImageData imageData) { mScreenshotView.setChipIntents(imageData); - if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { - mWorkProfileMessageController.onScreenshotTaken(imageData.owner, mScreenshotView); - } } /** @@ -1289,7 +1315,7 @@ public class ScreenshotController { } private Display getDefaultDisplay() { - return mDisplayManager.getDisplay(DEFAULT_DISPLAY); + return mDisplayManager.getDisplay(mDisplayTracker.getDefaultDisplayId()); } private boolean allowLongScreenshots() { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt index c43e4b4e3f3a..e9be88a59990 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt @@ -8,6 +8,7 @@ import android.net.Uri import android.os.UserHandle import android.view.WindowManager.ScreenshotSource import android.view.WindowManager.ScreenshotType +import androidx.annotation.VisibleForTesting import com.android.internal.util.ScreenshotRequest /** ScreenshotData represents the current state of a single screenshot being acquired. */ @@ -42,5 +43,10 @@ data class ScreenshotData( request.bitmap, ) } + + @VisibleForTesting + fun forTesting(): ScreenshotData { + return ScreenshotData(0, 0, null, null, null, 0, Insets.NONE, null) + } } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotDetectionController.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotDetectionController.kt new file mode 100644 index 000000000000..70ea2b5b9507 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotDetectionController.kt @@ -0,0 +1,56 @@ +/* + * 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.screenshot + +import android.content.pm.PackageManager +import android.view.IWindowManager +import android.view.ViewGroup +import android.widget.TextView +import com.android.systemui.R +import javax.inject.Inject + +class ScreenshotDetectionController +@Inject +constructor( + private val windowManager: IWindowManager, + private val packageManager: PackageManager, +) { + /** + * Notify potentially listening apps of the screenshot. Return a list of the names of the apps + * notified. + */ + fun maybeNotifyOfScreenshot(data: ScreenshotData): List<CharSequence> { + // TODO: actually ask the window manager once API is available. + return listOf() + } + + fun populateView(view: ViewGroup, appNames: List<CharSequence>) { + assert(appNames.isNotEmpty()) + + val textView: TextView = view.requireViewById(R.id.screenshot_detection_notice_text) + if (appNames.size == 1) { + textView.text = + view.resources.getString(R.string.screenshot_detected_template, appNames[0]) + } else { + textView.text = + view.resources.getString( + R.string.screenshot_detected_multiple_template, + appNames[0] + ) + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java index c891686ada8f..7a62bae5b5ae 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java @@ -46,6 +46,8 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum { SCREENSHOT_SAVED(306), @UiEvent(doc = "screenshot failed to save") SCREENSHOT_NOT_SAVED(336), + @UiEvent(doc = "failed to capture screenshot") + SCREENSHOT_CAPTURE_FAILED(1281), @UiEvent(doc = "screenshot preview tapped") SCREENSHOT_PREVIEW_TAPPED(307), @UiEvent(doc = "screenshot edit button tapped") diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotPolicyImpl.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotPolicyImpl.kt index 3a3528606302..21a73100da06 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotPolicyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotPolicyImpl.kt @@ -32,12 +32,12 @@ import android.os.RemoteException import android.os.UserHandle import android.os.UserManager import android.util.Log -import android.view.Display.DEFAULT_DISPLAY import com.android.internal.annotations.VisibleForTesting import com.android.internal.infra.ServiceConnector import com.android.systemui.SystemUIService import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.settings.DisplayTracker import com.android.systemui.screenshot.ScreenshotPolicy.DisplayContentInfo import java.util.Arrays import javax.inject.Inject @@ -52,6 +52,7 @@ internal open class ScreenshotPolicyImpl @Inject constructor( private val userMgr: UserManager, private val atmService: IActivityTaskManager, @Background val bgDispatcher: CoroutineDispatcher, + private val displayTracker: DisplayTracker ) : ScreenshotPolicy { private val proxyConnector: ServiceConnector<IScreenshotProxy> = @@ -64,7 +65,7 @@ internal open class ScreenshotPolicyImpl @Inject constructor( ) override fun getDefaultDisplayId(): Int { - return DEFAULT_DISPLAY + return displayTracker.defaultDisplayId } override suspend fun isManagedProfile(@UserIdInt userId: Int): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index ce7f2e72a54d..afba7ad24692 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -33,7 +33,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ValueAnimator; -import android.annotation.Nullable; import android.app.ActivityManager; import android.app.Notification; import android.app.PendingIntent; @@ -82,7 +81,6 @@ import android.widget.FrameLayout; import android.widget.HorizontalScrollView; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; @@ -102,8 +100,7 @@ import java.util.ArrayList; * Handles the visual elements and animations for the screenshot flow. */ public class ScreenshotView extends FrameLayout implements - ViewTreeObserver.OnComputeInternalInsetsListener, - WorkProfileMessageController.WorkProfileMessageDisplay { + ViewTreeObserver.OnComputeInternalInsetsListener { interface ScreenshotViewCallback { void onUserInteraction(); @@ -123,7 +120,7 @@ public class ScreenshotView extends FrameLayout implements private static final long SCREENSHOT_TO_CORNER_X_DURATION_MS = 234; private static final long SCREENSHOT_TO_CORNER_Y_DURATION_MS = 500; private static final long SCREENSHOT_TO_CORNER_SCALE_DURATION_MS = 234; - private static final long SCREENSHOT_ACTIONS_EXPANSION_DURATION_MS = 400; + public static final long SCREENSHOT_ACTIONS_EXPANSION_DURATION_MS = 400; private static final long SCREENSHOT_ACTIONS_ALPHA_DURATION_MS = 100; private static final float SCREENSHOT_ACTIONS_START_SCALE_X = .7f; private static final int SWIPE_PADDING_DP = 12; // extra padding around views to allow swipe @@ -135,14 +132,13 @@ public class ScreenshotView extends FrameLayout implements private final AccessibilityManager mAccessibilityManager; private final GestureDetector mSwipeDetector; + private int mDefaultDisplay = Display.DEFAULT_DISPLAY; private int mNavMode; private boolean mOrientationPortrait; private boolean mDirectionLTR; private ImageView mScrollingScrim; private DraggableConstraintLayout mScreenshotStatic; - private ViewGroup mMessageContainer; - private TextView mMessageContent; private ImageView mScreenshotPreview; private ImageView mScreenshotBadge; private View mScreenshotPreviewBorder; @@ -294,8 +290,11 @@ public class ScreenshotView extends FrameLayout implements mDismissButton.getBoundsOnScreen(tmpRect); swipeRegion.op(tmpRect, Region.Op.UNION); - mMessageContainer.findViewById(R.id.message_dismiss_button).getBoundsOnScreen(tmpRect); - swipeRegion.op(tmpRect, Region.Op.UNION); + View messageDismiss = findViewById(R.id.message_dismiss_button); + if (messageDismiss != null) { + messageDismiss.getBoundsOnScreen(tmpRect); + swipeRegion.op(tmpRect, Region.Op.UNION); + } return swipeRegion; } @@ -326,7 +325,7 @@ public class ScreenshotView extends FrameLayout implements private void startInputListening() { stopInputListening(); - mInputMonitor = new InputMonitorCompat("Screenshot", Display.DEFAULT_DISPLAY); + mInputMonitor = new InputMonitorCompat("Screenshot", mDefaultDisplay); mInputEventReceiver = mInputMonitor.getInputReceiver( Looper.getMainLooper(), Choreographer.getInstance(), ev -> { if (ev instanceof MotionEvent) { @@ -351,39 +350,11 @@ public class ScreenshotView extends FrameLayout implements } } - /** - * Show a notification under the screenshot view indicating that a work profile screenshot has - * been taken and which app can be used to view it. - * - * @param appName The name of the app to use to view screenshots - * @param appIcon Optional icon for the relevant files app - * @param onDismiss Runnable to be run when the user dismisses this message - */ - @Override - public void showWorkProfileMessage(CharSequence appName, @Nullable Drawable appIcon, - Runnable onDismiss) { - if (appIcon != null) { - // Replace the default icon if one is provided. - ImageView imageView = mMessageContainer.findViewById(R.id.screenshot_message_icon); - imageView.setImageDrawable(appIcon); - } - mMessageContent.setText( - mContext.getString(R.string.screenshot_work_profile_notification, appName)); - mMessageContainer.setVisibility(VISIBLE); - mMessageContainer.findViewById(R.id.message_dismiss_button).setOnClickListener((v) -> { - mMessageContainer.setVisibility(View.GONE); - onDismiss.run(); - }); - } - @Override // View protected void onFinishInflate() { + super.onFinishInflate(); mScrollingScrim = requireNonNull(findViewById(R.id.screenshot_scrolling_scrim)); mScreenshotStatic = requireNonNull(findViewById(R.id.screenshot_static)); - mMessageContainer = - requireNonNull(mScreenshotStatic.findViewById(R.id.screenshot_message_container)); - mMessageContent = - requireNonNull(mMessageContainer.findViewById(R.id.screenshot_message_content)); mScreenshotPreview = requireNonNull(findViewById(R.id.screenshot_preview)); mScreenshotPreviewBorder = requireNonNull( @@ -484,6 +455,10 @@ public class ScreenshotView extends FrameLayout implements mPackageName = packageName; } + void setDefaultDisplay(int displayId) { + mDefaultDisplay = displayId; + } + void updateInsets(WindowInsets insets) { int orientation = mContext.getResources().getConfiguration().orientation; mOrientationPortrait = (orientation == ORIENTATION_PORTRAIT); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java index 4214c8f6ecf2..8035d19e3b8f 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java @@ -26,6 +26,7 @@ import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK; import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS; import static com.android.systemui.screenshot.LogConfig.DEBUG_SERVICE; import static com.android.systemui.screenshot.LogConfig.logTag; +import static com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_CAPTURE_FAILED; import static com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_DISMISSED_OTHER; import android.annotation.MainThread; @@ -202,6 +203,7 @@ public class TakeScreenshotService extends Service { // animation and error notification. if (!mUserManager.isUserUnlocked()) { Log.w(TAG, "Skipping screenshot because storage is locked!"); + logFailedRequest(request); mNotificationsController.notifyScreenshotError( R.string.screenshot_failed_to_save_user_locked_text); callback.reportError(); @@ -212,6 +214,7 @@ public class TakeScreenshotService extends Service { mBgExecutor.execute(() -> { Log.w(TAG, "Skipping screenshot because an IT admin has disabled " + "screenshots on the device"); + logFailedRequest(request); String blockedByAdminText = mDevicePolicyManager.getResources().getString( SCREENSHOT_BLOCKED_BY_ADMIN, () -> mContext.getString(R.string.screenshot_blocked_by_admin)); @@ -225,38 +228,43 @@ public class TakeScreenshotService extends Service { if (mFeatureFlags.isEnabled(Flags.SCREENSHOT_METADATA)) { Log.d(TAG, "Processing screenshot data"); ScreenshotData screenshotData = ScreenshotData.fromRequest(request); - mProcessor.processAsync(screenshotData, - (data) -> dispatchToController(data, onSaved, callback)); + try { + mProcessor.processAsync(screenshotData, + (data) -> dispatchToController(data, onSaved, callback)); + } catch (IllegalStateException e) { + Log.e(TAG, "Failed to process screenshot request!", e); + logFailedRequest(request); + mNotificationsController.notifyScreenshotError( + R.string.screenshot_failed_to_capture_text); + callback.reportError(); + } } else { - mProcessor.processAsync(request, - (r) -> dispatchToController(r, onSaved, callback)); + try { + mProcessor.processAsync(request, + (r) -> dispatchToController(r, onSaved, callback)); + } catch (IllegalStateException e) { + Log.e(TAG, "Failed to process screenshot request!", e); + logFailedRequest(request); + mNotificationsController.notifyScreenshotError( + R.string.screenshot_failed_to_capture_text); + callback.reportError(); + } } } private void dispatchToController(ScreenshotData screenshot, Consumer<Uri> uriConsumer, RequestCallback callback) { - mUiEventLogger.log(ScreenshotEvent.getScreenshotSource(screenshot.getSource()), 0, screenshot.getPackageNameString()); - - if (screenshot.getType() == WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE - && screenshot.getBitmap() == null) { - Log.e(TAG, "Got null bitmap from screenshot message"); - mNotificationsController.notifyScreenshotError( - R.string.screenshot_failed_to_capture_text); - callback.reportError(); - return; - } - mScreenshot.handleScreenshot(screenshot, uriConsumer, callback); } private void dispatchToController(ScreenshotRequest request, Consumer<Uri> uriConsumer, RequestCallback callback) { - ComponentName topComponent = request.getTopComponent(); - mUiEventLogger.log(ScreenshotEvent.getScreenshotSource(request.getSource()), 0, - topComponent == null ? "" : topComponent.getPackageName()); + String packageName = topComponent == null ? "" : topComponent.getPackageName(); + mUiEventLogger.log( + ScreenshotEvent.getScreenshotSource(request.getSource()), 0, packageName); switch (request.getType()) { case WindowManager.TAKE_SCREENSHOT_FULLSCREEN: @@ -275,21 +283,22 @@ public class TakeScreenshotService extends Service { int taskId = request.getTaskId(); int userId = request.getUserId(); - if (screenshot == null) { - Log.e(TAG, "Got null bitmap from screenshot message"); - mNotificationsController.notifyScreenshotError( - R.string.screenshot_failed_to_capture_text); - callback.reportError(); - } else { - mScreenshot.handleImageAsScreenshot(screenshot, screenBounds, insets, - taskId, userId, topComponent, uriConsumer, callback); - } + mScreenshot.handleImageAsScreenshot(screenshot, screenBounds, insets, + taskId, userId, topComponent, uriConsumer, callback); break; default: - Log.w(TAG, "Invalid screenshot option: " + request.getType()); + Log.wtf(TAG, "Invalid screenshot option: " + request.getType()); } } + private void logFailedRequest(ScreenshotRequest request) { + ComponentName topComponent = request.getTopComponent(); + String packageName = topComponent == null ? "" : topComponent.getPackageName(); + mUiEventLogger.log( + ScreenshotEvent.getScreenshotSource(request.getSource()), 0, packageName); + mUiEventLogger.log(SCREENSHOT_CAPTURE_FAILED, 0, packageName); + } + private static void sendComplete(Messenger target) { try { if (DEBUG_CALLBACK) { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/WorkProfileMessageController.kt b/packages/SystemUI/src/com/android/systemui/screenshot/WorkProfileMessageController.kt index 5d7e56f6c98a..1b728b8aa9cc 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/WorkProfileMessageController.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/WorkProfileMessageController.kt @@ -23,13 +23,16 @@ import android.graphics.drawable.Drawable import android.os.UserHandle import android.os.UserManager import android.util.Log +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView import com.android.systemui.R import javax.inject.Inject /** - * Handles all the non-UI portions of the work profile first run: - * - Track whether the user has already dismissed it. - * - Load the proper icon and app name. + * Handles work profile first run, determining whether a first run UI should be shown and populating + * that UI if needed. */ class WorkProfileMessageController @Inject @@ -40,10 +43,12 @@ constructor( ) { /** - * Determine if a message should be shown to the user, send message details to messageDisplay if - * appropriate. + * @return a populated WorkProfileFirstRunData object if a work profile first run message should + * be shown */ - fun onScreenshotTaken(userHandle: UserHandle, messageDisplay: WorkProfileMessageDisplay) { + fun onScreenshotTaken(userHandle: UserHandle?): WorkProfileFirstRunData? { + if (userHandle == null) return null + if (userManager.isManagedProfile(userHandle.identifier) && !messageAlreadyDismissed()) { var badgedIcon: Drawable? = null var label: CharSequence? = null @@ -62,10 +67,27 @@ constructor( } // If label wasn't loaded, use a default - val badgedLabel = - packageManager.getUserBadgedLabel(label ?: defaultFileAppName(), userHandle) + return WorkProfileFirstRunData(label ?: defaultFileAppName(), badgedIcon) + } + return null + } - messageDisplay.showWorkProfileMessage(badgedLabel, badgedIcon) { onMessageDismissed() } + /** + * Use the provided WorkProfileFirstRunData to populate the work profile first run UI in the + * given view. + */ + fun populateView(view: ViewGroup, data: WorkProfileFirstRunData, animateOut: () -> Unit) { + if (data.icon != null) { + // Replace the default icon if one is provided. + val imageView: ImageView = view.requireViewById<ImageView>(R.id.screenshot_message_icon) + imageView.setImageDrawable(data.icon) + } + val messageContent = view.requireViewById<TextView>(R.id.screenshot_message_content) + messageContent.text = + view.context.getString(R.string.screenshot_work_profile_notification, data.appName) + view.requireViewById<View>(R.id.message_dismiss_button).setOnClickListener { + animateOut() + onMessageDismissed() } } @@ -89,14 +111,7 @@ constructor( private fun defaultFileAppName() = context.getString(R.string.screenshot_default_files_app_name) - /** UI that can show work profile messages (ScreenshotView in practice) */ - interface WorkProfileMessageDisplay { - /** - * Show the given message and icon, calling onDismiss if the user explicitly dismisses the - * message. - */ - fun showWorkProfileMessage(text: CharSequence, icon: Drawable?, onDismiss: Runnable) - } + data class WorkProfileFirstRunData constructor(val appName: CharSequence, val icon: Drawable?) companion object { const val TAG = "WorkProfileMessageCtrl" diff --git a/packages/SystemUI/src/com/android/systemui/settings/DisplayTracker.kt b/packages/SystemUI/src/com/android/systemui/settings/DisplayTracker.kt new file mode 100644 index 000000000000..bb7f721ad61f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/settings/DisplayTracker.kt @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.settings + +import android.view.Display +import java.util.concurrent.Executor + +/** + * Display tracker for SystemUI. + * + * This tracker provides async access to display information, as well as callbacks for display + * changes. + */ +interface DisplayTracker { + + /** The id for the default display for the current SystemUI instance. */ + val defaultDisplayId: Int + + /** All displays that should be associated with the current SystemUI instance. */ + val allDisplays: Array<Display> + + /** + * Add a [Callback] to be notified of display changes, including additions, removals, and + * configuration changes, on a particular [Executor]. + */ + fun addDisplayChangeCallback(callback: Callback, executor: Executor) + + /** + * Add a [Callback] to be notified of display brightness changes, on a particular [Executor]. + * This callback will trigger Callback#onDisplayChanged for a display brightness change. + */ + fun addBrightnessChangeCallback(callback: Callback, executor: Executor) + + /** Remove a [Callback] previously added. */ + fun removeCallback(callback: Callback) + + /** Ćallback for notifying of changes. */ + interface Callback { + + /** Notifies that a display has been added. */ + @JvmDefault fun onDisplayAdded(displayId: Int) {} + + /** Notifies that a display has been removed. */ + @JvmDefault fun onDisplayRemoved(displayId: Int) {} + + /** Notifies a display has been changed */ + @JvmDefault fun onDisplayChanged(displayId: Int) {} + } +} diff --git a/packages/SystemUI/src/com/android/systemui/settings/DisplayTrackerImpl.kt b/packages/SystemUI/src/com/android/systemui/settings/DisplayTrackerImpl.kt new file mode 100644 index 000000000000..5169f88c373c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/settings/DisplayTrackerImpl.kt @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.settings + +import android.hardware.display.DisplayManager +import android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS +import android.os.Handler +import android.view.Display +import androidx.annotation.GuardedBy +import androidx.annotation.VisibleForTesting +import androidx.annotation.WorkerThread +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.util.Assert +import java.lang.ref.WeakReference +import java.util.concurrent.Executor + +class DisplayTrackerImpl +internal constructor( + val displayManager: DisplayManager, + @Background val backgroundHandler: Handler +) : DisplayTracker { + override val defaultDisplayId: Int = Display.DEFAULT_DISPLAY + override val allDisplays: Array<Display> + get() = displayManager.displays + + @GuardedBy("displayCallbacks") + private val displayCallbacks: MutableList<DisplayTrackerDataItem> = ArrayList() + @GuardedBy("brightnessCallbacks") + private val brightnessCallbacks: MutableList<DisplayTrackerDataItem> = ArrayList() + + @VisibleForTesting + val displayChangedListener: DisplayManager.DisplayListener = + object : DisplayManager.DisplayListener { + override fun onDisplayAdded(displayId: Int) { + val list = synchronized(displayCallbacks) { displayCallbacks.toList() } + onDisplayAdded(displayId, list) + } + + override fun onDisplayRemoved(displayId: Int) { + val list = synchronized(displayCallbacks) { displayCallbacks.toList() } + onDisplayRemoved(displayId, list) + } + + override fun onDisplayChanged(displayId: Int) { + val list = synchronized(displayCallbacks) { displayCallbacks.toList() } + onDisplayChanged(displayId, list) + } + } + + @VisibleForTesting + val displayBrightnessChangedListener: DisplayManager.DisplayListener = + object : DisplayManager.DisplayListener { + override fun onDisplayAdded(displayId: Int) {} + + override fun onDisplayRemoved(displayId: Int) {} + + override fun onDisplayChanged(displayId: Int) { + val list = synchronized(brightnessCallbacks) { brightnessCallbacks.toList() } + onDisplayChanged(displayId, list) + } + } + + override fun addDisplayChangeCallback(callback: DisplayTracker.Callback, executor: Executor) { + synchronized(displayCallbacks) { + if (displayCallbacks.isEmpty()) { + displayManager.registerDisplayListener(displayChangedListener, backgroundHandler) + } + displayCallbacks.add(DisplayTrackerDataItem(WeakReference(callback), executor)) + } + } + + override fun addBrightnessChangeCallback( + callback: DisplayTracker.Callback, + executor: Executor + ) { + synchronized(brightnessCallbacks) { + if (brightnessCallbacks.isEmpty()) { + displayManager.registerDisplayListener( + displayBrightnessChangedListener, + backgroundHandler, + EVENT_FLAG_DISPLAY_BRIGHTNESS + ) + } + brightnessCallbacks.add(DisplayTrackerDataItem(WeakReference(callback), executor)) + } + } + + override fun removeCallback(callback: DisplayTracker.Callback) { + synchronized(displayCallbacks) { + val changed = displayCallbacks.removeIf { it.sameOrEmpty(callback) } + if (changed && displayCallbacks.isEmpty()) { + displayManager.unregisterDisplayListener(displayChangedListener) + } + } + + synchronized(brightnessCallbacks) { + val changed = brightnessCallbacks.removeIf { it.sameOrEmpty(callback) } + if (changed && brightnessCallbacks.isEmpty()) { + displayManager.unregisterDisplayListener(displayBrightnessChangedListener) + } + } + } + + @WorkerThread + private fun onDisplayAdded(displayId: Int, list: List<DisplayTrackerDataItem>) { + Assert.isNotMainThread() + + notifySubscribers({ onDisplayAdded(displayId) }, list) + } + + @WorkerThread + private fun onDisplayRemoved(displayId: Int, list: List<DisplayTrackerDataItem>) { + Assert.isNotMainThread() + + notifySubscribers({ onDisplayRemoved(displayId) }, list) + } + + @WorkerThread + private fun onDisplayChanged(displayId: Int, list: List<DisplayTrackerDataItem>) { + Assert.isNotMainThread() + + notifySubscribers({ onDisplayChanged(displayId) }, list) + } + + private inline fun notifySubscribers( + crossinline action: DisplayTracker.Callback.() -> Unit, + list: List<DisplayTrackerDataItem> + ) { + list.forEach { + if (it.callback.get() != null) { + it.executor.execute { it.callback.get()?.action() } + } + } + } + + private data class DisplayTrackerDataItem( + val callback: WeakReference<DisplayTracker.Callback>, + val executor: Executor + ) { + fun sameOrEmpty(other: DisplayTracker.Callback): Boolean { + return callback.get()?.equals(other) ?: true + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java index 2f6081bc9f8d..8089d01e7343 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java @@ -27,10 +27,10 @@ import android.content.Context; import android.database.ContentObserver; import android.hardware.display.BrightnessInfo; import android.hardware.display.DisplayManager; -import android.hardware.display.DisplayManager.DisplayListener; import android.net.Uri; import android.os.AsyncTask; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; @@ -49,6 +49,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.policy.BrightnessMirrorController; @@ -78,19 +79,14 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig private final ToggleSlider mControl; private final DisplayManager mDisplayManager; private final UserTracker mUserTracker; + private final DisplayTracker mDisplayTracker; private final IVrManager mVrManager; private final Executor mMainExecutor; private final Handler mBackgroundHandler; private final BrightnessObserver mBrightnessObserver; - private final DisplayListener mDisplayListener = new DisplayListener() { - @Override - public void onDisplayAdded(int displayId) {} - - @Override - public void onDisplayRemoved(int displayId) {} - + private final DisplayTracker.Callback mBrightnessListener = new DisplayTracker.Callback() { @Override public void onDisplayChanged(int displayId) { mBackgroundHandler.post(mUpdateSliderRunnable); @@ -143,14 +139,14 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig cr.registerContentObserver( BRIGHTNESS_FOR_VR_FLOAT_URI, false, this, UserHandle.USER_ALL); - mDisplayManager.registerDisplayListener(mDisplayListener, mHandler, - DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS); + mDisplayTracker.addBrightnessChangeCallback(mBrightnessListener, + new HandlerExecutor(mHandler)); } public void stopObserving() { final ContentResolver cr = mContext.getContentResolver(); cr.unregisterContentObserver(this); - mDisplayManager.unregisterDisplayListener(mDisplayListener); + mDisplayTracker.removeCallback(mBrightnessListener); } } @@ -292,6 +288,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig Context context, ToggleSlider control, UserTracker userTracker, + DisplayTracker displayTracker, @Main Executor mainExecutor, @Background Handler bgHandler) { mContext = context; @@ -300,6 +297,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig mMainExecutor = mainExecutor; mBackgroundHandler = bgHandler; mUserTracker = userTracker; + mDisplayTracker = displayTracker; mBrightnessObserver = new BrightnessObserver(mHandler); mDisplayId = mContext.getDisplayId(); @@ -450,6 +448,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig public static class Factory { private final Context mContext; private final UserTracker mUserTracker; + private final DisplayTracker mDisplayTracker; private final Executor mMainExecutor; private final Handler mBackgroundHandler; @@ -457,10 +456,12 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig public Factory( Context context, UserTracker userTracker, + DisplayTracker displayTracker, @Main Executor mainExecutor, @Background Handler bgHandler) { mContext = context; mUserTracker = userTracker; + mDisplayTracker = displayTracker; mMainExecutor = mainExecutor; mBackgroundHandler = bgHandler; } @@ -471,6 +472,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig mContext, toggleSlider, mUserTracker, + mDisplayTracker, mMainExecutor, mBackgroundHandler); } diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java index e208be957510..8879501fa03d 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java @@ -36,6 +36,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import java.util.List; @@ -49,16 +50,19 @@ public class BrightnessDialog extends Activity { private BrightnessController mBrightnessController; private final BrightnessSliderController.Factory mToggleSliderFactory; private final UserTracker mUserTracker; + private final DisplayTracker mDisplayTracker; private final Executor mMainExecutor; private final Handler mBackgroundHandler; @Inject public BrightnessDialog( UserTracker userTracker, + DisplayTracker displayTracker, BrightnessSliderController.Factory factory, @Main Executor mainExecutor, @Background Handler bgHandler) { mUserTracker = userTracker; + mDisplayTracker = displayTracker; mToggleSliderFactory = factory; mMainExecutor = mainExecutor; mBackgroundHandler = bgHandler; @@ -106,7 +110,7 @@ public class BrightnessDialog extends Activity { frame.addView(controller.getRootView(), MATCH_PARENT, WRAP_CONTENT); mBrightnessController = new BrightnessController( - this, controller, mUserTracker, mMainExecutor, mBackgroundHandler); + this, controller, mUserTracker, mDisplayTracker, mMainExecutor, mBackgroundHandler); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/settings/dagger/MultiUserUtilsModule.java b/packages/SystemUI/src/com/android/systemui/settings/dagger/MultiUserUtilsModule.java index 809fa2976911..e9a1dd7e6ecb 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/dagger/MultiUserUtilsModule.java +++ b/packages/SystemUI/src/com/android/systemui/settings/dagger/MultiUserUtilsModule.java @@ -19,6 +19,7 @@ package com.android.systemui.settings.dagger; import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; +import android.hardware.display.DisplayManager; import android.os.Handler; import android.os.UserManager; @@ -26,6 +27,8 @@ import com.android.systemui.CoreStartable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dump.DumpManager; +import com.android.systemui.settings.DisplayTracker; +import com.android.systemui.settings.DisplayTrackerImpl; import com.android.systemui.settings.UserContentResolverProvider; import com.android.systemui.settings.UserContextProvider; import com.android.systemui.settings.UserFileManager; @@ -69,6 +72,15 @@ public abstract class MultiUserUtilsModule { return tracker; } + @SysUISingleton + @Provides + static DisplayTracker provideDisplayTracker( + DisplayManager displayManager, + @Background Handler handler + ) { + return new DisplayTrackerImpl(displayManager, handler); + } + @Binds @IntoMap @ClassKey(UserFileManagerImpl.class) diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index cce3c64939f1..296c6319fc22 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -142,6 +142,7 @@ import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteracto import com.android.systemui.keyguard.domain.interactor.KeyguardBottomAreaInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor; +import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; import com.android.systemui.keyguard.shared.model.TransitionState; import com.android.systemui.keyguard.shared.model.TransitionStep; import com.android.systemui.keyguard.ui.binder.KeyguardLongPressViewBinder; @@ -207,7 +208,6 @@ import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.HeadsUpTouchHelper; import com.android.systemui.statusbar.phone.KeyguardBottomAreaView; import com.android.systemui.statusbar.phone.KeyguardBottomAreaViewController; -import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.KeyguardClockPositionAlgorithm; import com.android.systemui.statusbar.phone.KeyguardStatusBarView; @@ -3151,17 +3151,11 @@ public final class NotificationPanelViewController implements Dumpable { } // The padding on this area is large enough that we can use a cheaper clipping strategy mKeyguardStatusViewController.setClipBounds(clipStatusView ? mLastQsClipBounds : null); - if (!qsVisible && mSplitShadeEnabled) { - // On the lockscreen when qs isn't visible, we don't want the bounds of the shade to - // be visible, otherwise you can see the bounds once swiping up to see bouncer - mScrimController.setNotificationsBounds(0, 0, 0, 0); - } else { - // Increase the height of the notifications scrim when not in split shade - // (e.g. portrait tablet) so the rounded corners are not visible at the bottom, - // in this case they are rendered off-screen - final int notificationsScrimBottom = mSplitShadeEnabled ? bottom : bottom + radius; - mScrimController.setNotificationsBounds(left, top, right, notificationsScrimBottom); - } + // Increase the height of the notifications scrim when not in split shade + // (e.g. portrait tablet) so the rounded corners are not visible at the bottom, + // in this case they are rendered off-screen + final int notificationsScrimBottom = mSplitShadeEnabled ? bottom : bottom + radius; + mScrimController.setNotificationsBounds(left, top, right, notificationsScrimBottom); if (mSplitShadeEnabled) { mKeyguardStatusBarViewController.setNoTopClipping(); @@ -3222,6 +3216,12 @@ public final class NotificationPanelViewController implements Dumpable { private int calculateQsBottomPosition(float qsExpansionFraction) { if (mTransitioningToFullShadeProgress > 0.0f) { return mTransitionToFullShadeQSPosition; + } else if (mSplitShadeEnabled) { + // in split shade - outside lockscreen transition handled above - we simply jump between + // two qs expansion values - either shade is closed and qs expansion is 0 or shade is + // open and qs expansion is 1 + int qsBottomTarget = mQs.getDesiredHeight() + mLargeScreenShadeHeaderHeight; + return qsExpansionFraction > 0 ? qsBottomTarget : 0; } else { int qsBottomYFrom = (int) getHeaderTranslation() + mQs.getQsMinExpansionHeight(); int expandedTopMargin = mUseLargeScreenShadeHeader ? mLargeScreenShadeHeaderHeight : 0; @@ -3786,7 +3786,8 @@ public final class NotificationPanelViewController implements Dumpable { // change due to "unlock hint animation." In this case, fading out the bottom area // would also hide the message that says "swipe to unlock," we don't want to do that. float expansionAlpha = MathUtils.map( - isUnlockHintRunning() ? 0 : KeyguardBouncer.ALPHA_EXPANSION_THRESHOLD, 1f, 0f, 1f, + isUnlockHintRunning() ? 0 : KeyguardBouncerConstants.ALPHA_EXPANSION_THRESHOLD, 1f, + 0f, 1f, getExpandedFraction()); float alpha = Math.min(expansionAlpha, 1 - computeQsExpansionFraction()); alpha *= mBottomAreaShadeAlpha; @@ -4957,8 +4958,12 @@ public final class NotificationPanelViewController implements Dumpable { beginJankMonitoring(); } mInitialOffsetOnTouch = expandedHeight; - mInitialExpandY = newY; - mInitialExpandX = newX; + if (!mTracking || isFullyCollapsed()) { + mInitialExpandY = newY; + mInitialExpandX = newX; + } else { + mShadeLog.d("not setting mInitialExpandY in startExpandMotion"); + } mInitialTouchFromKeyguard = mKeyguardStateController.isShowing(); if (startTracking) { mTouchSlopExceeded = true; @@ -6142,8 +6147,12 @@ public final class NotificationPanelViewController implements Dumpable { + " false"); return true; } - mInitialExpandY = y; - mInitialExpandX = x; + if (!mTracking || isFullyCollapsed()) { + mInitialExpandY = y; + mInitialExpandX = x; + } else { + mShadeLog.d("not setting mInitialExpandY in onInterceptTouch"); + } mTouchStartedInEmptyArea = !isInContentBounds(x, y); mTouchSlopExceeded = mTouchSlopExceededBeforeDown; mMotionAborted = false; @@ -6332,7 +6341,8 @@ public final class NotificationPanelViewController implements Dumpable { final float x = event.getX(pointerIndex); final float y = event.getY(pointerIndex); - if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { + if (event.getActionMasked() == MotionEvent.ACTION_DOWN + || event.getActionMasked() == MotionEvent.ACTION_MOVE) { mGestureWaitForTouchSlop = shouldGestureWaitForTouchSlop(); mIgnoreXTouchSlop = true; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index ab2e692915ad..156e4fd1889f 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -563,7 +563,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW mCurrentState.keyguardOccluded, mCurrentState.bouncerShowing, mCurrentState.dozing, - mCurrentState.panelExpanded); + mCurrentState.panelExpanded, + mCurrentState.dreaming); } } @@ -778,6 +779,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } @Override + public void setDreaming(boolean dreaming) { + mCurrentState.dreaming = dreaming; + apply(mCurrentState); + } + + @Override public void setForcePluginOpen(boolean forceOpen, Object token) { if (forceOpen) { mCurrentState.forceOpenTokens.add(token); @@ -904,5 +911,10 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW public void onDozingChanged(boolean isDozing) { setDozing(isDozing); } + + @Override + public void onDreamingChanged(boolean isDreaming) { + setDreaming(isDreaming); + } }; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt index 736404aa548a..fed9b8469c4b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt @@ -23,8 +23,8 @@ import com.android.systemui.shade.NotificationShadeWindowState.Buffer import com.android.systemui.statusbar.StatusBarState /** - * Represents state of shade window, used by [NotificationShadeWindowControllerImpl]. - * Contains nested class [Buffer] for pretty table logging in bug reports. + * Represents state of shade window, used by [NotificationShadeWindowControllerImpl]. Contains + * nested class [Buffer] for pretty table logging in bug reports. */ class NotificationShadeWindowState( @JvmField var keyguardShowing: Boolean = false, @@ -55,6 +55,7 @@ class NotificationShadeWindowState( @JvmField var remoteInputActive: Boolean = false, @JvmField var forcePluginOpen: Boolean = false, @JvmField var dozing: Boolean = false, + @JvmField var dreaming: Boolean = false, @JvmField var scrimsVisibility: Int = 0, @JvmField var backgroundBlurRadius: Int = 0, ) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java index 7ed6e3e55623..60fa865b83bc 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java @@ -160,12 +160,10 @@ public class NotificationShadeWindowViewController { // This view is not part of the newly inflated expanded status bar. mBrightnessMirror = mView.findViewById(R.id.brightness_mirror_container); - if (featureFlags.isEnabled(Flags.MODERN_BOUNCER)) { - KeyguardBouncerViewBinder.bind( - mView.findViewById(R.id.keyguard_bouncer_container), - keyguardBouncerViewModel, - keyguardBouncerComponentFactory); - } + KeyguardBouncerViewBinder.bind( + mView.findViewById(R.id.keyguard_bouncer_container), + keyguardBouncerViewModel, + keyguardBouncerComponentFactory); if (featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION)) { collectFlow(mView, keyguardTransitionInteractor.getLockscreenToDreamingTransition(), diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt index 85b259e54f37..de02115184b6 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt @@ -31,6 +31,7 @@ import com.android.systemui.R import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags +import com.android.systemui.fragments.FragmentService import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.plugins.qs.QS import com.android.systemui.plugins.qs.QSContainerController @@ -54,6 +55,7 @@ class NotificationsQSContainerController @Inject constructor( private val largeScreenShadeHeaderController: LargeScreenShadeHeaderController, private val shadeExpansionStateManager: ShadeExpansionStateManager, private val featureFlags: FeatureFlags, + private val fragmentService: FragmentService, @Main private val delayableExecutor: DelayableExecutor ) : ViewController<NotificationsQuickSettingsContainer>(view), QSContainerController { @@ -128,6 +130,7 @@ class NotificationsQSContainerController @Inject constructor( mView.setInsetsChangedListener(delayedInsetSetter) mView.setQSFragmentAttachedListener { qs: QS -> qs.setContainerController(this) } mView.setConfigurationChangedListener { updateResources() } + fragmentService.getFragmentHostManager(mView).addTagListener(QS.TAG, mView) } override fun onViewDetached() { @@ -136,6 +139,7 @@ class NotificationsQSContainerController @Inject constructor( mView.removeOnInsetsChangedListener() mView.removeQSFragmentAttachedListener() mView.setConfigurationChangedListener(null) + fragmentService.getFragmentHostManager(mView).removeTagListener(QS.TAG, mView) } fun updateResources() { diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java index 02316b7965ca..f73dde632051 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java @@ -29,7 +29,6 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; import com.android.systemui.R; -import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentHostManager.FragmentListener; import com.android.systemui.plugins.qs.QS; import com.android.systemui.statusbar.notification.AboveShelfObserver; @@ -133,18 +132,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout } @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - FragmentHostManager.get(this).addTagListener(QS.TAG, this); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - FragmentHostManager.get(this).removeTagListener(QS.TAG, this); - } - - @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { mInsetsChangedListener.accept(insets); return insets; diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt index b02a45a913db..641131e4dcc1 100644 --- a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt @@ -18,7 +18,6 @@ package com.android.systemui.smartspace.dagger import com.android.systemui.plugins.BcSmartspaceDataPlugin import com.android.systemui.smartspace.SmartspacePrecondition import com.android.systemui.smartspace.SmartspaceTargetFilter -import com.android.systemui.smartspace.filters.LockscreenAndDreamTargetFilter import com.android.systemui.smartspace.preconditions.LockscreenPrecondition import dagger.Binds import dagger.BindsOptionalOf @@ -35,11 +34,6 @@ abstract class SmartspaceModule { const val DREAM_SMARTSPACE_DATA_PLUGIN = "dreams_smartspace_data_plugin" /** - * The lockscreen smartspace target filter. - */ - const val LOCKSCREEN_SMARTSPACE_TARGET_FILTER = "lockscreen_smartspace_target_filter" - - /** * The dream smartspace target filter. */ const val DREAM_SMARTSPACE_TARGET_FILTER = "dream_smartspace_target_filter" @@ -48,6 +42,16 @@ abstract class SmartspaceModule { * The precondition for dream smartspace */ const val DREAM_SMARTSPACE_PRECONDITION = "dream_smartspace_precondition" + + /** + * The BcSmartspaceDataPlugin for the standalone date (+alarm+dnd). + */ + const val DATE_SMARTSPACE_DATA_PLUGIN = "date_smartspace_data_plugin" + + /** + * The BcSmartspaceDataPlugin for the standalone weather. + */ + const val WEATHER_SMARTSPACE_DATA_PLUGIN = "weather_smartspace_data_plugin" } @BindsOptionalOf @@ -59,12 +63,6 @@ abstract class SmartspaceModule { abstract fun optionalDreamsBcSmartspaceDataPlugin(): BcSmartspaceDataPlugin? @Binds - @Named(LOCKSCREEN_SMARTSPACE_TARGET_FILTER) - abstract fun provideLockscreenSmartspaceTargetFilter( - filter: LockscreenAndDreamTargetFilter? - ): SmartspaceTargetFilter? - - @Binds @Named(DREAM_SMARTSPACE_PRECONDITION) abstract fun bindSmartspacePrecondition( lockscreenPrecondition: LockscreenPrecondition? diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedButton.java index 87c12c25a0a5..6577cf696b61 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedButton.java @@ -20,10 +20,21 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.Button; +import com.android.systemui.animation.LaunchableView; +import com.android.systemui.animation.LaunchableViewDelegate; + +import kotlin.Unit; + /** * A Button which doesn't have overlapping drawing commands */ -public class AlphaOptimizedButton extends Button { +public class AlphaOptimizedButton extends Button implements LaunchableView { + private LaunchableViewDelegate mDelegate = new LaunchableViewDelegate(this, + (visibility) -> { + super.setVisibility(visibility); + return Unit.INSTANCE; + }); + public AlphaOptimizedButton(Context context) { super(context); } @@ -45,4 +56,14 @@ public class AlphaOptimizedButton extends Button { public boolean hasOverlappingRendering() { return false; } + + @Override + public void setShouldBlockVisibilityChanges(boolean block) { + mDelegate.setShouldBlockVisibilityChanges(block); + } + + @Override + public void setVisibility(int visibility) { + mDelegate.setVisibility(visibility); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 17583793701c..f2e729d7967c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -20,7 +20,6 @@ import static android.app.StatusBarManager.DISABLE2_NONE; import static android.app.StatusBarManager.DISABLE_NONE; import static android.inputmethodservice.InputMethodService.BACK_DISPOSITION_DEFAULT; import static android.inputmethodservice.InputMethodService.IME_INVISIBLE; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; import android.annotation.Nullable; @@ -38,7 +37,6 @@ import android.hardware.biometrics.BiometricManager.BiometricMultiSensorMode; import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; -import android.hardware.display.DisplayManager; import android.hardware.fingerprint.IUdfpsHbmListener; import android.inputmethodservice.InputMethodService.BackDispositionMode; import android.media.INearbyMediaDevicesProvider; @@ -46,6 +44,7 @@ import android.media.MediaRoute2Info; import android.os.Binder; import android.os.Bundle; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.IBinder; import android.os.Looper; import android.os.Message; @@ -60,6 +59,7 @@ import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import com.android.internal.os.SomeArgs; import com.android.internal.statusbar.IAddTileResultCallback; @@ -70,6 +70,7 @@ import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.GcUtils; import com.android.internal.view.AppearanceRegion; import com.android.systemui.dump.DumpHandler; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.CommandQueue.Callbacks; import com.android.systemui.statusbar.commandline.CommandRegistry; import com.android.systemui.statusbar.policy.CallbackController; @@ -89,8 +90,7 @@ import java.util.ArrayList; * are coalesced, note that they are all idempotent. */ public class CommandQueue extends IStatusBar.Stub implements - CallbackController<Callbacks>, - DisplayManager.DisplayListener { + CallbackController<Callbacks> { private static final String TAG = CommandQueue.class.getSimpleName(); private static final int INDEX_MASK = 0xffff; @@ -192,6 +192,7 @@ public class CommandQueue extends IStatusBar.Stub implements private ProtoTracer mProtoTracer; private final @Nullable CommandRegistry mRegistry; private final @Nullable DumpHandler mDumpHandler; + private final @Nullable DisplayTracker mDisplayTracker; /** * These methods are called back on the main thread. @@ -351,7 +352,7 @@ public class CommandQueue extends IStatusBar.Stub implements } /** - * @see DisplayManager.DisplayListener#onDisplayRemoved(int) + * @see DisplayTracker.Callback#onDisplayRemoved(int) */ default void onDisplayRemoved(int displayId) { } @@ -500,12 +501,14 @@ public class CommandQueue extends IStatusBar.Stub implements default void showMediaOutputSwitcher(String packageName) {} } - public CommandQueue(Context context) { - this(context, null, null, null); + @VisibleForTesting + public CommandQueue(Context context, DisplayTracker displayTracker) { + this(context, displayTracker, null, null, null); } public CommandQueue( Context context, + DisplayTracker displayTracker, ProtoTracer protoTracer, CommandRegistry registry, DumpHandler dumpHandler @@ -513,33 +516,28 @@ public class CommandQueue extends IStatusBar.Stub implements mProtoTracer = protoTracer; mRegistry = registry; mDumpHandler = dumpHandler; - context.getSystemService(DisplayManager.class).registerDisplayListener(this, mHandler); + mDisplayTracker = displayTracker; + mDisplayTracker.addDisplayChangeCallback(new DisplayTracker.Callback() { + @Override + public void onDisplayRemoved(int displayId) { + synchronized (mLock) { + mDisplayDisabled.remove(displayId); + } + // This callback is registered with {@link #mHandler} that already posts to run + // on main thread, so it is safe to dispatch directly. + for (int i = mCallbacks.size() - 1; i >= 0; i--) { + mCallbacks.get(i).onDisplayRemoved(displayId); + } + } + }, new HandlerExecutor(mHandler)); // We always have default display. - setDisabled(DEFAULT_DISPLAY, DISABLE_NONE, DISABLE2_NONE); + setDisabled(mDisplayTracker.getDefaultDisplayId(), DISABLE_NONE, DISABLE2_NONE); } - @Override - public void onDisplayAdded(int displayId) { } - - @Override - public void onDisplayRemoved(int displayId) { - synchronized (mLock) { - mDisplayDisabled.remove(displayId); - } - // This callback is registered with {@link #mHandler} that already posts to run on main - // thread, so it is safe to dispatch directly. - for (int i = mCallbacks.size() - 1; i >= 0; i--) { - mCallbacks.get(i).onDisplayRemoved(displayId); - } - } - - @Override - public void onDisplayChanged(int displayId) { } - // TODO(b/118592525): add multi-display support if needed. public boolean panelsEnabled() { - final int disabled1 = getDisabled1(DEFAULT_DISPLAY); - final int disabled2 = getDisabled2(DEFAULT_DISPLAY); + final int disabled1 = getDisabled1(mDisplayTracker.getDefaultDisplayId()); + final int disabled2 = getDisabled2(mDisplayTracker.getDefaultDisplayId()); return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0 && (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java index 63179dac7b8c..5adb58bca886 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CrossFadeHelper.java @@ -77,6 +77,12 @@ public class CrossFadeHelper { */ public static void fadeOut(View view, float fadeOutAmount, boolean remap) { view.animate().cancel(); + + // Don't fade out if already not visible. + if (view.getAlpha() == 0.0f) { + return; + } + if (fadeOutAmount == 1.0f && view.getVisibility() != View.GONE) { view.setVisibility(View.INVISIBLE); } else if (view.getVisibility() == View.INVISIBLE) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 006b5528e7e9..648185503ef6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -43,6 +43,7 @@ import static com.android.systemui.keyguard.ScreenLifecycle.SCREEN_ON; import static com.android.systemui.plugins.FalsingManager.LOW_PENALTY; import static com.android.systemui.plugins.log.LogLevel.ERROR; +import android.app.AlarmManager; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.Context; @@ -98,6 +99,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.KeyguardIndicationTextView; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.util.AlarmTimeout; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.wakelock.SettableWakeLock; import com.android.systemui.util.wakelock.WakeLock; @@ -127,10 +129,8 @@ public class KeyguardIndicationController { private static final String TAG = "KeyguardIndication"; private static final boolean DEBUG_CHARGING_SPEED = false; - private static final int MSG_HIDE_TRANSIENT = 1; - private static final int MSG_SHOW_ACTION_TO_UNLOCK = 2; - private static final int MSG_HIDE_BIOMETRIC_MESSAGE = 3; - private static final int MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON = 4; + private static final int MSG_SHOW_ACTION_TO_UNLOCK = 1; + private static final int MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON = 2; private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300; public static final long DEFAULT_HIDE_DELAY_MS = 3500 + KeyguardIndicationTextView.Y_IN_DURATION; @@ -212,6 +212,11 @@ public class KeyguardIndicationController { }; private boolean mFaceLockedOutThisAuthSession; + // Use AlarmTimeouts to guarantee that the events are handled even if scheduled and + // triggered while the device is asleep + private final AlarmTimeout mHideTransientMessageHandler; + private final AlarmTimeout mHideBiometricMessageHandler; + /** * Creates a new KeyguardIndicationController and registers callbacks. */ @@ -238,7 +243,9 @@ public class KeyguardIndicationController { AccessibilityManager accessibilityManager, FaceHelpMessageDeferral faceHelpMessageDeferral, KeyguardLogger keyguardLogger, - AlternateBouncerInteractor alternateBouncerInteractor) { + AlternateBouncerInteractor alternateBouncerInteractor, + AlarmManager alarmManager + ) { mContext = context; mBroadcastDispatcher = broadcastDispatcher; mDevicePolicyManager = devicePolicyManager; @@ -273,17 +280,26 @@ public class KeyguardIndicationController { mHandler = new Handler(mainLooper) { @Override public void handleMessage(Message msg) { - if (msg.what == MSG_HIDE_TRANSIENT) { - hideTransientIndication(); - } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) { + if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) { showActionToUnlock(); - } else if (msg.what == MSG_HIDE_BIOMETRIC_MESSAGE) { - hideBiometricMessage(); } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) { mBiometricErrorMessageToShowOnScreenOn = null; } } }; + + mHideTransientMessageHandler = new AlarmTimeout( + alarmManager, + this::hideTransientIndication, + TAG, + mHandler + ); + mHideBiometricMessageHandler = new AlarmTimeout( + alarmManager, + this::hideBiometricMessage, + TAG, + mHandler + ); } /** Call this after construction to finish setting up the instance. */ @@ -335,6 +351,8 @@ public class KeyguardIndicationController { */ public void destroy() { mHandler.removeCallbacksAndMessages(null); + mHideBiometricMessageHandler.cancel(); + mHideTransientMessageHandler.cancel(); mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); } @@ -679,7 +697,7 @@ public class KeyguardIndicationController { if (visible) { // If this is called after an error message was already shown, we should not clear it. // Otherwise the error message won't be shown - if (!mHandler.hasMessages(MSG_HIDE_TRANSIENT)) { + if (!mHideTransientMessageHandler.isScheduled()) { hideTransientIndication(); } updateDeviceEntryIndication(false); @@ -727,16 +745,14 @@ public class KeyguardIndicationController { * Hides transient indication in {@param delayMs}. */ public void hideTransientIndicationDelayed(long delayMs) { - mHandler.sendMessageDelayed( - mHandler.obtainMessage(MSG_HIDE_TRANSIENT), delayMs); + mHideTransientMessageHandler.schedule(delayMs, AlarmTimeout.MODE_RESCHEDULE_IF_SCHEDULED); } /** * Hides biometric indication in {@param delayMs}. */ public void hideBiometricMessageDelayed(long delayMs) { - mHandler.sendMessageDelayed( - mHandler.obtainMessage(MSG_HIDE_BIOMETRIC_MESSAGE), delayMs); + mHideBiometricMessageHandler.schedule(delayMs, AlarmTimeout.MODE_RESCHEDULE_IF_SCHEDULED); } /** @@ -751,7 +767,6 @@ public class KeyguardIndicationController { */ private void showTransientIndication(CharSequence transientIndication) { mTransientIndication = transientIndication; - mHandler.removeMessages(MSG_HIDE_TRANSIENT); hideTransientIndicationDelayed(DEFAULT_HIDE_DELAY_MS); updateTransient(); @@ -777,7 +792,6 @@ public class KeyguardIndicationController { mBiometricMessageFollowUp = biometricMessageFollowUp; mHandler.removeMessages(MSG_SHOW_ACTION_TO_UNLOCK); - mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE); hideBiometricMessageDelayed( mBiometricMessageFollowUp != null ? IMPORTANT_MSG_MIN_DURATION * 2 @@ -791,7 +805,7 @@ public class KeyguardIndicationController { if (mBiometricMessage != null || mBiometricMessageFollowUp != null) { mBiometricMessage = null; mBiometricMessageFollowUp = null; - mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE); + mHideBiometricMessageHandler.cancel(); updateBiometricMessage(); } } @@ -802,7 +816,7 @@ public class KeyguardIndicationController { public void hideTransientIndication() { if (mTransientIndication != null) { mTransientIndication = null; - mHandler.removeMessages(MSG_HIDE_TRANSIENT); + mHideTransientMessageHandler.cancel(); updateTransient(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java index 0b1807dd2d70..2ca0b0054bf7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java @@ -143,6 +143,9 @@ public interface NotificationShadeWindowController extends RemoteInputController /** Sets the state of whether sysui is dozing or not. */ default void setDozing(boolean dozing) {} + /** Sets the state of whether sysui is dreaming or not. */ + default void setDreaming(boolean dreaming) {} + /** Sets the state of whether plugin open is forced or not. */ default void setForcePluginOpen(boolean forcePluginOpen, Object token) {} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java index 186e6dc92f93..784e2d153be1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java @@ -129,6 +129,11 @@ public class StatusBarStateControllerImpl implements private boolean mIsDozing; /** + * If the device is currently dreaming or not. + */ + private boolean mIsDreaming; + + /** * If the status bar is currently expanded or not. */ private boolean mIsExpanded; @@ -294,6 +299,29 @@ public class StatusBarStateControllerImpl implements } @Override + public boolean setIsDreaming(boolean isDreaming) { + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, "setIsDreaming:" + isDreaming); + } + if (mIsDreaming == isDreaming) { + return false; + } + + mIsDreaming = isDreaming; + + synchronized (mListeners) { + String tag = getClass().getSimpleName() + "#setIsDreaming"; + DejankUtils.startDetectingBlockingIpcs(tag); + for (RankedListener rl : new ArrayList<>(mListeners)) { + rl.mListener.onDreamingChanged(isDreaming); + } + DejankUtils.stopDetectingBlockingIpcs(tag); + } + + return true; + } + + @Override public void setAndInstrumentDozeAmount(View view, float dozeAmount, boolean animated) { if (mDarkAnimator != null && mDarkAnimator.isRunning()) { if (animated && mDozeAmountTarget == dozeAmount) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SysuiStatusBarStateController.java b/packages/SystemUI/src/com/android/systemui/statusbar/SysuiStatusBarStateController.java index e0cf812a11e3..088c56850d25 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SysuiStatusBarStateController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SysuiStatusBarStateController.java @@ -99,6 +99,13 @@ public interface SysuiStatusBarStateController extends StatusBarStateController boolean setIsDozing(boolean isDozing); /** + * Update the dreaming state from {@link CentralSurfaces}'s perspective + * @param isDreaming whether we are dreaming + * @return {@code true} if the state changed, else {@code false} + */ + boolean setIsDreaming(boolean isDreaming); + + /** * Changes the current doze amount, also starts the * {@link com.android.internal.jank.InteractionJankMonitor InteractionJankMonitor} as possible. * diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java index 098c6175a93e..d7568a9bd89c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -39,6 +39,7 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.carrier.QSCarrierGroupController; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.ActionClickLogger; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.MediaArtworkProcessor; @@ -184,11 +185,12 @@ public interface CentralSurfacesDependenciesModule { @SysUISingleton static CommandQueue provideCommandQueue( Context context, + DisplayTracker displayTracker, ProtoTracer protoTracer, CommandRegistry registry, DumpHandler dumpHandler ) { - return new CommandQueue(context, protoTracer, registry, dumpHandler); + return new CommandQueue(context, displayTracker, protoTracer, registry, dumpHandler); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt index 3a4731a5a6aa..92a8356b7f07 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt @@ -20,9 +20,9 @@ package com.android.systemui.statusbar.gesture import android.annotation.CallSuper import android.os.Looper import android.view.Choreographer -import android.view.Display import android.view.InputEvent import android.view.MotionEvent +import com.android.systemui.settings.DisplayTracker import com.android.systemui.shared.system.InputChannelCompat import com.android.systemui.shared.system.InputMonitorCompat @@ -38,7 +38,8 @@ import com.android.systemui.shared.system.InputMonitorCompat * gesture is detected, they should call [onGestureDetected] (which will notify the callbacks). */ abstract class GenericGestureDetector( - private val tag: String + private val tag: String, + private val displayTracker: DisplayTracker ) { /** * Active callbacks, each associated with a tag. Gestures will only be monitored if @@ -86,7 +87,7 @@ abstract class GenericGestureDetector( internal open fun startGestureListening() { stopGestureListening() - inputMonitor = InputMonitorCompat(tag, Display.DEFAULT_DISPLAY).also { + inputMonitor = InputMonitorCompat(tag, displayTracker.defaultDisplayId).also { inputReceiver = it.getInputReceiver( Looper.getMainLooper(), Choreographer.getInstance(), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureHandler.kt index 5ab3d7ce9bec..693ae6617feb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureHandler.kt @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.gesture import android.content.Context import android.view.MotionEvent import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.window.StatusBarWindowController import javax.inject.Inject @@ -28,9 +29,10 @@ class SwipeStatusBarAwayGestureHandler @Inject constructor( context: Context, + displayTracker: DisplayTracker, logger: SwipeUpGestureLogger, private val statusBarWindowController: StatusBarWindowController, -) : SwipeUpGestureHandler(context, logger, loggerTag = LOGGER_TAG) { +) : SwipeUpGestureHandler(context, displayTracker, logger, loggerTag = LOGGER_TAG) { override fun startOfGestureIsWithinBounds(ev: MotionEvent): Boolean { // Gesture starts just below the status bar return ev.y >= statusBarWindowController.statusBarHeight && diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt index 5ecc35ca4576..452762d185a0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt @@ -24,6 +24,7 @@ import android.view.MotionEvent.ACTION_DOWN import android.view.MotionEvent.ACTION_MOVE import android.view.MotionEvent.ACTION_UP import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.settings.DisplayTracker /** * A class to detect a generic "swipe up" gesture. To be notified when the swipe up gesture is @@ -32,9 +33,10 @@ import com.android.systemui.dagger.SysUISingleton @SysUISingleton abstract class SwipeUpGestureHandler( context: Context, + displayTracker: DisplayTracker, private val logger: SwipeUpGestureLogger, - private val loggerTag: String, -) : GenericGestureDetector(SwipeUpGestureHandler::class.simpleName!!) { + private val loggerTag: String +) : GenericGestureDetector(SwipeUpGestureHandler::class.simpleName!!, displayTracker) { private var startY: Float = 0f private var startTime: Long = 0L diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt index 7ffb07aa77d0..a901d5979576 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt @@ -21,6 +21,7 @@ import android.view.GestureDetector import android.view.InputEvent import android.view.MotionEvent import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.settings.DisplayTracker import javax.inject.Inject /** @@ -29,8 +30,9 @@ import javax.inject.Inject */ @SysUISingleton class TapGestureDetector @Inject constructor( - private val context: Context -) : GenericGestureDetector(TapGestureDetector::class.simpleName!!) { + private val context: Context, + displayTracker: DisplayTracker +) : GenericGestureDetector(TapGestureDetector::class.simpleName!!, displayTracker) { private val gestureListener = object : GestureDetector.SimpleOnGestureListener() { override fun onSingleTapUp(e: MotionEvent): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 665b1bc15adc..6a9761dd673b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt @@ -52,6 +52,8 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.settings.UserTracker import com.android.systemui.shared.regionsampling.RegionSampler import com.android.systemui.shared.regionsampling.UpdateColorCallback +import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DATE_SMARTSPACE_DATA_PLUGIN +import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.WEATHER_SMARTSPACE_DATA_PLUGIN import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.DeviceProvisionedController @@ -60,6 +62,7 @@ import com.android.systemui.util.settings.SecureSettings import java.util.Optional import java.util.concurrent.Executor import javax.inject.Inject +import javax.inject.Named /** Controller for managing the smartspace view on the lockscreen */ @SysUISingleton @@ -82,6 +85,10 @@ constructor( @Main private val uiExecutor: Executor, @Background private val bgExecutor: Executor, @Main private val handler: Handler, + @Named(DATE_SMARTSPACE_DATA_PLUGIN) + optionalDatePlugin: Optional<BcSmartspaceDataPlugin>, + @Named(WEATHER_SMARTSPACE_DATA_PLUGIN) + optionalWeatherPlugin: Optional<BcSmartspaceDataPlugin>, optionalPlugin: Optional<BcSmartspaceDataPlugin>, optionalConfigPlugin: Optional<BcSmartspaceConfigPlugin>, ) { @@ -90,6 +97,8 @@ constructor( } private var session: SmartspaceSession? = null + private val datePlugin: BcSmartspaceDataPlugin? = optionalDatePlugin.orElse(null) + private val weatherPlugin: BcSmartspaceDataPlugin? = optionalWeatherPlugin.orElse(null) private val plugin: BcSmartspaceDataPlugin? = optionalPlugin.orElse(null) private val configPlugin: BcSmartspaceConfigPlugin? = optionalConfigPlugin.orElse(null) @@ -131,6 +140,10 @@ constructor( private val sessionListener = SmartspaceSession.OnTargetsAvailableListener { targets -> execution.assertIsMainThread() + + // The weather data plugin takes unfiltered targets and performs the filtering internally. + weatherPlugin?.onTargetsAvailable(targets) + val filteredTargets = targets.filter(::filterSmartspaceTarget) plugin?.onTargetsAvailable(filteredTargets) if (!isContentUpdatedOnce) { @@ -209,32 +222,77 @@ constructor( return plugin != null } + fun isDateWeatherDecoupled(): Boolean { + execution.assertIsMainThread() + + return featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED) && + datePlugin != null && weatherPlugin != null + } + private fun updateBypassEnabled() { val bypassEnabled = bypassController.bypassEnabled smartspaceViews.forEach { it.setKeyguardBypassEnabled(bypassEnabled) } } /** - * Constructs the smartspace view and connects it to the smartspace service. + * Constructs the date view and connects it to the smartspace service. */ - fun buildAndConnectView(parent: ViewGroup): View? { + fun buildAndConnectDateView(parent: ViewGroup): View? { execution.assertIsMainThread() if (!isEnabled()) { throw RuntimeException("Cannot build view when not enabled") } + if (!isDateWeatherDecoupled()) { + throw RuntimeException("Cannot build date view when not decoupled") + } - val view = buildView(parent) + val view = buildView(parent, datePlugin) connectSession() return view } - fun requestSmartspaceUpdate() { - session?.requestSmartspaceUpdate() + /** + * Constructs the weather view and connects it to the smartspace service. + */ + fun buildAndConnectWeatherView(parent: ViewGroup): View? { + execution.assertIsMainThread() + + if (!isEnabled()) { + throw RuntimeException("Cannot build view when not enabled") + } + if (!isDateWeatherDecoupled()) { + throw RuntimeException("Cannot build weather view when not decoupled") + } + + val view = buildView(parent, weatherPlugin) + connectSession() + + return view } - private fun buildView(parent: ViewGroup): View? { + /** + * Constructs the smartspace view and connects it to the smartspace service. + */ + fun buildAndConnectView(parent: ViewGroup): View? { + execution.assertIsMainThread() + + if (!isEnabled()) { + throw RuntimeException("Cannot build view when not enabled") + } + + val view = buildView(parent, plugin, configPlugin) + connectSession() + + return view + } + + private fun buildView( + parent: ViewGroup, + plugin: BcSmartspaceDataPlugin?, + configPlugin: BcSmartspaceConfigPlugin? = null + ): View? { if (plugin == null) { return null } @@ -242,7 +300,7 @@ constructor( val ssView = plugin.getView(parent) ssView.setUiSurface(BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD) ssView.registerDataProvider(plugin) - ssView.registerConfigProvider(configPlugin) + configPlugin?.let { ssView.registerConfigProvider(it) } ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) { @@ -273,7 +331,8 @@ constructor( } private fun connectSession() { - if (plugin == null || session != null || smartspaceViews.isEmpty()) { + if (datePlugin == null && weatherPlugin == null && plugin == null) return + if (session != null || smartspaceViews.isEmpty()) { return } @@ -310,15 +369,22 @@ constructor( statusBarStateController.addCallback(statusBarStateListener) bypassController.registerOnBypassStateChangedListener(bypassStateChangedListener) - plugin.registerSmartspaceEventNotifier { - e -> session?.notifySmartspaceEvent(e) - } + datePlugin?.registerSmartspaceEventNotifier { e -> session?.notifySmartspaceEvent(e) } + weatherPlugin?.registerSmartspaceEventNotifier { e -> session?.notifySmartspaceEvent(e) } + plugin?.registerSmartspaceEventNotifier { e -> session?.notifySmartspaceEvent(e) } updateBypassEnabled() reloadSmartspace() } /** + * Requests the smartspace session for an update. + */ + fun requestSmartspaceUpdate() { + session?.requestSmartspaceUpdate() + } + + /** * Disconnects the smartspace view from the smartspace service and cleans up any resources. */ fun disconnect() { @@ -341,9 +407,15 @@ constructor( bypassController.unregisterOnBypassStateChangedListener(bypassStateChangedListener) session = null + datePlugin?.registerSmartspaceEventNotifier(null) + + weatherPlugin?.registerSmartspaceEventNotifier(null) + weatherPlugin?.onTargetsAvailable(emptyList()) + plugin?.registerSmartspaceEventNotifier(null) plugin?.onTargetsAvailable(emptyList()) - Log.d(TAG, "Ending smartspace session for lockscreen") + + Log.d(TAG, "Ended smartspace session for lockscreen") } fun addListener(listener: SmartspaceTargetListener) { @@ -357,8 +429,11 @@ constructor( } private fun filterSmartspaceTarget(t: SmartspaceTarget): Boolean { + if (isDateWeatherDecoupled()) { + return t.featureType != SmartspaceTarget.FEATURE_WEATHER + } if (!showNotifications) { - return t.getFeatureType() == SmartspaceTarget.FEATURE_WEATHER + return t.featureType == SmartspaceTarget.FEATURE_WEATHER } return when (t.userHandle) { userTracker.userHandle -> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 9275e2b603c3..a6b71dc3e54d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -591,6 +591,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } mShowingPublicInitialized = false; updateNotificationColor(); + updateLongClickable(); if (mMenuRow != null) { mMenuRow.onNotificationUpdated(mEntry.getSbn()); mMenuRow.setAppName(mAppName); @@ -1196,8 +1197,26 @@ public class ExpandableNotificationRow extends ActivatableNotificationView return getShowingLayout().getVisibleWrapper(); } + private boolean isNotificationRowLongClickable() { + if (mLongPressListener == null) { + return false; + } + + if (!areGutsExposed()) { // guts is not opened + return true; + } + + // if it is leave behind, it shouldn't be long clickable. + return !isGutsLeaveBehind(); + } + + private void updateLongClickable() { + setLongClickable(isNotificationRowLongClickable()); + } + public void setLongPressListener(LongPressListener longPressListener) { mLongPressListener = longPressListener; + updateLongClickable(); } public void setDragController(ExpandableNotificationRowDragController dragController) { @@ -2044,11 +2063,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView void onGutsOpened() { resetTranslation(); updateContentAccessibilityImportanceForGuts(false /* isEnabled */); + updateLongClickable(); } void onGutsClosed() { updateContentAccessibilityImportanceForGuts(true /* isEnabled */); mIsSnoozed = false; + updateLongClickable(); } /** @@ -2947,6 +2968,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView return (mGuts != null && mGuts.isExposed()); } + private boolean isGutsLeaveBehind() { + return (mGuts != null && mGuts.isLeavebehind()); + } + @Override public boolean isContentExpandable() { if (mIsSummaryWithChildren && !shouldShowPublic()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java index 37ff11db81e3..efcbb3cd9655 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java @@ -586,7 +586,9 @@ public class NotificationGutsManager implements NotifGutsViewManager { } final ExpandableNotificationRow row = (ExpandableNotificationRow) view; - view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + if (view.isLongClickable()) { + view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + } if (row.areGutsExposed()) { closeAndSaveGuts(false /* removeLeavebehind */, false /* force */, true /* removeControls */, -1 /* x */, -1 /* y */, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index f6a06ea67b4b..85399ca22d96 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1306,8 +1306,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { // Set up the quick settings tile panel final View container = mNotificationShadeWindowView.findViewById(R.id.qs_frame); if (container != null) { - FragmentHostManager fragmentHostManager = FragmentHostManager.get(container); - ExtensionFragmentListener.attachExtensonToFragment(container, QS.TAG, R.id.qs_frame, + FragmentHostManager fragmentHostManager = + mFragmentService.getFragmentHostManager(container); + ExtensionFragmentListener.attachExtensonToFragment( + mFragmentService, + container, + QS.TAG, + R.id.qs_frame, mExtensionController .newExtension(QS.class) .withPlugin(QS.class) @@ -1478,7 +1483,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } protected QS createDefaultQSFragment() { - return FragmentHostManager.get(mNotificationShadeWindowView).create(QSFragment.class); + return mFragmentService + .getFragmentHostManager(mNotificationShadeWindowView) + .create(QSFragment.class); } private void setUpPresenter() { @@ -3772,6 +3779,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { }); } else if (mDozing && !unlocking) { mScrimController.transitionTo(ScrimState.AOD); + // This will cancel the keyguardFadingAway animation if it is running. We need to do + // this as otherwise it can remain pending and leave keyguard in a weird state. + mUnlockScrimCallback.onCancelled(); } else if (mKeyguardStateController.isShowing() && !isOccluded() && !unlocking) { mScrimController.transitionTo(ScrimState.KEYGUARD); } else if (mKeyguardStateController.isShowing() && mKeyguardUpdateMonitor.isDreaming() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java deleted file mode 100644 index d31875935dd3..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ /dev/null @@ -1,708 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.systemui.statusbar.phone; - -import static com.android.keyguard.KeyguardSecurityModel.SecurityMode; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; -import static com.android.systemui.plugins.ActivityStarter.OnDismissAction; - -import android.content.Context; -import android.content.res.ColorStateList; -import android.hardware.biometrics.BiometricSourceType; -import android.os.Handler; -import android.os.Trace; -import android.os.UserHandle; -import android.os.UserManager; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; -import android.view.ViewGroup; -import android.view.WindowInsets; - -import com.android.internal.policy.SystemBarUtils; -import com.android.keyguard.KeyguardHostViewController; -import com.android.keyguard.KeyguardSecurityModel; -import com.android.keyguard.KeyguardSecurityView; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.keyguard.ViewMediatorCallback; -import com.android.keyguard.dagger.KeyguardBouncerComponent; -import com.android.systemui.DejankUtils; -import com.android.systemui.classifier.FalsingCollector; -import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.keyguard.DismissCallbackRegistry; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.KeyguardResetCallback; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; -import com.android.systemui.shared.system.SysUiStatsLog; -import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.util.ListenerSet; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - -/** - * A class which manages the primary (pin/pattern/password) bouncer on the lockscreen. - * @deprecated Use KeyguardBouncerRepository - */ -@Deprecated -public class KeyguardBouncer { - - private static final String TAG = "PrimaryKeyguardBouncer"; - static final long BOUNCER_FACE_DELAY = 1200; - public static final float ALPHA_EXPANSION_THRESHOLD = 0.95f; - protected final Context mContext; - protected final ViewMediatorCallback mCallback; - protected final ViewGroup mContainer; - private final FalsingCollector mFalsingCollector; - private final DismissCallbackRegistry mDismissCallbackRegistry; - private final Handler mHandler; - private final List<PrimaryBouncerExpansionCallback> mExpansionCallbacks = new ArrayList<>(); - private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; - private final KeyguardStateController mKeyguardStateController; - private final KeyguardSecurityModel mKeyguardSecurityModel; - private final KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory; - private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback = - new KeyguardUpdateMonitorCallback() { - @Override - public void onStrongAuthStateChanged(int userId) { - mBouncerPromptReason = mCallback.getBouncerPromptReason(); - } - - @Override - public void onLockedOutStateChanged(BiometricSourceType type) { - if (type == BiometricSourceType.FINGERPRINT) { - mBouncerPromptReason = mCallback.getBouncerPromptReason(); - } - } - - @Override - public void onNonStrongBiometricAllowedChanged(int userId) { - mBouncerPromptReason = mCallback.getBouncerPromptReason(); - } - }; - private final Runnable mRemoveViewRunnable = this::removeView; - private final KeyguardBypassController mKeyguardBypassController; - private KeyguardHostViewController mKeyguardViewController; - private final ListenerSet<KeyguardResetCallback> mResetCallbacks = new ListenerSet<>(); - private final Runnable mResetRunnable = ()-> { - if (mKeyguardViewController != null) { - mKeyguardViewController.resetSecurityContainer(); - for (KeyguardResetCallback callback : mResetCallbacks) { - callback.onKeyguardReset(); - } - } - }; - - private int mStatusBarHeight; - private float mExpansion = EXPANSION_HIDDEN; - private boolean mShowingSoon; - private int mBouncerPromptReason; - private boolean mIsAnimatingAway; - private boolean mIsScrimmed; - private boolean mInitialized; - - private KeyguardBouncer(Context context, ViewMediatorCallback callback, - ViewGroup container, - DismissCallbackRegistry dismissCallbackRegistry, FalsingCollector falsingCollector, - PrimaryBouncerExpansionCallback expansionCallback, - KeyguardStateController keyguardStateController, - KeyguardUpdateMonitor keyguardUpdateMonitor, - KeyguardBypassController keyguardBypassController, @Main Handler handler, - KeyguardSecurityModel keyguardSecurityModel, - KeyguardBouncerComponent.Factory keyguardBouncerComponentFactory) { - mContext = context; - mCallback = callback; - mContainer = container; - mKeyguardUpdateMonitor = keyguardUpdateMonitor; - mFalsingCollector = falsingCollector; - mDismissCallbackRegistry = dismissCallbackRegistry; - mHandler = handler; - mKeyguardStateController = keyguardStateController; - mKeyguardSecurityModel = keyguardSecurityModel; - mKeyguardBouncerComponentFactory = keyguardBouncerComponentFactory; - mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback); - mKeyguardBypassController = keyguardBypassController; - mExpansionCallbacks.add(expansionCallback); - } - - /** - * Get the KeyguardBouncer expansion - * @return 1=HIDDEN, 0=SHOWING, in between 0 and 1 means the bouncer is in transition. - */ - public float getExpansion() { - return mExpansion; - } - - /** - * Enable/disable only the back button - */ - public void setBackButtonEnabled(boolean enabled) { - int vis = mContainer.getSystemUiVisibility(); - if (enabled) { - vis &= ~View.STATUS_BAR_DISABLE_BACK; - } else { - vis |= View.STATUS_BAR_DISABLE_BACK; - } - mContainer.setSystemUiVisibility(vis); - } - - public void show(boolean resetSecuritySelection) { - show(resetSecuritySelection, true /* scrimmed */); - } - - /** - * Shows the bouncer. - * - * @param resetSecuritySelection Cleans keyguard view - * @param isScrimmed true when the bouncer show show scrimmed, false when the user will be - * dragging it and translation should be deferred. - */ - public void show(boolean resetSecuritySelection, boolean isScrimmed) { - final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser(); - if (keyguardUserId == UserHandle.USER_SYSTEM && UserManager.isSplitSystemUser()) { - // In split system user mode, we never unlock system user. - return; - } - - try { - Trace.beginSection("KeyguardBouncer#show"); - - ensureView(); - mIsScrimmed = isScrimmed; - - // On the keyguard, we want to show the bouncer when the user drags up, but it's - // not correct to end the falsing session. We still need to verify if those touches - // are valid. - // Later, at the end of the animation, when the bouncer is at the top of the screen, - // onFullyShown() will be called and FalsingManager will stop recording touches. - if (isScrimmed) { - setExpansion(EXPANSION_VISIBLE); - } - - if (resetSecuritySelection) { - // showPrimarySecurityScreen() updates the current security method. This is needed - // in case we are already showing and the current security method changed. - showPrimarySecurityScreen(); - } - - if (mContainer.getVisibility() == View.VISIBLE || mShowingSoon) { - // Calls to reset must resume the ViewControllers when in fullscreen mode - if (needsFullscreenBouncer()) { - mKeyguardViewController.onResume(); - } - return; - } - - final int activeUserId = KeyguardUpdateMonitor.getCurrentUser(); - final boolean isSystemUser = - UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM; - final boolean allowDismissKeyguard = !isSystemUser && activeUserId == keyguardUserId; - - // If allowed, try to dismiss the Keyguard. If no security auth (password/pin/pattern) - // is set, this will dismiss the whole Keyguard. Otherwise, show the bouncer. - if (allowDismissKeyguard && mKeyguardViewController.dismiss(activeUserId)) { - return; - } - - // This condition may indicate an error on Android, so log it. - if (!allowDismissKeyguard) { - Log.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " - + keyguardUserId); - } - - mShowingSoon = true; - - // Split up the work over multiple frames. - DejankUtils.removeCallbacks(mResetRunnable); - if (mKeyguardStateController.isFaceAuthEnabled() - && !mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible( - KeyguardUpdateMonitor.getCurrentUser()) - && !needsFullscreenBouncer() - && mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed( - BiometricSourceType.FACE) - && !mKeyguardBypassController.getBypassEnabled()) { - mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY); - } else { - DejankUtils.postAfterTraversal(mShowRunnable); - } - - mKeyguardStateController.notifyBouncerShowing(true /* showing */); - dispatchStartingToShow(); - } finally { - Trace.endSection(); - } - } - - public boolean isScrimmed() { - return mIsScrimmed; - } - - /** - * This method must be called at the end of the bouncer animation when - * the translation is performed manually by the user, otherwise FalsingManager - * will never be notified and its internal state will be out of sync. - */ - private void onFullyShown() { - mFalsingCollector.onBouncerShown(); - if (mKeyguardViewController == null) { - Log.e(TAG, "onFullyShown when view was null"); - } else { - mKeyguardViewController.onResume(); - mContainer.announceForAccessibility( - mKeyguardViewController.getAccessibilityTitleForCurrentMode()); - } - } - - /** - * @see #onFullyShown() - */ - private void onFullyHidden() { - - } - - private void setVisibility(@View.Visibility int visibility) { - mContainer.setVisibility(visibility); - if (mKeyguardViewController != null) { - mKeyguardViewController.onBouncerVisibilityChanged(visibility); - } - dispatchVisibilityChanged(); - } - - private final Runnable mShowRunnable = new Runnable() { - @Override - public void run() { - setVisibility(View.VISIBLE); - showPromptReason(mBouncerPromptReason); - final CharSequence customMessage = mCallback.consumeCustomMessage(); - if (customMessage != null) { - mKeyguardViewController.showErrorMessage(customMessage); - } - mKeyguardViewController.appear(mStatusBarHeight); - mShowingSoon = false; - if (mExpansion == EXPANSION_VISIBLE) { - mKeyguardViewController.onResume(); - mKeyguardViewController.resetSecurityContainer(); - showPromptReason(mBouncerPromptReason); - } - } - }; - - /** - * Show a string explaining why the security view needs to be solved. - * - * @param reason a flag indicating which string should be shown, see - * {@link KeyguardSecurityView#PROMPT_REASON_NONE} - * and {@link KeyguardSecurityView#PROMPT_REASON_RESTART} - */ - public void showPromptReason(int reason) { - if (mKeyguardViewController != null) { - mKeyguardViewController.showPromptReason(reason); - } else { - Log.w(TAG, "Trying to show prompt reason on empty bouncer"); - } - } - - public void showMessage(String message, ColorStateList colorState) { - if (mKeyguardViewController != null) { - mKeyguardViewController.showMessage(message, colorState); - } else { - Log.w(TAG, "Trying to show message on empty bouncer"); - } - } - - private void cancelShowRunnable() { - DejankUtils.removeCallbacks(mShowRunnable); - mHandler.removeCallbacks(mShowRunnable); - mShowingSoon = false; - } - - public void showWithDismissAction(OnDismissAction r, Runnable cancelAction) { - ensureView(); - setDismissAction(r, cancelAction); - show(false /* resetSecuritySelection */); - } - - /** - * Set the actions to run when the keyguard is dismissed or when the dismiss is cancelled. Those - * actions will still be run even if this bouncer is not shown, for instance when authenticating - * with an alternate authenticator like the UDFPS. - */ - public void setDismissAction(OnDismissAction r, Runnable cancelAction) { - mKeyguardViewController.setOnDismissAction(r, cancelAction); - } - - public void hide(boolean destroyView) { - Trace.beginSection("KeyguardBouncer#hide"); - if (isShowing()) { - SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, - SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN); - mDismissCallbackRegistry.notifyDismissCancelled(); - } - mIsScrimmed = false; - mFalsingCollector.onBouncerHidden(); - mKeyguardStateController.notifyBouncerShowing(false /* showing */); - cancelShowRunnable(); - if (mKeyguardViewController != null) { - mKeyguardViewController.cancelDismissAction(); - mKeyguardViewController.cleanUp(); - } - mIsAnimatingAway = false; - setVisibility(View.INVISIBLE); - if (destroyView) { - - // We have a ViewFlipper that unregisters a broadcast when being detached, which may - // be slow because of AM lock contention during unlocking. We can delay it a bit. - mHandler.postDelayed(mRemoveViewRunnable, 50); - } - Trace.endSection(); - } - - /** - * See {@link StatusBarKeyguardViewManager#startPreHideAnimation}. - */ - public void startPreHideAnimation(Runnable runnable) { - mIsAnimatingAway = true; - if (mKeyguardViewController != null) { - mKeyguardViewController.startDisappearAnimation(runnable); - } else if (runnable != null) { - runnable.run(); - } - } - - /** - * Reset the state of the view. - */ - public void reset() { - cancelShowRunnable(); - inflateView(); - mFalsingCollector.onBouncerHidden(); - } - - public void onScreenTurnedOff() { - if (mKeyguardViewController != null && mContainer.getVisibility() == View.VISIBLE) { - mKeyguardViewController.onPause(); - } - } - - public boolean isShowing() { - return (mShowingSoon || mContainer.getVisibility() == View.VISIBLE) - && mExpansion == EXPANSION_VISIBLE && !isAnimatingAway(); - } - - /** - * {@link #show(boolean)} was called but we're not showing yet, or being dragged. - */ - public boolean inTransit() { - return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE; - } - - /** - * @return {@code true} when bouncer's pre-hide animation already started but isn't completely - * hidden yet, {@code false} otherwise. - */ - public boolean isAnimatingAway() { - return mIsAnimatingAway; - } - - public void prepare() { - boolean wasInitialized = mInitialized; - ensureView(); - if (wasInitialized) { - showPrimarySecurityScreen(); - } - mBouncerPromptReason = mCallback.getBouncerPromptReason(); - } - - private void showPrimarySecurityScreen() { - mKeyguardViewController.showPrimarySecurityScreen(); - } - - /** - * Current notification panel expansion - * @param fraction 0 when notification panel is collapsed and 1 when expanded. - * @see StatusBarKeyguardViewManager#onPanelExpansionChanged - */ - public void setExpansion(float fraction) { - float oldExpansion = mExpansion; - boolean expansionChanged = mExpansion != fraction; - mExpansion = fraction; - if (mKeyguardViewController != null && !mIsAnimatingAway) { - mKeyguardViewController.setExpansion(fraction); - } - - if (fraction == EXPANSION_VISIBLE && oldExpansion != EXPANSION_VISIBLE) { - onFullyShown(); - dispatchFullyShown(); - } else if (fraction == EXPANSION_HIDDEN && oldExpansion != EXPANSION_HIDDEN) { - DejankUtils.postAfterTraversal(mResetRunnable); - /* - * There are cases where #hide() was not invoked, such as when - * NotificationPanelViewController controls the hide animation. Make sure the state gets - * updated by calling #hide() directly. - */ - hide(false /* destroyView */); - dispatchFullyHidden(); - } else if (fraction != EXPANSION_VISIBLE && oldExpansion == EXPANSION_VISIBLE) { - dispatchStartingToHide(); - if (mKeyguardViewController != null) { - mKeyguardViewController.onStartingToHide(); - } - } - - if (expansionChanged) { - dispatchExpansionChanged(); - } - } - - public boolean willDismissWithAction() { - return mKeyguardViewController != null && mKeyguardViewController.hasDismissActions(); - } - - public int getTop() { - if (mKeyguardViewController == null) { - return 0; - } - - return mKeyguardViewController.getTop(); - } - - protected void ensureView() { - // Removal of the view might be deferred to reduce unlock latency, - // in this case we need to force the removal, otherwise we'll - // end up in an unpredictable state. - boolean forceRemoval = mHandler.hasCallbacks(mRemoveViewRunnable); - if (!mInitialized || forceRemoval) { - inflateView(); - } - } - - protected void inflateView() { - removeView(); - mHandler.removeCallbacks(mRemoveViewRunnable); - - KeyguardBouncerComponent component = mKeyguardBouncerComponentFactory.create(mContainer); - mKeyguardViewController = component.getKeyguardHostViewController(); - mKeyguardViewController.init(); - - mStatusBarHeight = SystemBarUtils.getStatusBarHeight(mContext); - setVisibility(View.INVISIBLE); - - final WindowInsets rootInsets = mContainer.getRootWindowInsets(); - if (rootInsets != null) { - mContainer.dispatchApplyWindowInsets(rootInsets); - } - mInitialized = true; - } - - protected void removeView() { - mContainer.removeAllViews(); - mInitialized = false; - } - - /** - * @return True if and only if the security method should be shown before showing the - * notifications on Keyguard, like SIM PIN/PUK. - */ - public boolean needsFullscreenBouncer() { - SecurityMode mode = mKeyguardSecurityModel.getSecurityMode( - KeyguardUpdateMonitor.getCurrentUser()); - return mode == SecurityMode.SimPin || mode == SecurityMode.SimPuk; - } - - /** - * Like {@link #needsFullscreenBouncer}, but uses the currently visible security method, which - * makes this method much faster. - */ - public boolean isFullscreenBouncer() { - if (mKeyguardViewController != null) { - SecurityMode mode = mKeyguardViewController.getCurrentSecurityMode(); - return mode == SecurityMode.SimPin || mode == SecurityMode.SimPuk; - } - return false; - } - - /** - * WARNING: This method might cause Binder calls. - */ - public boolean isSecure() { - return mKeyguardSecurityModel.getSecurityMode( - KeyguardUpdateMonitor.getCurrentUser()) != SecurityMode.None; - } - - public boolean shouldDismissOnMenuPressed() { - return mKeyguardViewController.shouldEnableMenuKey(); - } - - public boolean interceptMediaKey(KeyEvent event) { - ensureView(); - return mKeyguardViewController.interceptMediaKey(event); - } - - /** - * @return true if the pre IME back event should be handled - */ - public boolean dispatchBackKeyEventPreIme() { - ensureView(); - return mKeyguardViewController.dispatchBackKeyEventPreIme(); - } - - public void notifyKeyguardAuthenticated(boolean strongAuth) { - ensureView(); - mKeyguardViewController.finish(strongAuth, KeyguardUpdateMonitor.getCurrentUser()); - } - - private void dispatchFullyShown() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onFullyShown(); - } - } - - private void dispatchStartingToHide() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onStartingToHide(); - } - } - - private void dispatchStartingToShow() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onStartingToShow(); - } - } - - private void dispatchFullyHidden() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onFullyHidden(); - } - } - - private void dispatchExpansionChanged() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onExpansionChanged(mExpansion); - } - } - - private void dispatchVisibilityChanged() { - for (PrimaryBouncerExpansionCallback callback : mExpansionCallbacks) { - callback.onVisibilityChanged(mContainer.getVisibility() == View.VISIBLE); - } - } - - /** - * Apply keyguard configuration from the currently active resources. This can be called when the - * device configuration changes, to re-apply some resources that are qualified on the device - * configuration. - */ - public void updateResources() { - if (mKeyguardViewController != null) { - mKeyguardViewController.updateResources(); - } - } - - public void dump(PrintWriter pw) { - pw.println("KeyguardBouncer"); - pw.println(" isShowing(): " + isShowing()); - pw.println(" mStatusBarHeight: " + mStatusBarHeight); - pw.println(" mExpansion: " + mExpansion); - pw.println(" mKeyguardViewController; " + mKeyguardViewController); - pw.println(" mShowingSoon: " + mShowingSoon); - pw.println(" mBouncerPromptReason: " + mBouncerPromptReason); - pw.println(" mIsAnimatingAway: " + mIsAnimatingAway); - pw.println(" mInitialized: " + mInitialized); - } - - /** Update keyguard position based on a tapped X coordinate. */ - public void updateKeyguardPosition(float x) { - if (mKeyguardViewController != null) { - mKeyguardViewController.updateKeyguardPosition(x); - } - } - - public void addKeyguardResetCallback(KeyguardResetCallback callback) { - mResetCallbacks.addIfAbsent(callback); - } - - public void removeKeyguardResetCallback(KeyguardResetCallback callback) { - mResetCallbacks.remove(callback); - } - - /** - * Adds a callback to listen to bouncer expansion updates. - */ - public void addBouncerExpansionCallback(PrimaryBouncerExpansionCallback callback) { - if (!mExpansionCallbacks.contains(callback)) { - mExpansionCallbacks.add(callback); - } - } - - /** - * Removes a previously added callback. If the callback was never added, this methood - * does nothing. - */ - public void removeBouncerExpansionCallback(PrimaryBouncerExpansionCallback callback) { - mExpansionCallbacks.remove(callback); - } - - /** Create a {@link KeyguardBouncer} once a container and bouncer callback are available. */ - public static class Factory { - private final Context mContext; - private final ViewMediatorCallback mCallback; - private final DismissCallbackRegistry mDismissCallbackRegistry; - private final FalsingCollector mFalsingCollector; - private final KeyguardStateController mKeyguardStateController; - private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; - private final KeyguardBypassController mKeyguardBypassController; - private final Handler mHandler; - private final KeyguardSecurityModel mKeyguardSecurityModel; - private final KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory; - - @Inject - public Factory(Context context, ViewMediatorCallback callback, - DismissCallbackRegistry dismissCallbackRegistry, FalsingCollector falsingCollector, - KeyguardStateController keyguardStateController, - KeyguardUpdateMonitor keyguardUpdateMonitor, - KeyguardBypassController keyguardBypassController, @Main Handler handler, - KeyguardSecurityModel keyguardSecurityModel, - KeyguardBouncerComponent.Factory keyguardBouncerComponentFactory) { - mContext = context; - mCallback = callback; - mDismissCallbackRegistry = dismissCallbackRegistry; - mFalsingCollector = falsingCollector; - mKeyguardStateController = keyguardStateController; - mKeyguardUpdateMonitor = keyguardUpdateMonitor; - mKeyguardBypassController = keyguardBypassController; - mHandler = handler; - mKeyguardSecurityModel = keyguardSecurityModel; - mKeyguardBouncerComponentFactory = keyguardBouncerComponentFactory; - } - - /** - * Construct a KeyguardBouncer that will exist in the given container. - */ - public KeyguardBouncer create(ViewGroup container, - PrimaryBouncerExpansionCallback expansionCallback) { - return new KeyguardBouncer(mContext, mCallback, container, - mDismissCallbackRegistry, mFalsingCollector, expansionCallback, - mKeyguardStateController, mKeyguardUpdateMonitor, - mKeyguardBypassController, mHandler, mKeyguardSecurityModel, - mKeyguardBouncerComponentFactory); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java index 4d1454232853..fe2a9137c1a9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.phone; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; @@ -38,6 +37,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.plugins.DarkIconDispatcher; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.statusbar.policy.BatteryController; import java.io.PrintWriter; @@ -94,7 +94,8 @@ public class LightBarController implements BatteryController.BatteryStateChangeC DarkIconDispatcher darkIconDispatcher, BatteryController batteryController, NavigationModeController navModeController, - DumpManager dumpManager) { + DumpManager dumpManager, + DisplayTracker displayTracker) { mDarkIconColor = ctx.getColor(R.color.dark_mode_icon_color_single_tone); mLightIconColor = ctx.getColor(R.color.light_mode_icon_color_single_tone); mStatusBarIconController = (SysuiDarkIconDispatcher) darkIconDispatcher; @@ -104,7 +105,7 @@ public class LightBarController implements BatteryController.BatteryStateChangeC mNavigationMode = mode; }); - if (ctx.getDisplayId() == DEFAULT_DISPLAY) { + if (ctx.getDisplayId() == displayTracker.getDefaultDisplayId()) { dumpManager.registerDumpable(getClass().getSimpleName(), this); } } @@ -317,24 +318,27 @@ public class LightBarController implements BatteryController.BatteryStateChangeC private final BatteryController mBatteryController; private final NavigationModeController mNavModeController; private final DumpManager mDumpManager; + private final DisplayTracker mDisplayTracker; @Inject public Factory( DarkIconDispatcher darkIconDispatcher, BatteryController batteryController, NavigationModeController navModeController, - DumpManager dumpManager) { + DumpManager dumpManager, + DisplayTracker displayTracker) { mDarkIconDispatcher = darkIconDispatcher; mBatteryController = batteryController; mNavModeController = navModeController; mDumpManager = dumpManager; + mDisplayTracker = displayTracker; } /** Create an {@link LightBarController} */ public LightBarController create(Context context) { return new LightBarController(context, mDarkIconDispatcher, mBatteryController, - mNavModeController, mDumpManager); + mNavModeController, mDumpManager, mDisplayTracker); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 24ad55d67bb0..11863627218e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -501,7 +501,7 @@ public interface StatusBarIconController { @VisibleForTesting protected StatusIconDisplayable addWifiIcon(int index, String slot, WifiIconState state) { if (mStatusBarPipelineFlags.useNewWifiIcon()) { - throw new IllegalStateException("Attempting to add a mobile icon while the new " + throw new IllegalStateException("Attempting to add a wifi icon while the new " + "icons are enabled is not supported"); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 8e22bf4a8df4..fd465710d4ea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -129,7 +129,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb private final ConfigurationController mConfigurationController; private final NavigationModeController mNavigationModeController; private final NotificationShadeWindowController mNotificationShadeWindowController; - private final KeyguardBouncer.Factory mKeyguardBouncerFactory; private final KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory; private final DreamOverlayStateController mDreamOverlayStateController; @Nullable @@ -206,28 +205,28 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb Log.d(TAG, "onBackInvokedCallback() called, invoking onBackPressed()"); } onBackPressed(); - if (shouldPlayBackAnimation()) { + if (shouldPlayBackAnimation() && mPrimaryBouncerView.getDelegate() != null) { mPrimaryBouncerView.getDelegate().getBackCallback().onBackInvoked(); } } @Override public void onBackProgressed(BackEvent event) { - if (shouldPlayBackAnimation()) { + if (shouldPlayBackAnimation() && mPrimaryBouncerView.getDelegate() != null) { mPrimaryBouncerView.getDelegate().getBackCallback().onBackProgressed(event); } } @Override public void onBackCancelled() { - if (shouldPlayBackAnimation()) { + if (shouldPlayBackAnimation() && mPrimaryBouncerView.getDelegate() != null) { mPrimaryBouncerView.getDelegate().getBackCallback().onBackCancelled(); } } @Override public void onBackStarted(BackEvent event) { - if (shouldPlayBackAnimation()) { + if (shouldPlayBackAnimation() && mPrimaryBouncerView.getDelegate() != null) { mPrimaryBouncerView.getDelegate().getBackCallback().onBackStarted(event); } } @@ -256,7 +255,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb private View mNotificationContainer; - @Nullable protected KeyguardBouncer mPrimaryBouncer; protected boolean mRemoteInputActive; private boolean mGlobalActionsVisible = false; private boolean mLastGlobalActionsVisible = false; @@ -281,7 +279,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb private boolean mLastScreenOffAnimationPlaying; private float mQsExpansion; final Set<KeyguardViewManagerCallback> mCallbacks = new HashSet<>(); - private boolean mIsModernBouncerEnabled; private boolean mIsUnoccludeTransitionFlagEnabled; private boolean mIsModernAlternateBouncerEnabled; private boolean mIsBackAnimationEnabled; @@ -329,7 +326,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb NotificationShadeWindowController notificationShadeWindowController, KeyguardStateController keyguardStateController, NotificationMediaManager notificationMediaManager, - KeyguardBouncer.Factory keyguardBouncerFactory, KeyguardMessageAreaController.Factory keyguardMessageAreaFactory, Optional<SysUIUnfoldComponent> sysUIUnfoldComponent, Lazy<ShadeController> shadeController, @@ -352,7 +348,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mKeyguardUpdateManager = keyguardUpdateMonitor; mStatusBarStateController = sysuiStatusBarStateController; mDockManager = dockManager; - mKeyguardBouncerFactory = keyguardBouncerFactory; mKeyguardMessageAreaFactory = keyguardMessageAreaFactory; mShadeController = shadeController; mLatencyTracker = latencyTracker; @@ -362,7 +357,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mPrimaryBouncerView = primaryBouncerView; mFoldAodAnimationController = sysUIUnfoldComponent .map(SysUIUnfoldComponent::getFoldAodAnimationController).orElse(null); - mIsModernBouncerEnabled = featureFlags.isEnabled(Flags.MODERN_BOUNCER); mIsUnoccludeTransitionFlagEnabled = featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION); mIsModernAlternateBouncerEnabled = featureFlags.isEnabled(Flags.MODERN_ALTERNATE_BOUNCER); mAlternateBouncerInteractor = alternateBouncerInteractor; @@ -381,11 +375,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mBiometricUnlockController = biometricUnlockController; ViewGroup container = mCentralSurfaces.getBouncerContainer(); - if (mIsModernBouncerEnabled) { - mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mExpansionCallback); - } else { - mPrimaryBouncer = mKeyguardBouncerFactory.create(container, mExpansionCallback); - } + mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mExpansionCallback); mNotificationPanelViewController = notificationPanelViewController; if (shadeExpansionStateManager != null) { shadeExpansionStateManager.addExpansionListener(this); @@ -552,11 +542,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * show if any subsequent events are to be handled. */ if (beginShowingBouncer(event)) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.show(false /* resetSecuritySelection */, false /* scrimmed */); - } else { - mPrimaryBouncerInteractor.show(/* isScrimmed= */false); - } + mPrimaryBouncerInteractor.show(/* isScrimmed= */false); } if (!primaryBouncerIsOrWillBeShowing()) { @@ -564,17 +550,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } if (mKeyguardStateController.isShowing()) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.setExpansion(fraction); - } else { - mPrimaryBouncerInteractor.setPanelExpansion(fraction); - } + mPrimaryBouncerInteractor.setPanelExpansion(fraction); } else { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.setExpansion(EXPANSION_HIDDEN); - } else { - mPrimaryBouncerInteractor.setPanelExpansion(EXPANSION_HIDDEN); - } + mPrimaryBouncerInteractor.setPanelExpansion(EXPANSION_HIDDEN); } } @@ -604,24 +582,17 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb /** * Shows the notification keyguard or the bouncer depending on - * {@link KeyguardBouncer#needsFullscreenBouncer()}. + * {@link #needsFullscreenBouncer()}. */ protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing) { if (needsFullscreenBouncer() && !mDozing) { // The keyguard might be showing (already). So we need to hide it. mCentralSurfaces.hideKeyguard(); - if (mPrimaryBouncer != null) { - mPrimaryBouncer.show(true /* resetSecuritySelection */); - } else { - mPrimaryBouncerInteractor.show(true); - } + mPrimaryBouncerInteractor.show(true); } else { mCentralSurfaces.showKeyguard(); if (hideBouncerWhenShowing) { hideBouncer(false /* destroyView */); - if (mPrimaryBouncer != null) { - mPrimaryBouncer.prepare(); - } } } updateStates(); @@ -648,11 +619,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb */ @VisibleForTesting void hideBouncer(boolean destroyView) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.hide(destroyView); - } else { - mPrimaryBouncerInteractor.hide(); - } + mPrimaryBouncerInteractor.hide(); if (mKeyguardStateController.isShowing()) { // If we were showing the bouncer and then aborting, we need to also clear out any // potential actions unless we actually unlocked. @@ -671,11 +638,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb hideAlternateBouncer(false); if (mKeyguardStateController.isShowing() && !isBouncerShowing()) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.show(false /* resetSecuritySelection */, scrimmed); - } else { - mPrimaryBouncerInteractor.show(scrimmed); - } + mPrimaryBouncerInteractor.show(scrimmed); } updateStates(); } @@ -708,13 +671,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb // instead of the bouncer. if (mAlternateBouncerInteractor.canShowAlternateBouncerForFingerprint()) { if (!afterKeyguardGone) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.setDismissAction(mAfterKeyguardGoneAction, - mKeyguardGoneCancelAction); - } else { - mPrimaryBouncerInteractor.setDismissAction(mAfterKeyguardGoneAction, - mKeyguardGoneCancelAction); - } + mPrimaryBouncerInteractor.setDismissAction(mAfterKeyguardGoneAction, + mKeyguardGoneCancelAction); mAfterKeyguardGoneAction = null; mKeyguardGoneCancelAction = null; } @@ -726,22 +684,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (afterKeyguardGone) { // we'll handle the dismiss action after keyguard is gone, so just show the // bouncer - if (mPrimaryBouncer != null) { - mPrimaryBouncer.show(false /* resetSecuritySelection */); - } else { - mPrimaryBouncerInteractor.show(/* isScrimmed= */true); - } + mPrimaryBouncerInteractor.show(/* isScrimmed= */true); } else { // after authentication success, run dismiss action with the option to defer // hiding the keyguard based on the return value of the OnDismissAction - if (mPrimaryBouncer != null) { - mPrimaryBouncer.showWithDismissAction(mAfterKeyguardGoneAction, - mKeyguardGoneCancelAction); - } else { - mPrimaryBouncerInteractor.setDismissAction( - mAfterKeyguardGoneAction, mKeyguardGoneCancelAction); - mPrimaryBouncerInteractor.show(/* isScrimmed= */true); - } + mPrimaryBouncerInteractor.setDismissAction( + mAfterKeyguardGoneAction, mKeyguardGoneCancelAction); + mPrimaryBouncerInteractor.show(/* isScrimmed= */true); // bouncer will handle the dismiss action, so we no longer need to track it here mAfterKeyguardGoneAction = null; mKeyguardGoneCancelAction = null; @@ -841,11 +790,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void onFinishedGoingToSleep() { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.onScreenTurnedOff(); - } else { - mPrimaryBouncerInteractor.onScreenTurnedOff(); - } + mPrimaryBouncerInteractor.onScreenTurnedOff(); } @Override @@ -939,11 +884,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void startPreHideAnimation(Runnable finishRunnable) { if (primaryBouncerIsShowing()) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.startPreHideAnimation(finishRunnable); - } else { - mPrimaryBouncerInteractor.startDisappearAnimation(finishRunnable); - } + mPrimaryBouncerInteractor.startDisappearAnimation(finishRunnable); mNotificationPanelViewController.startBouncerPreHideAnimation(); // We update the state (which will show the keyguard) only if an animation will run on @@ -1051,17 +992,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } public void onThemeChanged() { - if (mIsModernBouncerEnabled) { - updateResources(); - return; - } - boolean wasShowing = primaryBouncerIsShowing(); - boolean wasScrimmed = primaryBouncerIsScrimmed(); - - hideBouncer(true /* destroyView */); - mPrimaryBouncer.prepare(); - - if (wasShowing) showPrimaryBouncer(wasScrimmed); + updateResources(); } public void onKeyguardFadedAway() { @@ -1106,10 +1037,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * WARNING: This method might cause Binder calls. */ public boolean isSecure() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.isSecure(); - } - return mKeyguardSecurityModel.getSecurityMode( KeyguardUpdateMonitor.getCurrentUser()) != KeyguardSecurityModel.SecurityMode.None; } @@ -1164,10 +1091,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } public boolean isFullscreenBouncer() { - if (mPrimaryBouncerView.getDelegate() != null) { - return mPrimaryBouncerView.getDelegate().isFullScreenBouncer(); - } - return mPrimaryBouncer != null && mPrimaryBouncer.isFullscreenBouncer(); + return mPrimaryBouncerView.getDelegate() != null + && mPrimaryBouncerView.getDelegate().isFullScreenBouncer(); } /** @@ -1223,17 +1148,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb != (mLastBouncerDismissible || !mLastShowing || mLastRemoteInputActive) || mFirstUpdate) { if (primaryBouncerDismissible || !showing || remoteInputActive) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.setBackButtonEnabled(true); - } else { - mPrimaryBouncerInteractor.setBackButtonEnabled(true); - } + mPrimaryBouncerInteractor.setBackButtonEnabled(true); } else { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.setBackButtonEnabled(false); - } else { - mPrimaryBouncerInteractor.setBackButtonEnabled(false); - } + mPrimaryBouncerInteractor.setBackButtonEnabled(false); } } @@ -1327,27 +1244,21 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } public boolean shouldDismissOnMenuPressed() { - if (mPrimaryBouncerView.getDelegate() != null) { - return mPrimaryBouncerView.getDelegate().shouldDismissOnMenuPressed(); - } - return mPrimaryBouncer != null && mPrimaryBouncer.shouldDismissOnMenuPressed(); + return mPrimaryBouncerView.getDelegate() != null + && mPrimaryBouncerView.getDelegate().shouldDismissOnMenuPressed(); } public boolean interceptMediaKey(KeyEvent event) { - if (mPrimaryBouncerView.getDelegate() != null) { - return mPrimaryBouncerView.getDelegate().interceptMediaKey(event); - } - return mPrimaryBouncer != null && mPrimaryBouncer.interceptMediaKey(event); + return mPrimaryBouncerView.getDelegate() != null + && mPrimaryBouncerView.getDelegate().interceptMediaKey(event); } /** * @return true if the pre IME back event should be handled */ public boolean dispatchBackKeyEventPreIme() { - if (mPrimaryBouncerView.getDelegate() != null) { - return mPrimaryBouncerView.getDelegate().dispatchBackKeyEventPreIme(); - } - return mPrimaryBouncer != null && mPrimaryBouncer.dispatchBackKeyEventPreIme(); + return mPrimaryBouncerView.getDelegate() != null + && mPrimaryBouncerView.getDelegate().dispatchBackKeyEventPreIme(); } public void readyForKeyguardDone() { @@ -1393,11 +1304,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * fingerprint. */ public void notifyKeyguardAuthenticated(boolean strongAuth) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.notifyKeyguardAuthenticated(strongAuth); - } else { - mPrimaryBouncerInteractor.notifyKeyguardAuthenticated(strongAuth); - } + mPrimaryBouncerInteractor.notifyKeyguardAuthenticated(strongAuth); if (mAlternateBouncerInteractor.isVisibleState()) { hideAlternateBouncer(false); @@ -1412,11 +1319,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mKeyguardMessageAreaController.setMessage(message); } } else { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.showMessage(message, colorState); - } else { - mPrimaryBouncerInteractor.showMessage(message, colorState); - } + mPrimaryBouncerInteractor.showMessage(message, colorState); } } @@ -1472,11 +1375,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * configuration. */ public void updateResources() { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.updateResources(); - } else { - mPrimaryBouncerInteractor.updateResources(); - } + mPrimaryBouncerInteractor.updateResources(); } public void dump(PrintWriter pw) { @@ -1494,11 +1393,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb pw.println(" " + callback); } - if (mPrimaryBouncer != null) { - pw.println("PrimaryBouncer:"); - mPrimaryBouncer.dump(pw); - } - if (mOccludingAppBiometricUI != null) { pw.println("mOccludingAppBiometricUI:"); mOccludingAppBiometricUI.dump(pw); @@ -1548,11 +1442,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } } - @Nullable - public KeyguardBouncer getPrimaryBouncer() { - return mPrimaryBouncer; - } - /** * For any touches on the NPVC, show the primary bouncer if the alternate bouncer is currently * showing. @@ -1571,11 +1460,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb /** Update keyguard position based on a tapped X coordinate. */ public void updateKeyguardPosition(float x) { - if (mPrimaryBouncer != null) { - mPrimaryBouncer.updateKeyguardPosition(x); - } else { - mPrimaryBouncerInteractor.setKeyguardPosition(x); - } + mPrimaryBouncerInteractor.setKeyguardPosition(x); } private static class DismissWithActionRequest { @@ -1615,56 +1500,35 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * Returns if bouncer expansion is between 0 and 1 non-inclusive. */ public boolean isPrimaryBouncerInTransit() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.inTransit(); - } else { - return mPrimaryBouncerInteractor.isInTransit(); - } + return mPrimaryBouncerInteractor.isInTransit(); } /** * Returns if bouncer is showing */ public boolean primaryBouncerIsShowing() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.isShowing(); - } else { - return mPrimaryBouncerInteractor.isFullyShowing(); - } + return mPrimaryBouncerInteractor.isFullyShowing(); } /** * Returns if bouncer is scrimmed */ public boolean primaryBouncerIsScrimmed() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.isScrimmed(); - } else { - return mPrimaryBouncerInteractor.isScrimmed(); - } + return mPrimaryBouncerInteractor.isScrimmed(); } /** * Returns if bouncer is animating away */ public boolean bouncerIsAnimatingAway() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.isAnimatingAway(); - } else { - return mPrimaryBouncerInteractor.isAnimatingAway(); - } - + return mPrimaryBouncerInteractor.isAnimatingAway(); } /** * Returns if bouncer will dismiss with action */ public boolean primaryBouncerWillDismissWithAction() { - if (mPrimaryBouncer != null) { - return mPrimaryBouncer.willDismissWithAction(); - } else { - return mPrimaryBouncerInteractor.willDismissWithAction(); - } + return mPrimaryBouncerInteractor.willDismissWithAction(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java index ae48c2d3b6f3..50cce45cd87a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowCallback.java @@ -17,5 +17,5 @@ package com.android.systemui.statusbar.phone; public interface StatusBarWindowCallback { void onStateChanged(boolean keyguardShowing, boolean keyguardOccluded, boolean bouncerShowing, - boolean isDozing, boolean panelExpanded); + boolean isDozing, boolean panelExpanded, boolean isDreaming); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java index 344d23341dc1..c1c6c88da822 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java @@ -23,6 +23,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewStub; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.LockIconView; import com.android.systemui.R; import com.android.systemui.battery.BatteryMeterView; @@ -67,6 +68,7 @@ import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateController; import com.android.systemui.tuner.TunerService; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.util.settings.SecureSettings; @@ -299,7 +301,9 @@ public abstract class StatusBarViewModule { OperatorNameViewController.Factory operatorNameViewControllerFactory, SecureSettings secureSettings, @Main Executor mainExecutor, - DumpManager dumpManager + DumpManager dumpManager, + StatusBarWindowStateController statusBarWindowStateController, + KeyguardUpdateMonitor keyguardUpdateMonitor ) { return new CollapsedStatusBarFragment(statusBarFragmentComponentFactory, ongoingCallController, @@ -320,7 +324,9 @@ public abstract class StatusBarViewModule { operatorNameViewControllerFactory, secureSettings, mainExecutor, - dumpManager); + dumpManager, + statusBarWindowStateController, + keyguardUpdateMonitor); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index 9354c5e1948d..00fd4ef9a1fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -44,6 +44,7 @@ import android.widget.LinearLayout; import androidx.annotation.VisibleForTesting; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; @@ -72,6 +73,8 @@ import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentCom import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallListener; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateListener; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.util.CarrierConfigTracker.CarrierConfigChangedListener; import com.android.systemui.util.CarrierConfigTracker.DefaultDataSubscriptionChangedListener; @@ -129,6 +132,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private final SecureSettings mSecureSettings; private final Executor mMainExecutor; private final DumpManager mDumpManager; + private final StatusBarWindowStateController mStatusBarWindowStateController; + private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private List<String> mBlockedIcons = new ArrayList<>(); private Map<Startable, Startable.State> mStartableStates = new ArrayMap<>(); @@ -164,6 +169,22 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } }; + /** + * Whether we've launched the secure camera over the lockscreen, but haven't yet received a + * status bar window state change afterward. + * + * We wait for this state change (which will tell us whether to show/hide the status bar icons) + * so that there is no flickering/jump cutting during the camera launch. + */ + private boolean mWaitingForWindowStateChangeAfterCameraLaunch = false; + + /** + * Listener that updates {@link #mWaitingForWindowStateChangeAfterCameraLaunch} when it receives + * a new status bar window state. + */ + private final StatusBarWindowStateListener mStatusBarWindowStateListener = state -> + mWaitingForWindowStateChangeAfterCameraLaunch = false; + @SuppressLint("ValidFragment") public CollapsedStatusBarFragment( StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory, @@ -185,7 +206,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue OperatorNameViewController.Factory operatorNameViewControllerFactory, SecureSettings secureSettings, @Main Executor mainExecutor, - DumpManager dumpManager + DumpManager dumpManager, + StatusBarWindowStateController statusBarWindowStateController, + KeyguardUpdateMonitor keyguardUpdateMonitor ) { mStatusBarFragmentComponentFactory = statusBarFragmentComponentFactory; mOngoingCallController = ongoingCallController; @@ -207,6 +230,20 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mSecureSettings = secureSettings; mMainExecutor = mainExecutor; mDumpManager = dumpManager; + mStatusBarWindowStateController = statusBarWindowStateController; + mKeyguardUpdateMonitor = keyguardUpdateMonitor; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mStatusBarWindowStateController.addListener(mStatusBarWindowStateListener); + } + + @Override + public void onDestroy() { + super.onDestroy(); + mStatusBarWindowStateController.removeListener(mStatusBarWindowStateListener); } @Override @@ -254,6 +291,11 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mCarrierConfigTracker.addDefaultDataSubscriptionChangedListener(mDefaultDataListener); } + @Override + public void onCameraLaunchGestureDetected(int source) { + mWaitingForWindowStateChangeAfterCameraLaunch = true; + } + @VisibleForTesting void updateBlockedIcons() { mBlockedIcons.clear(); @@ -466,6 +508,27 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue && mNotificationPanelViewController.hideStatusBarIconsWhenExpanded()) { return true; } + + // When launching the camera over the lockscreen, the icons become visible momentarily + // before animating out, since we're not yet aware that the launching camera activity is + // fullscreen. Even once the activity finishes launching, it takes a short time before WM + // decides that the top app wants to hide the icons and tells us to hide them. To ensure + // that this high-visibility animation is smooth, keep the icons hidden during a camera + // launch until we receive a window state change which indicates that the activity is done + // launching and WM has decided to show/hide the icons. For extra safety (to ensure the + // icons don't remain hidden somehow) we double check that the camera is still showing, the + // status bar window isn't hidden, and we're still occluded as well, though these checks + // are typically unnecessary. + final boolean hideIconsForSecureCamera = + (mWaitingForWindowStateChangeAfterCameraLaunch || + !mStatusBarWindowStateController.windowIsShowing()) && + mKeyguardUpdateMonitor.isSecureCameraLaunchedOverKeyguard() && + mKeyguardStateController.isOccluded(); + + if (hideIconsForSecureCamera) { + return true; + } + return mStatusBarHideIconsForBouncerManager.getShouldHideStatusBarIconsForBouncer(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt index 2c8677dee4d9..2d80edb8d2f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt @@ -19,14 +19,14 @@ package com.android.systemui.statusbar.phone.userswitcher import android.content.Context import android.util.AttributeSet import android.widget.ImageView -import android.widget.LinearLayout import android.widget.TextView import com.android.systemui.R +import com.android.systemui.common.ui.view.LaunchableLinearLayout class StatusBarUserSwitcherContainer( context: Context?, attrs: AttributeSet? -) : LinearLayout(context, attrs) { +) : LaunchableLinearLayout(context, attrs) { lateinit var text: TextView private set lateinit var avatar: ImageView diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt index 9ae38e973bd0..0e4a4321bf26 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt @@ -28,6 +28,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionMod import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.UserSetupRepository +import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.util.CarrierConfigTracker import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -37,10 +38,12 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.transformLatest @@ -100,6 +103,7 @@ class MobileIconsInteractorImpl constructor( private val mobileConnectionsRepo: MobileConnectionsRepository, private val carrierConfigTracker: CarrierConfigTracker, + private val logger: ConnectivityPipelineLogger, userSetupRepo: UserSetupRepository, @Application private val scope: CoroutineScope, ) : MobileIconsInteractor { @@ -168,6 +172,8 @@ constructor( } } } + .distinctUntilChanged() + .onEach { logger.logFilteredSubscriptionsChanged(it) } override val defaultDataSubId = mobileConnectionsRepo.defaultDataSubId diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileUiAdapter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileUiAdapter.kt index 829a5cad6504..ef75713cd2f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileUiAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/MobileUiAdapter.kt @@ -23,6 +23,8 @@ import com.android.systemui.statusbar.phone.StatusBarIconController import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel +import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger +import java.io.PrintWriter import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -30,7 +32,9 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch @@ -51,13 +55,17 @@ constructor( interactor: MobileIconsInteractor, private val iconController: StatusBarIconController, private val iconsViewModelFactory: MobileIconsViewModel.Factory, + private val logger: ConnectivityPipelineLogger, @Application private val scope: CoroutineScope, private val statusBarPipelineFlags: StatusBarPipelineFlags, ) : CoreStartable { private val mobileSubIds: Flow<List<Int>> = - interactor.filteredSubscriptions.mapLatest { subscriptions -> - subscriptions.map { subscriptionModel -> subscriptionModel.subscriptionId } - } + interactor.filteredSubscriptions + .mapLatest { subscriptions -> + subscriptions.map { subscriptionModel -> subscriptionModel.subscriptionId } + } + .distinctUntilChanged() + .onEach { logger.logUiAdapterSubIdsUpdated(it) } /** * We expose the list of tracked subscriptions as a flow of a list of ints, where each int is @@ -72,6 +80,9 @@ constructor( /** In order to keep the logs tame, we will reuse the same top-level mobile icons view model */ val mobileIconsViewModel = iconsViewModelFactory.create(mobileSubIdsState) + private var isCollecting: Boolean = false + private var lastValue: List<Int>? = null + override fun start() { // Only notify the icon controller if we want to *render* the new icons. // Note that this flow may still run if @@ -79,8 +90,18 @@ constructor( // get the logging data without rendering. if (statusBarPipelineFlags.useNewMobileIcons()) { scope.launch { - mobileSubIds.collectLatest { iconController.setNewMobileIconSubIds(it) } + isCollecting = true + mobileSubIds.collectLatest { + logger.logUiAdapterSubIdsSentToIconController(it) + lastValue = it + iconController.setNewMobileIconSubIds(it) + } } } } + + override fun dump(pw: PrintWriter, args: Array<out String>) { + pw.println("isCollecting=$isCollecting") + pw.println("Last values sent to icon controller: $lastValue") + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt index d3ff3573dae2..7c7ffaf5c617 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt @@ -25,6 +25,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.dagger.StatusBarConnectivityLog import com.android.systemui.plugins.log.LogBuffer import com.android.systemui.plugins.log.LogLevel +import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.toString import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -97,15 +98,20 @@ constructor( ) } - fun logOnCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) { + fun logOnCapabilitiesChanged( + network: Network, + networkCapabilities: NetworkCapabilities, + isDefaultNetworkCallback: Boolean, + ) { buffer.log( SB_LOGGING_TAG, LogLevel.INFO, { + bool1 = isDefaultNetworkCallback int1 = network.getNetId() str1 = networkCapabilities.toString() }, - { "onCapabilitiesChanged: net=$int1 capabilities=$str1" } + { "onCapabilitiesChanged[default=$bool1]: net=$int1 capabilities=$str1" } ) } @@ -196,6 +202,35 @@ constructor( ) } + // TODO(b/238425913): We should split this class into mobile-specific and wifi-specific loggers. + + fun logFilteredSubscriptionsChanged(subs: List<SubscriptionModel>) { + buffer.log( + SB_LOGGING_TAG, + LogLevel.INFO, + { str1 = subs.toString() }, + { "Filtered subscriptions updated: $str1" }, + ) + } + + fun logUiAdapterSubIdsUpdated(subs: List<Int>) { + buffer.log( + SB_LOGGING_TAG, + LogLevel.INFO, + { str1 = subs.toString() }, + { "Sub IDs in MobileUiAdapter updated internally: $str1" }, + ) + } + + fun logUiAdapterSubIdsSentToIconController(subs: List<Int>) { + buffer.log( + SB_LOGGING_TAG, + LogLevel.INFO, + { str1 = subs.toString() }, + { "Sub IDs in MobileUiAdapter being sent to icon controller: $str1" }, + ) + } + companion object { const val SB_LOGGING_TAG = "SbConnectivity" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt index cc0ec548716d..b1e28129a690 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt @@ -77,6 +77,17 @@ open class ModernStatusBarView(context: Context, attrs: AttributeSet?) : return binding.getShouldIconBeVisible() } + /** See [StatusBarIconView.getDrawingRect]. */ + override fun getDrawingRect(outRect: Rect) { + super.getDrawingRect(outRect) + val translationX = translationX.toInt() + val translationY = translationY.toInt() + outRect.left += translationX + outRect.right += translationX + outRect.top += translationY + outRect.bottom += translationY + } + /** * Initializes this view. * diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt index d26499c18661..86690479f679 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt @@ -114,13 +114,17 @@ constructor( network: Network, networkCapabilities: NetworkCapabilities ) { + logger.logOnCapabilitiesChanged( + network, + networkCapabilities, + isDefaultNetworkCallback = true, + ) + // This method will always be called immediately after the network // becomes the default, in addition to any time the capabilities change // while the network is the default. - // If this network contains valid wifi info, then wifi is the default - // network. - val wifiInfo = networkCapabilitiesToWifiInfo(networkCapabilities) - trySend(wifiInfo != null) + // If this network is a wifi network, then wifi is the default network. + trySend(isWifiNetwork(networkCapabilities)) } override fun onLost(network: Network) { @@ -152,7 +156,11 @@ constructor( network: Network, networkCapabilities: NetworkCapabilities ) { - logger.logOnCapabilitiesChanged(network, networkCapabilities) + logger.logOnCapabilitiesChanged( + network, + networkCapabilities, + isDefaultNetworkCallback = false, + ) wifiNetworkChangeEvents.tryEmit(Unit) @@ -253,16 +261,30 @@ constructor( networkCapabilities: NetworkCapabilities ): WifiInfo? { return when { - networkCapabilities.hasTransport(TRANSPORT_WIFI) -> - networkCapabilities.transportInfo as WifiInfo? networkCapabilities.hasTransport(TRANSPORT_CELLULAR) -> // Sometimes, cellular networks can act as wifi networks (known as VCN -- // virtual carrier network). So, see if this cellular network has wifi info. Utils.tryGetWifiInfoForVcn(networkCapabilities) + networkCapabilities.hasTransport(TRANSPORT_WIFI) -> + if (networkCapabilities.transportInfo is WifiInfo) { + networkCapabilities.transportInfo as WifiInfo + } else { + null + } else -> null } } + /** True if these capabilities represent a wifi network. */ + private fun isWifiNetwork(networkCapabilities: NetworkCapabilities): Boolean { + return when { + networkCapabilities.hasTransport(TRANSPORT_WIFI) -> true + networkCapabilities.hasTransport(TRANSPORT_CELLULAR) -> + Utils.tryGetWifiInfoForVcn(networkCapabilities) != null + else -> false + } + } + private fun createWifiNetworkModel( wifiInfo: WifiInfo, network: Network, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java index 9946b4b9ecaa..5dcafb37f57e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.policy; import android.annotation.WorkerThread; -import android.content.Intent; import android.content.pm.PackageManager; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; @@ -255,7 +254,6 @@ public class FlashlightControllerImpl implements FlashlightController { setTorchMode(enabled); mSecureSettings.putInt(Settings.Secure.FLASHLIGHT_AVAILABLE, 1); mSecureSettings.putInt(Secure.FLASHLIGHT_ENABLED, enabled ? 1 : 0); - mBroadcastSender.sendBroadcast(new Intent(ACTION_FLASHLIGHT_CHANGED)); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java index e0d780a5fcd5..7a4e35f159ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java @@ -48,6 +48,7 @@ import com.android.systemui.animation.DelegateLaunchAnimatorController; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.fragments.FragmentHostManager; +import com.android.systemui.fragments.FragmentService; import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import com.android.systemui.unfold.util.JankMonitorTransitionProgressListener; @@ -73,6 +74,7 @@ public class StatusBarWindowController { private boolean mIsAttached; private final ViewGroup mStatusBarWindowView; + private final FragmentService mFragmentService; // The container in which we should run launch animations started from the status bar and // expanding into the opening window. private final ViewGroup mLaunchAnimationContainer; @@ -86,6 +88,7 @@ public class StatusBarWindowController { WindowManager windowManager, IWindowManager iWindowManager, StatusBarContentInsetsProvider contentInsetsProvider, + FragmentService fragmentService, @Main Resources resources, Optional<UnfoldTransitionProgressProvider> unfoldTransitionProgressProvider) { mContext = context; @@ -93,6 +96,7 @@ public class StatusBarWindowController { mIWindowManager = iWindowManager; mContentInsetsProvider = contentInsetsProvider; mStatusBarWindowView = statusBarWindowView; + mFragmentService = fragmentService; mLaunchAnimationContainer = mStatusBarWindowView.findViewById( R.id.status_bar_launch_animation_container); mLpChanged = new WindowManager.LayoutParams(); @@ -157,7 +161,7 @@ public class StatusBarWindowController { /** Returns a fragment host manager for the status bar window view. */ public FragmentHostManager getFragmentHostManager() { - return FragmentHostManager.get(mStatusBarWindowView); + return mFragmentService.getFragmentHostManager(mStatusBarWindowView); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt index 60f6df66cb5a..8f424b2e251e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt @@ -61,6 +61,10 @@ class StatusBarWindowStateController @Inject constructor( listeners.add(listener) } + fun removeListener(listener: StatusBarWindowStateListener) { + listeners.remove(listener) + } + /** Returns true if the window is currently showing. */ fun windowIsShowing() = windowState == WINDOW_STATE_SHOWING diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt index ec6965a83b5a..899b0c2b0947 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewLogger.kt @@ -80,6 +80,26 @@ open class TemporaryViewLogger<T : TemporaryViewInfo>( ) } + /** Logs that there was a failure to animate the view in. */ + fun logAnimateInFailure() { + buffer.log( + tag, + LogLevel.WARNING, + {}, + { "View's appearance animation failed. Forcing view display manually." }, + ) + } + + /** Logs that there was a failure to animate the view out. */ + fun logAnimateOutFailure() { + buffer.log( + tag, + LogLevel.WARNING, + {}, + { "View's disappearance animation failed." }, + ) + } + fun logViewHidden(info: T) { buffer.log( tag, diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarAnimator.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarAnimator.kt new file mode 100644 index 000000000000..01a81deabc95 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarAnimator.kt @@ -0,0 +1,83 @@ +/* + * 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.temporarydisplay.chipbar + +import android.view.View +import android.view.ViewGroup +import com.android.systemui.animation.Interpolators +import com.android.systemui.animation.ViewHierarchyAnimator +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.util.children +import javax.inject.Inject + +/** + * A class controlling chipbar animations. Typically delegates to [ViewHierarchyAnimator]. + * + * Used so that animations can be mocked out in tests. + */ +@SysUISingleton +open class ChipbarAnimator @Inject constructor() { + /** + * Animates [innerView] and its children into view. + * + * @return true if the animation was successfully started and false if the animation can't be + * run for any reason. + * + * See [ViewHierarchyAnimator.animateAddition]. + */ + open fun animateViewIn(innerView: ViewGroup, onAnimationEnd: Runnable): Boolean { + return ViewHierarchyAnimator.animateAddition( + innerView, + ViewHierarchyAnimator.Hotspot.TOP, + Interpolators.EMPHASIZED_DECELERATE, + duration = ANIMATION_IN_DURATION, + includeMargins = true, + includeFadeIn = true, + onAnimationEnd = onAnimationEnd, + ) + } + + /** + * Animates [innerView] and its children out of view. + * + * @return true if the animation was successfully started and false if the animation can't be + * run for any reason. + * + * See [ViewHierarchyAnimator.animateRemoval]. + */ + open fun animateViewOut(innerView: ViewGroup, onAnimationEnd: Runnable): Boolean { + return ViewHierarchyAnimator.animateRemoval( + innerView, + ViewHierarchyAnimator.Hotspot.TOP, + Interpolators.EMPHASIZED_ACCELERATE, + ANIMATION_OUT_DURATION, + includeMargins = true, + onAnimationEnd, + ) + } + + /** Force shows this view and all child views. Should be used in case [animateViewIn] fails. */ + fun forceDisplayView(innerView: View) { + innerView.alpha = 1f + if (innerView is ViewGroup) { + innerView.children.forEach { forceDisplayView(it) } + } + } +} + +private const val ANIMATION_IN_DURATION = 500L +private const val ANIMATION_OUT_DURATION = 250L diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt index 46f13cc6b037..696134cde3c9 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt @@ -32,8 +32,6 @@ import androidx.annotation.IdRes import com.android.internal.widget.CachingIconView import com.android.systemui.Gefingerpoken import com.android.systemui.R -import com.android.systemui.animation.Interpolators -import com.android.systemui.animation.ViewHierarchyAnimator import com.android.systemui.classifier.FalsingCollector import com.android.systemui.common.shared.model.ContentDescription.Companion.loadContentDescription import com.android.systemui.common.shared.model.Text.Companion.loadText @@ -78,6 +76,7 @@ constructor( configurationController: ConfigurationController, dumpManager: DumpManager, powerManager: PowerManager, + private val chipbarAnimator: ChipbarAnimator, private val falsingManager: FalsingManager, private val falsingCollector: FalsingCollector, private val swipeChipbarAwayGestureHandler: SwipeChipbarAwayGestureHandler?, @@ -206,23 +205,17 @@ constructor( } override fun animateViewIn(view: ViewGroup) { + // We can only request focus once the animation finishes. val onAnimationEnd = Runnable { maybeGetAccessibilityFocus(view.getTag(INFO_TAG) as ChipbarInfo?, view) } - val added = - ViewHierarchyAnimator.animateAddition( - view.getInnerView(), - ViewHierarchyAnimator.Hotspot.TOP, - Interpolators.EMPHASIZED_DECELERATE, - duration = ANIMATION_IN_DURATION, - includeMargins = true, - includeFadeIn = true, - // We can only request focus once the animation finishes. - onAnimationEnd = onAnimationEnd, - ) - // If the view doesn't get animated, the [onAnimationEnd] runnable won't get run. So, just - // run it immediately. - if (!added) { + val animatedIn = chipbarAnimator.animateViewIn(view.getInnerView(), onAnimationEnd) + + // If the view doesn't get animated, the [onAnimationEnd] runnable won't get run and the + // views would remain un-displayed. So, just force-set/run those items immediately. + if (!animatedIn) { + logger.logAnimateInFailure() + chipbarAnimator.forceDisplayView(view.getInnerView()) onAnimationEnd.run() } } @@ -230,18 +223,11 @@ constructor( override fun animateViewOut(view: ViewGroup, removalReason: String?, onAnimationEnd: Runnable) { val innerView = view.getInnerView() innerView.accessibilityLiveRegion = ACCESSIBILITY_LIVE_REGION_NONE - val removed = - ViewHierarchyAnimator.animateRemoval( - innerView, - ViewHierarchyAnimator.Hotspot.TOP, - Interpolators.EMPHASIZED_ACCELERATE, - ANIMATION_OUT_DURATION, - includeMargins = true, - onAnimationEnd, - ) + val removed = chipbarAnimator.animateViewOut(innerView, onAnimationEnd) // If the view doesn't get animated, the [onAnimationEnd] runnable won't get run. So, just // run it immediately. if (!removed) { + logger.logAnimateOutFailure() onAnimationEnd.run() } @@ -299,8 +285,6 @@ constructor( } } -private const val ANIMATION_IN_DURATION = 500L -private const val ANIMATION_OUT_DURATION = 250L @IdRes private val INFO_TAG = R.id.tag_chipbar_info private const val SWIPE_UP_GESTURE_REASON = "SWIPE_UP_GESTURE_DETECTED" private const val TAG = "ChipbarCoordinator" diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt index 6e3cb4823afa..9dbc4b398ab3 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt @@ -19,6 +19,7 @@ package com.android.systemui.temporarydisplay.chipbar import android.content.Context import android.view.MotionEvent import android.view.View +import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.gesture.SwipeUpGestureHandler import com.android.systemui.statusbar.gesture.SwipeUpGestureLogger import com.android.systemui.util.boundsOnScreen @@ -31,8 +32,9 @@ import com.android.systemui.util.boundsOnScreen */ class SwipeChipbarAwayGestureHandler( context: Context, + displayTracker: DisplayTracker, logger: SwipeUpGestureLogger, -) : SwipeUpGestureHandler(context, logger, loggerTag = LOGGER_TAG) { +) : SwipeUpGestureHandler(context, displayTracker, logger, loggerTag = LOGGER_TAG) { private var viewFetcher: () -> View? = { null } diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt index 933c0604a3b9..b1be4045eb43 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt @@ -21,6 +21,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBufferFactory import com.android.systemui.media.taptotransfer.MediaTttFlags import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.gesture.SwipeUpGestureLogger import com.android.systemui.temporarydisplay.chipbar.SwipeChipbarAwayGestureHandler import dagger.Module @@ -41,10 +42,11 @@ interface TemporaryDisplayModule { fun provideSwipeChipbarAwayGestureHandler( mediaTttFlags: MediaTttFlags, context: Context, + displayTracker: DisplayTracker, logger: SwipeUpGestureLogger, ): SwipeChipbarAwayGestureHandler? { return if (mediaTttFlags.isMediaTttDismissGestureEnabled()) { - SwipeChipbarAwayGestureHandler(context, logger) + SwipeChipbarAwayGestureHandler(context, displayTracker, logger) } else { null } diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index f29ca4d30ccb..3e3a891004c4 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -357,13 +357,22 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { }; @Inject - public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher, - @Background Handler bgHandler, @Main Executor mainExecutor, - @Background Executor bgExecutor, ThemeOverlayApplier themeOverlayApplier, - SecureSettings secureSettings, WallpaperManager wallpaperManager, - UserManager userManager, DeviceProvisionedController deviceProvisionedController, - UserTracker userTracker, DumpManager dumpManager, FeatureFlags featureFlags, - @Main Resources resources, WakefulnessLifecycle wakefulnessLifecycle) { + public ThemeOverlayController( + Context context, + BroadcastDispatcher broadcastDispatcher, + @Background Handler bgHandler, + @Main Executor mainExecutor, + @Background Executor bgExecutor, + ThemeOverlayApplier themeOverlayApplier, + SecureSettings secureSettings, + WallpaperManager wallpaperManager, + UserManager userManager, + DeviceProvisionedController deviceProvisionedController, + UserTracker userTracker, + DumpManager dumpManager, + FeatureFlags featureFlags, + @Main Resources resources, + WakefulnessLifecycle wakefulnessLifecycle) { mContext = context; mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES); mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET); diff --git a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java index 79811c5de42d..24758908cff2 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java @@ -28,8 +28,9 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settingslib.Utils; +import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.fragments.FragmentHostManager; +import com.android.systemui.fragments.FragmentService; import java.util.Objects; @@ -74,7 +75,7 @@ public class RadioListPreference extends CustomListPreference { RadioFragment f = new RadioFragment(); f.setPreference(this); - FragmentHostManager.get(v).getFragmentManager() + Dependency.get(FragmentService.class).getFragmentHostManager(v).getFragmentManager() .beginTransaction() .add(android.R.id.content, f) .commit(); @@ -86,8 +87,10 @@ public class RadioListPreference extends CustomListPreference { Bundle savedInstanceState) { super.onDialogStateRestored(fragment, dialog, savedInstanceState); View view = dialog.findViewById(R.id.content); - RadioFragment radioFragment = (RadioFragment) FragmentHostManager.get(view) - .getFragmentManager().findFragmentById(R.id.content); + RadioFragment radioFragment = (RadioFragment) Dependency.get(FragmentService.class) + .getFragmentHostManager(view) + .getFragmentManager() + .findFragmentById(R.id.content); if (radioFragment != null) { radioFragment.setPreference(this); } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt index 0069bb545ef4..19a0866cd0a8 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt @@ -38,6 +38,7 @@ import android.view.WindowlessWindowManager import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags +import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.LightRevealEffect import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.statusbar.LinearLightRevealEffect @@ -68,6 +69,7 @@ constructor( @Main private val executor: Executor, private val threadFactory: ThreadFactory, private val rotationChangeProvider: RotationChangeProvider, + private val displayTracker: DisplayTracker ) { private val transitionListener = TransitionListener() @@ -104,7 +106,7 @@ constructor( .setName("unfold-overlay-container") displayAreaHelper.get().attachToRootDisplayArea( - Display.DEFAULT_DISPLAY, + displayTracker.defaultDisplayId, containerBuilder ) { builder -> executor.execute { diff --git a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt index 8cb4deb4882c..e5ab47325229 100644 --- a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt @@ -17,8 +17,11 @@ package com.android.systemui.user.data.repository +import android.app.IActivityManager +import android.app.UserSwitchObserver import android.content.Context import android.content.pm.UserInfo +import android.os.IRemoteCallback import android.os.UserHandle import android.os.UserManager import android.provider.Settings @@ -30,6 +33,8 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR import com.android.systemui.settings.UserTracker import com.android.systemui.user.data.model.UserSwitcherSettingsModel import com.android.systemui.util.settings.GlobalSettings @@ -68,6 +73,9 @@ interface UserRepository { /** [UserInfo] of the currently-selected user. */ val selectedUserInfo: Flow<UserInfo> + /** Whether user switching is currently in progress. */ + val userSwitchingInProgress: Flow<Boolean> + /** User ID of the last non-guest selected user. */ val lastSelectedNonGuestUserId: Int @@ -108,6 +116,8 @@ constructor( @Background private val backgroundDispatcher: CoroutineDispatcher, private val globalSettings: GlobalSettings, private val tracker: UserTracker, + private val activityManager: IActivityManager, + featureFlags: FeatureFlags, ) : UserRepository { private val _userSwitcherSettings = MutableStateFlow(runBlocking { getSettings() }) @@ -129,6 +139,10 @@ constructor( private var _isGuestUserResetting: Boolean = false override var isGuestUserResetting: Boolean = _isGuestUserResetting + private val _isUserSwitchingInProgress = MutableStateFlow(false) + override val userSwitchingInProgress: Flow<Boolean> + get() = _isUserSwitchingInProgress + override val isGuestUserCreationScheduled = AtomicBoolean() override val isStatusBarUserChipEnabled: Boolean = @@ -141,6 +155,9 @@ constructor( init { observeSelectedUser() observeUserSettings() + if (featureFlags.isEnabled(FACE_AUTH_REFACTOR)) { + observeUserSwitching() + } } override fun refreshUsers() { @@ -166,6 +183,28 @@ constructor( return _userSwitcherSettings.value.isSimpleUserSwitcher } + private fun observeUserSwitching() { + conflatedCallbackFlow { + val callback = + object : UserSwitchObserver() { + override fun onUserSwitching(newUserId: Int, reply: IRemoteCallback) { + trySendWithFailureLogging(true, TAG, "userSwitching started") + } + + override fun onUserSwitchComplete(newUserId: Int) { + trySendWithFailureLogging(false, TAG, "userSwitching completed") + } + } + activityManager.registerUserSwitchObserver(callback, TAG) + trySendWithFailureLogging(false, TAG, "initial value defaulting to false") + awaitClose { activityManager.unregisterUserSwitchObserver(callback) } + } + .onEach { _isUserSwitchingInProgress.value = it } + // TODO (b/262838215), Make this stateIn and initialize directly in field declaration + // once the flag is launched + .launchIn(applicationScope) + } + private fun observeSelectedUser() { conflatedCallbackFlow { fun send() { diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index d54de3fa9a3f..c2727fc32465 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -14,8 +14,6 @@ package com.android.systemui.util; -import static android.view.Display.DEFAULT_DISPLAY; - import android.Manifest; import android.content.Context; import android.content.Intent; @@ -26,6 +24,7 @@ import android.view.DisplayCutout; import com.android.internal.policy.SystemBarUtils; import com.android.systemui.R; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.shared.system.QuickStepContract; import java.util.List; @@ -71,8 +70,9 @@ public class Utils { * {@link android.view.WindowManagerPolicyConstants#NAV_BAR_MODE_GESTURAL} AND * the context is that of the default display */ - public static boolean isGesturalModeOnDefaultDisplay(Context context, int navMode) { - return context.getDisplayId() == DEFAULT_DISPLAY + public static boolean isGesturalModeOnDefaultDisplay(Context context, + DisplayTracker displayTracker, int navMode) { + return context.getDisplayId() == displayTracker.getDefaultDisplayId() && QuickStepContract.isGesturalMode(navMode); } diff --git a/packages/SystemUI/src/com/android/systemui/util/animation/TransitionLayout.kt b/packages/SystemUI/src/com/android/systemui/util/animation/TransitionLayout.kt index 08ee0af17fb0..56c5d3b433ff 100644 --- a/packages/SystemUI/src/com/android/systemui/util/animation/TransitionLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/util/animation/TransitionLayout.kt @@ -27,6 +27,8 @@ import android.view.ViewTreeObserver import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet +import com.android.systemui.animation.LaunchableView +import com.android.systemui.animation.LaunchableViewDelegate import com.android.systemui.statusbar.CrossFadeHelper /** @@ -38,7 +40,7 @@ class TransitionLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { +) : ConstraintLayout(context, attrs, defStyleAttr), LaunchableView { private val boundsRect = Rect() private val originalGoneChildrenSet: MutableSet<Int> = mutableSetOf() @@ -50,7 +52,11 @@ class TransitionLayout @JvmOverloads constructor( private var desiredMeasureWidth = 0 private var desiredMeasureHeight = 0 - private var transitionVisibility = View.VISIBLE + private val delegate = + LaunchableViewDelegate( + this, + superSetVisibility = { super.setVisibility(it) }, + ) /** * The measured state of this view which is the one we will lay ourselves out with. This @@ -83,11 +89,12 @@ class TransitionLayout @JvmOverloads constructor( } } - override fun setTransitionVisibility(visibility: Int) { - // We store the last transition visibility assigned to this view to restore it later if - // necessary. - super.setTransitionVisibility(visibility) - transitionVisibility = visibility + override fun setShouldBlockVisibilityChanges(block: Boolean) { + delegate.setShouldBlockVisibilityChanges(block) + } + + override fun setVisibility(visibility: Int) { + delegate.setVisibility(visibility) } override fun onFinishInflate() { @@ -173,14 +180,6 @@ class TransitionLayout @JvmOverloads constructor( translationY = currentState.translation.y CrossFadeHelper.fadeIn(this, currentState.alpha) - - // CrossFadeHelper#fadeIn will change this view visibility, which overrides the transition - // visibility. We set the transition visibility again to make sure that this view plays well - // with GhostView, which sets the transition visibility and is used for activity launch - // animations. - if (transitionVisibility != View.VISIBLE) { - setTransitionVisibility(transitionVisibility) - } } private fun applyCurrentStateOnPredraw() { diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java index 7033ccde8c7d..5d896cbbdab4 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java @@ -236,7 +236,8 @@ public class BubblesManager { // Store callback in a field so it won't get GC'd mStatusBarWindowCallback = - (keyguardShowing, keyguardOccluded, bouncerShowing, isDozing, panelExpanded) -> + (keyguardShowing, keyguardOccluded, bouncerShowing, isDozing, panelExpanded, + isDreaming) -> mBubbles.onNotificationPanelExpandedChanged(panelExpanded); notificationShadeWindowController.registerCallback(mStatusBarWindowCallback); diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java index 8ef98f08c60d..bd60401034b3 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java @@ -16,8 +16,6 @@ package com.android.systemui.wmshell; -import static android.view.Display.DEFAULT_DISPLAY; - import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED; @@ -50,6 +48,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.model.SysUiState; import com.android.systemui.notetask.NoteTaskInitializer; +import com.android.systemui.settings.DisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.tracing.ProtoTraceable; import com.android.systemui.statusbar.CommandQueue; @@ -124,6 +123,7 @@ public final class WMShell implements private final WakefulnessLifecycle mWakefulnessLifecycle; private final ProtoTracer mProtoTracer; private final UserTracker mUserTracker; + private final DisplayTracker mDisplayTracker; private final NoteTaskInitializer mNoteTaskInitializer; private final Executor mSysUiMainExecutor; @@ -186,6 +186,7 @@ public final class WMShell implements ProtoTracer protoTracer, WakefulnessLifecycle wakefulnessLifecycle, UserTracker userTracker, + DisplayTracker displayTracker, NoteTaskInitializer noteTaskInitializer, @Main Executor sysUiMainExecutor) { mContext = context; @@ -203,6 +204,7 @@ public final class WMShell implements mWakefulnessLifecycle = wakefulnessLifecycle; mProtoTracer = protoTracer; mUserTracker = userTracker; + mDisplayTracker = displayTracker; mNoteTaskInitializer = noteTaskInitializer; mSysUiMainExecutor = sysUiMainExecutor; } @@ -268,7 +270,7 @@ public final class WMShell implements public void onStartTransition(boolean isEntering) { mSysUiMainExecutor.execute(() -> { mSysUiState.setFlag(SYSUI_STATE_ONE_HANDED_ACTIVE, - true).commitUpdate(DEFAULT_DISPLAY); + true).commitUpdate(mDisplayTracker.getDefaultDisplayId()); }); } @@ -276,7 +278,7 @@ public final class WMShell implements public void onStartFinished(Rect bounds) { mSysUiMainExecutor.execute(() -> { mSysUiState.setFlag(SYSUI_STATE_ONE_HANDED_ACTIVE, - true).commitUpdate(DEFAULT_DISPLAY); + true).commitUpdate(mDisplayTracker.getDefaultDisplayId()); }); } @@ -284,7 +286,7 @@ public final class WMShell implements public void onStopFinished(Rect bounds) { mSysUiMainExecutor.execute(() -> { mSysUiState.setFlag(SYSUI_STATE_ONE_HANDED_ACTIVE, - false).commitUpdate(DEFAULT_DISPLAY); + false).commitUpdate(mDisplayTracker.getDefaultDisplayId()); }); } }); @@ -333,7 +335,8 @@ public final class WMShell implements @Override public void setImeWindowStatus(int displayId, IBinder token, int vis, int backDisposition, boolean showImeSwitcher) { - if (displayId == DEFAULT_DISPLAY && (vis & InputMethodService.IME_VISIBLE) != 0) { + if (displayId == mDisplayTracker.getDefaultDisplayId() + && (vis & InputMethodService.IME_VISIBLE) != 0) { oneHanded.stopOneHanded( OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_POP_IME_OUT); } @@ -346,7 +349,7 @@ public final class WMShell implements @Override public void onVisibilityChanged(boolean hasFreeformTasks) { mSysUiState.setFlag(SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE, hasFreeformTasks) - .commitUpdate(DEFAULT_DISPLAY); + .commitUpdate(mDisplayTracker.getDefaultDisplayId()); } }, mSysUiMainExecutor); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt index 00b2fbe8a4cb..43a201735cbb 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt @@ -15,7 +15,6 @@ */ package com.android.keyguard -import com.android.systemui.statusbar.CommandQueue import android.content.BroadcastReceiver import android.testing.AndroidTestingRunner import android.view.View @@ -33,16 +32,17 @@ import com.android.systemui.plugins.ClockController import com.android.systemui.plugins.ClockEvents import com.android.systemui.plugins.ClockFaceController import com.android.systemui.plugins.ClockFaceEvents +import com.android.systemui.plugins.ClockTickRate import com.android.systemui.plugins.log.LogBuffer +import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.ConfigurationController +import com.android.systemui.util.concurrency.DelayableExecutor 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 java.util.TimeZone -import java.util.concurrent.Executor import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import kotlinx.coroutines.yield @@ -57,8 +57,10 @@ import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.times import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit +import java.util.* +import java.util.concurrent.Executor +import org.mockito.Mockito.`when` as whenever @RunWith(AndroidTestingRunner::class) @SmallTest @@ -72,7 +74,7 @@ class ClockEventControllerTest : SysuiTestCase() { @Mock private lateinit var animations: ClockAnimations @Mock private lateinit var events: ClockEvents @Mock private lateinit var clock: ClockController - @Mock private lateinit var mainExecutor: Executor + @Mock private lateinit var mainExecutor: DelayableExecutor @Mock private lateinit var bgExecutor: Executor @Mock private lateinit var featureFlags: FeatureFlags @Mock private lateinit var smallClockController: ClockFaceController @@ -97,6 +99,8 @@ class ClockEventControllerTest : SysuiTestCase() { whenever(largeClockController.events).thenReturn(largeClockEvents) whenever(clock.events).thenReturn(events) whenever(clock.animations).thenReturn(animations) + whenever(smallClockEvents.tickRate).thenReturn(ClockTickRate.PER_MINUTE) + whenever(largeClockEvents.tickRate).thenReturn(ClockTickRate.PER_MINUTE) repository = FakeKeyguardRepository() diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java index 10595439200a..50645e5daa09 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java @@ -150,4 +150,11 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase { getContext().getResources().getString(R.string.kg_prompt_reason_restart_password), false); } + + + @Test + public void testReset() { + mKeyguardAbsKeyInputViewController.reset(); + verify(mKeyguardMessageAreaController).setMessage("", false); + } } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java index a4180fd2e0f1..36b3f897190d 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java @@ -33,6 +33,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.view.View; +import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -47,6 +48,7 @@ import com.android.systemui.plugins.ClockAnimations; import com.android.systemui.plugins.ClockController; import com.android.systemui.plugins.ClockEvents; import com.android.systemui.plugins.ClockFaceController; +import com.android.systemui.plugins.ClockFaceEvents; import com.android.systemui.plugins.log.LogBuffer; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shared.clocks.AnimatableClockView; @@ -99,6 +101,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { @Mock private ClockEvents mClockEvents; @Mock + private ClockFaceEvents mClockFaceEvents; + @Mock DumpManager mDumpManager; @Mock ClockEventController mClockEventController; @@ -118,6 +122,11 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { @Mock private LogBuffer mLogBuffer; + private final View mFakeDateView = (View) (new ViewGroup(mContext) { + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) {} + }); + private final View mFakeWeatherView = new View(mContext); private final View mFakeSmartspaceView = new View(mContext); private KeyguardClockSwitchController mController; @@ -145,6 +154,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { when(mLargeClockView.getContext()).thenReturn(getContext()); when(mView.isAttachedToWindow()).thenReturn(true); + when(mSmartspaceController.buildAndConnectDateView(any())).thenReturn(mFakeDateView); + when(mSmartspaceController.buildAndConnectWeatherView(any())).thenReturn(mFakeWeatherView); when(mSmartspaceController.buildAndConnectView(any())).thenReturn(mFakeSmartspaceView); mExecutor = new FakeExecutor(new FakeSystemClock()); mController = new KeyguardClockSwitchController( @@ -168,6 +179,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { when(mClockController.getLargeClock()).thenReturn(mLargeClockController); when(mClockController.getSmallClock()).thenReturn(mSmallClockController); when(mClockController.getEvents()).thenReturn(mClockEvents); + when(mSmallClockController.getEvents()).thenReturn(mClockFaceEvents); + when(mLargeClockController.getEvents()).thenReturn(mClockFaceEvents); when(mClockController.getAnimations()).thenReturn(mClockAnimations); when(mClockRegistry.createCurrentClock()).thenReturn(mClockController); when(mClockEventController.getClock()).thenReturn(mClockController); @@ -252,6 +265,19 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { } @Test + public void onLocaleListChanged_rebuildsSmartspaceViews_whenDecouplingEnabled() { + when(mSmartspaceController.isEnabled()).thenReturn(true); + when(mSmartspaceController.isDateWeatherDecoupled()).thenReturn(true); + mController.init(); + + mController.onLocaleListChanged(); + // Should be called once on initial setup, then once again for locale change + verify(mSmartspaceController, times(2)).buildAndConnectDateView(mView); + verify(mSmartspaceController, times(2)).buildAndConnectWeatherView(mView); + verify(mSmartspaceController, times(2)).buildAndConnectView(mView); + } + + @Test public void testSmartspaceDisabledShowsKeyguardStatusArea() { when(mSmartspaceController.isEnabled()).thenReturn(false); mController.init(); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java index 01365b43b4b8..1a365ef9db17 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java @@ -25,9 +25,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManagerGlobal; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -39,6 +37,7 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.dagger.KeyguardStatusViewComponent; import com.android.systemui.SysuiTestCase; import com.android.systemui.navigationbar.NavigationBarController; +import com.android.systemui.settings.FakeDisplayTracker; import org.junit.Before; import org.junit.Test; @@ -58,12 +57,12 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Mock private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory; @Mock - private DisplayManager mDisplayManager; - @Mock private KeyguardDisplayManager.KeyguardPresentation mKeyguardPresentation; + private Executor mMainExecutor = Runnable::run; private Executor mBackgroundExecutor = Runnable::run; private KeyguardDisplayManager mManager; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); // The default and secondary displays are both in the default group private Display mDefaultDisplay; @@ -75,9 +74,9 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext.addMockSystemService(DisplayManager.class, mDisplayManager); mManager = spy(new KeyguardDisplayManager(mContext, () -> mNavigationBarController, - mKeyguardStatusViewComponentFactory, mBackgroundExecutor)); + mKeyguardStatusViewComponentFactory, mDisplayTracker, mMainExecutor, + mBackgroundExecutor)); doReturn(mKeyguardPresentation).when(mManager).createPresentation(any()); mDefaultDisplay = new Display(DisplayManagerGlobal.getInstance(), Display.DEFAULT_DISPLAY, @@ -96,23 +95,21 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Test public void testShow_defaultDisplayOnly() { - when(mDisplayManager.getDisplays()).thenReturn(new Display[]{mDefaultDisplay}); + mDisplayTracker.setAllDisplays(new Display[]{mDefaultDisplay}); mManager.show(); verify(mManager, never()).createPresentation(any()); } @Test public void testShow_includeSecondaryDisplay() { - when(mDisplayManager.getDisplays()).thenReturn( - new Display[]{mDefaultDisplay, mSecondaryDisplay}); + mDisplayTracker.setAllDisplays(new Display[]{mDefaultDisplay, mSecondaryDisplay}); mManager.show(); verify(mManager, times(1)).createPresentation(eq(mSecondaryDisplay)); } @Test public void testShow_includeAlwaysUnlockedDisplay() { - when(mDisplayManager.getDisplays()).thenReturn( - new Display[]{mDefaultDisplay, mAlwaysUnlockedDisplay}); + mDisplayTracker.setAllDisplays(new Display[]{mDefaultDisplay, mAlwaysUnlockedDisplay}); mManager.show(); verify(mManager, never()).createPresentation(any()); @@ -120,9 +117,8 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { @Test public void testShow_includeSecondaryAndAlwaysUnlockedDisplays() { - when(mDisplayManager.getDisplays()).thenReturn( + mDisplayTracker.setAllDisplays( new Display[]{mDefaultDisplay, mSecondaryDisplay, mAlwaysUnlockedDisplay}); - mManager.show(); verify(mManager, times(1)).createPresentation(eq(mSecondaryDisplay)); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewControllerTest.java index 06082b61ec26..68dc6c04bc79 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewControllerTest.java @@ -29,6 +29,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.KeyguardSliceProvider; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.tuner.TunerService; @@ -52,6 +53,7 @@ public class KeyguardSliceViewControllerTest extends SysuiTestCase { private ConfigurationController mConfigurationController; @Mock private ActivityStarter mActivityStarter; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); private DumpManager mDumpManager = new DumpManager(); private KeyguardSliceViewController mController; @@ -63,7 +65,7 @@ public class KeyguardSliceViewControllerTest extends SysuiTestCase { when(mView.getContext()).thenReturn(mContext); mController = new KeyguardSliceViewController( mView, mActivityStarter, mConfigurationController, - mTunerService, mDumpManager); + mTunerService, mDumpManager, mDisplayTracker); mController.setupUri(KeyguardSliceProvider.KEYGUARD_SLICE_URI); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 7647ec8a83e8..d1650b776052 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -854,6 +854,32 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + public void faceUnlockDoesNotRunWhenDeviceIsGoingToSleepWithAssistantVisible() { + mKeyguardUpdateMonitor.setKeyguardShowing(true, true); + mKeyguardUpdateMonitor.setAssistantVisible(true); + + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); + mTestableLooper.processAllMessages(); + clearInvocations(mFaceManager); + + // Device going to sleep while assistant is visible + mKeyguardUpdateMonitor.handleStartedGoingToSleep(0); + mKeyguardUpdateMonitor.handleFinishedGoingToSleep(0); + mTestableLooper.moveTimeForward(DEFAULT_CANCEL_SIGNAL_TIMEOUT); + mTestableLooper.processAllMessages(); + + mKeyguardUpdateMonitor.handleKeyguardReset(); + + assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isFalse(); + verify(mFaceManager, never()).authenticate(any(), + any(), + any(), + any(), + anyInt(), + anyBoolean()); + } + + @Test public void testIgnoresAuth_whenTrustAgentOnKeyguard_withoutBypass() { mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON); mTestableLooper.processAllMessages(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt index 81d0034128b1..32edf8f23aed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt @@ -148,7 +148,7 @@ class ChooserSelectorTest : SysuiTestCase() { // Act whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true) - flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.id)) + flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name)) // Assert verify(mockPackageManager, times(2)).setComponentEnabledSetting( @@ -175,7 +175,7 @@ class ChooserSelectorTest : SysuiTestCase() { // Act whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) - flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.id)) + flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name)) // Assert verify(mockPackageManager, times(2)).setComponentEnabledSetting( @@ -198,13 +198,13 @@ class ChooserSelectorTest : SysuiTestCase() { // Act whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) - flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.id + 1)) + flagListener.value.onFlagChanged(TestFlagEvent("other flag")) // Assert verifyZeroInteractions(mockPackageManager) } - private class TestFlagEvent(override val flagId: Int) : FlagListenable.FlagEvent { + private class TestFlagEvent(override val flagName: String) : FlagListenable.FlagEvent { override fun requestNoRestart() {} } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java index 0627fc6c542f..fc111485971c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java @@ -21,6 +21,7 @@ import static android.view.DisplayCutout.BOUNDS_POSITION_TOP; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.android.systemui.dump.LogBufferHelperKt.logcatLogBuffer; import static com.google.common.truth.Truth.assertThat; @@ -88,7 +89,9 @@ import com.android.systemui.decor.OverlayWindow; import com.android.systemui.decor.PrivacyDotCornerDecorProviderImpl; import com.android.systemui.decor.PrivacyDotDecorProviderFactory; import com.android.systemui.decor.RoundedCornerResDelegate; +import com.android.systemui.log.ScreenDecorationsLogger; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.events.PrivacyDotViewController; import com.android.systemui.tuner.TunerService; @@ -117,6 +120,7 @@ public class ScreenDecorationsTest extends SysuiTestCase { private DisplayManager mDisplayManager; private SecureSettings mSecureSettings; private final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); + private final FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); private FakeThreadFactory mThreadFactory; private ArrayList<DecorProvider> mPrivacyDecorProviders; private ArrayList<DecorProvider> mFaceScanningProviders; @@ -217,11 +221,14 @@ public class ScreenDecorationsTest extends SysuiTestCase { mAuthController, mStatusBarStateController, mKeyguardUpdateMonitor, - mExecutor)); + mExecutor, + new ScreenDecorationsLogger(logcatLogBuffer("TestLogBuffer")))); mScreenDecorations = spy(new ScreenDecorations(mContext, mExecutor, mSecureSettings, - mTunerService, mUserTracker, mDotViewController, mThreadFactory, - mPrivacyDotDecorProviderFactory, mFaceScanningProviderFactory) { + mTunerService, mUserTracker, mDisplayTracker, mDotViewController, mThreadFactory, + mPrivacyDotDecorProviderFactory, mFaceScanningProviderFactory, + new ScreenDecorationsLogger(logcatLogBuffer("TestLogBuffer")), + mAuthController) { @Override public void start() { super.start(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java index 58b4af43a9b7..da419d177d46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java @@ -39,6 +39,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import org.junit.Before; @@ -76,6 +77,7 @@ public class IWindowMagnificationConnectionTest extends SysuiTestCase { private IWindowMagnificationConnection mIWindowMagnificationConnection; private WindowMagnification mWindowMagnification; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Before public void setUp() throws Exception { @@ -88,7 +90,7 @@ public class IWindowMagnificationConnectionTest extends SysuiTestCase { any(IWindowMagnificationConnection.class)); mWindowMagnification = new WindowMagnification(getContext(), getContext().getMainThreadHandler(), mCommandQueue, - mModeSwitchesController, mSysUiState, mOverviewProxyService); + mModeSwitchesController, mSysUiState, mOverviewProxyService, mDisplayTracker); mWindowMagnification.mMagnificationControllerSupplier = new FakeControllerSupplier( mContext.getSystemService(DisplayManager.class)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index cdf3f654899e..f4505f5a914e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -78,6 +78,7 @@ import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.model.SysUiState; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.util.leak.ReferenceTestUtils; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.utils.os.FakeHandler; @@ -120,11 +121,12 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { private Handler mHandler; private TestableWindowManager mWindowManager; - private SysUiState mSysUiState = new SysUiState(); + private SysUiState mSysUiState; private Resources mResources; private WindowMagnificationAnimationController mWindowMagnificationAnimationController; private WindowMagnificationController mWindowMagnificationController; private Instrumentation mInstrumentation; + private final FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); private final ValueAnimator mValueAnimator = ValueAnimator.ofFloat(0, 1.0f).setDuration(0); @Before @@ -143,6 +145,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { return null; }).when(mSfVsyncFrameProvider).postFrameCallback( any(FrameCallback.class)); + mSysUiState = new SysUiState(mDisplayTracker); mSysUiState.addCallback(Mockito.mock(SysUiState.SysUiStateCallback.class)); when(mSecureSettings.getIntForUser(anyString(), anyInt(), anyInt())).then( returnsSecondArg()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java index ccf2f8b16f8a..f75dc03c7eae 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java @@ -45,6 +45,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import org.junit.Before; @@ -74,6 +75,8 @@ public class WindowMagnificationTest extends SysuiTestCase { private CommandQueue mCommandQueue; private WindowMagnification mWindowMagnification; private OverviewProxyListener mOverviewProxyListener; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -87,10 +90,10 @@ public class WindowMagnificationTest extends SysuiTestCase { when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState); - mCommandQueue = new CommandQueue(getContext()); + mCommandQueue = new CommandQueue(getContext(), new FakeDisplayTracker(getContext())); mWindowMagnification = new WindowMagnification(getContext(), getContext().getMainThreadHandler(), mCommandQueue, mModeSwitchesController, - mSysUiState, mOverviewProxyService); + mSysUiState, mOverviewProxyService, mDisplayTracker); mWindowMagnification.start(); final ArgumentCaptor<OverviewProxyListener> listenerArgumentCaptor = diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt index a61cd23b60fc..578e1d4d02ce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt @@ -15,6 +15,7 @@ import android.view.RemoteAnimationAdapter import android.view.RemoteAnimationTarget import android.view.SurfaceControl import android.view.ViewGroup +import android.widget.FrameLayout import android.widget.LinearLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase @@ -26,6 +27,7 @@ import junit.framework.Assert.assertTrue import junit.framework.AssertionFailedError import kotlin.concurrent.thread import org.junit.After +import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Rule import org.junit.Test @@ -195,6 +197,13 @@ class ActivityLaunchAnimatorTest : SysuiTestCase() { verify(controller).onLaunchAnimationStart(anyBoolean()) } + @Test + fun creatingControllerFromNormalViewThrows() { + assertThrows(IllegalArgumentException::class.java) { + ActivityLaunchAnimator.Controller.fromView(FrameLayout(mContext)) + } + } + private fun fakeWindow(): RemoteAnimationTarget { val bounds = Rect(10 /* left */, 20 /* top */, 30 /* right */, 40 /* bottom */) val taskInfo = ActivityManager.RunningTaskInfo() diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt index cac4a0e5432c..1e62fd2332c3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt @@ -26,6 +26,7 @@ import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue import org.junit.After import org.junit.Assert.assertNotEquals +import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Rule import org.junit.Test @@ -260,6 +261,13 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { assertThat(touchSurface.visibility).isEqualTo(View.GONE) } + @Test + fun creatingControllerFromNormalViewThrows() { + assertThrows(IllegalArgumentException::class.java) { + DialogLaunchAnimator.Controller.fromView(FrameLayout(mContext)) + } + } + private fun createAndShowDialog( animator: DialogLaunchAnimator = dialogLaunchAnimator, ): TestDialog { diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt index 3696ec540baf..0798d73cc2f2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt @@ -16,58 +16,34 @@ package com.android.systemui.animation -import android.graphics.drawable.Drawable import android.testing.AndroidTestingRunner import android.testing.TestableLooper -import android.view.View -import android.view.ViewGroup -import android.view.ViewParent +import android.widget.FrameLayout import androidx.test.filters.SmallTest -import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.SysuiTestCase -import org.junit.Before +import org.junit.Assert.assertThrows import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentMatchers.any -import org.mockito.ArgumentMatchers.anyInt -import org.mockito.Mock -import org.mockito.Mockito.`when` as whenever -import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper class GhostedViewLaunchAnimatorControllerTest : SysuiTestCase() { - @Mock lateinit var interactionJankMonitor: InteractionJankMonitor - @Mock lateinit var view: View - @Mock lateinit var rootView: ViewGroup - @Mock lateinit var viewParent: ViewParent - @Mock lateinit var drawable: Drawable - lateinit var controller: GhostedViewLaunchAnimatorController - - @Before - fun setup() { - MockitoAnnotations.initMocks(this) - whenever(view.rootView).thenReturn(rootView) - whenever(view.background).thenReturn(drawable) - whenever(view.height).thenReturn(0) - whenever(view.width).thenReturn(0) - whenever(view.parent).thenReturn(viewParent) - whenever(view.visibility).thenReturn(View.VISIBLE) - whenever(view.invalidate()).then { /* NO-OP */ } - whenever(view.getLocationOnScreen(any())).then { /* NO-OP */ } - whenever(interactionJankMonitor.begin(any(), anyInt())).thenReturn(true) - whenever(interactionJankMonitor.end(anyInt())).thenReturn(true) - controller = GhostedViewLaunchAnimatorController(view, 0, interactionJankMonitor) - } - @Test fun animatingOrphanViewDoesNotCrash() { val state = LaunchAnimator.State(top = 0, bottom = 0, left = 0, right = 0) + val controller = GhostedViewLaunchAnimatorController(LaunchableFrameLayout(mContext)) controller.onIntentStarted(willAnimate = true) controller.onLaunchAnimationStart(isExpandingFullyAbove = true) controller.onLaunchAnimationProgress(state, progress = 0f, linearProgress = 0f) controller.onLaunchAnimationEnd(isExpandingFullyAbove = true) } + + @Test + fun creatingControllerFromNormalViewThrows() { + assertThrows(IllegalArgumentException::class.java) { + GhostedViewLaunchAnimatorController(FrameLayout(mContext)) + } + } }
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt index b92c5d039d45..41beada11fa9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt @@ -51,14 +51,22 @@ import android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG import android.view.WindowMetrics import androidx.test.filters.SmallTest import com.airbnb.lottie.LottieAnimationView +import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestableContext import com.android.systemui.dump.DumpManager +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags.MODERN_ALTERNATE_BOUNCER +import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.recents.OverviewProxyService import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.TestCoroutineScope import org.junit.Before import org.junit.Rule import org.junit.Test @@ -101,6 +109,9 @@ class SideFpsControllerTest : SysuiTestCase() { @Captor lateinit var overlayCaptor: ArgumentCaptor<View> @Captor lateinit var overlayViewParamsCaptor: ArgumentCaptor<WindowManager.LayoutParams> + private lateinit var keyguardBouncerRepository: FakeKeyguardBouncerRepository + private lateinit var alternateBouncerInteractor: AlternateBouncerInteractor + private val featureFlags = FakeFeatureFlags() private val executor = FakeExecutor(FakeSystemClock()) private lateinit var overlayController: ISidefpsController private lateinit var sideFpsController: SideFpsController @@ -121,6 +132,18 @@ class SideFpsControllerTest : SysuiTestCase() { @Before fun setup() { + featureFlags.set(MODERN_ALTERNATE_BOUNCER, true) + keyguardBouncerRepository = FakeKeyguardBouncerRepository() + alternateBouncerInteractor = + AlternateBouncerInteractor( + keyguardBouncerRepository, + FakeBiometricSettingsRepository(), + FakeDeviceEntryFingerprintAuthRepository(), + FakeSystemClock(), + mock(KeyguardUpdateMonitor::class.java), + featureFlags, + ) + context.addMockSystemService(DisplayManager::class.java, displayManager) context.addMockSystemService(WindowManager::class.java, windowManager) @@ -217,7 +240,10 @@ class SideFpsControllerTest : SysuiTestCase() { displayManager, executor, handler, - dumpManager + alternateBouncerInteractor, + TestCoroutineScope(), + featureFlags, + dumpManager, ) overlayController = @@ -507,6 +533,26 @@ class SideFpsControllerTest : SysuiTestCase() { private fun verifySfpsIndicatorVisibilityOnTaskbarUpdate(sfpsViewVisible: Boolean) { sideFpsController.overlayOffsets = sensorLocation + } + + fun alternateBouncerVisibility_showAndHideSideFpsUI() = testWithDisplay { + // WHEN alternate bouncer is visible + keyguardBouncerRepository.setAlternateVisible(true) + executor.runAllReady() + + // THEN side fps shows UI + verify(windowManager).addView(any(), any()) + verify(windowManager, never()).removeView(any()) + + // WHEN alternate bouncer is no longer visible + keyguardBouncerRepository.setAlternateVisible(false) + executor.runAllReady() + + // THEN side fps UI is hidden + verify(windowManager).removeView(any()) + } + + private fun hidesWithTaskbar(visible: Boolean) { overlayController.show(SENSOR_ID, REASON_UNKNOWN) executor.runAllReady() @@ -515,7 +561,7 @@ class SideFpsControllerTest : SysuiTestCase() { verify(windowManager).addView(any(), any()) verify(windowManager, never()).removeView(any()) - verify(sideFpsView).visibility = if (sfpsViewVisible) View.VISIBLE else View.GONE + verify(sideFpsView).visibility = if (visible) View.VISIBLE else View.GONE } /** diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerBaseTest.java index 9c32c38e665c..dbbc2663a879 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerBaseTest.java @@ -37,7 +37,6 @@ import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.shade.ShadeExpansionListener; import com.android.systemui.shade.ShadeExpansionStateManager; import com.android.systemui.statusbar.LockscreenShadeTransitionController; -import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.SystemUIDialogManager; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; @@ -71,7 +70,6 @@ public class UdfpsKeyguardViewControllerBaseTest extends SysuiTestCase { protected @Mock SystemUIDialogManager mDialogManager; protected @Mock UdfpsController mUdfpsController; protected @Mock ActivityLaunchAnimator mActivityLaunchAnimator; - protected @Mock KeyguardBouncer mBouncer; protected @Mock PrimaryBouncerInteractor mPrimaryBouncerInteractor; protected @Mock AlternateBouncerInteractor mAlternateBouncerInteractor; @@ -149,11 +147,8 @@ public class UdfpsKeyguardViewControllerBaseTest extends SysuiTestCase { protected UdfpsKeyguardViewController createUdfpsKeyguardViewController( boolean useModernBouncer, boolean useExpandedOverlay) { - mFeatureFlags.set(Flags.MODERN_BOUNCER, useModernBouncer); mFeatureFlags.set(Flags.MODERN_ALTERNATE_BOUNCER, useModernBouncer); mFeatureFlags.set(Flags.UDFPS_NEW_TOUCH_DETECTION, useExpandedOverlay); - when(mStatusBarKeyguardViewManager.getPrimaryBouncer()).thenReturn( - useModernBouncer ? null : mBouncer); UdfpsKeyguardViewController controller = new UdfpsKeyguardViewController( mView, mStatusBarStateController, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java index 7715f7fc5dc9..f437a8f009f8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java @@ -32,24 +32,17 @@ import android.view.MotionEvent; import androidx.test.filters.SmallTest; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; import com.android.systemui.shade.ShadeExpansionListener; import com.android.systemui.statusbar.StatusBarState; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper(setAsMainLooper = true) public class UdfpsKeyguardViewControllerTest extends UdfpsKeyguardViewControllerBaseTest { - private @Captor ArgumentCaptor<PrimaryBouncerExpansionCallback> - mBouncerExpansionCallbackCaptor; - private PrimaryBouncerExpansionCallback mBouncerExpansionCallback; - @Override public UdfpsKeyguardViewController createUdfpsKeyguardViewController() { return createUdfpsKeyguardViewController(/* useModernBouncer */ false, @@ -62,11 +55,9 @@ public class UdfpsKeyguardViewControllerTest extends UdfpsKeyguardViewController captureStatusBarStateListeners(); sendStatusBarStateChanged(StatusBarState.KEYGUARD); - captureBouncerExpansionCallback(); when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true); when(mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()).thenReturn(true); - mBouncerExpansionCallback.onVisibilityChanged(true); - + when(mView.getUnpausedAlpha()).thenReturn(0); assertTrue(mController.shouldPauseAuth()); } @@ -304,11 +295,6 @@ public class UdfpsKeyguardViewControllerTest extends UdfpsKeyguardViewController verify(mView, atLeastOnce()).setPauseAuth(false); } - private void captureBouncerExpansionCallback() { - verify(mBouncer).addBouncerExpansionCallback(mBouncerExpansionCallbackCaptor.capture()); - mBouncerExpansionCallback = mBouncerExpansionCallbackCaptor.getValue(); - } - @Test // TODO(b/259264861): Tracking Bug public void testUdfpsExpandedOverlayOn() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt index 9060922266c0..c73ff1dab3d8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt @@ -26,8 +26,10 @@ import com.android.systemui.classifier.FalsingCollector import com.android.systemui.flags.FeatureFlags import com.android.systemui.keyguard.DismissCallbackRegistry import com.android.systemui.keyguard.data.BouncerView -import com.android.systemui.keyguard.data.repository.BiometricRepository +import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository +import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepositoryImpl import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor @@ -64,7 +66,7 @@ class UdfpsKeyguardViewControllerWithCoroutinesTest : UdfpsKeyguardViewControlle allowTestableLooperAsMainThread() // repeatWhenAttached requires the main thread MockitoAnnotations.initMocks(this) keyguardBouncerRepository = - KeyguardBouncerRepository( + KeyguardBouncerRepositoryImpl( mock(com.android.keyguard.ViewMediatorCallback::class.java), FakeSystemClock(), TestCoroutineScope(), @@ -90,7 +92,8 @@ class UdfpsKeyguardViewControllerWithCoroutinesTest : UdfpsKeyguardViewControlle mAlternateBouncerInteractor = AlternateBouncerInteractor( keyguardBouncerRepository, - mock(BiometricRepository::class.java), + mock(BiometricSettingsRepository::class.java), + mock(DeviceEntryFingerprintAuthRepository::class.java), mock(SystemClock::class.java), mock(KeyguardUpdateMonitor::class.java), mock(FeatureFlags::class.java) diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java index bdd496ec219b..71c335e6b173 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java @@ -16,8 +16,6 @@ package com.android.systemui.clipboardoverlay; -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_ENABLED; - import static com.google.android.setupcompat.util.WizardManagerHelper.SETTINGS_SECURE_USER_SETUP_COMPLETE; import static org.junit.Assert.assertEquals; @@ -33,7 +31,6 @@ import android.content.ClipData; import android.content.ClipDescription; import android.content.ClipboardManager; import android.os.PersistableBundle; -import android.provider.DeviceConfig; import android.provider.Settings; import androidx.test.filters.SmallTest; @@ -41,9 +38,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.logging.UiEventLogger; import com.android.systemui.SysuiTestCase; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.flags.Flags; -import com.android.systemui.util.DeviceConfigProxyFake; import org.junit.Before; import org.junit.Test; @@ -63,18 +57,11 @@ public class ClipboardListenerTest extends SysuiTestCase { @Mock private ClipboardManager mClipboardManager; @Mock - private ClipboardOverlayControllerLegacyFactory mClipboardOverlayControllerLegacyFactory; - @Mock - private ClipboardOverlayControllerLegacy mOverlayControllerLegacy; - @Mock private ClipboardOverlayController mOverlayController; @Mock private ClipboardToast mClipboardToast; @Mock private UiEventLogger mUiEventLogger; - @Mock - private FeatureFlags mFeatureFlags; - private DeviceConfigProxyFake mDeviceConfigProxy; private ClipData mSampleClipData; private String mSampleSource = "Example source"; @@ -97,8 +84,6 @@ public class ClipboardListenerTest extends SysuiTestCase { mOverlayControllerProvider = () -> mOverlayController; MockitoAnnotations.initMocks(this); - when(mClipboardOverlayControllerLegacyFactory.create(any())) - .thenReturn(mOverlayControllerLegacy); when(mClipboardManager.hasPrimaryClip()).thenReturn(true); Settings.Secure.putInt( mContext.getContentResolver(), SETTINGS_SECURE_USER_SETUP_COMPLETE, 1); @@ -108,26 +93,13 @@ public class ClipboardListenerTest extends SysuiTestCase { when(mClipboardManager.getPrimaryClip()).thenReturn(mSampleClipData); when(mClipboardManager.getPrimaryClipSource()).thenReturn(mSampleSource); - mDeviceConfigProxy = new DeviceConfigProxyFake(); - - mClipboardListener = new ClipboardListener(getContext(), mDeviceConfigProxy, - mOverlayControllerProvider, mClipboardOverlayControllerLegacyFactory, - mClipboardToast, mClipboardManager, mUiEventLogger, mFeatureFlags); + mClipboardListener = new ClipboardListener(getContext(), mOverlayControllerProvider, + mClipboardToast, mClipboardManager, mUiEventLogger); } - @Test - public void test_disabled() { - mDeviceConfigProxy.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, - "false", false); - mClipboardListener.start(); - verifyZeroInteractions(mClipboardManager); - verifyZeroInteractions(mUiEventLogger); - } @Test - public void test_enabled() { - mDeviceConfigProxy.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, - "true", false); + public void test_initialization() { mClipboardListener.start(); verify(mClipboardManager).addPrimaryClipChangedListener(any()); verifyZeroInteractions(mUiEventLogger); @@ -135,45 +107,6 @@ public class ClipboardListenerTest extends SysuiTestCase { @Test public void test_consecutiveCopies() { - when(mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR)).thenReturn(false); - - mDeviceConfigProxy.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, - "true", false); - mClipboardListener.start(); - mClipboardListener.onPrimaryClipChanged(); - - verify(mClipboardOverlayControllerLegacyFactory).create(any()); - - verify(mOverlayControllerLegacy).setClipData( - mClipDataCaptor.capture(), mStringCaptor.capture()); - - assertEquals(mSampleClipData, mClipDataCaptor.getValue()); - assertEquals(mSampleSource, mStringCaptor.getValue()); - - verify(mOverlayControllerLegacy).setOnSessionCompleteListener(mRunnableCaptor.capture()); - - // Should clear the overlay controller - mRunnableCaptor.getValue().run(); - - mClipboardListener.onPrimaryClipChanged(); - - verify(mClipboardOverlayControllerLegacyFactory, times(2)).create(any()); - - // Not calling the runnable here, just change the clip again and verify that the overlay is - // NOT recreated. - - mClipboardListener.onPrimaryClipChanged(); - - verify(mClipboardOverlayControllerLegacyFactory, times(2)).create(any()); - verifyZeroInteractions(mOverlayControllerProvider); - } - - @Test - public void test_consecutiveCopies_new() { - when(mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR)).thenReturn(true); - - mDeviceConfigProxy.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, - "true", false); mClipboardListener.start(); mClipboardListener.onPrimaryClipChanged(); @@ -200,7 +133,6 @@ public class ClipboardListenerTest extends SysuiTestCase { mClipboardListener.onPrimaryClipChanged(); verify(mOverlayControllerProvider, times(2)).get(); - verifyZeroInteractions(mClipboardOverlayControllerLegacyFactory); } @Test @@ -231,23 +163,6 @@ public class ClipboardListenerTest extends SysuiTestCase { @Test public void test_logging_enterAndReenter() { - when(mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR)).thenReturn(false); - - mClipboardListener.start(); - - mClipboardListener.onPrimaryClipChanged(); - mClipboardListener.onPrimaryClipChanged(); - - verify(mUiEventLogger, times(1)).log( - ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED, 0, mSampleSource); - verify(mUiEventLogger, times(1)).log( - ClipboardOverlayEvent.CLIPBOARD_OVERLAY_UPDATED, 0, mSampleSource); - } - - @Test - public void test_logging_enterAndReenter_new() { - when(mFeatureFlags.isEnabled(Flags.CLIPBOARD_OVERLAY_REFACTOR)).thenReturn(true); - mClipboardListener.start(); mClipboardListener.onPrimaryClipChanged(); @@ -271,6 +186,5 @@ public class ClipboardListenerTest extends SysuiTestCase { ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource); verify(mClipboardToast, times(1)).showCopiedToast(); verifyZeroInteractions(mOverlayControllerProvider); - verifyZeroInteractions(mClipboardOverlayControllerLegacyFactory); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java index b4e85c06933a..ca5b7af5695a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java @@ -47,6 +47,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.screenshot.TimeoutHandler; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -81,6 +82,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { private ClipboardOverlayUtils mClipboardUtils; @Mock private UiEventLogger mUiEventLogger; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); private FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); @Mock @@ -116,7 +118,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { mFeatureFlags, mClipboardUtils, mExecutor, - mUiEventLogger); + mUiEventLogger, + mDisplayTracker); verify(mClipboardOverlayView).setCallbacks(mOverlayCallbacksCaptor.capture()); mCallbacks = mOverlayCallbacksCaptor.getValue(); } 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 ed40c90b2c69..85f9961bf449 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 @@ -20,6 +20,7 @@ import android.app.PendingIntent import android.content.ComponentName import android.content.Context import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager import android.content.pm.ServiceInfo import android.os.UserHandle import android.service.controls.ControlsProviderService @@ -95,6 +96,7 @@ class ControlsUiControllerImplTest : SysuiTestCase() { @Mock lateinit var dumpManager: DumpManager @Mock lateinit var authorizedPanelsRepository: AuthorizedPanelsRepository @Mock lateinit var featureFlags: FeatureFlags + @Mock lateinit var packageManager: PackageManager val sharedPreferences = FakeSharedPreferences() lateinit var controlsSettingsRepository: FakeControlsSettingsRepository @@ -124,6 +126,7 @@ class ControlsUiControllerImplTest : SysuiTestCase() { ControlsUiControllerImpl( Lazy { controlsController }, context, + packageManager, uiExecutor, bgExecutor, Lazy { controlsListingController }, diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/ui/OverflowMenuAdapterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/OverflowMenuAdapterTest.kt new file mode 100644 index 000000000000..dbaf94f1018c --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/ui/OverflowMenuAdapterTest.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.controls.ui + +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class OverflowMenuAdapterTest : SysuiTestCase() { + + @Test + fun testGetItemId() { + val ids = listOf(27L, 73L) + val labels = listOf("first", "second") + val adapter = + OverflowMenuAdapter( + context, + layoutId = 0, + labels.zip(ids).map { OverflowMenuAdapter.MenuItem(it.first, it.second) } + ) { true } + + ids.forEachIndexed { index, id -> assertThat(adapter.getItemId(index)).isEqualTo(id) } + } + + @Test + fun testCheckEnabled() { + val ids = listOf(27L, 73L) + val labels = listOf("first", "second") + val adapter = + OverflowMenuAdapter( + context, + layoutId = 0, + labels.zip(ids).map { OverflowMenuAdapter.MenuItem(it.first, it.second) } + ) { position -> position == 0 } + + assertThat(adapter.isEnabled(0)).isTrue() + assertThat(adapter.isEnabled(1)).isFalse() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index ff883eb16bde..6b095ffd3977 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -36,11 +36,10 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.systemui.SysuiTestCase; import com.android.systemui.dreams.complication.ComplicationHostViewController; +import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; import com.android.systemui.statusbar.BlurUtils; -import com.android.systemui.statusbar.phone.KeyguardBouncer; -import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import org.junit.Before; import org.junit.Test; @@ -81,12 +80,6 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { BlurUtils mBlurUtils; @Mock - StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; - - @Mock - KeyguardBouncer mBouncer; - - @Mock ViewRootImpl mViewRoot; @Mock @@ -96,6 +89,9 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { DreamOverlayAnimationsController mAnimationsController; @Mock + BouncerlessScrimController mBouncerlessScrimController; + + @Mock DreamOverlayStateController mStateController; DreamOverlayContainerViewController mController; @@ -106,7 +102,6 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { when(mDreamOverlayContainerView.getResources()).thenReturn(mResources); when(mDreamOverlayContainerView.getViewTreeObserver()).thenReturn(mViewTreeObserver); - when(mStatusBarKeyguardViewManager.getPrimaryBouncer()).thenReturn(mBouncer); when(mDreamOverlayContainerView.getViewRootImpl()).thenReturn(mViewRoot); mController = new DreamOverlayContainerViewController( @@ -114,7 +109,6 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { mComplicationHostViewController, mDreamOverlayContentView, mDreamOverlayStatusBarViewController, - mStatusBarKeyguardViewManager, mBlurUtils, mHandler, mResources, @@ -123,7 +117,8 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { MILLIS_UNTIL_FULL_JITTER, mPrimaryBouncerCallbackInteractor, mAnimationsController, - mStateController); + mStateController, + mBouncerlessScrimController); } @Test @@ -170,7 +165,8 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { final ArgumentCaptor<PrimaryBouncerExpansionCallback> bouncerExpansionCaptor = ArgumentCaptor.forClass(PrimaryBouncerExpansionCallback.class); mController.onViewAttached(); - verify(mBouncer).addBouncerExpansionCallback(bouncerExpansionCaptor.capture()); + verify(mPrimaryBouncerCallbackInteractor).addBouncerExpansionCallback( + bouncerExpansionCaptor.capture()); bouncerExpansionCaptor.getValue().onExpansionChanged(0.5f); verify(mBlurUtils, never()).applyBlur(eq(mViewRoot), anyInt(), eq(false)); @@ -181,7 +177,8 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { final ArgumentCaptor<PrimaryBouncerExpansionCallback> bouncerExpansionCaptor = ArgumentCaptor.forClass(PrimaryBouncerExpansionCallback.class); mController.onViewAttached(); - verify(mBouncer).addBouncerExpansionCallback(bouncerExpansionCaptor.capture()); + verify(mPrimaryBouncerCallbackInteractor).addBouncerExpansionCallback( + bouncerExpansionCaptor.capture()); final float blurRadius = 1337f; when(mBlurUtils.blurRadiusOfRatio(anyFloat())).thenReturn(blurRadius); @@ -217,6 +214,27 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { } @Test + public void testSkipEntryAnimationsWhenExitingLowLight() { + ArgumentCaptor<DreamOverlayStateController.Callback> callbackCaptor = + ArgumentCaptor.forClass(DreamOverlayStateController.Callback.class); + when(mStateController.isLowLightActive()).thenReturn(false); + + // Call onInit so that the callback is added. + mController.onInit(); + verify(mStateController).addCallback(callbackCaptor.capture()); + + // Send the signal that low light is exiting + callbackCaptor.getValue().onExitLowLight(); + + // View is attached to trigger animations. + mController.onViewAttached(); + + // Entry animations should be started then immediately ended to skip to the end. + verify(mAnimationsController).startEntryAnimations(); + verify(mAnimationsController).endAnimations(); + } + + @Test public void testCancelDreamEntryAnimationsOnDetached() { mController.onViewAttached(); mController.onViewDetached(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index 3b8bb8089910..dfb4d5baeef5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -31,6 +31,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.service.dreams.IDreamOverlay; import android.service.dreams.IDreamOverlayCallback; +import android.service.dreams.IDreamOverlayClient; +import android.service.dreams.IDreamOverlayClientCallback; import android.testing.AndroidTestingRunner; import android.view.View; import android.view.ViewGroup; @@ -58,6 +60,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @SmallTest @@ -148,13 +151,25 @@ public class DreamOverlayServiceTest extends SysuiTestCase { mDreamOverlayCallbackController); } - @Test - public void testOnStartMetricsLogged() throws Exception { + public IDreamOverlayClient getClient() throws RemoteException { final IBinder proxy = mService.onBind(new Intent()); final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClientCallback callback = + Mockito.mock(IDreamOverlayClientCallback.class); + overlay.getClient(callback); + final ArgumentCaptor<IDreamOverlayClient> clientCaptor = + ArgumentCaptor.forClass(IDreamOverlayClient.class); + verify(callback).onDreamOverlayClient(clientCaptor.capture()); + + return clientCaptor.getValue(); + } + + @Test + public void testOnStartMetricsLogged() throws Exception { + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -165,11 +180,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testOverlayContainerViewAddedToWindow() throws Exception { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -178,11 +192,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testDreamOverlayContainerViewControllerInitialized() throws Exception { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -196,11 +209,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { .thenReturn(mDreamOverlayContainerViewParent) .thenReturn(null); - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -209,11 +221,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testShouldShowComplicationsSetByStartDream() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, true /*shouldShowComplication*/); assertThat(mService.shouldShowComplications()).isTrue(); @@ -221,11 +232,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testLowLightSetByStartDream() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, + client.startDream(mWindowParams, mDreamOverlayCallback, LOW_LIGHT_COMPONENT.flattenToString(), false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -235,11 +245,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testOnEndDream() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, + client.startDream(mWindowParams, mDreamOverlayCallback, LOW_LIGHT_COMPONENT.flattenToString(), false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -261,11 +270,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testDestroy() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, + client.startDream(mWindowParams, mDreamOverlayCallback, LOW_LIGHT_COMPONENT.flattenToString(), false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -305,15 +313,14 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testDecorViewNotAddedToWindowAfterDestroy() throws Exception { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Destroy the service. mService.onDestroy(); mMainExecutor.runAllReady(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -331,11 +338,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testResetCurrentOverlayWhenConnectedToNewDream() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. Do not show dream complications. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, false /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -352,7 +358,7 @@ public class DreamOverlayServiceTest extends SysuiTestCase { // New dream starting with dream complications showing. Note that when a new dream is // binding to the dream overlay service, it receives the same instance of IBinder as the // first one. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, true /*shouldShowComplication*/); mMainExecutor.runAllReady(); @@ -371,11 +377,10 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Test public void testWakeUp() throws RemoteException { - final IBinder proxy = mService.onBind(new Intent()); - final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + final IDreamOverlayClient client = getClient(); // Inform the overlay service of dream starting. - overlay.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, + client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT, true /*shouldShowComplication*/); mMainExecutor.runAllReady(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index ee989d1ddab6..b7d0f294ecd4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -251,6 +251,30 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { } @Test + public void testNotifyLowLightExit() { + final DreamOverlayStateController stateController = + new DreamOverlayStateController(mExecutor, true); + + stateController.addCallback(mCallback); + mExecutor.runAllReady(); + assertThat(stateController.isLowLightActive()).isFalse(); + + // Turn low light on then off to trigger the exiting callback. + stateController.setLowLightActive(true); + stateController.setLowLightActive(false); + + // Callback was only called once, when + mExecutor.runAllReady(); + verify(mCallback, times(1)).onExitLowLight(); + assertThat(stateController.isLowLightActive()).isFalse(); + + // Set with false again, which should not cause the callback to trigger again. + stateController.setLowLightActive(false); + mExecutor.runAllReady(); + verify(mCallback, times(1)).onExitLowLight(); + } + + @Test public void testNotifyEntryAnimationsFinishedChanged() { final DreamOverlayStateController stateController = new DreamOverlayStateController(mExecutor, true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java index 89c728082cc5..a4cf15c3fafa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java @@ -31,13 +31,13 @@ import android.content.ComponentName; import android.content.Context; import android.testing.AndroidTestingRunner; import android.view.View; -import android.widget.ImageView; import androidx.test.filters.SmallTest; import com.android.internal.logging.UiEventLogger; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.common.ui.view.LaunchableImageView; import com.android.systemui.controls.ControlsServiceInfo; import com.android.systemui.controls.controller.ControlsController; import com.android.systemui.controls.controller.StructureInfo; @@ -90,7 +90,7 @@ public class DreamHomeControlsComplicationTest extends SysuiTestCase { private View mView; @Mock - private ImageView mHomeControlsView; + private LaunchableImageView mHomeControlsView; @Mock private ActivityStarter mActivityStarter; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/conditions/DreamConditionTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/conditions/DreamConditionTest.java new file mode 100644 index 000000000000..19347c768524 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/conditions/DreamConditionTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.conditions; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.shared.condition.Condition; + +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) +public class DreamConditionTest extends SysuiTestCase { + @Mock + Context mContext; + + @Mock + Condition.Callback mCallback; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + /** + * Ensure a dreaming state immediately triggers the condition. + */ + @Test + public void testInitialState() { + final Intent intent = new Intent(Intent.ACTION_DREAMING_STARTED); + when(mContext.registerReceiver(any(), any())).thenReturn(intent); + final DreamCondition condition = new DreamCondition(mContext); + condition.addCallback(mCallback); + condition.start(); + + verify(mCallback).onConditionChanged(eq(condition)); + assertThat(condition.isConditionMet()).isTrue(); + } + + /** + * Ensure that changing dream state triggers condition. + */ + @Test + public void testChange() { + final Intent intent = new Intent(Intent.ACTION_DREAMING_STARTED); + final ArgumentCaptor<BroadcastReceiver> receiverCaptor = + ArgumentCaptor.forClass(BroadcastReceiver.class); + when(mContext.registerReceiver(receiverCaptor.capture(), any())).thenReturn(intent); + final DreamCondition condition = new DreamCondition(mContext); + condition.addCallback(mCallback); + condition.start(); + clearInvocations(mCallback); + receiverCaptor.getValue().onReceive(mContext, new Intent(Intent.ACTION_DREAMING_STOPPED)); + verify(mCallback).onConditionChanged(eq(condition)); + assertThat(condition.isConditionMet()).isFalse(); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java index f64179deec35..3a168d4e234b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java @@ -41,12 +41,13 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.UiEventLogger; import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.touch.scrim.ScrimController; +import com.android.systemui.dreams.touch.scrim.ScrimManager; import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants; import com.android.systemui.shade.ShadeExpansionChangeEvent; import com.android.systemui.shared.system.InputChannelCompat; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; -import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.wm.shell.animation.FlingAnimationUtils; import org.junit.Before; @@ -63,10 +64,13 @@ import java.util.Optional; @RunWith(AndroidTestingRunner.class) public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { @Mock - StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + CentralSurfaces mCentralSurfaces; @Mock - CentralSurfaces mCentralSurfaces; + ScrimManager mScrimManager; + + @Mock + ScrimController mScrimController; @Mock NotificationShadeWindowController mNotificationShadeWindowController; @@ -111,7 +115,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); mTouchHandler = new BouncerSwipeTouchHandler( mDisplayMetrics, - mStatusBarKeyguardViewManager, + mScrimManager, Optional.of(mCentralSurfaces), mNotificationShadeWindowController, mValueAnimatorCreator, @@ -121,6 +125,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { TOUCH_REGION, mUiEventLogger); + when(mScrimManager.getCurrentController()).thenReturn(mScrimController); when(mCentralSurfaces.isBouncerShowing()).thenReturn(false); when(mCentralSurfaces.getDisplayHeight()).thenReturn((float) SCREEN_HEIGHT_PX); when(mValueAnimatorCreator.create(anyFloat(), anyFloat())).thenReturn(mValueAnimator); @@ -193,7 +198,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) .isTrue(); - verify(mStatusBarKeyguardViewManager, never()).onPanelExpansionChanged(any()); + verify(mScrimController, never()).expand(any()); } /** @@ -220,7 +225,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) .isTrue(); - verify(mStatusBarKeyguardViewManager, never()).onPanelExpansionChanged(any()); + verify(mScrimController, never()).expand(any()); } /** @@ -274,12 +279,12 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, 0, direction == Direction.UP ? SCREEN_HEIGHT_PX - distanceY : distanceY, 0); - reset(mStatusBarKeyguardViewManager); + reset(mScrimController); assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) .isTrue(); // Ensure only called once - verify(mStatusBarKeyguardViewManager).onPanelExpansionChanged(any()); + verify(mScrimController).expand(any()); final float expansion = isBouncerInitiallyShowing ? percent : 1 - percent; final float dragDownAmount = event2.getY() - event1.getY(); @@ -288,7 +293,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { ShadeExpansionChangeEvent event = new ShadeExpansionChangeEvent( expansion, /* expanded= */ false, /* tracking= */ true, dragDownAmount); - verify(mStatusBarKeyguardViewManager).onPanelExpansionChanged(event); + verify(mScrimController).expand(event); } /** diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java new file mode 100644 index 000000000000..79c535aea2d0 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java @@ -0,0 +1,78 @@ +/* + * 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.dreams.touch.scrim; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; + +import android.os.PowerManager; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.shade.ShadeExpansionChangeEvent; +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.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class BouncerlessScrimControllerTest extends SysuiTestCase { + @Mock + BouncerlessScrimController.Callback mCallback; + + @Mock + PowerManager mPowerManager; + + private final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testWakeupOnSwipeOpen() { + final BouncerlessScrimController scrimController = + new BouncerlessScrimController(mExecutor, mPowerManager); + scrimController.addCallback(mCallback); + scrimController.expand(new ShadeExpansionChangeEvent(.5f, true, false, 0.0f)); + mExecutor.runAllReady(); + verify(mPowerManager).wakeUp(anyLong(), eq(PowerManager.WAKE_REASON_GESTURE), any()); + verify(mCallback).onWakeup(); + } + + @Test + public void testExpansionPropagation() { + final BouncerlessScrimController scrimController = + new BouncerlessScrimController(mExecutor, mPowerManager); + scrimController.addCallback(mCallback); + final ShadeExpansionChangeEvent expansionEvent = + new ShadeExpansionChangeEvent(0.5f, false, false, 0.0f); + scrimController.expand(expansionEvent); + mExecutor.runAllReady(); + verify(mCallback).onExpansion(eq(expansionEvent)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/ScrimManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/ScrimManagerTest.java new file mode 100644 index 000000000000..ac9822db85d6 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/scrim/ScrimManagerTest.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.touch.scrim; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.statusbar.policy.KeyguardStateController; +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) +public class ScrimManagerTest extends SysuiTestCase { + @Mock + ScrimController mBouncerlessScrimController; + + @Mock + ScrimController mBouncerScrimController; + + @Mock + KeyguardStateController mKeyguardStateController; + + @Mock + ScrimManager.Callback mCallback; + + private final FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testControllerSelection() { + when(mKeyguardStateController.canDismissLockScreen()).thenReturn(false); + ArgumentCaptor<KeyguardStateController.Callback> callbackCaptor = + ArgumentCaptor.forClass(KeyguardStateController.Callback.class); + final ScrimManager manager = new ScrimManager(mExecutor, mBouncerScrimController, + mBouncerlessScrimController, mKeyguardStateController); + verify(mKeyguardStateController).addCallback(callbackCaptor.capture()); + + assertThat(manager.getCurrentController()).isEqualTo(mBouncerScrimController); + when(mKeyguardStateController.canDismissLockScreen()).thenReturn(true); + callbackCaptor.getValue().onKeyguardShowingChanged(); + mExecutor.runAllReady(); + assertThat(manager.getCurrentController()).isEqualTo(mBouncerlessScrimController); + } + + @Test + public void testCallback() { + when(mKeyguardStateController.canDismissLockScreen()).thenReturn(false); + ArgumentCaptor<KeyguardStateController.Callback> callbackCaptor = + ArgumentCaptor.forClass(KeyguardStateController.Callback.class); + final ScrimManager manager = new ScrimManager(mExecutor, mBouncerScrimController, + mBouncerlessScrimController, mKeyguardStateController); + verify(mKeyguardStateController).addCallback(callbackCaptor.capture()); + + manager.addCallback(mCallback); + when(mKeyguardStateController.canDismissLockScreen()).thenReturn(true); + callbackCaptor.getValue().onKeyguardShowingChanged(); + mExecutor.runAllReady(); + verify(mCallback).onScrimControllerChanged(eq(mBouncerlessScrimController)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FakeFeatureFlagsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FakeFeatureFlagsTest.kt index 170a70f2fc40..35f0f6c68798 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FakeFeatureFlagsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FakeFeatureFlagsTest.kt @@ -125,7 +125,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.set(unreleasedFlag, false) flags.set(unreleasedFlag, false) - listener.verifyInOrder(unreleasedFlag.id, unreleasedFlag.id) + listener.verifyInOrder(unreleasedFlag.name, unreleasedFlag.name) } @Test @@ -137,7 +137,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.set(stringFlag, "Test") flags.set(stringFlag, "Test") - listener.verifyInOrder(stringFlag.id) + listener.verifyInOrder(stringFlag.name) } @Test @@ -149,7 +149,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.removeListener(listener) flags.set(unreleasedFlag, false) - listener.verifyInOrder(unreleasedFlag.id) + listener.verifyInOrder(unreleasedFlag.name) } @Test @@ -162,7 +162,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.removeListener(listener) flags.set(stringFlag, "Other") - listener.verifyInOrder(stringFlag.id) + listener.verifyInOrder(stringFlag.name) } @Test @@ -175,7 +175,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.set(releasedFlag, true) flags.set(unreleasedFlag, true) - listener.verifyInOrder(releasedFlag.id, unreleasedFlag.id) + listener.verifyInOrder(releasedFlag.name, unreleasedFlag.name) } @Test @@ -191,7 +191,7 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.set(releasedFlag, false) flags.set(unreleasedFlag, false) - listener.verifyInOrder(releasedFlag.id, unreleasedFlag.id) + listener.verifyInOrder(releasedFlag.name, unreleasedFlag.name) } @Test @@ -204,8 +204,8 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.set(releasedFlag, true) - listener1.verifyInOrder(releasedFlag.id) - listener2.verifyInOrder(releasedFlag.id) + listener1.verifyInOrder(releasedFlag.name) + listener2.verifyInOrder(releasedFlag.name) } @Test @@ -220,18 +220,18 @@ class FakeFeatureFlagsTest : SysuiTestCase() { flags.removeListener(listener2) flags.set(releasedFlag, false) - listener1.verifyInOrder(releasedFlag.id, releasedFlag.id) - listener2.verifyInOrder(releasedFlag.id) + listener1.verifyInOrder(releasedFlag.name, releasedFlag.name) + listener2.verifyInOrder(releasedFlag.name) } class VerifyingListener : FlagListenable.Listener { - var flagEventIds = mutableListOf<Int>() + var flagEventNames = mutableListOf<String>() override fun onFlagChanged(event: FlagListenable.FlagEvent) { - flagEventIds.add(event.flagId) + flagEventNames.add(event.flagName) } - fun verifyInOrder(vararg eventIds: Int) { - assertThat(flagEventIds).containsExactlyElementsIn(eventIds.asList()) + fun verifyInOrder(vararg eventNames: String) { + assertThat(flagEventNames).containsExactlyElementsIn(eventNames.asList()) } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt index 7592cc527190..d8bbd04bfd4a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt @@ -23,12 +23,11 @@ import android.content.res.Resources import android.content.res.Resources.NotFoundException import android.test.suitebuilder.annotation.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.statusbar.commandline.CommandRegistry -import com.android.systemui.util.DeviceConfigProxyFake import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.nullable import com.android.systemui.util.mockito.withArgCaptor +import com.android.systemui.util.settings.GlobalSettings import com.android.systemui.util.settings.SecureSettings import com.google.common.truth.Truth.assertThat import org.junit.Assert @@ -62,21 +61,20 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Mock private lateinit var mockContext: Context @Mock + private lateinit var globalSettings: GlobalSettings + @Mock private lateinit var secureSettings: SecureSettings @Mock private lateinit var systemProperties: SystemPropertiesHelper @Mock private lateinit var resources: Resources @Mock - private lateinit var commandRegistry: CommandRegistry - @Mock private lateinit var restarter: Restarter - private val flagMap = mutableMapOf<Int, Flag<*>>() + private val flagMap = mutableMapOf<String, Flag<*>>() private lateinit var broadcastReceiver: BroadcastReceiver - private lateinit var clearCacheAction: Consumer<Int> + private lateinit var clearCacheAction: Consumer<String> private val serverFlagReader = ServerFlagReaderFake() - private val deviceConfig = DeviceConfigProxyFake() private val teamfoodableFlagA = UnreleasedFlag( 500, name = "a", namespace = "test", teamfood = true ) @@ -87,11 +85,13 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Before fun setup() { MockitoAnnotations.initMocks(this) - flagMap.put(teamfoodableFlagA.id, teamfoodableFlagA) - flagMap.put(teamfoodableFlagB.id, teamfoodableFlagB) + flagMap.put(Flags.TEAMFOOD.name, Flags.TEAMFOOD) + flagMap.put(teamfoodableFlagA.name, teamfoodableFlagA) + flagMap.put(teamfoodableFlagB.name, teamfoodableFlagB) mFeatureFlagsDebug = FeatureFlagsDebug( flagManager, mockContext, + globalSettings, secureSettings, systemProperties, resources, @@ -110,14 +110,14 @@ class FeatureFlagsDebugTest : SysuiTestCase() { clearCacheAction = withArgCaptor { verify(flagManager).clearCacheAction = capture() } - whenever(flagManager.idToSettingsKey(any())).thenAnswer { "key-${it.arguments[0]}" } + whenever(flagManager.nameToSettingsKey(any())).thenAnswer { "key-${it.arguments[0]}" } } @Test fun readBooleanFlag() { // Remember that the TEAMFOOD flag is id#1 and has special behavior. - whenever(flagManager.readFlagValue<Boolean>(eq(3), any())).thenReturn(true) - whenever(flagManager.readFlagValue<Boolean>(eq(4), any())).thenReturn(false) + whenever(flagManager.readFlagValue<Boolean>(eq("3"), any())).thenReturn(true) + whenever(flagManager.readFlagValue<Boolean>(eq("4"), any())).thenReturn(false) assertThat( mFeatureFlagsDebug.isEnabled( @@ -141,7 +141,7 @@ class FeatureFlagsDebugTest : SysuiTestCase() { mFeatureFlagsDebug.isEnabled( ReleasedFlag( 4, - name = "3", + name = "4", namespace = "test" ) ) @@ -150,7 +150,7 @@ class FeatureFlagsDebugTest : SysuiTestCase() { mFeatureFlagsDebug.isEnabled( UnreleasedFlag( 5, - name = "4", + name = "5", namespace = "test" ) ) @@ -159,7 +159,8 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Test fun teamFoodFlag_False() { - whenever(flagManager.readFlagValue<Boolean>(eq(1), any())).thenReturn(false) + whenever(flagManager.readFlagValue<Boolean>( + eq(Flags.TEAMFOOD.name), any())).thenReturn(false) assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagA)).isFalse() assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagB)).isTrue() @@ -170,7 +171,8 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Test fun teamFoodFlag_True() { - whenever(flagManager.readFlagValue<Boolean>(eq(1), any())).thenReturn(true) + whenever(flagManager.readFlagValue<Boolean>( + eq(Flags.TEAMFOOD.name), any())).thenReturn(true) assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagA)).isTrue() assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagB)).isTrue() @@ -181,11 +183,12 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Test fun teamFoodFlag_Overridden() { - whenever(flagManager.readFlagValue<Boolean>(eq(teamfoodableFlagA.id), any())) + whenever(flagManager.readFlagValue<Boolean>(eq(teamfoodableFlagA.name), any())) .thenReturn(true) - whenever(flagManager.readFlagValue<Boolean>(eq(teamfoodableFlagB.id), any())) + whenever(flagManager.readFlagValue<Boolean>(eq(teamfoodableFlagB.name), any())) .thenReturn(false) - whenever(flagManager.readFlagValue<Boolean>(eq(1), any())).thenReturn(true) + whenever(flagManager.readFlagValue<Boolean>( + eq(Flags.TEAMFOOD.name), any())).thenReturn(true) assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagA)).isTrue() assertThat(mFeatureFlagsDebug.isEnabled(teamfoodableFlagB)).isFalse() @@ -202,8 +205,8 @@ class FeatureFlagsDebugTest : SysuiTestCase() { whenever(resources.getBoolean(1004)).thenAnswer { throw NameNotFoundException() } whenever(resources.getBoolean(1005)).thenAnswer { throw NameNotFoundException() } - whenever(flagManager.readFlagValue<Boolean>(eq(3), any())).thenReturn(true) - whenever(flagManager.readFlagValue<Boolean>(eq(5), any())).thenReturn(false) + whenever(flagManager.readFlagValue<Boolean>(eq("3"), any())).thenReturn(true) + whenever(flagManager.readFlagValue<Boolean>(eq("5"), any())).thenReturn(false) assertThat( mFeatureFlagsDebug.isEnabled( @@ -255,8 +258,8 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Test fun readStringFlag() { - whenever(flagManager.readFlagValue<String>(eq(3), any())).thenReturn("foo") - whenever(flagManager.readFlagValue<String>(eq(4), any())).thenReturn("bar") + whenever(flagManager.readFlagValue<String>(eq("3"), any())).thenReturn("foo") + whenever(flagManager.readFlagValue<String>(eq("4"), any())).thenReturn("bar") assertThat(mFeatureFlagsDebug.getString(StringFlag(1, "1", "test", "biz"))).isEqualTo("biz") assertThat(mFeatureFlagsDebug.getString(StringFlag(2, "2", "test", "baz"))).isEqualTo("baz") assertThat(mFeatureFlagsDebug.getString(StringFlag(3, "3", "test", "buz"))).isEqualTo("foo") @@ -272,9 +275,9 @@ class FeatureFlagsDebugTest : SysuiTestCase() { whenever(resources.getString(1005)).thenAnswer { throw NameNotFoundException() } whenever(resources.getString(1006)).thenAnswer { throw NameNotFoundException() } - whenever(flagManager.readFlagValue<String>(eq(3), any())).thenReturn("override3") - whenever(flagManager.readFlagValue<String>(eq(4), any())).thenReturn("override4") - whenever(flagManager.readFlagValue<String>(eq(6), any())).thenReturn("override6") + whenever(flagManager.readFlagValue<String>(eq("3"), any())).thenReturn("override3") + whenever(flagManager.readFlagValue<String>(eq("4"), any())).thenReturn("override4") + whenever(flagManager.readFlagValue<String>(eq("6"), any())).thenReturn("override6") assertThat( mFeatureFlagsDebug.getString( @@ -322,8 +325,8 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Test fun readIntFlag() { - whenever(flagManager.readFlagValue<Int>(eq(3), any())).thenReturn(22) - whenever(flagManager.readFlagValue<Int>(eq(4), any())).thenReturn(48) + whenever(flagManager.readFlagValue<Int>(eq("3"), any())).thenReturn(22) + whenever(flagManager.readFlagValue<Int>(eq("4"), any())).thenReturn(48) assertThat(mFeatureFlagsDebug.getInt(IntFlag(1, "1", "test", 12))).isEqualTo(12) assertThat(mFeatureFlagsDebug.getInt(IntFlag(2, "2", "test", 93))).isEqualTo(93) assertThat(mFeatureFlagsDebug.getInt(IntFlag(3, "3", "test", 8))).isEqualTo(22) @@ -368,12 +371,12 @@ class FeatureFlagsDebugTest : SysuiTestCase() { broadcastReceiver.onReceive(mockContext, Intent()) broadcastReceiver.onReceive(mockContext, Intent("invalid action")) broadcastReceiver.onReceive(mockContext, Intent(FlagManager.ACTION_SET_FLAG)) - setByBroadcast(0, false) // unknown id does nothing - setByBroadcast(1, "string") // wrong type does nothing - setByBroadcast(2, 123) // wrong type does nothing - setByBroadcast(3, false) // wrong type does nothing - setByBroadcast(4, 123) // wrong type does nothing - verifyNoMoreInteractions(flagManager, secureSettings) + setByBroadcast("0", false) // unknown id does nothing + setByBroadcast("1", "string") // wrong type does nothing + setByBroadcast("2", 123) // wrong type does nothing + setByBroadcast("3", false) // wrong type does nothing + setByBroadcast("4", 123) // wrong type does nothing + verifyNoMoreInteractions(flagManager, globalSettings) } @Test @@ -383,16 +386,16 @@ class FeatureFlagsDebugTest : SysuiTestCase() { // trying to erase an id not in the map does nothing broadcastReceiver.onReceive( mockContext, - Intent(FlagManager.ACTION_SET_FLAG).putExtra(FlagManager.EXTRA_ID, 0) + Intent(FlagManager.ACTION_SET_FLAG).putExtra(FlagManager.EXTRA_NAME, "") ) - verifyNoMoreInteractions(flagManager, secureSettings) + verifyNoMoreInteractions(flagManager, globalSettings) // valid id with no value puts empty string in the setting broadcastReceiver.onReceive( mockContext, - Intent(FlagManager.ACTION_SET_FLAG).putExtra(FlagManager.EXTRA_ID, 1) + Intent(FlagManager.ACTION_SET_FLAG).putExtra(FlagManager.EXTRA_NAME, "1") ) - verifyPutData(1, "", numReads = 0) + verifyPutData("1", "", numReads = 0) } @Test @@ -402,51 +405,51 @@ class FeatureFlagsDebugTest : SysuiTestCase() { addFlag(ResourceBooleanFlag(3, "3", "test", 1003)) addFlag(ResourceBooleanFlag(4, "4", "test", 1004)) - setByBroadcast(1, false) - verifyPutData(1, "{\"type\":\"boolean\",\"value\":false}") + setByBroadcast("1", false) + verifyPutData("1", "{\"type\":\"boolean\",\"value\":false}") - setByBroadcast(2, true) - verifyPutData(2, "{\"type\":\"boolean\",\"value\":true}") + setByBroadcast("2", true) + verifyPutData("2", "{\"type\":\"boolean\",\"value\":true}") - setByBroadcast(3, false) - verifyPutData(3, "{\"type\":\"boolean\",\"value\":false}") + setByBroadcast("3", false) + verifyPutData("3", "{\"type\":\"boolean\",\"value\":false}") - setByBroadcast(4, true) - verifyPutData(4, "{\"type\":\"boolean\",\"value\":true}") + setByBroadcast("4", true) + verifyPutData("4", "{\"type\":\"boolean\",\"value\":true}") } @Test fun setStringFlag() { - addFlag(StringFlag(1, "flag1", "1", "test")) + addFlag(StringFlag(1, "1", "1", "test")) addFlag(ResourceStringFlag(2, "2", "test", 1002)) - setByBroadcast(1, "override1") - verifyPutData(1, "{\"type\":\"string\",\"value\":\"override1\"}") + setByBroadcast("1", "override1") + verifyPutData("1", "{\"type\":\"string\",\"value\":\"override1\"}") - setByBroadcast(2, "override2") - verifyPutData(2, "{\"type\":\"string\",\"value\":\"override2\"}") + setByBroadcast("2", "override2") + verifyPutData("2", "{\"type\":\"string\",\"value\":\"override2\"}") } @Test fun setFlag_ClearsCache() { val flag1 = addFlag(StringFlag(1, "1", "test", "flag1")) - whenever(flagManager.readFlagValue<String>(eq(1), any())).thenReturn("original") + whenever(flagManager.readFlagValue<String>(eq("1"), any())).thenReturn("original") // gets the flag & cache it assertThat(mFeatureFlagsDebug.getString(flag1)).isEqualTo("original") - verify(flagManager).readFlagValue(eq(1), eq(StringFlagSerializer)) + verify(flagManager, times(1)).readFlagValue(eq("1"), eq(StringFlagSerializer)) // hit the cache assertThat(mFeatureFlagsDebug.getString(flag1)).isEqualTo("original") verifyNoMoreInteractions(flagManager) // set the flag - setByBroadcast(1, "new") - verifyPutData(1, "{\"type\":\"string\",\"value\":\"new\"}", numReads = 2) - whenever(flagManager.readFlagValue<String>(eq(1), any())).thenReturn("new") + setByBroadcast("1", "new") + verifyPutData("1", "{\"type\":\"string\",\"value\":\"new\"}", numReads = 2) + whenever(flagManager.readFlagValue<String>(eq("1"), any())).thenReturn("new") assertThat(mFeatureFlagsDebug.getString(flag1)).isEqualTo("new") - verify(flagManager, times(3)).readFlagValue(eq(1), eq(StringFlagSerializer)) + verify(flagManager, times(3)).readFlagValue(eq("1"), eq(StringFlagSerializer)) } @Test @@ -463,7 +466,6 @@ class FeatureFlagsDebugTest : SysuiTestCase() { val flag = UnreleasedFlag(100, name = "100", namespace = "test") serverFlagReader.setFlagValue(flag.namespace, flag.name, true) - assertThat(mFeatureFlagsDebug.isEnabled(flag)).isTrue() } @@ -503,26 +505,26 @@ class FeatureFlagsDebugTest : SysuiTestCase() { assertThat(dump).contains(" sysui_flag_7: [length=9] \"override7\"\n") } - private fun verifyPutData(id: Int, data: String, numReads: Int = 1) { - inOrder(flagManager, secureSettings).apply { - verify(flagManager, times(numReads)).readFlagValue(eq(id), any<FlagSerializer<*>>()) - verify(flagManager).idToSettingsKey(eq(id)) - verify(secureSettings).putStringForUser(eq("key-$id"), eq(data), anyInt()) - verify(flagManager).dispatchListenersAndMaybeRestart(eq(id), any()) + private fun verifyPutData(name: String, data: String, numReads: Int = 1) { + inOrder(flagManager, globalSettings).apply { + verify(flagManager, times(numReads)).readFlagValue(eq(name), any<FlagSerializer<*>>()) + verify(flagManager).nameToSettingsKey(eq(name)) + verify(globalSettings).putStringForUser(eq("key-$name"), eq(data), anyInt()) + verify(flagManager).dispatchListenersAndMaybeRestart(eq(name), any()) }.verifyNoMoreInteractions() - verifyNoMoreInteractions(flagManager, secureSettings) + verifyNoMoreInteractions(flagManager, globalSettings) } - private fun setByBroadcast(id: Int, value: Serializable?) { + private fun setByBroadcast(name: String, value: Serializable?) { val intent = Intent(FlagManager.ACTION_SET_FLAG) - intent.putExtra(FlagManager.EXTRA_ID, id) + intent.putExtra(FlagManager.EXTRA_NAME, name) intent.putExtra(FlagManager.EXTRA_VALUE, value) broadcastReceiver.onReceive(mockContext, intent) } private fun <F : Flag<*>> addFlag(flag: F): F { - val old = flagMap.put(flag.id, flag) - check(old == null) { "Flag ${flag.id} already registered" } + val old = flagMap.put(flag.name, flag) + check(old == null) { "Flag ${flag.name} already registered" } return flag } diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt index d5b5a4a4101e..4c6028c4c9b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt @@ -19,7 +19,6 @@ import android.content.pm.PackageManager.NameNotFoundException import android.content.res.Resources import android.test.suitebuilder.annotation.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.util.DeviceConfigProxyFake import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertThrows import org.junit.Before @@ -39,9 +38,8 @@ class FeatureFlagsReleaseTest : SysuiTestCase() { @Mock private lateinit var mResources: Resources @Mock private lateinit var mSystemProperties: SystemPropertiesHelper @Mock private lateinit var restarter: Restarter - private val flagMap = mutableMapOf<Int, Flag<*>>() + private val flagMap = mutableMapOf<String, Flag<*>>() private val serverFlagReader = ServerFlagReaderFake() - private val deviceConfig = DeviceConfigProxyFake() @Before fun setup() { @@ -49,7 +47,6 @@ class FeatureFlagsReleaseTest : SysuiTestCase() { mFeatureFlagsRelease = FeatureFlagsRelease( mResources, mSystemProperties, - deviceConfig, serverFlagReader, flagMap, restarter) diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagCommandTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagCommandTest.kt index fea91c53424d..28131b50f04c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagCommandTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagCommandTest.kt @@ -32,7 +32,7 @@ class FlagCommandTest : SysuiTestCase() { @Mock private lateinit var featureFlags: FeatureFlagsDebug @Mock private lateinit var pw: PrintWriter - private val flagMap = mutableMapOf<Int, Flag<*>>() + private val flagMap = mutableMapOf<String, Flag<*>>() private val flagA = UnreleasedFlag(500, "500", "test") private val flagB = ReleasedFlag(501, "501", "test") private val stringFlag = StringFlag(502, "502", "test", "abracadabra") @@ -53,59 +53,59 @@ class FlagCommandTest : SysuiTestCase() { (invocation.getArgument(0) as IntFlag).default } - flagMap.put(flagA.id, flagA) - flagMap.put(flagB.id, flagB) - flagMap.put(stringFlag.id, stringFlag) - flagMap.put(intFlag.id, intFlag) + flagMap.put(flagA.name, flagA) + flagMap.put(flagB.name, flagB) + flagMap.put(stringFlag.name, stringFlag) + flagMap.put(intFlag.name, intFlag) cmd = FlagCommand(featureFlags, flagMap) } @Test fun readBooleanFlagCommand() { - cmd.execute(pw, listOf(flagA.id.toString())) + cmd.execute(pw, listOf(flagA.name)) Mockito.verify(featureFlags).isEnabled(flagA) } @Test fun readStringFlagCommand() { - cmd.execute(pw, listOf(stringFlag.id.toString())) + cmd.execute(pw, listOf(stringFlag.name)) Mockito.verify(featureFlags).getString(stringFlag) } @Test fun readIntFlag() { - cmd.execute(pw, listOf(intFlag.id.toString())) + cmd.execute(pw, listOf(intFlag.name)) Mockito.verify(featureFlags).getInt(intFlag) } @Test fun setBooleanFlagCommand() { - cmd.execute(pw, listOf(flagB.id.toString(), "on")) + cmd.execute(pw, listOf(flagB.name, "on")) Mockito.verify(featureFlags).setBooleanFlagInternal(flagB, true) } @Test fun setStringFlagCommand() { - cmd.execute(pw, listOf(stringFlag.id.toString(), "set", "foobar")) + cmd.execute(pw, listOf(stringFlag.name, "set", "foobar")) Mockito.verify(featureFlags).setStringFlagInternal(stringFlag, "foobar") } @Test fun setIntFlag() { - cmd.execute(pw, listOf(intFlag.id.toString(), "put", "123")) + cmd.execute(pw, listOf(intFlag.name, "put", "123")) Mockito.verify(featureFlags).setIntFlagInternal(intFlag, 123) } @Test fun toggleBooleanFlagCommand() { - cmd.execute(pw, listOf(flagB.id.toString(), "toggle")) + cmd.execute(pw, listOf(flagB.name, "toggle")) Mockito.verify(featureFlags).setBooleanFlagInternal(flagB, false) } @Test fun eraseFlagCommand() { - cmd.execute(pw, listOf(flagA.id.toString(), "erase")) + cmd.execute(pw, listOf(flagA.name, "erase")) Mockito.verify(featureFlags).eraseFlag(flagA) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt index fca7e96fb148..e679d47537b5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt @@ -87,14 +87,14 @@ class FlagManagerTest : SysuiTestCase() { @Test fun testObserverClearsCache() { val listener = mock<FlagListenable.Listener>() - val clearCacheAction = mock<Consumer<Int>>() + val clearCacheAction = mock<Consumer<String>>() mFlagManager.clearCacheAction = clearCacheAction mFlagManager.addListener(ReleasedFlag(1, "1", "test"), listener) val observer = withArgCaptor<ContentObserver> { verify(mFlagSettingsHelper).registerContentObserver(any(), any(), capture()) } observer.onChange(false, flagUri(1)) - verify(clearCacheAction).accept(eq(1)) + verify(clearCacheAction).accept(eq("1")) } @Test @@ -110,14 +110,14 @@ class FlagManagerTest : SysuiTestCase() { val flagEvent1 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener1).onFlagChanged(capture()) } - assertThat(flagEvent1.flagId).isEqualTo(1) + assertThat(flagEvent1.flagName).isEqualTo("1") verifyNoMoreInteractions(listener1, listener10) observer.onChange(false, flagUri(10)) val flagEvent10 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener10).onFlagChanged(capture()) } - assertThat(flagEvent10.flagId).isEqualTo(10) + assertThat(flagEvent10.flagName).isEqualTo("10") verifyNoMoreInteractions(listener1, listener10) } @@ -130,18 +130,18 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(ReleasedFlag(1, "1", "test"), listener1) mFlagManager.addListener(ReleasedFlag(10, "10", "test"), listener10) - mFlagManager.dispatchListenersAndMaybeRestart(1, null) + mFlagManager.dispatchListenersAndMaybeRestart("1", null) val flagEvent1 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener1).onFlagChanged(capture()) } - assertThat(flagEvent1.flagId).isEqualTo(1) + assertThat(flagEvent1.flagName).isEqualTo("1") verifyNoMoreInteractions(listener1, listener10) - mFlagManager.dispatchListenersAndMaybeRestart(10, null) + mFlagManager.dispatchListenersAndMaybeRestart("10", null) val flagEvent10 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener10).onFlagChanged(capture()) } - assertThat(flagEvent10.flagId).isEqualTo(10) + assertThat(flagEvent10.flagName).isEqualTo("10") verifyNoMoreInteractions(listener1, listener10) } @@ -151,25 +151,25 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(ReleasedFlag(1, "1", "test"), listener) mFlagManager.addListener(ReleasedFlag(10, "10", "test"), listener) - mFlagManager.dispatchListenersAndMaybeRestart(1, null) + mFlagManager.dispatchListenersAndMaybeRestart("1", null) val flagEvent1 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener).onFlagChanged(capture()) } - assertThat(flagEvent1.flagId).isEqualTo(1) + assertThat(flagEvent1.flagName).isEqualTo("1") verifyNoMoreInteractions(listener) - mFlagManager.dispatchListenersAndMaybeRestart(10, null) + mFlagManager.dispatchListenersAndMaybeRestart("10", null) val flagEvent10 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener, times(2)).onFlagChanged(capture()) } - assertThat(flagEvent10.flagId).isEqualTo(10) + assertThat(flagEvent10.flagName).isEqualTo("10") verifyNoMoreInteractions(listener) } @Test fun testRestartWithNoListeners() { val restartAction = mock<Consumer<Boolean>>() - mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) + mFlagManager.dispatchListenersAndMaybeRestart("1", restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } @@ -180,7 +180,7 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(ReleasedFlag(1, "1", "test")) { event -> event.requestNoRestart() } - mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) + mFlagManager.dispatchListenersAndMaybeRestart("1", restartAction) verify(restartAction).accept(eq(true)) verifyNoMoreInteractions(restartAction) } @@ -191,7 +191,7 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(ReleasedFlag(10, "10", "test")) { event -> event.requestNoRestart() } - mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) + mFlagManager.dispatchListenersAndMaybeRestart("1", restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } @@ -205,7 +205,7 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(ReleasedFlag(10, "10", "test")) { // do not request } - mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) + mFlagManager.dispatchListenersAndMaybeRestart("1", restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } @@ -214,31 +214,31 @@ class FlagManagerTest : SysuiTestCase() { fun testReadBooleanFlag() { // test that null string returns null whenever(mFlagSettingsHelper.getString(any())).thenReturn(null) - assertThat(mFlagManager.readFlagValue(1, BooleanFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", BooleanFlagSerializer)).isNull() // test that empty string returns null whenever(mFlagSettingsHelper.getString(any())).thenReturn("") - assertThat(mFlagManager.readFlagValue(1, BooleanFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", BooleanFlagSerializer)).isNull() // test false whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"boolean\",\"value\":false}") - assertThat(mFlagManager.readFlagValue(1, BooleanFlagSerializer)).isFalse() + assertThat(mFlagManager.readFlagValue("1", BooleanFlagSerializer)).isFalse() // test true whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"boolean\",\"value\":true}") - assertThat(mFlagManager.readFlagValue(1, BooleanFlagSerializer)).isTrue() + assertThat(mFlagManager.readFlagValue("1", BooleanFlagSerializer)).isTrue() // Reading a value of a different type should just return null whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"string\",\"value\":\"foo\"}") - assertThat(mFlagManager.readFlagValue(1, BooleanFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", BooleanFlagSerializer)).isNull() // Reading a value that isn't json should throw an exception assertThrows(InvalidFlagStorageException::class.java) { whenever(mFlagSettingsHelper.getString(any())).thenReturn("1") - mFlagManager.readFlagValue(1, BooleanFlagSerializer) + mFlagManager.readFlagValue("1", BooleanFlagSerializer) } } @@ -257,31 +257,31 @@ class FlagManagerTest : SysuiTestCase() { fun testReadStringFlag() { // test that null string returns null whenever(mFlagSettingsHelper.getString(any())).thenReturn(null) - assertThat(mFlagManager.readFlagValue(1, StringFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", StringFlagSerializer)).isNull() // test that empty string returns null whenever(mFlagSettingsHelper.getString(any())).thenReturn("") - assertThat(mFlagManager.readFlagValue(1, StringFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", StringFlagSerializer)).isNull() // test json with the empty string value returns empty string whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"string\",\"value\":\"\"}") - assertThat(mFlagManager.readFlagValue(1, StringFlagSerializer)).isEqualTo("") + assertThat(mFlagManager.readFlagValue("1", StringFlagSerializer)).isEqualTo("") // test string with value is returned whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"string\",\"value\":\"foo\"}") - assertThat(mFlagManager.readFlagValue(1, StringFlagSerializer)).isEqualTo("foo") + assertThat(mFlagManager.readFlagValue("1", StringFlagSerializer)).isEqualTo("foo") // Reading a value of a different type should just return null whenever(mFlagSettingsHelper.getString(any())) .thenReturn("{\"type\":\"boolean\",\"value\":false}") - assertThat(mFlagManager.readFlagValue(1, StringFlagSerializer)).isNull() + assertThat(mFlagManager.readFlagValue("1", StringFlagSerializer)).isNull() // Reading a value that isn't json should throw an exception assertThrows(InvalidFlagStorageException::class.java) { whenever(mFlagSettingsHelper.getString(any())).thenReturn("1") - mFlagManager.readFlagValue(1, StringFlagSerializer) + mFlagManager.readFlagValue("1", StringFlagSerializer) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/fragments/FragmentServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/fragments/FragmentServiceTest.kt index 77c837b803af..a2dc1eb606ed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/fragments/FragmentServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/fragments/FragmentServiceTest.kt @@ -14,6 +14,7 @@ import org.junit.Test @SmallTest class FragmentServiceTest : SysuiTestCase() { private val fragmentCreator = TestFragmentCreator() + private val fragmenetHostManagerFactory: FragmentHostManager.Factory = mock() private val fragmentCreatorFactory = FragmentService.FragmentCreator.Factory { fragmentCreator } private lateinit var fragmentService: FragmentService @@ -24,7 +25,13 @@ class FragmentServiceTest : SysuiTestCase() { Looper.prepare() } - fragmentService = FragmentService(fragmentCreatorFactory, mock(), DumpManager()) + fragmentService = + FragmentService( + fragmentCreatorFactory, + fragmenetHostManagerFactory, + mock(), + DumpManager() + ) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt index c0af0cb4089e..fb54d6d6b2d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt @@ -62,6 +62,7 @@ import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test @@ -184,6 +185,7 @@ class CustomizationProviderTest : SysuiTestCase() { mainDispatcher = testDispatcher, backgroundHandler = backgroundHandler, ) + underTest.mainDispatcher = UnconfinedTestDispatcher() underTest.attachInfoForTesting( context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt index 8da4eae2f64a..58cdec447cc6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.data.quickaffordance import android.app.StatusBarManager import android.content.Context +import android.content.pm.PackageManager import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.camera.CameraGestureHelper @@ -32,7 +33,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import org.mockito.Mock -import org.mockito.Mockito.anyInt import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -43,16 +43,19 @@ class CameraQuickAffordanceConfigTest : SysuiTestCase() { @Mock private lateinit var cameraGestureHelper: CameraGestureHelper @Mock private lateinit var context: Context + @Mock private lateinit var packageManager: PackageManager private lateinit var underTest: CameraQuickAffordanceConfig @Before fun setUp() { MockitoAnnotations.initMocks(this) + setLaunchable(true) underTest = CameraQuickAffordanceConfig( context, + packageManager, ) { cameraGestureHelper } @@ -86,6 +89,7 @@ class CameraQuickAffordanceConfigTest : SysuiTestCase() { } private fun setLaunchable(isLaunchable: Boolean) { - whenever(cameraGestureHelper.canCameraGestureBeLaunched(anyInt())).thenReturn(isLaunchable) + whenever(packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) + .thenReturn(isLaunchable) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfigTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfigTest.kt new file mode 100644 index 000000000000..a3740d88e1a9 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfigTest.kt @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.data.quickaffordance + +import android.content.Context +import android.media.AudioManager +import androidx.lifecycle.LiveData +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.UserFileManager +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.RingerModeTracker +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.argumentCaptor +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.mockito.Mock +import org.mockito.Mockito.times +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(JUnit4::class) +class MuteQuickAffordanceConfigTest : SysuiTestCase() { + + private lateinit var underTest: MuteQuickAffordanceConfig + @Mock + private lateinit var ringerModeTracker: RingerModeTracker + @Mock + private lateinit var audioManager: AudioManager + @Mock + private lateinit var userTracker: UserTracker + @Mock + private lateinit var userFileManager: UserFileManager + + private lateinit var testScope: TestScope + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + + testScope = TestScope() + + whenever(userTracker.userContext).thenReturn(context) + whenever(userFileManager.getSharedPreferences(any(), any(), any())) + .thenReturn(context.getSharedPreferences("mutequickaffordancetest", Context.MODE_PRIVATE)) + + underTest = MuteQuickAffordanceConfig( + context, + userTracker, + userFileManager, + ringerModeTracker, + audioManager + ) + } + + @Test + fun `picker state - volume fixed - not available`() = testScope.runTest { + //given + whenever(audioManager.isVolumeFixed).thenReturn(true) + + //when + val result = underTest.getPickerScreenState() + + //then + assertEquals(KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice, result) + } + + @Test + fun `picker state - volume not fixed - available`() = testScope.runTest { + //given + whenever(audioManager.isVolumeFixed).thenReturn(false) + + //when + val result = underTest.getPickerScreenState() + + //then + assertEquals(KeyguardQuickAffordanceConfig.PickerScreenState.Default(), result) + } + + @Test + fun `triggered - state was previously NORMAL - currently SILENT - move to previous state`() { + //given + val ringerModeCapture = argumentCaptor<Int>() + val ringerModeInternal = mock<LiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + whenever(ringerModeInternal.value).thenReturn(AudioManager.RINGER_MODE_NORMAL) + underTest.onTriggered(null) + whenever(ringerModeInternal.value).thenReturn(AudioManager.RINGER_MODE_SILENT) + + //when + val result = underTest.onTriggered(null) + verify(audioManager, times(2)).ringerModeInternal = ringerModeCapture.capture() + + //then + assertEquals(KeyguardQuickAffordanceConfig.OnTriggeredResult.Handled, result) + assertEquals(AudioManager.RINGER_MODE_NORMAL, ringerModeCapture.value) + } + + @Test + fun `triggered - state is not SILENT - move to SILENT ringer`() { + //given + val ringerModeCapture = argumentCaptor<Int>() + val ringerModeInternal = mock<LiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + whenever(ringerModeInternal.value).thenReturn(AudioManager.RINGER_MODE_NORMAL) + + //when + val result = underTest.onTriggered(null) + verify(audioManager).ringerModeInternal = ringerModeCapture.capture() + + //then + assertEquals(KeyguardQuickAffordanceConfig.OnTriggeredResult.Handled, result) + assertEquals(AudioManager.RINGER_MODE_SILENT, ringerModeCapture.value) + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt new file mode 100644 index 000000000000..26601b63e02d --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt @@ -0,0 +1,220 @@ +/* + * 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.data.quickaffordance + +import android.content.Context +import android.media.AudioManager +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.keyguard.data.repository.KeyguardQuickAffordanceRepository +import com.android.systemui.settings.UserFileManager +import com.android.systemui.settings.UserTracker +import com.android.systemui.util.RingerModeTracker +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.argumentCaptor +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.cancelChildren +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals + +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.mockito.Mock +import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(JUnit4::class) +class MuteQuickAffordanceCoreStartableTest : SysuiTestCase() { + + @Mock + private lateinit var featureFlags: FeatureFlags + @Mock + private lateinit var userTracker: UserTracker + @Mock + private lateinit var ringerModeTracker: RingerModeTracker + @Mock + private lateinit var userFileManager: UserFileManager + @Mock + private lateinit var keyguardQuickAffordanceRepository: KeyguardQuickAffordanceRepository + + private lateinit var testScope: TestScope + + private lateinit var underTest: MuteQuickAffordanceCoreStartable + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + + whenever(featureFlags.isEnabled(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES)).thenReturn(true) + + val config: KeyguardQuickAffordanceConfig = mock() + whenever(config.key).thenReturn(BuiltInKeyguardQuickAffordanceKeys.MUTE) + + val emission = MutableStateFlow(mapOf("testQuickAffordanceKey" to listOf(config))) + whenever(keyguardQuickAffordanceRepository.selections).thenReturn(emission) + + testScope = TestScope() + + underTest = MuteQuickAffordanceCoreStartable( + featureFlags, + userTracker, + ringerModeTracker, + userFileManager, + keyguardQuickAffordanceRepository, + testScope, + ) + } + + @Test + fun `feature flag is OFF - do nothing with keyguardQuickAffordanceRepository`() = testScope.runTest { + //given + whenever(featureFlags.isEnabled(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES)).thenReturn(false) + + //when + underTest.start() + + //then + verifyZeroInteractions(keyguardQuickAffordanceRepository) + coroutineContext.cancelChildren() + } + + @Test + fun `feature flag is ON - call to keyguardQuickAffordanceRepository`() = testScope.runTest { + //given + val ringerModeInternal = mock<MutableLiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + + //when + underTest.start() + runCurrent() + + //then + verify(keyguardQuickAffordanceRepository).selections + coroutineContext.cancelChildren() + } + + @Test + fun `ringer mode is changed to SILENT - do not save to shared preferences`() = testScope.runTest { + //given + val ringerModeInternal = mock<MutableLiveData<Int>>() + val observerCaptor = argumentCaptor<Observer<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + + //when + underTest.start() + runCurrent() + verify(ringerModeInternal).observeForever(observerCaptor.capture()) + observerCaptor.value.onChanged(AudioManager.RINGER_MODE_SILENT) + + //then + verifyZeroInteractions(userFileManager) + coroutineContext.cancelChildren() + } + + @Test + fun `ringerModeInternal changes to something not SILENT - is set in sharedpreferences`() = testScope.runTest { + //given + val newRingerMode = 99 + val observerCaptor = argumentCaptor<Observer<Int>>() + val ringerModeInternal = mock<MutableLiveData<Int>>() + val sharedPrefs = context.getSharedPreferences("quick_affordance_mute_ringer_mode_cache_test", Context.MODE_PRIVATE) + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + whenever( + userFileManager.getSharedPreferences(eq("quick_affordance_mute_ringer_mode_cache"), any(), any()) + ).thenReturn(sharedPrefs) + + //when + underTest.start() + runCurrent() + verify(ringerModeInternal).observeForever(observerCaptor.capture()) + observerCaptor.value.onChanged(newRingerMode) + val result = sharedPrefs.getInt("key_last_non_silent_ringer_mode", -1) + + //then + assertEquals(newRingerMode, result) + coroutineContext.cancelChildren() + } + + @Test + fun `MUTE is in selections - observe ringerModeInternal`() = testScope.runTest { + //given + val ringerModeInternal = mock<MutableLiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + + //when + underTest.start() + runCurrent() + + //then + verify(ringerModeInternal).observeForever(any()) + coroutineContext.cancelChildren() + } + + @Test + fun `MUTE is in selections 2x - observe ringerModeInternal`() = testScope.runTest { + //given + val config: KeyguardQuickAffordanceConfig = mock() + whenever(config.key).thenReturn(BuiltInKeyguardQuickAffordanceKeys.MUTE) + val emission = MutableStateFlow(mapOf("testKey" to listOf(config), "testkey2" to listOf(config))) + whenever(keyguardQuickAffordanceRepository.selections).thenReturn(emission) + val ringerModeInternal = mock<MutableLiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + + //when + underTest.start() + runCurrent() + + //then + verify(ringerModeInternal).observeForever(any()) + coroutineContext.cancelChildren() + } + + @Test + fun `MUTE is not in selections - stop observing ringerModeInternal`() = testScope.runTest { + //given + val config: KeyguardQuickAffordanceConfig = mock() + whenever(config.key).thenReturn("notmutequickaffordance") + val emission = MutableStateFlow(mapOf("testKey" to listOf(config))) + whenever(keyguardQuickAffordanceRepository.selections).thenReturn(emission) + val ringerModeInternal = mock<MutableLiveData<Int>>() + whenever(ringerModeTracker.ringerModeInternal).thenReturn(ringerModeInternal) + + //when + underTest.start() + runCurrent() + + //then + verify(ringerModeInternal).removeObserver(any()) + coroutineContext.cancelChildren() + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/BiometricRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt index a92dd3b92397..ddd10493571c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/BiometricRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt @@ -50,8 +50,8 @@ import org.mockito.MockitoAnnotations @SmallTest @TestableLooper.RunWithLooper(setAsMainLooper = true) @RunWith(AndroidTestingRunner::class) -class BiometricRepositoryTest : SysuiTestCase() { - private lateinit var underTest: BiometricRepository +class BiometricSettingsRepositoryTest : SysuiTestCase() { + private lateinit var underTest: BiometricSettingsRepository @Mock private lateinit var authController: AuthController @Mock private lateinit var lockPatternUtils: LockPatternUtils @@ -71,11 +71,11 @@ class BiometricRepositoryTest : SysuiTestCase() { userRepository = FakeUserRepository() } - private suspend fun createBiometricRepository() { + private suspend fun createBiometricSettingsRepository() { userRepository.setUserInfos(listOf(PRIMARY_USER)) userRepository.setSelectedUserInfo(PRIMARY_USER) underTest = - BiometricRepositoryImpl( + BiometricSettingsRepositoryImpl( context = context, lockPatternUtils = lockPatternUtils, broadcastDispatcher = fakeBroadcastDispatcher, @@ -91,7 +91,7 @@ class BiometricRepositoryTest : SysuiTestCase() { @Test fun fingerprintEnrollmentChange() = testScope.runTest { - createBiometricRepository() + createBiometricSettingsRepository() val fingerprintEnabledByDevicePolicy = collectLastValue(underTest.isFingerprintEnrolled) runCurrent() @@ -117,7 +117,7 @@ class BiometricRepositoryTest : SysuiTestCase() { @Test fun strongBiometricAllowedChange() = testScope.runTest { - createBiometricRepository() + createBiometricSettingsRepository() val strongBiometricAllowed = collectLastValue(underTest.isStrongBiometricAllowed) runCurrent() @@ -140,7 +140,7 @@ class BiometricRepositoryTest : SysuiTestCase() { @Test fun fingerprintDisabledByDpmChange() = testScope.runTest { - createBiometricRepository() + createBiometricSettingsRepository() val fingerprintEnabledByDevicePolicy = collectLastValue(underTest.isFingerprintEnabledByDevicePolicy) runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt index c4ae2db93569..9203f05602b6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt @@ -55,7 +55,11 @@ class DeviceEntryFingerprintAuthRepositoryTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) testScope = TestScope() - underTest = DeviceEntryFingerprintAuthRepositoryImpl(keyguardUpdateMonitor) + underTest = + DeviceEntryFingerprintAuthRepositoryImpl( + keyguardUpdateMonitor, + testScope.backgroundScope, + ) } @After diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt index 969537d23111..444a2a7eada6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepositoryTest.kt @@ -45,7 +45,7 @@ class KeyguardBouncerRepositoryTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) val testCoroutineScope = TestCoroutineScope() underTest = - KeyguardBouncerRepository( + KeyguardBouncerRepositoryImpl( viewMediatorCallback, systemClock, testCoroutineScope, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt index b071a028865d..6099f011a90d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt @@ -275,10 +275,10 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { expected: Map<String, List<KeyguardQuickAffordanceConfig>>, ) { assertThat(observed).isEqualTo(expected) - assertThat(underTest.getSelections()) + assertThat(underTest.getCurrentSelections()) .isEqualTo(expected.mapValues { (_, configs) -> configs.map { it.key } }) expected.forEach { (slotId, configs) -> - assertThat(underTest.getSelections(slotId)).isEqualTo(configs) + assertThat(underTest.getCurrentSelections(slotId)).isEqualTo(configs) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt index 1da7241e58bd..8caf60fb3ebd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt @@ -22,8 +22,10 @@ import com.android.keyguard.ViewMediatorCallback import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags -import com.android.systemui.keyguard.data.repository.FakeBiometricRepository +import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository +import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepositoryImpl import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.util.time.FakeSystemClock import com.android.systemui.util.time.SystemClock @@ -45,7 +47,9 @@ import org.mockito.MockitoAnnotations class AlternateBouncerInteractorTest : SysuiTestCase() { private lateinit var underTest: AlternateBouncerInteractor private lateinit var bouncerRepository: KeyguardBouncerRepository - private lateinit var biometricRepository: FakeBiometricRepository + private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository + private lateinit var deviceEntryFingerprintAuthRepository: + FakeDeviceEntryFingerprintAuthRepository @Mock private lateinit var systemClock: SystemClock @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor @Mock private lateinit var bouncerLogger: TableLogBuffer @@ -55,18 +59,20 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { fun setup() { MockitoAnnotations.initMocks(this) bouncerRepository = - KeyguardBouncerRepository( + KeyguardBouncerRepositoryImpl( mock(ViewMediatorCallback::class.java), FakeSystemClock(), TestCoroutineScope(), bouncerLogger, ) - biometricRepository = FakeBiometricRepository() + biometricSettingsRepository = FakeBiometricSettingsRepository() + deviceEntryFingerprintAuthRepository = FakeDeviceEntryFingerprintAuthRepository() featureFlags = FakeFeatureFlags().apply { this.set(Flags.MODERN_ALTERNATE_BOUNCER, true) } underTest = AlternateBouncerInteractor( bouncerRepository, - biometricRepository, + biometricSettingsRepository, + deviceEntryFingerprintAuthRepository, systemClock, keyguardUpdateMonitor, featureFlags, @@ -90,7 +96,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { @Test fun canShowAlternateBouncerForFingerprint_noFingerprintsEnrolled() { givenCanShowAlternateBouncer() - biometricRepository.setFingerprintEnrolled(false) + biometricSettingsRepository.setFingerprintEnrolled(false) assertFalse(underTest.canShowAlternateBouncerForFingerprint()) } @@ -98,7 +104,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { @Test fun canShowAlternateBouncerForFingerprint_strongBiometricNotAllowed() { givenCanShowAlternateBouncer() - biometricRepository.setStrongBiometricAllowed(false) + biometricSettingsRepository.setStrongBiometricAllowed(false) assertFalse(underTest.canShowAlternateBouncerForFingerprint()) } @@ -106,7 +112,15 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { @Test fun canShowAlternateBouncerForFingerprint_devicePolicyDoesNotAllowFingerprint() { givenCanShowAlternateBouncer() - biometricRepository.setFingerprintEnabledByDevicePolicy(false) + biometricSettingsRepository.setFingerprintEnabledByDevicePolicy(false) + + assertFalse(underTest.canShowAlternateBouncerForFingerprint()) + } + + @Test + fun canShowAlternateBouncerForFingerprint_fingerprintLockedOut() { + givenCanShowAlternateBouncer() + deviceEntryFingerprintAuthRepository.setLockedOut(true) assertFalse(underTest.canShowAlternateBouncerForFingerprint()) } @@ -145,12 +159,13 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { private fun givenCanShowAlternateBouncer() { bouncerRepository.setAlternateBouncerUIAvailable(true) - biometricRepository.setFingerprintEnrolled(true) - biometricRepository.setStrongBiometricAllowed(true) - biometricRepository.setFingerprintEnabledByDevicePolicy(true) + biometricSettingsRepository.setFingerprintEnrolled(true) + biometricSettingsRepository.setStrongBiometricAllowed(true) + biometricSettingsRepository.setFingerprintEnabledByDevicePolicy(true) + deviceEntryFingerprintAuthRepository.setLockedOut(false) } private fun givenCannotShowAlternateBouncer() { - biometricRepository.setFingerprintEnrolled(false) + biometricSettingsRepository.setFingerprintEnrolled(false) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index 3a871b4de8bc..702f37635092 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -24,6 +24,7 @@ import com.android.systemui.animation.Interpolators import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositoryImpl +import com.android.systemui.keyguard.shared.model.BiometricUnlockModel import com.android.systemui.keyguard.shared.model.DozeStateModel import com.android.systemui.keyguard.shared.model.DozeTransitionModel import com.android.systemui.keyguard.shared.model.KeyguardState @@ -437,6 +438,43 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { } @Test + fun `DOZING to GONE`() = + testScope.runTest { + // GIVEN a prior transition has run to DOZING + runner.startTransition( + testScope, + TransitionInfo( + ownerName = "", + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.DOZING, + animator = + ValueAnimator().apply { + duration = 10 + interpolator = Interpolators.LINEAR + }, + ) + ) + runCurrent() + reset(mockTransitionRepository) + + // WHEN biometrics succeeds with wake and unlock mode + keyguardRepository.setBiometricUnlockState(BiometricUnlockModel.WAKE_AND_UNLOCK) + runCurrent() + + val info = + withArgCaptor<TransitionInfo> { + verify(mockTransitionRepository).startTransition(capture()) + } + // THEN a transition to DOZING should occur + assertThat(info.ownerName).isEqualTo("FromDozingTransitionInteractor") + assertThat(info.from).isEqualTo(KeyguardState.DOZING) + assertThat(info.to).isEqualTo(KeyguardState.GONE) + assertThat(info.animator).isNotNull() + + coroutineContext.cancelChildren() + } + + @Test fun `GONE to DOZING`() = testScope.runTest { // GIVEN a device with AOD not available diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt index 7f48ea19c91a..c5e025285944 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorTest.kt @@ -68,13 +68,13 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Mock private lateinit var keyguardBypassController: KeyguardBypassController @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor private val mainHandler = FakeHandler(Looper.getMainLooper()) - private lateinit var mPrimaryBouncerInteractor: PrimaryBouncerInteractor + private lateinit var underTest: PrimaryBouncerInteractor @Before fun setUp() { MockitoAnnotations.initMocks(this) DejankUtils.setImmediate(true) - mPrimaryBouncerInteractor = + underTest = PrimaryBouncerInteractor( repository, bouncerView, @@ -94,7 +94,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Test fun testShow_isScrimmed() { - mPrimaryBouncerInteractor.show(true) + underTest.show(true) verify(repository).setOnScreenTurnedOff(false) verify(repository).setKeyguardAuthenticated(null) verify(repository).setPrimaryHide(false) @@ -124,7 +124,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Test fun testHide() { - mPrimaryBouncerInteractor.hide() + underTest.hide() verify(falsingCollector).onBouncerHidden() verify(keyguardStateController).notifyBouncerShowing(false) verify(repository).setPrimaryShowingSoon(false) @@ -137,7 +137,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Test fun testExpansion() { `when`(repository.panelExpansionAmount.value).thenReturn(0.5f) - mPrimaryBouncerInteractor.setPanelExpansion(0.6f) + underTest.setPanelExpansion(0.6f) verify(repository).setPanelExpansion(0.6f) verify(mPrimaryBouncerCallbackInteractor).dispatchExpansionChanged(0.6f) } @@ -146,7 +146,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { fun testExpansion_fullyShown() { `when`(repository.panelExpansionAmount.value).thenReturn(0.5f) `when`(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(null) - mPrimaryBouncerInteractor.setPanelExpansion(EXPANSION_VISIBLE) + underTest.setPanelExpansion(EXPANSION_VISIBLE) verify(falsingCollector).onBouncerShown() verify(mPrimaryBouncerCallbackInteractor).dispatchFullyShown() } @@ -155,7 +155,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { fun testExpansion_fullyHidden() { `when`(repository.panelExpansionAmount.value).thenReturn(0.5f) `when`(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(null) - mPrimaryBouncerInteractor.setPanelExpansion(EXPANSION_HIDDEN) + underTest.setPanelExpansion(EXPANSION_HIDDEN) verify(repository).setPrimaryVisible(false) verify(repository).setPrimaryShow(null) verify(repository).setPrimaryHide(true) @@ -167,7 +167,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Test fun testExpansion_startingToHide() { `when`(repository.panelExpansionAmount.value).thenReturn(EXPANSION_VISIBLE) - mPrimaryBouncerInteractor.setPanelExpansion(0.1f) + underTest.setPanelExpansion(0.1f) verify(repository).setPrimaryStartingToHide(true) verify(mPrimaryBouncerCallbackInteractor).dispatchStartingToHide() } @@ -175,7 +175,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { @Test fun testShowMessage() { val argCaptor = ArgumentCaptor.forClass(BouncerShowMessageModel::class.java) - mPrimaryBouncerInteractor.showMessage("abc", null) + underTest.showMessage("abc", null) verify(repository).setShowMessage(argCaptor.capture()) assertThat(argCaptor.value.message).isEqualTo("abc") } @@ -184,62 +184,62 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { fun testDismissAction() { val onDismissAction = mock(ActivityStarter.OnDismissAction::class.java) val cancelAction = mock(Runnable::class.java) - mPrimaryBouncerInteractor.setDismissAction(onDismissAction, cancelAction) + underTest.setDismissAction(onDismissAction, cancelAction) verify(bouncerViewDelegate).setDismissAction(onDismissAction, cancelAction) } @Test fun testUpdateResources() { - mPrimaryBouncerInteractor.updateResources() + underTest.updateResources() verify(repository).setResourceUpdateRequests(true) } @Test fun testNotifyKeyguardAuthenticated() { - mPrimaryBouncerInteractor.notifyKeyguardAuthenticated(true) + underTest.notifyKeyguardAuthenticated(true) verify(repository).setKeyguardAuthenticated(true) } @Test fun testNotifyShowedMessage() { - mPrimaryBouncerInteractor.onMessageShown() + underTest.onMessageShown() verify(repository).setShowMessage(null) } @Test fun testOnScreenTurnedOff() { - mPrimaryBouncerInteractor.onScreenTurnedOff() + underTest.onScreenTurnedOff() verify(repository).setOnScreenTurnedOff(true) } @Test fun testSetKeyguardPosition() { - mPrimaryBouncerInteractor.setKeyguardPosition(0f) + underTest.setKeyguardPosition(0f) verify(repository).setKeyguardPosition(0f) } @Test fun testNotifyKeyguardAuthenticatedHandled() { - mPrimaryBouncerInteractor.notifyKeyguardAuthenticatedHandled() + underTest.notifyKeyguardAuthenticatedHandled() verify(repository).setKeyguardAuthenticated(null) } @Test fun testNotifyUpdatedResources() { - mPrimaryBouncerInteractor.notifyUpdatedResources() + underTest.notifyUpdatedResources() verify(repository).setResourceUpdateRequests(false) } @Test fun testSetBackButtonEnabled() { - mPrimaryBouncerInteractor.setBackButtonEnabled(true) + underTest.setBackButtonEnabled(true) verify(repository).setIsBackButtonEnabled(true) } @Test fun testStartDisappearAnimation() { val runnable = mock(Runnable::class.java) - mPrimaryBouncerInteractor.startDisappearAnimation(runnable) + underTest.startDisappearAnimation(runnable) verify(repository).setPrimaryStartDisappearAnimation(any(Runnable::class.java)) } @@ -248,42 +248,42 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { `when`(repository.primaryBouncerVisible.value).thenReturn(true) `when`(repository.panelExpansionAmount.value).thenReturn(EXPANSION_VISIBLE) `when`(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(null) - assertThat(mPrimaryBouncerInteractor.isFullyShowing()).isTrue() + assertThat(underTest.isFullyShowing()).isTrue() `when`(repository.primaryBouncerVisible.value).thenReturn(false) - assertThat(mPrimaryBouncerInteractor.isFullyShowing()).isFalse() + assertThat(underTest.isFullyShowing()).isFalse() } @Test fun testIsScrimmed() { `when`(repository.primaryBouncerScrimmed.value).thenReturn(true) - assertThat(mPrimaryBouncerInteractor.isScrimmed()).isTrue() + assertThat(underTest.isScrimmed()).isTrue() `when`(repository.primaryBouncerScrimmed.value).thenReturn(false) - assertThat(mPrimaryBouncerInteractor.isScrimmed()).isFalse() + assertThat(underTest.isScrimmed()).isFalse() } @Test fun testIsInTransit() { `when`(repository.primaryBouncerShowingSoon.value).thenReturn(true) - assertThat(mPrimaryBouncerInteractor.isInTransit()).isTrue() + assertThat(underTest.isInTransit()).isTrue() `when`(repository.primaryBouncerShowingSoon.value).thenReturn(false) - assertThat(mPrimaryBouncerInteractor.isInTransit()).isFalse() + assertThat(underTest.isInTransit()).isFalse() `when`(repository.panelExpansionAmount.value).thenReturn(0.5f) - assertThat(mPrimaryBouncerInteractor.isInTransit()).isTrue() + assertThat(underTest.isInTransit()).isTrue() } @Test fun testIsAnimatingAway() { `when`(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(Runnable {}) - assertThat(mPrimaryBouncerInteractor.isAnimatingAway()).isTrue() + assertThat(underTest.isAnimatingAway()).isTrue() `when`(repository.primaryBouncerStartingDisappearAnimation.value).thenReturn(null) - assertThat(mPrimaryBouncerInteractor.isAnimatingAway()).isFalse() + assertThat(underTest.isAnimatingAway()).isFalse() } @Test fun testWillDismissWithAction() { `when`(bouncerViewDelegate.willDismissWithActions()).thenReturn(true) - assertThat(mPrimaryBouncerInteractor.willDismissWithAction()).isTrue() + assertThat(underTest.willDismissWithAction()).isTrue() `when`(bouncerViewDelegate.willDismissWithActions()).thenReturn(false) - assertThat(mPrimaryBouncerInteractor.willDismissWithAction()).isFalse() + assertThat(underTest.willDismissWithAction()).isFalse() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt new file mode 100644 index 000000000000..ea7bc91cd2d5 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.keyguard.domain.interactor + +import android.os.Looper +import androidx.test.filters.SmallTest +import com.android.keyguard.KeyguardSecurityModel +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingCollector +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.keyguard.DismissCallbackRegistry +import com.android.systemui.keyguard.data.BouncerView +import com.android.systemui.keyguard.data.BouncerViewDelegate +import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.statusbar.phone.KeyguardBypassController +import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.utils.os.FakeHandler +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.junit.runners.JUnit4 +import org.mockito.Mock +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(JUnit4::class) +class PrimaryBouncerInteractorWithCoroutinesTest : SysuiTestCase() { + private lateinit var repository: FakeKeyguardBouncerRepository + @Mock private lateinit var bouncerView: BouncerView + @Mock private lateinit var bouncerViewDelegate: BouncerViewDelegate + @Mock private lateinit var keyguardStateController: KeyguardStateController + @Mock private lateinit var keyguardSecurityModel: KeyguardSecurityModel + @Mock private lateinit var primaryBouncerCallbackInteractor: PrimaryBouncerCallbackInteractor + @Mock private lateinit var falsingCollector: FalsingCollector + @Mock private lateinit var dismissCallbackRegistry: DismissCallbackRegistry + @Mock private lateinit var keyguardBypassController: KeyguardBypassController + @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor + private val mainHandler = FakeHandler(Looper.getMainLooper()) + private lateinit var underTest: PrimaryBouncerInteractor + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + repository = FakeKeyguardBouncerRepository() + underTest = + PrimaryBouncerInteractor( + repository, + bouncerView, + mainHandler, + keyguardStateController, + keyguardSecurityModel, + primaryBouncerCallbackInteractor, + falsingCollector, + dismissCallbackRegistry, + keyguardBypassController, + keyguardUpdateMonitor, + ) + } + + @Test + fun notInteractableWhenExpansionIsBelow90Percent() = runTest { + val isInteractable = collectLastValue(underTest.isInteractable) + + repository.setPrimaryVisible(true) + repository.setPanelExpansion(0.15f) + + assertThat(isInteractable()).isFalse() + } + + @Test + fun notInteractableWhenExpansionAbove90PercentButNotVisible() = runTest { + val isInteractable = collectLastValue(underTest.isInteractable) + + repository.setPrimaryVisible(false) + repository.setPanelExpansion(0.05f) + + assertThat(isInteractable()).isFalse() + } + + @Test + fun isInteractableWhenExpansionAbove90PercentAndVisible() = runTest { + var isInteractable = collectLastValue(underTest.isInteractable) + + repository.setPrimaryVisible(true) + repository.setPanelExpansion(0.09f) + + assertThat(isInteractable()).isTrue() + + repository.setPanelExpansion(0.12f) + assertThat(isInteractable()).isFalse() + + repository.setPanelExpansion(0f) + assertThat(isInteractable()).isTrue() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowTest.kt new file mode 100644 index 000000000000..a5b78b74fcdf --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowTest.kt @@ -0,0 +1,174 @@ +/* + * 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 + +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository +import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.shared.model.TransitionState +import com.android.systemui.keyguard.shared.model.TransitionStep +import com.google.common.truth.Truth.assertThat +import kotlin.time.Duration.Companion.milliseconds +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +@SmallTest +@RunWith(JUnit4::class) +class KeyguardTransitionAnimationFlowTest : SysuiTestCase() { + private lateinit var underTest: KeyguardTransitionAnimationFlow + private lateinit var repository: FakeKeyguardTransitionRepository + + @Before + fun setUp() { + repository = FakeKeyguardTransitionRepository() + underTest = + KeyguardTransitionAnimationFlow( + 1000.milliseconds, + repository.transitions, + ) + } + + @Test(expected = IllegalArgumentException::class) + fun zeroDurationThrowsException() = runTest { + val flow = underTest.createFlow(duration = 0.milliseconds, onStep = { it }) + } + + @Test(expected = IllegalArgumentException::class) + fun startTimePlusDurationGreaterThanTransitionDurationThrowsException() = runTest { + val flow = + underTest.createFlow( + startTime = 300.milliseconds, + duration = 800.milliseconds, + onStep = { it } + ) + } + + @Test + fun onFinishRunsWhenSpecified() = runTest { + val flow = + underTest.createFlow( + duration = 100.milliseconds, + onStep = { it }, + onFinish = { 10f }, + ) + var animationValues = collectLastValue(flow) + repository.sendTransitionStep(step(1f, TransitionState.FINISHED)) + assertThat(animationValues()).isEqualTo(10f) + } + + @Test + fun onCancelRunsWhenSpecified() = runTest { + val flow = + underTest.createFlow( + duration = 100.milliseconds, + onStep = { it }, + onCancel = { 100f }, + ) + var animationValues = collectLastValue(flow) + repository.sendTransitionStep(step(0.5f, TransitionState.CANCELED)) + assertThat(animationValues()).isEqualTo(100f) + } + + @Test + fun usesStartTime() = runTest { + val flow = + underTest.createFlow( + startTime = 500.milliseconds, + duration = 500.milliseconds, + onStep = { it }, + ) + var animationValues = collectLastValue(flow) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + assertThat(animationValues()).isEqualTo(0f) + + // Should not emit a value + repository.sendTransitionStep(step(0.1f, TransitionState.RUNNING)) + + repository.sendTransitionStep(step(0.5f, TransitionState.RUNNING)) + assertFloat(animationValues(), 0f) + repository.sendTransitionStep(step(0.6f, TransitionState.RUNNING)) + assertFloat(animationValues(), 0.2f) + repository.sendTransitionStep(step(0.8f, TransitionState.RUNNING)) + assertFloat(animationValues(), 0.6f) + repository.sendTransitionStep(step(1f, TransitionState.RUNNING)) + assertFloat(animationValues(), 1f) + } + + @Test + fun usesInterpolator() = runTest { + val flow = + underTest.createFlow( + duration = 1000.milliseconds, + interpolator = EMPHASIZED_ACCELERATE, + onStep = { it }, + ) + var animationValues = collectLastValue(flow) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + assertFloat(animationValues(), EMPHASIZED_ACCELERATE.getInterpolation(0f)) + repository.sendTransitionStep(step(0.5f, TransitionState.RUNNING)) + assertFloat(animationValues(), EMPHASIZED_ACCELERATE.getInterpolation(0.5f)) + repository.sendTransitionStep(step(0.6f, TransitionState.RUNNING)) + assertFloat(animationValues(), EMPHASIZED_ACCELERATE.getInterpolation(0.6f)) + repository.sendTransitionStep(step(0.8f, TransitionState.RUNNING)) + assertFloat(animationValues(), EMPHASIZED_ACCELERATE.getInterpolation(0.8f)) + repository.sendTransitionStep(step(1f, TransitionState.RUNNING)) + assertFloat(animationValues(), EMPHASIZED_ACCELERATE.getInterpolation(1f)) + } + + @Test + fun usesOnStepToDoubleValue() = runTest { + val flow = + underTest.createFlow( + duration = 1000.milliseconds, + onStep = { it * 2 }, + ) + var animationValues = collectLastValue(flow) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + assertFloat(animationValues(), 0f) + repository.sendTransitionStep(step(0.3f, TransitionState.RUNNING)) + assertFloat(animationValues(), 0.6f) + repository.sendTransitionStep(step(0.6f, TransitionState.RUNNING)) + assertFloat(animationValues(), 1.2f) + repository.sendTransitionStep(step(0.8f, TransitionState.RUNNING)) + assertFloat(animationValues(), 1.6f) + repository.sendTransitionStep(step(1f, TransitionState.RUNNING)) + assertFloat(animationValues(), 2f) + } + + private fun assertFloat(actual: Float?, expected: Float) { + assertThat(actual!!).isWithin(0.01f).of(expected) + } + + private fun step( + value: Float, + state: TransitionState = TransitionState.RUNNING + ): TransitionStep { + return TransitionStep( + from = KeyguardState.GONE, + to = KeyguardState.DREAMING, + value = value, + transitionState = state, + ownerName = "GoneToDreamingTransitionViewModelTest" + ) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt index 557166301d64..06e397d8fb8f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt @@ -18,19 +18,13 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE -import com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor.Companion.TO_LOCKSCREEN_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.DREAM_OVERLAY_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.DREAM_OVERLAY_TRANSLATION_Y -import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.LOCKSCREEN_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.LOCKSCREEN_TRANSLATION_Y +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -46,6 +40,7 @@ import org.junit.runners.JUnit4 class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { private lateinit var underTest: DreamingToLockscreenTransitionViewModel private lateinit var repository: FakeKeyguardTransitionRepository + private lateinit var transitionAnimation: KeyguardTransitionAnimationFlow @Before fun setUp() { @@ -63,32 +58,18 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.dreamOverlayTranslationY(pixels).onEach { values.add(it) }.launchIn(this) + // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) + repository.sendTransitionStep(step(0.6f)) + // ...up to here + repository.sendTransitionStep(step(0.8f)) repository.sendTransitionStep(step(1f)) - // Only 3 values should be present, since the dream overlay runs for a small fraction - // of the overall animation time - assertThat(values.size).isEqualTo(3) - assertThat(values[0]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0f, DREAM_OVERLAY_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.3f, DREAM_OVERLAY_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.5f, DREAM_OVERLAY_TRANSLATION_Y) - ) * pixels - ) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } job.cancel() } @@ -100,16 +81,18 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.dreamOverlayAlpha.onEach { values.add(it) }.launchIn(this) + // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.1f)) repository.sendTransitionStep(step(0.5f)) + // ...up to here repository.sendTransitionStep(step(1f)) // Only two values should be present, since the dream overlay runs for a small fraction // of the overall animation time - assertThat(values.size).isEqualTo(2) - assertThat(values[0]).isEqualTo(1f - animValue(0f, DREAM_OVERLAY_ALPHA)) - assertThat(values[1]).isEqualTo(1f - animValue(0.1f, DREAM_OVERLAY_ALPHA)) + assertThat(values.size).isEqualTo(4) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -121,19 +104,15 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.1f)) - // Should start running here... repository.sendTransitionStep(step(0.2f)) repository.sendTransitionStep(step(0.3f)) - // ...up to here repository.sendTransitionStep(step(1f)) - // Only two values should be present, since the dream overlay runs for a small fraction - // of the overall animation time - assertThat(values.size).isEqualTo(2) - assertThat(values[0]).isEqualTo(animValue(0.2f, LOCKSCREEN_ALPHA)) - assertThat(values[1]).isEqualTo(animValue(0.3f, LOCKSCREEN_ALPHA)) + assertThat(values.size).isEqualTo(4) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -147,58 +126,27 @@ class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) repository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(4) - assertThat(values[0]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0.3f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0.5f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[3]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(1f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(-100f, 0f)) } job.cancel() } - private fun animValue(stepValue: Float, params: AnimationParams): Float { - val totalDuration = TO_LOCKSCREEN_DURATION - val startValue = (params.startTime / totalDuration).toFloat() - - val multiplier = (totalDuration / params.duration).toFloat() - return (stepValue - startValue) * multiplier - } - - private fun step(value: Float): TransitionStep { + private fun step( + value: Float, + state: TransitionState = TransitionState.RUNNING + ): TransitionStep { return TransitionStep( from = KeyguardState.DREAMING, to = KeyguardState.LOCKSCREEN, value = value, - transitionState = TransitionState.RUNNING, + transitionState = state, ownerName = "DreamingToLockscreenTransitionViewModelTest" ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt index 7fa204bb980b..14c3b504d0ae 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt @@ -18,16 +18,12 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.FromGoneTransitionInteractor.Companion.TO_DREAMING_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingTransitionViewModel.Companion.LOCKSCREEN_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingTransitionViewModel.Companion.LOCKSCREEN_TRANSLATION_Y +import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -59,20 +55,18 @@ class GoneToDreamingTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this) // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.1f)) repository.sendTransitionStep(step(0.2f)) - // ...up to here repository.sendTransitionStep(step(0.3f)) + // ...up to here repository.sendTransitionStep(step(1f)) // Only three values should be present, since the dream overlay runs for a small - // fraction - // of the overall animation time - assertThat(values.size).isEqualTo(3) - assertThat(values[0]).isEqualTo(1f - animValue(0f, LOCKSCREEN_ALPHA)) - assertThat(values[1]).isEqualTo(1f - animValue(0.1f, LOCKSCREEN_ALPHA)) - assertThat(values[2]).isEqualTo(1f - animValue(0.2f, LOCKSCREEN_ALPHA)) + // fraction of the overall animation time + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -87,45 +81,19 @@ class GoneToDreamingTransitionViewModelTest : SysuiTestCase() { underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) - // ...up to here - repository.sendTransitionStep(step(1f)) // And a final reset event on CANCEL repository.sendTransitionStep(step(0.8f, TransitionState.CANCELED)) - assertThat(values.size).isEqualTo(4) - assertThat(values[0]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.3f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.5f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[3]).isEqualTo(0f) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } + job.cancel() } - private fun animValue(stepValue: Float, params: AnimationParams): Float { - val totalDuration = TO_DREAMING_DURATION - val startValue = (params.startTime / totalDuration).toFloat() - - val multiplier = (totalDuration / params.duration).toFloat() - return (stepValue - startValue) * multiplier - } - private fun step( value: Float, state: TransitionState = TransitionState.RUNNING diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt index 539fc2c1548e..ed31dc39dd90 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt @@ -18,16 +18,12 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor.Companion.TO_DREAMING_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.Companion.LOCKSCREEN_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.Companion.LOCKSCREEN_TRANSLATION_Y +import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -59,19 +55,18 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this) // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.1f)) repository.sendTransitionStep(step(0.2f)) - // ...up to here repository.sendTransitionStep(step(0.3f)) + // ...up to here repository.sendTransitionStep(step(1f)) // Only three values should be present, since the dream overlay runs for a small // fraction of the overall animation time - assertThat(values.size).isEqualTo(3) - assertThat(values[0]).isEqualTo(1f - animValue(0f, LOCKSCREEN_ALPHA)) - assertThat(values[1]).isEqualTo(1f - animValue(0.1f, LOCKSCREEN_ALPHA)) - assertThat(values[2]).isEqualTo(1f - animValue(0.2f, LOCKSCREEN_ALPHA)) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -85,47 +80,22 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) - // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) - // ...up to here repository.sendTransitionStep(step(1f)) // And a final reset event on FINISHED repository.sendTransitionStep(step(1f, TransitionState.FINISHED)) - assertThat(values.size).isEqualTo(4) - assertThat(values[0]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.3f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.5f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[3]).isEqualTo(0f) + assertThat(values.size).isEqualTo(6) + values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } + // Validate finished value + assertThat(values[5]).isEqualTo(0f) job.cancel() } - private fun animValue(stepValue: Float, params: AnimationParams): Float { - val totalDuration = TO_DREAMING_DURATION - val startValue = (params.startTime / totalDuration).toFloat() - - val multiplier = (totalDuration / params.duration).toFloat() - return (stepValue - startValue) * multiplier - } - private fun step( value: Float, state: TransitionState = TransitionState.RUNNING diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt index 759345f51c59..458b31519500 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt @@ -18,16 +18,12 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor.Companion.TO_OCCLUDED_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.LockscreenToOccludedTransitionViewModel.Companion.LOCKSCREEN_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.LockscreenToOccludedTransitionViewModel.Companion.LOCKSCREEN_TRANSLATION_Y +import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -59,19 +55,18 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this) // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.1f)) repository.sendTransitionStep(step(0.4f)) - // ...up to here repository.sendTransitionStep(step(0.7f)) + // ...up to here repository.sendTransitionStep(step(1f)) // Only 3 values should be present, since the dream overlay runs for a small fraction // of the overall animation time - assertThat(values.size).isEqualTo(3) - assertThat(values[0]).isEqualTo(1f - animValue(0f, LOCKSCREEN_ALPHA)) - assertThat(values[1]).isEqualTo(1f - animValue(0.1f, LOCKSCREEN_ALPHA)) - assertThat(values[2]).isEqualTo(1f - animValue(0.4f, LOCKSCREEN_ALPHA)) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -86,54 +81,51 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) // Should start running here... + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) repository.sendTransitionStep(step(1f)) // ...up to here - assertThat(values.size).isEqualTo(4) - assertThat(values[0]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.3f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(0.5f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[3]) - .isEqualTo( - EMPHASIZED_ACCELERATE.getInterpolation( - animValue(1f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } + job.cancel() } - private fun animValue(stepValue: Float, params: AnimationParams): Float { - val totalDuration = TO_OCCLUDED_DURATION - val startValue = (params.startTime / totalDuration).toFloat() + @Test + fun lockscreenTranslationYIsCanceled() = + runTest(UnconfinedTestDispatcher()) { + val values = mutableListOf<Float>() - val multiplier = (totalDuration / params.duration).toFloat() - return (stepValue - startValue) * multiplier - } + val pixels = 100 + val job = + underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) + + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + repository.sendTransitionStep(step(0f)) + repository.sendTransitionStep(step(0.3f)) + repository.sendTransitionStep(step(0.3f, TransitionState.CANCELED)) + + assertThat(values.size).isEqualTo(4) + values.forEach { assertThat(it).isIn(Range.closed(0f, 100f)) } + + // Cancel will reset the translation + assertThat(values[3]).isEqualTo(0) + + job.cancel() + } - private fun step(value: Float): TransitionStep { + private fun step( + value: Float, + state: TransitionState = TransitionState.RUNNING, + ): TransitionStep { return TransitionStep( from = KeyguardState.LOCKSCREEN, to = KeyguardState.OCCLUDED, value = value, - transitionState = TransitionState.RUNNING, + transitionState = state, ownerName = "LockscreenToOccludedTransitionViewModelTest" ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt index 98d292d689e4..a36214ecdb2f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt @@ -18,16 +18,12 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository -import com.android.systemui.keyguard.domain.interactor.FromOccludedTransitionInteractor.Companion.TO_LOCKSCREEN_DURATION import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor -import com.android.systemui.keyguard.shared.model.AnimationParams import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep -import com.android.systemui.keyguard.ui.viewmodel.OccludedToLockscreenTransitionViewModel.Companion.LOCKSCREEN_ALPHA -import com.android.systemui.keyguard.ui.viewmodel.OccludedToLockscreenTransitionViewModel.Companion.LOCKSCREEN_TRANSLATION_Y +import com.google.common.collect.Range import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -58,21 +54,19 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenAlpha.onEach { values.add(it) }.launchIn(this) - repository.sendTransitionStep(step(0f)) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + repository.sendTransitionStep(step(0.1f)) // Should start running here... repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.4f)) repository.sendTransitionStep(step(0.5f)) - // ...up to here repository.sendTransitionStep(step(0.6f)) + // ...up to here + repository.sendTransitionStep(step(0.8f)) repository.sendTransitionStep(step(1f)) - // Only two values should be present, since the dream overlay runs for a small fraction - // of the overall animation time - assertThat(values.size).isEqualTo(3) - assertThat(values[0]).isEqualTo(animValue(0.3f, LOCKSCREEN_ALPHA)) - assertThat(values[1]).isEqualTo(animValue(0.4f, LOCKSCREEN_ALPHA)) - assertThat(values[2]).isEqualTo(animValue(0.5f, LOCKSCREEN_ALPHA)) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) } job.cancel() } @@ -86,58 +80,27 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() { val job = underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this) + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) repository.sendTransitionStep(step(0f)) repository.sendTransitionStep(step(0.3f)) repository.sendTransitionStep(step(0.5f)) repository.sendTransitionStep(step(1f)) - assertThat(values.size).isEqualTo(4) - assertThat(values[0]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[1]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0.3f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[2]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(0.5f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) - assertThat(values[3]) - .isEqualTo( - -pixels + - EMPHASIZED_DECELERATE.getInterpolation( - animValue(1f, LOCKSCREEN_TRANSLATION_Y) - ) * pixels - ) + assertThat(values.size).isEqualTo(5) + values.forEach { assertThat(it).isIn(Range.closed(-100f, 0f)) } job.cancel() } - private fun animValue(stepValue: Float, params: AnimationParams): Float { - val totalDuration = TO_LOCKSCREEN_DURATION - val startValue = (params.startTime / totalDuration).toFloat() - - val multiplier = (totalDuration / params.duration).toFloat() - return (stepValue - startValue) * multiplier - } - - private fun step(value: Float): TransitionStep { + private fun step( + value: Float, + state: TransitionState = TransitionState.RUNNING + ): TransitionStep { return TransitionStep( from = KeyguardState.OCCLUDED, to = KeyguardState.LOCKSCREEN, value = value, - transitionState = TransitionState.RUNNING, + transitionState = state, ownerName = "OccludedToLockscreenTransitionViewModelTest" ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataTest.kt index 1d6e980bdb86..670f11787ce4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataTest.kt @@ -113,5 +113,6 @@ private val DEFAULT_DATA = recommendations = emptyList(), dismissIntent = null, headphoneConnectionTimeMillis = 0, - instanceId = InstanceId.fakeInstanceId(-1) + instanceId = InstanceId.fakeInstanceId(-1), + expiryTimeMs = 0, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataCombineLatestTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataCombineLatestTest.java index c0639f34484c..0a5b124cdb7b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataCombineLatestTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataCombineLatestTest.java @@ -79,7 +79,7 @@ public class MediaDataCombineLatestTest extends SysuiTestCase { USER_ID, true, APP, null, ARTIST, TITLE, null, new ArrayList<>(), new ArrayList<>(), null, PACKAGE, null, null, null, true, null, MediaData.PLAYBACK_LOCAL, false, KEY, false, false, false, 0L, - InstanceId.fakeInstanceId(-1), -1, false); + InstanceId.fakeInstanceId(-1), -1, false, null); mDeviceData = new MediaDeviceData(true, null, DEVICE_NAME, null, false); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataFilterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataFilterTest.kt index 9d33e6f84972..eb6235ca8a6a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataFilterTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataFilterTest.kt @@ -27,11 +27,13 @@ import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.models.player.MediaData import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.ui.MediaPlayerData +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.NotificationLockscreenUserManager import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import java.util.concurrent.Executor @@ -40,11 +42,11 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.anyLong import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations private const val KEY = "TEST_KEY" @@ -72,6 +74,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Mock private lateinit var smartspaceData: SmartspaceMediaData @Mock private lateinit var smartspaceMediaRecommendationItem: SmartspaceAction @Mock private lateinit var logger: MediaUiEventLogger + @Mock private lateinit var mediaFlags: MediaFlags private lateinit var mediaDataFilter: MediaDataFilter private lateinit var dataMain: MediaData @@ -82,6 +85,7 @@ class MediaDataFilterTest : SysuiTestCase() { fun setup() { MockitoAnnotations.initMocks(this) MediaPlayerData.clear() + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) mediaDataFilter = MediaDataFilter( context, @@ -90,7 +94,8 @@ class MediaDataFilterTest : SysuiTestCase() { lockscreenUserManager, executor, clock, - logger + logger, + mediaFlags ) mediaDataFilter.mediaDataManager = mediaDataManager mediaDataFilter.addListener(listener) @@ -108,19 +113,20 @@ class MediaDataFilterTest : SysuiTestCase() { ) dataGuest = dataMain.copy(userId = USER_GUEST) - `when`(smartspaceData.targetId).thenReturn(SMARTSPACE_KEY) - `when`(smartspaceData.isActive).thenReturn(true) - `when`(smartspaceData.isValid()).thenReturn(true) - `when`(smartspaceData.packageName).thenReturn(SMARTSPACE_PACKAGE) - `when`(smartspaceData.recommendations).thenReturn(listOf(smartspaceMediaRecommendationItem)) - `when`(smartspaceData.headphoneConnectionTimeMillis) + whenever(smartspaceData.targetId).thenReturn(SMARTSPACE_KEY) + whenever(smartspaceData.isActive).thenReturn(true) + whenever(smartspaceData.isValid()).thenReturn(true) + whenever(smartspaceData.packageName).thenReturn(SMARTSPACE_PACKAGE) + whenever(smartspaceData.recommendations) + .thenReturn(listOf(smartspaceMediaRecommendationItem)) + whenever(smartspaceData.headphoneConnectionTimeMillis) .thenReturn(clock.currentTimeMillis() - 100) - `when`(smartspaceData.instanceId).thenReturn(SMARTSPACE_INSTANCE_ID) + whenever(smartspaceData.instanceId).thenReturn(SMARTSPACE_INSTANCE_ID) } private fun setUser(id: Int) { - `when`(lockscreenUserManager.isCurrentProfile(anyInt())).thenReturn(false) - `when`(lockscreenUserManager.isCurrentProfile(eq(id))).thenReturn(true) + whenever(lockscreenUserManager.isCurrentProfile(anyInt())).thenReturn(false) + whenever(lockscreenUserManager.isCurrentProfile(eq(id))).thenReturn(true) mediaDataFilter.handleUserSwitched(id) } @@ -277,7 +283,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun hasActiveMediaOrRecommendation_inactiveRecommendationSet_returnsFalse() { - `when`(smartspaceData.isActive).thenReturn(false) + whenever(smartspaceData.isActive).thenReturn(false) mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isFalse() @@ -285,7 +291,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun hasActiveMediaOrRecommendation_invalidRecommendationSet_returnsFalse() { - `when`(smartspaceData.isValid()).thenReturn(false) + whenever(smartspaceData.isValid()).thenReturn(false) mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isFalse() @@ -293,8 +299,8 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun hasActiveMediaOrRecommendation_activeAndValidRecommendationSet_returnsTrue() { - `when`(smartspaceData.isActive).thenReturn(true) - `when`(smartspaceData.isValid()).thenReturn(true) + whenever(smartspaceData.isActive).thenReturn(true) + whenever(smartspaceData.isValid()).thenReturn(true) mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isTrue() @@ -349,7 +355,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_noMedia_inactiveRec_showsNothing() { - `when`(smartspaceData.isActive).thenReturn(false) + whenever(smartspaceData.isActive).thenReturn(false) mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) @@ -379,7 +385,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_noRecentMedia_inactiveRec_showsNothing() { - `when`(smartspaceData.isActive).thenReturn(false) + whenever(smartspaceData.isActive).thenReturn(false) val dataOld = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) mediaDataFilter.onMediaDataLoaded(KEY, null, dataOld) @@ -395,7 +401,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_hasRecentMedia_inactiveRec_showsNothing() { - `when`(smartspaceData.isActive).thenReturn(false) + whenever(smartspaceData.isActive).thenReturn(false) // WHEN we have media that was recently played, but not currently active val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) @@ -418,7 +424,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Test fun testOnSmartspaceMediaDataLoaded_hasRecentMedia_activeInvalidRec_usesMedia() { - `when`(smartspaceData.isValid()).thenReturn(false) + whenever(smartspaceData.isValid()).thenReturn(false) // WHEN we have media that was recently played, but not currently active val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) @@ -513,4 +519,59 @@ class MediaDataFilterTest : SysuiTestCase() { assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isFalse() assertThat(mediaDataFilter.hasActiveMedia()).isFalse() } + + @Test + fun testOnSmartspaceLoaded_persistentEnabled_isInactive_notifiesListeners() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + whenever(smartspaceData.isActive).thenReturn(false) + + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isFalse() + assertThat(mediaDataFilter.hasAnyMediaOrRecommendation()).isTrue() + } + + @Test + fun testOnSmartspaceLoaded_persistentEnabled_inactive_hasRecentMedia_staysInactive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + whenever(smartspaceData.isActive).thenReturn(false) + + // If there is media that was recently played but inactive + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // And an inactive recommendation is loaded + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // Smartspace is loaded but the media stays inactive + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + verify(listener, never()) + .onMediaDataLoaded(any(), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + assertThat(mediaDataFilter.hasActiveMediaOrRecommendation()).isFalse() + assertThat(mediaDataFilter.hasAnyMediaOrRecommendation()).isTrue() + } + + @Test + fun testOnSwipeToDismiss_persistentEnabled_recommendationSetInactive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + val data = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = SMARTSPACE_KEY, + isActive = true, + packageName = SMARTSPACE_PACKAGE, + recommendations = listOf(smartspaceMediaRecommendationItem), + ) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, data) + mediaDataFilter.onSwipeToDismiss() + + verify(mediaDataManager).setRecommendationInactive(eq(SMARTSPACE_KEY)) + verify(mediaDataManager, never()) + .dismissSmartspaceRecommendation(eq(SMARTSPACE_KEY), anyLong()) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt index 1ac66952fd3f..44e2fbd8465f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt @@ -46,6 +46,8 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dump.DumpManager import com.android.systemui.media.controls.models.player.MediaData +import com.android.systemui.media.controls.models.recommendation.EXTRA_KEY_TRIGGER_SOURCE +import com.android.systemui.media.controls.models.recommendation.EXTRA_VALUE_TRIGGER_PERIODIC import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaDataProvider import com.android.systemui.media.controls.resume.MediaResumeListener @@ -82,6 +84,8 @@ import org.mockito.junit.MockitoJUnit private const val KEY = "KEY" private const val KEY_2 = "KEY_2" private const val KEY_MEDIA_SMARTSPACE = "MEDIA_SMARTSPACE_ID" +private const val SMARTSPACE_CREATION_TIME = 1234L +private const val SMARTSPACE_EXPIRY_TIME = 5678L private const val PACKAGE_NAME = "com.example.app" private const val SYSTEM_PACKAGE_NAME = "com.android.systemui" private const val APP_NAME = "SystemUI" @@ -230,10 +234,12 @@ class MediaDataManagerTest : SysuiTestCase() { whenever(mediaSmartspaceTarget.smartspaceTargetId).thenReturn(KEY_MEDIA_SMARTSPACE) whenever(mediaSmartspaceTarget.featureType).thenReturn(SmartspaceTarget.FEATURE_MEDIA) whenever(mediaSmartspaceTarget.iconGrid).thenReturn(validRecommendationList) - whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(1234L) + whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(SMARTSPACE_CREATION_TIME) + whenever(mediaSmartspaceTarget.expiryTimeMillis).thenReturn(SMARTSPACE_EXPIRY_TIME) whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(false) whenever(mediaFlags.isExplicitIndicatorEnabled()).thenReturn(true) whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(false) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) whenever(logger.getNewInstanceId()).thenReturn(instanceIdSequence.newInstanceId()) } @@ -644,27 +650,8 @@ class MediaDataManagerTest : SysuiTestCase() { build() } val currentTime = clock.elapsedRealtime() - mediaDataManager.addResumptionControls( - USER_ID, - desc, - Runnable {}, - session.sessionToken, - APP_NAME, - pendingIntent, - PACKAGE_NAME - ) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) - // THEN the media data indicates that it is for resumption - verify(listener) - .onMediaDataLoaded( - eq(PACKAGE_NAME), - eq(null), - capture(mediaDataCaptor), - eq(true), - eq(0), - eq(false) - ) + addResumeControlAndLoad(desc) + val data = mediaDataCaptor.value assertThat(data.resumption).isTrue() assertThat(data.song).isEqualTo(SESSION_TITLE) @@ -690,27 +677,8 @@ class MediaDataManagerTest : SysuiTestCase() { build() } val currentTime = clock.elapsedRealtime() - mediaDataManager.addResumptionControls( - USER_ID, - desc, - Runnable {}, - session.sessionToken, - APP_NAME, - pendingIntent, - PACKAGE_NAME - ) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) - // THEN the media data indicates that it is for resumption - verify(listener) - .onMediaDataLoaded( - eq(PACKAGE_NAME), - eq(null), - capture(mediaDataCaptor), - eq(true), - eq(0), - eq(false) - ) + addResumeControlAndLoad(desc) + val data = mediaDataCaptor.value assertThat(data.resumption).isTrue() assertThat(data.song).isEqualTo(SESSION_TITLE) @@ -723,6 +691,84 @@ class MediaDataManagerTest : SysuiTestCase() { } @Test + fun testAddResumptionControls_hasPartialProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added with partial progress + val progress = 0.5 + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED + ) + putDouble(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE, progress) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(progress) + } + + @Test + fun testAddResumptionControls_hasNotPlayedProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added that have not been played + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED + ) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(0) + } + + @Test + fun testAddResumptionControls_hasFullProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added with progress info + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED + ) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + // THEN the media data includes the progress + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(1) + } + + @Test fun testResumptionDisabled_dismissesResumeControls() { // WHEN there are resume controls and resumption is switched off val desc = @@ -730,26 +776,8 @@ class MediaDataManagerTest : SysuiTestCase() { setTitle(SESSION_TITLE) build() } - mediaDataManager.addResumptionControls( - USER_ID, - desc, - Runnable {}, - session.sessionToken, - APP_NAME, - pendingIntent, - PACKAGE_NAME - ) - assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) - assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) - verify(listener) - .onMediaDataLoaded( - eq(PACKAGE_NAME), - eq(null), - capture(mediaDataCaptor), - eq(true), - eq(0), - eq(false) - ) + addResumeControlAndLoad(desc) + val data = mediaDataCaptor.value mediaDataManager.setMediaResumptionEnabled(false) @@ -825,8 +853,9 @@ class MediaDataManagerTest : SysuiTestCase() { cardAction = mediaSmartspaceBaseAction, recommendations = validRecommendationList, dismissIntent = DISMISS_INTENT, - headphoneConnectionTimeMillis = 1234L, - instanceId = InstanceId.fakeInstanceId(instanceId) + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, ) ), eq(false) @@ -848,8 +877,9 @@ class MediaDataManagerTest : SysuiTestCase() { targetId = KEY_MEDIA_SMARTSPACE, isActive = true, dismissIntent = DISMISS_INTENT, - headphoneConnectionTimeMillis = 1234L, - instanceId = InstanceId.fakeInstanceId(instanceId) + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, ) ), eq(false) @@ -879,8 +909,9 @@ class MediaDataManagerTest : SysuiTestCase() { targetId = KEY_MEDIA_SMARTSPACE, isActive = true, dismissIntent = null, - headphoneConnectionTimeMillis = 1234L, - instanceId = InstanceId.fakeInstanceId(instanceId) + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, ) ), eq(false) @@ -909,6 +940,129 @@ class MediaDataManagerTest : SysuiTestCase() { } @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_headphoneTrigger_isActive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_periodicTrigger_notActive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + val extras = + Bundle().apply { + putString("package_name", PACKAGE_NAME) + putParcelable("dismiss_intent", DISMISS_INTENT) + putString(EXTRA_KEY_TRIGGER_SOURCE, EXTRA_VALUE_TRIGGER_PERIODIC) + } + whenever(mediaSmartspaceBaseAction.extras).thenReturn(extras) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_noTargets_inactive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + smartspaceMediaDataProvider.onTargetsAvailable(listOf()) + uiExecutor.advanceClockToLast() + uiExecutor.runAllReady() + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + verify(listener, never()).onSmartspaceMediaDataRemoved(eq(KEY_MEDIA_SMARTSPACE), eq(false)) + } + + @Test + fun testSetRecommendationInactive_notifiesListeners() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + mediaDataManager.setRecommendationInactive(KEY_MEDIA_SMARTSPACE) + uiExecutor.advanceClockToLast() + uiExecutor.runAllReady() + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test fun testOnSmartspaceMediaDataLoaded_settingDisabled_doesNothing() { // WHEN media recommendation setting is off Settings.Secure.putInt( @@ -1690,4 +1844,29 @@ class MediaDataManagerTest : SysuiTestCase() { stateBuilder.setState(PlaybackState.STATE_PAUSED, 0, 1.0f) whenever(controller.playbackState).thenReturn(stateBuilder.build()) } + + /** Helper function to add a resumption control and capture the resulting MediaData */ + private fun addResumeControlAndLoad(desc: MediaDescription) { + mediaDataManager.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME + ) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListenerTest.kt index 92bf84ce285c..8baa06ac0141 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaTimeoutListenerTest.kt @@ -25,13 +25,16 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.models.player.MediaData +import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.util.concurrency.FakeExecutor 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.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -48,7 +51,6 @@ import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` import org.mockito.junit.MockitoJUnit private const val KEY = "KEY" @@ -56,6 +58,7 @@ private const val PACKAGE = "PKG" private const val SESSION_KEY = "SESSION_KEY" private const val SESSION_ARTIST = "SESSION_ARTIST" private const val SESSION_TITLE = "SESSION_TITLE" +private const val SMARTSPACE_KEY = "SMARTSPACE_KEY" private fun <T> anyObject(): T { return Mockito.anyObject<T>() @@ -85,10 +88,13 @@ class MediaTimeoutListenerTest : SysuiTestCase() { private lateinit var resumeData: MediaData private lateinit var mediaTimeoutListener: MediaTimeoutListener private var clock = FakeSystemClock() + @Mock private lateinit var mediaFlags: MediaFlags + @Mock private lateinit var smartspaceData: SmartspaceMediaData @Before fun setup() { - `when`(mediaControllerFactory.create(any())).thenReturn(mediaController) + whenever(mediaControllerFactory.create(any())).thenReturn(mediaController) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) executor = FakeExecutor(clock) mediaTimeoutListener = MediaTimeoutListener( @@ -96,7 +102,8 @@ class MediaTimeoutListenerTest : SysuiTestCase() { executor, logger, statusBarStateController, - clock + clock, + mediaFlags, ) mediaTimeoutListener.timeoutCallback = timeoutCallback mediaTimeoutListener.stateCallback = stateCallback @@ -133,9 +140,9 @@ class MediaTimeoutListenerTest : SysuiTestCase() { @Test fun testOnMediaDataLoaded_registersPlaybackListener() { val playingState = mock(android.media.session.PlaybackState::class.java) - `when`(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) + whenever(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) - `when`(mediaController.playbackState).thenReturn(playingState) + whenever(mediaController.playbackState).thenReturn(playingState) mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) verify(mediaController).registerCallback(capture(mediaCallbackCaptor)) verify(logger).logPlaybackState(eq(KEY), eq(playingState)) @@ -188,8 +195,8 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // To playing val playingState = mock(android.media.session.PlaybackState::class.java) - `when`(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) - `when`(mediaController.playbackState).thenReturn(playingState) + whenever(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) + whenever(mediaController.playbackState).thenReturn(playingState) mediaTimeoutListener.onMediaDataLoaded(newKey, KEY, mediaData) verify(mediaController).unregisterCallback(anyObject()) verify(mediaController).registerCallback(anyObject()) @@ -208,8 +215,8 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // Migrate, still not playing val playingState = mock(android.media.session.PlaybackState::class.java) - `when`(playingState.state).thenReturn(PlaybackState.STATE_PAUSED) - `when`(mediaController.playbackState).thenReturn(playingState) + whenever(playingState.state).thenReturn(PlaybackState.STATE_PAUSED) + whenever(mediaController.playbackState).thenReturn(playingState) mediaTimeoutListener.onMediaDataLoaded(newKey, KEY, mediaData) // The number of queued timeout tasks remains the same. The timeout task isn't cancelled nor @@ -296,8 +303,8 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // WHEN we get an update with media playing val playingState = mock(android.media.session.PlaybackState::class.java) - `when`(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) - `when`(mediaController.playbackState).thenReturn(playingState) + whenever(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) + whenever(mediaController.playbackState).thenReturn(playingState) val mediaPlaying = mediaData.copy(isPlaying = true) mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaPlaying) @@ -347,7 +354,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // WHEN regular media is paused val pausedState = PlaybackState.Builder().setState(PlaybackState.STATE_PAUSED, 0L, 0f).build() - `when`(mediaController.playbackState).thenReturn(pausedState) + whenever(mediaController.playbackState).thenReturn(pausedState) mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) assertThat(executor.numPending()).isEqualTo(1) @@ -379,7 +386,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // AND that media is resumed val playingState = PlaybackState.Builder().setState(PlaybackState.STATE_PAUSED, 0L, 0f).build() - `when`(mediaController.playbackState).thenReturn(playingState) + whenever(mediaController.playbackState).thenReturn(playingState) mediaTimeoutListener.onMediaDataLoaded(KEY, PACKAGE, mediaData) // THEN the timeout length is changed to a regular media control @@ -593,8 +600,91 @@ class MediaTimeoutListenerTest : SysuiTestCase() { assertThat(executor.numPending()).isEqualTo(1) } + @Test + fun testSmartspaceDataLoaded_schedulesTimeout() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + val duration = 60_000 + val createTime = 1234L + val expireTime = createTime + duration + whenever(smartspaceData.headphoneConnectionTimeMillis).thenReturn(createTime) + whenever(smartspaceData.expiryTimeMs).thenReturn(expireTime) + + mediaTimeoutListener.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + assertThat(executor.numPending()).isEqualTo(1) + assertThat(executor.advanceClockToNext()).isEqualTo(duration) + } + + @Test + fun testSmartspaceMediaData_timesOut_invokesCallback() { + // Given a pending timeout + testSmartspaceDataLoaded_schedulesTimeout() + + executor.runAllReady() + verify(timeoutCallback).invoke(eq(SMARTSPACE_KEY), eq(true)) + } + + @Test + fun testSmartspaceDataLoaded_alreadyExists_updatesTimeout() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + val duration = 100 + val createTime = 1234L + val expireTime = createTime + duration + whenever(smartspaceData.headphoneConnectionTimeMillis).thenReturn(createTime) + whenever(smartspaceData.expiryTimeMs).thenReturn(expireTime) + + mediaTimeoutListener.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + assertThat(executor.numPending()).isEqualTo(1) + + val expiryLonger = expireTime + duration + whenever(smartspaceData.expiryTimeMs).thenReturn(expiryLonger) + mediaTimeoutListener.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat(executor.numPending()).isEqualTo(1) + assertThat(executor.advanceClockToNext()).isEqualTo(duration * 2) + } + + @Test + fun testSmartspaceDataRemoved_cancelTimeout() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + mediaTimeoutListener.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + assertThat(executor.numPending()).isEqualTo(1) + + mediaTimeoutListener.onSmartspaceMediaDataRemoved(SMARTSPACE_KEY) + assertThat(executor.numPending()).isEqualTo(0) + } + + @Test + fun testSmartspaceData_dozedPastTimeout_invokedOnWakeup() { + // Given a pending timeout + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + verify(statusBarStateController).addCallback(capture(dozingCallbackCaptor)) + val duration = 60_000 + val createTime = 1234L + val expireTime = createTime + duration + whenever(smartspaceData.headphoneConnectionTimeMillis).thenReturn(createTime) + whenever(smartspaceData.expiryTimeMs).thenReturn(expireTime) + + mediaTimeoutListener.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + assertThat(executor.numPending()).isEqualTo(1) + + // And we doze past the scheduled timeout + val time = clock.currentTimeMillis() + clock.setElapsedRealtime(time + duration * 2) + assertThat(executor.numPending()).isEqualTo(1) + + // Then when no longer dozing, the timeout runs immediately + dozingCallbackCaptor.value.onDozingChanged(false) + verify(timeoutCallback).invoke(eq(SMARTSPACE_KEY), eq(true)) + verify(logger).logTimeout(eq(SMARTSPACE_KEY)) + + // and cancel any later scheduled timeout + assertThat(executor.numPending()).isEqualTo(0) + } + private fun loadMediaDataWithPlaybackState(state: PlaybackState) { - `when`(mediaController.playbackState).thenReturn(state) + whenever(mediaController.playbackState).thenReturn(state) mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) verify(mediaController).registerCallback(capture(mediaCallbackCaptor)) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt index e4e95e580a7c..e201b6b67f91 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt @@ -33,6 +33,7 @@ import com.android.systemui.media.controls.models.recommendation.SmartspaceMedia import com.android.systemui.media.controls.pipeline.EMPTY_SMARTSPACE_MEDIA_DATA import com.android.systemui.media.controls.pipeline.MediaDataManager import com.android.systemui.media.controls.ui.MediaHierarchyManager.Companion.LOCATION_QS +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager @@ -46,6 +47,7 @@ import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import javax.inject.Provider import junit.framework.Assert.assertEquals +import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue import org.junit.Before import org.junit.Ignore @@ -87,6 +89,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { @Mock lateinit var smartspaceMediaData: SmartspaceMediaData @Mock lateinit var mediaCarousel: MediaScrollView @Mock lateinit var pageIndicator: PageIndicator + @Mock lateinit var mediaFlags: MediaFlags @Captor lateinit var listener: ArgumentCaptor<MediaDataManager.Listener> @Captor lateinit var configListener: ArgumentCaptor<ConfigurationController.ConfigurationListener> @@ -114,7 +117,8 @@ class MediaCarouselControllerTest : SysuiTestCase() { falsingManager, dumpManager, logger, - debugLogger + debugLogger, + mediaFlags, ) verify(configurationController).addCallback(capture(configListener)) verify(mediaDataManager).addListener(capture(listener)) @@ -123,6 +127,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { whenever(mediaControlPanelFactory.get()).thenReturn(panel) whenever(panel.mediaViewController).thenReturn(mediaViewController) whenever(mediaDataManager.smartspaceMediaData).thenReturn(smartspaceMediaData) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) MediaPlayerData.clear() } @@ -700,4 +705,39 @@ class MediaCarouselControllerTest : SysuiTestCase() { mediaCarouselController.mediaCarouselScrollHandler.visibleMediaIndex ) } + + @Test + fun testRecommendation_persistentEnabled_newSmartspaceLoaded_updatesSort() { + testRecommendation_persistentEnabled_inactiveSmartspaceDataLoaded_isAdded() + + // When an update to existing smartspace data is loaded + listener.value.onSmartspaceMediaDataLoaded( + SMARTSPACE_KEY, + EMPTY_SMARTSPACE_MEDIA_DATA.copy(isActive = true), + true + ) + + // Then the carousel is updated + assertTrue(MediaPlayerData.playerKeys().elementAt(0).data.active) + assertTrue(MediaPlayerData.visiblePlayerKeys().elementAt(0).data.active) + } + + @Test + fun testRecommendation_persistentEnabled_inactiveSmartspaceDataLoaded_isAdded() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + // When inactive smartspace data is loaded + listener.value.onSmartspaceMediaDataLoaded( + SMARTSPACE_KEY, + EMPTY_SMARTSPACE_MEDIA_DATA, + false + ) + + // Then it is added to the carousel with correct state + assertTrue(MediaPlayerData.playerKeys().elementAt(0).isSsMediaRec) + assertFalse(MediaPlayerData.playerKeys().elementAt(0).data.active) + + assertTrue(MediaPlayerData.visiblePlayerKeys().elementAt(0).isSsMediaRec) + assertFalse(MediaPlayerData.visiblePlayerKeys().elementAt(0).data.active) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt index b35dd266e422..55a33b6636e0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt @@ -52,6 +52,7 @@ import android.widget.TextView import androidx.constraintlayout.widget.Barrier import androidx.constraintlayout.widget.ConstraintSet import androidx.lifecycle.LiveData +import androidx.media.utils.MediaConstants import androidx.test.filters.SmallTest import com.android.internal.logging.InstanceId import com.android.internal.widget.CachingIconView @@ -204,6 +205,15 @@ public class MediaControlPanelTest : SysuiTestCase() { @Mock private lateinit var coverContainer1: ViewGroup @Mock private lateinit var coverContainer2: ViewGroup @Mock private lateinit var coverContainer3: ViewGroup + @Mock private lateinit var recAppIconItem: CachingIconView + @Mock private lateinit var recCardTitle: TextView + @Mock private lateinit var recProgressBar1: SeekBar + @Mock private lateinit var recProgressBar2: SeekBar + @Mock private lateinit var recProgressBar3: SeekBar + @Mock private lateinit var recSubtitleMock1: TextView + @Mock private lateinit var recSubtitleMock2: TextView + @Mock private lateinit var recSubtitleMock3: TextView + @Mock private lateinit var coverItem: ImageView private lateinit var coverItem1: ImageView private lateinit var coverItem2: ImageView private lateinit var coverItem3: ImageView @@ -220,6 +230,7 @@ public class MediaControlPanelTest : SysuiTestCase() { this.set(Flags.UMO_TURBULENCE_NOISE, false) this.set(Flags.MEDIA_FALSING_PENALTY, true) this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true) + this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false) } @JvmField @Rule val mockito = MockitoJUnit.rule() @@ -902,6 +913,17 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test + fun bind_resumeState_withProgress() { + val progress = 0.5 + val state = mediaData.copy(resumption = true, resumeProgress = progress) + + player.attachPlayer(viewHolder) + player.bindPlayer(state, PACKAGE) + + verify(seekBarViewModel).updateStaticProgress(progress) + } + + @Test fun bindNotificationActions() { val icon = context.getDrawable(android.R.drawable.ic_media_play) val bg = context.getDrawable(R.drawable.qs_media_round_button_background) @@ -2059,6 +2081,114 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test + fun bindRecommendation_setAfterExecutors() { + fakeFeatureFlag.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, true) + whenever(recommendationViewHolder.mediaAppIcons) + .thenReturn(listOf(recAppIconItem, recAppIconItem, recAppIconItem)) + whenever(recommendationViewHolder.cardTitle).thenReturn(recCardTitle) + whenever(recommendationViewHolder.mediaCoverItems) + .thenReturn(listOf(coverItem, coverItem, coverItem)) + whenever(recommendationViewHolder.mediaProgressBars) + .thenReturn(listOf(recProgressBar1, recProgressBar2, recProgressBar3)) + whenever(recommendationViewHolder.mediaSubtitles) + .thenReturn(listOf(recSubtitleMock1, recSubtitleMock2, recSubtitleMock3)) + + val bmp = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bmp) + canvas.drawColor(Color.RED) + val albumArt = Icon.createWithBitmap(bmp) + val data = + smartspaceData.copy( + recommendations = + listOf( + SmartspaceAction.Builder("id1", "title1") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id2", "title2") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "title3") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(data) + bgExecutor.runAllReady() + mainExecutor.runAllReady() + + verify(recCardTitle).setTextColor(any<Int>()) + verify(recAppIconItem, times(3)).setImageDrawable(any(Drawable::class.java)) + verify(coverItem, times(3)).setImageDrawable(any(Drawable::class.java)) + } + + @Test + fun bindRecommendationWithProgressBars() { + fakeFeatureFlag.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, true) + whenever(recommendationViewHolder.mediaAppIcons) + .thenReturn(listOf(recAppIconItem, recAppIconItem, recAppIconItem)) + whenever(recommendationViewHolder.cardTitle).thenReturn(recCardTitle) + whenever(recommendationViewHolder.mediaCoverItems) + .thenReturn(listOf(coverItem, coverItem, coverItem)) + whenever(recommendationViewHolder.mediaProgressBars) + .thenReturn(listOf(recProgressBar1, recProgressBar2, recProgressBar3)) + whenever(recommendationViewHolder.mediaSubtitles) + .thenReturn(listOf(recSubtitleMock1, recSubtitleMock2, recSubtitleMock3)) + + val bmp = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bmp) + canvas.drawColor(Color.RED) + val albumArt = Icon.createWithBitmap(bmp) + val bundle = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED + ) + putDouble(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE, 0.5) + } + val data = + smartspaceData.copy( + recommendations = + listOf( + SmartspaceAction.Builder("id1", "title1") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(bundle) + .build(), + SmartspaceAction.Builder("id2", "title2") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "title3") + .setSubtitle("subtitle1") + .setIcon(albumArt) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(data) + + verify(recProgressBar1).setProgress(50) + verify(recProgressBar1).visibility = View.VISIBLE + verify(recProgressBar2).visibility = View.GONE + verify(recProgressBar3).visibility = View.GONE + verify(recSubtitleMock1).visibility = View.GONE + verify(recSubtitleMock2).visibility = View.VISIBLE + verify(recSubtitleMock3).visibility = View.VISIBLE + } + + @Test fun onButtonClick_touchRippleFlagEnabled_playsTouchRipple() { fakeFeatureFlag.set(Flags.UMO_SURFACE_RIPPLE, true) val semanticActions = diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt index 4ed6d7cf6bd0..2f7eac2ad4ae 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaViewControllerTest.kt @@ -22,6 +22,7 @@ import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.R import com.android.systemui.SysuiTestCase +import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.util.animation.MeasurementInput import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.animation.TransitionViewState @@ -55,6 +56,7 @@ class MediaViewControllerTest : SysuiTestCase() { @Mock private lateinit var mediaTitleWidgetState: WidgetState @Mock private lateinit var mediaSubTitleWidgetState: WidgetState @Mock private lateinit var mediaContainerWidgetState: WidgetState + @Mock private lateinit var mediaFlags: MediaFlags val delta = 0.1F @@ -64,7 +66,13 @@ class MediaViewControllerTest : SysuiTestCase() { fun setup() { MockitoAnnotations.initMocks(this) mediaViewController = - MediaViewController(context, configurationController, mediaHostStatesManager, logger) + MediaViewController( + context, + configurationController, + mediaHostStatesManager, + logger, + mediaFlags, + ) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 7c3c9d2a1bb1..8fd15c1f6b90 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java @@ -29,6 +29,7 @@ import android.graphics.drawable.Icon; import android.testing.AndroidTestingRunner; import android.view.View; import android.widget.LinearLayout; +import android.widget.SeekBar; import androidx.core.graphics.drawable.IconCompat; import androidx.test.filters.SmallTest; @@ -43,6 +44,8 @@ import com.google.common.collect.ImmutableList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import java.util.ArrayList; import java.util.List; @@ -57,6 +60,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { private static final String TEST_DEVICE_ID_1 = "test_device_id_1"; private static final String TEST_DEVICE_ID_2 = "test_device_id_2"; private static final String TEST_SESSION_NAME = "test_session_name"; + private static final int TEST_MAX_VOLUME = 20; private static final int TEST_CURRENT_VOLUME = 10; @@ -69,6 +73,8 @@ public class MediaOutputAdapterTest extends SysuiTestCase { private IconCompat mIconCompat = mock(IconCompat.class); private View mDialogLaunchView = mock(View.class); + @Captor + private ArgumentCaptor<SeekBar.OnSeekBarChangeListener> mOnSeekBarChangeListenerCaptor; private MediaOutputAdapter mMediaOutputAdapter; private MediaOutputAdapter.MediaDeviceViewHolder mViewHolder; private List<MediaDevice> mMediaDevices = new ArrayList<>(); @@ -78,6 +84,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { @Before public void setUp() { when(mMediaOutputController.isAdvancedLayoutSupported()).thenReturn(false); + when(mMediaOutputController.isSubStatusSupported()).thenReturn(false); when(mMediaOutputController.getMediaItemList()).thenReturn(mMediaItems); when(mMediaOutputController.getMediaDevices()).thenReturn(mMediaDevices); when(mMediaOutputController.hasAdjustVolumeUserRestriction()).thenReturn(false); @@ -348,6 +355,24 @@ public class MediaOutputAdapterTest extends SysuiTestCase { } @Test + public void onBindViewHolder_dragSeekbar_setsVolume() { + mOnSeekBarChangeListenerCaptor = ArgumentCaptor.forClass( + SeekBar.OnSeekBarChangeListener.class); + MediaOutputSeekbar mSpySeekbar = spy(mViewHolder.mSeekBar); + mViewHolder.mSeekBar = mSpySeekbar; + when(mMediaDevice1.getMaxVolume()).thenReturn(TEST_MAX_VOLUME); + when(mMediaDevice1.getCurrentVolume()).thenReturn(TEST_MAX_VOLUME); + mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0); + + verify(mViewHolder.mSeekBar).setOnSeekBarChangeListener( + mOnSeekBarChangeListenerCaptor.capture()); + + mOnSeekBarChangeListenerCaptor.getValue().onStopTrackingTouch(mViewHolder.mSeekBar); + assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE); + verify(mMediaOutputController).logInteractionAdjustVolume(mMediaDevice1); + } + + @Test public void onBindViewHolder_bindSelectableDevice_verifyView() { List<MediaDevice> selectableDevices = new ArrayList<>(); selectableDevices.add(mMediaDevice2); @@ -404,6 +429,24 @@ public class MediaOutputAdapterTest extends SysuiTestCase { } @Test + public void subStatusSupported_onBindViewHolder_bindFailedStateDevice_verifyView() { + String deviceStatus = ""; + when(mMediaOutputController.isSubStatusSupported()).thenReturn(true); + when(mMediaDevice2.hasDisabledReason()).thenReturn(true); + when(mMediaDevice2.getDisableReason()).thenReturn(-1); + mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1); + + assertThat(mViewHolder.mTitleText.getVisibility()).isEqualTo(View.GONE); + assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE); + assertThat(mViewHolder.mProgressBar.getVisibility()).isEqualTo(View.GONE); + assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.GONE); + assertThat(mViewHolder.mSubTitleText.getVisibility()).isEqualTo(View.VISIBLE); + assertThat(mViewHolder.mTwoLineTitleText.getVisibility()).isEqualTo(View.VISIBLE); + assertThat(mViewHolder.mSubTitleText.getText()).isEqualTo(deviceStatus); + assertThat(mViewHolder.mTwoLineTitleText.getText()).isEqualTo(TEST_DEVICE_NAME_2); + } + + @Test public void onBindViewHolder_inTransferring_bindTransferringDevice_verifyView() { when(mMediaOutputController.isAnyDeviceTransferring()).thenReturn(true); when(mMediaDevice1.getState()).thenReturn( diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java index 117751c47004..7c36e4680a72 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java @@ -93,6 +93,11 @@ public class MediaOutputControllerTest extends SysuiTestCase { private static final String TEST_SONG = "test_song"; private static final String TEST_SESSION_ID = "test_session_id"; private static final String TEST_SESSION_NAME = "test_session_name"; + private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final ActivityLaunchAnimator.Controller mActivityLaunchAnimatorController = mock( + ActivityLaunchAnimator.Controller.class); + private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( + NearbyMediaDevicesManager.class); // Mock private MediaController mMediaController = mock(MediaController.class); private MediaSessionManager mMediaSessionManager = mock(MediaSessionManager.class); @@ -111,12 +116,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { private KeyguardManager mKeyguardManager = mock(KeyguardManager.class); private PowerExemptionManager mPowerExemptionManager = mock(PowerExemptionManager.class); private CommonNotifCollection mNotifCollection = mock(CommonNotifCollection.class); - private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); private FeatureFlags mFlags = mock(FeatureFlags.class); - private final ActivityLaunchAnimator.Controller mActivityLaunchAnimatorController = mock( - ActivityLaunchAnimator.Controller.class); - private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( - NearbyMediaDevicesManager.class); private View mDialogLaunchView = mock(View.class); private MediaOutputController.Callback mCallback = mock(MediaOutputController.Callback.class); @@ -522,6 +522,17 @@ public class MediaOutputControllerTest extends SysuiTestCase { } @Test + public void logInteractionAdjustVolume_triggersFromMetricLogger() { + MediaOutputMetricLogger spyMediaOutputMetricLogger = spy( + mMediaOutputController.mMetricLogger); + mMediaOutputController.mMetricLogger = spyMediaOutputMetricLogger; + + mMediaOutputController.logInteractionAdjustVolume(mMediaDevice1); + + verify(spyMediaOutputMetricLogger).logInteractionAdjustVolume(mMediaDevice1); + } + + @Test public void getSessionVolumeMax_triggersFromLocalMediaManager() { mMediaOutputController.getSessionVolumeMax(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt index c63ca3d0ec31..ef10e40631e0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt @@ -45,6 +45,7 @@ import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.temporarydisplay.TemporaryViewDisplayController +import com.android.systemui.temporarydisplay.chipbar.ChipbarAnimator import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator import com.android.systemui.temporarydisplay.chipbar.ChipbarLogger import com.android.systemui.temporarydisplay.chipbar.SwipeChipbarAwayGestureHandler @@ -145,6 +146,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { configurationController, dumpManager, powerManager, + ChipbarAnimator(), falsingManager, falsingCollector, swipeHandler, diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolverTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolverTest.kt new file mode 100644 index 000000000000..e8b6f9bd3478 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/devicepolicy/ScreenCaptureDevicePolicyResolverTest.kt @@ -0,0 +1,703 @@ +/* + * 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.mediaprojection.devicepolicy + +import android.app.admin.DevicePolicyManager +import android.os.UserHandle +import android.os.UserManager +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever +import com.google.common.truth.Truth.assertWithMessage +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameters +import org.mockito.ArgumentMatchers.any + +abstract class BaseScreenCaptureDevicePolicyResolverTest(private val precondition: Preconditions) : + SysuiTestCase() { + + abstract class Preconditions( + val personalScreenCaptureDisabled: Boolean, + val workScreenCaptureDisabled: Boolean, + val disallowShareIntoManagedProfile: Boolean + ) + + protected val devicePolicyManager: DevicePolicyManager = mock() + protected val userManager: UserManager = mock() + + protected val personalUserHandle: UserHandle = UserHandle.of(123) + protected val workUserHandle: UserHandle = UserHandle.of(456) + + protected val policyResolver = + ScreenCaptureDevicePolicyResolver( + devicePolicyManager, + userManager, + personalUserHandle, + workUserHandle + ) + + @Before + fun setUp() { + setUpPolicies() + } + + private fun setUpPolicies() { + whenever( + devicePolicyManager.getScreenCaptureDisabled( + any(), + eq(personalUserHandle.identifier) + ) + ) + .thenReturn(precondition.personalScreenCaptureDisabled) + + whenever(devicePolicyManager.getScreenCaptureDisabled(any(), eq(workUserHandle.identifier))) + .thenReturn(precondition.workScreenCaptureDisabled) + + whenever( + userManager.hasUserRestrictionForUser( + eq(UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE), + eq(workUserHandle) + ) + ) + .thenReturn(precondition.disallowShareIntoManagedProfile) + } +} + +@RunWith(Parameterized::class) +@SmallTest +class IsAllowedScreenCaptureDevicePolicyResolverTest( + private val test: IsScreenCaptureAllowedTestCase +) : BaseScreenCaptureDevicePolicyResolverTest(test.given) { + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getParams() = + listOf( + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false, + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true, + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false, + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true, + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = true, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureAllowed = false, + ), + IsScreenCaptureAllowedTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + isTargetInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureAllowed = false, + ), + ) + } + + class Preconditions( + personalScreenCaptureDisabled: Boolean, + workScreenCaptureDisabled: Boolean, + disallowShareIntoManagedProfile: Boolean, + val isHostInWorkProfile: Boolean, + val isTargetInWorkProfile: Boolean, + ) : + BaseScreenCaptureDevicePolicyResolverTest.Preconditions( + personalScreenCaptureDisabled, + workScreenCaptureDisabled, + disallowShareIntoManagedProfile + ) + + data class IsScreenCaptureAllowedTestCase( + val given: Preconditions, + val expectedScreenCaptureAllowed: Boolean + ) { + override fun toString(): String = + "isScreenCaptureAllowed: " + + "host[${if (given.isHostInWorkProfile) "work" else "personal"} profile], " + + "target[${if (given.isTargetInWorkProfile) "work" else "personal"} profile], " + + "personal screen capture disabled = ${given.personalScreenCaptureDisabled}, " + + "work screen capture disabled = ${given.workScreenCaptureDisabled}, " + + "disallow share into managed profile = ${given.disallowShareIntoManagedProfile}, " + + "expected screen capture allowed = $expectedScreenCaptureAllowed" + } + + @Test + fun test() { + val targetAppUserHandle = + if (test.given.isTargetInWorkProfile) workUserHandle else personalUserHandle + val hostAppUserHandle = + if (test.given.isHostInWorkProfile) workUserHandle else personalUserHandle + + val screenCaptureAllowed = + policyResolver.isScreenCaptureAllowed(targetAppUserHandle, hostAppUserHandle) + + assertWithMessage("Screen capture policy resolved incorrectly") + .that(screenCaptureAllowed) + .isEqualTo(test.expectedScreenCaptureAllowed) + } +} + +@RunWith(Parameterized::class) +@SmallTest +class IsCompletelyNotAllowedScreenCaptureDevicePolicyResolverTest( + private val test: IsScreenCaptureCompletelyDisabledTestCase +) : BaseScreenCaptureDevicePolicyResolverTest(test.given) { + + companion object { + @Parameters(name = "{0}") + @JvmStatic + fun getParams() = + listOf( + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = false, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = false, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = false, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = false, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = false + ), + expectedScreenCaptureCompletelyDisabled = true, + ), + IsScreenCaptureCompletelyDisabledTestCase( + given = + Preconditions( + isHostInWorkProfile = true, + personalScreenCaptureDisabled = true, + workScreenCaptureDisabled = true, + disallowShareIntoManagedProfile = true + ), + expectedScreenCaptureCompletelyDisabled = true, + ) + ) + } + + class Preconditions( + personalScreenCaptureDisabled: Boolean, + workScreenCaptureDisabled: Boolean, + disallowShareIntoManagedProfile: Boolean, + val isHostInWorkProfile: Boolean, + ) : + BaseScreenCaptureDevicePolicyResolverTest.Preconditions( + personalScreenCaptureDisabled, + workScreenCaptureDisabled, + disallowShareIntoManagedProfile + ) + + data class IsScreenCaptureCompletelyDisabledTestCase( + val given: Preconditions, + val expectedScreenCaptureCompletelyDisabled: Boolean + ) { + override fun toString(): String = + "isScreenCaptureCompletelyDisabled: " + + "host[${if (given.isHostInWorkProfile) "work" else "personal"} profile], " + + "personal screen capture disabled = ${given.personalScreenCaptureDisabled}, " + + "work screen capture disabled = ${given.workScreenCaptureDisabled}, " + + "disallow share into managed profile = ${given.disallowShareIntoManagedProfile}, " + + "expected screen capture completely disabled = $expectedScreenCaptureCompletelyDisabled" + } + + @Test + fun test() { + val hostAppUserHandle = + if (test.given.isHostInWorkProfile) workUserHandle else personalUserHandle + + val completelyDisabled = policyResolver.isScreenCaptureCompletelyDisabled(hostAppUserHandle) + + assertWithMessage("Screen capture policy resolved incorrectly") + .that(completelyDisabled) + .isEqualTo(test.expectedScreenCaptureCompletelyDisabled) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/model/SysUiStateTest.java b/packages/SystemUI/tests/src/com/android/systemui/model/SysUiStateTest.java index 9bcfd5b2ae52..1a93adc7a631 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/model/SysUiStateTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/model/SysUiStateTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.settings.FakeDisplayTracker; import org.junit.Before; import org.junit.Test; @@ -46,7 +47,8 @@ public class SysUiStateTest extends SysuiTestCase { @Before public void setup() { - mFlagsContainer = new SysUiState(); + FakeDisplayTracker displayTracker = new FakeDisplayTracker(mContext); + mFlagsContainer = new SysUiState(displayTracker); mCallback = mock(SysUiState.SysUiStateCallback.class); mFlagsContainer.addCallback(mCallback); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java index 92652a788bcb..3eb73290636f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java @@ -40,6 +40,7 @@ import com.android.systemui.SysuiTestableContext; import com.android.systemui.assist.AssistManager; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.policy.KeyguardStateController; import org.junit.After; @@ -65,6 +66,7 @@ public class NavigationBarButtonTest extends SysuiTestCase { private ImageReader mReader; private NavigationBarView mNavBar; private VirtualDisplay mVirtualDisplay; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Before public void setup() { @@ -83,6 +85,7 @@ public class NavigationBarButtonTest extends SysuiTestCase { mDependency.injectTestDependency(EdgeBackGestureHandler.Factory.class, mEdgeBackGestureHandlerFactory); mNavBar = new NavigationBarView(context, null); + mNavBar.setDisplayTracker(mDisplayTracker); } private Display createVirtualDisplay() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java index 8058b85e205a..aacbf8f2adeb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java @@ -37,6 +37,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.res.Configuration; +import android.hardware.display.DisplayManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.util.SparseArray; @@ -50,6 +51,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shared.recents.utilities.Utilities; import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.statusbar.CommandQueue; @@ -81,6 +83,7 @@ public class NavigationBarControllerTest extends SysuiTestCase { private NavigationBar mDefaultNavBar; private NavigationBar mSecondaryNavBar; private StaticMockitoSession mMockitoSession; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Mock private CommandQueue mCommandQueue; @@ -92,6 +95,7 @@ public class NavigationBarControllerTest extends SysuiTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); + DisplayManager displayManager = mContext.getSystemService(DisplayManager.class); mNavigationBarController = spy( new NavigationBarController(mContext, mock(OverviewProxyService.class), @@ -110,7 +114,8 @@ public class NavigationBarControllerTest extends SysuiTestCase { Optional.of(mock(Pip.class)), Optional.of(mock(BackAnimation.class)), mock(FeatureFlags.class), - mock(SecureSettings.class))); + mock(SecureSettings.class), + mDisplayTracker)); initializeNavigationBars(); mMockitoSession = mockitoSession().mockStatic(Utilities.class).startMocking(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java index 2ad865e6ef11..764ddc49d110 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java @@ -87,6 +87,7 @@ import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.recents.Recents; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.settings.UserContextProvider; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.NotificationShadeWindowView; @@ -495,7 +496,8 @@ public class NavigationBarTest extends SysuiTestCase { Optional.of(mock(BackAnimation.class)), mUserContextProvider, mWakefulnessLifecycle, - mTaskStackChangeListeners)); + mTaskStackChangeListeners, + new FakeDisplayTracker(mContext))); } private void processAllMessages() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java index cafd2cf7cea0..5270737b7f3e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java @@ -36,6 +36,7 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.phone.BarTransitions; import com.android.systemui.statusbar.phone.LightBarTransitionsController; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -63,6 +64,7 @@ public class NavigationBarTransitionsTest extends SysuiTestCase { IWindowManager mIWindowManager; private NavigationBarTransitions mTransitions; + private final FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Before public void setup() { @@ -86,7 +88,7 @@ public class NavigationBarTransitionsTest extends SysuiTestCase { when(navBar.getCurrentView()).thenReturn(navBar); when(navBar.findViewById(anyInt())).thenReturn(navBar); mTransitions = new NavigationBarTransitions( - navBar, mIWindowManager, mLightBarTransitionsFactory); + navBar, mIWindowManager, mLightBarTransitionsFactory, mDisplayTracker); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt index 36e02cb1df06..bc67df6507fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt @@ -16,40 +16,50 @@ import org.junit.runners.Parameterized internal class FloatingRotationButtonPositionCalculatorTest(private val testCase: TestCase) : SysuiTestCase() { - private val calculator = FloatingRotationButtonPositionCalculator( - MARGIN_DEFAULT, MARGIN_TASKBAR_LEFT, MARGIN_TASKBAR_BOTTOM - ) - @Test fun calculatePosition() { - val position = calculator.calculatePosition( + val position = testCase.calculator.calculatePosition( testCase.rotation, testCase.taskbarVisible, testCase.taskbarStashed ) - assertThat(position).isEqualTo(testCase.expectedPosition) } internal class TestCase( + val calculator: FloatingRotationButtonPositionCalculator, val rotation: Int, val taskbarVisible: Boolean, val taskbarStashed: Boolean, val expectedPosition: Position ) { override fun toString(): String = - "when rotation = $rotation, " + + "when calculator = $calculator, " + + "rotation = $rotation, " + "taskbarVisible = $taskbarVisible, " + "taskbarStashed = $taskbarStashed - " + "expected $expectedPosition" } companion object { + private const val MARGIN_DEFAULT = 10 + private const val MARGIN_TASKBAR_LEFT = 20 + private const val MARGIN_TASKBAR_BOTTOM = 30 + + private val posLeftCalculator = FloatingRotationButtonPositionCalculator( + MARGIN_DEFAULT, MARGIN_TASKBAR_LEFT, MARGIN_TASKBAR_BOTTOM, true + ) + private val posRightCalculator = FloatingRotationButtonPositionCalculator( + MARGIN_DEFAULT, MARGIN_TASKBAR_LEFT, MARGIN_TASKBAR_BOTTOM, false + ) + @Parameterized.Parameters(name = "{0}") @JvmStatic fun getParams(): Collection<TestCase> = listOf( + // Position left TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_0, taskbarVisible = false, taskbarStashed = false, @@ -60,6 +70,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_90, taskbarVisible = false, taskbarStashed = false, @@ -70,6 +81,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_180, taskbarVisible = false, taskbarStashed = false, @@ -80,6 +92,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_270, taskbarVisible = false, taskbarStashed = false, @@ -90,6 +103,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = false, @@ -100,6 +114,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_0, taskbarVisible = true, taskbarStashed = true, @@ -110,6 +125,7 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase ) ), TestCase( + calculator = posLeftCalculator, rotation = Surface.ROTATION_90, taskbarVisible = true, taskbarStashed = false, @@ -118,11 +134,86 @@ internal class FloatingRotationButtonPositionCalculatorTest(private val testCase translationX = -MARGIN_TASKBAR_LEFT, translationY = -MARGIN_TASKBAR_BOTTOM ) + ), + + // Position right + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_0, + taskbarVisible = false, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_90, + taskbarVisible = false, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.TOP or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_180, + taskbarVisible = false, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.TOP or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = MARGIN_DEFAULT + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_270, + taskbarVisible = false, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.BOTTOM or Gravity.LEFT, + translationX = MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_0, + taskbarVisible = true, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_TASKBAR_LEFT, + translationY = -MARGIN_TASKBAR_BOTTOM + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_0, + taskbarVisible = true, + taskbarStashed = true, + expectedPosition = Position( + gravity = Gravity.BOTTOM or Gravity.RIGHT, + translationX = -MARGIN_DEFAULT, + translationY = -MARGIN_DEFAULT + ) + ), + TestCase( + calculator = posRightCalculator, + rotation = Surface.ROTATION_90, + taskbarVisible = true, + taskbarStashed = false, + expectedPosition = Position( + gravity = Gravity.TOP or Gravity.RIGHT, + translationX = -MARGIN_TASKBAR_LEFT, + translationY = MARGIN_TASKBAR_BOTTOM + ) ) ) - - private const val MARGIN_DEFAULT = 10 - private const val MARGIN_TASKBAR_LEFT = 20 - private const val MARGIN_TASKBAR_BOTTOM = 30 } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index 42ef9c2914ce..4caa50fa847d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -60,6 +60,7 @@ import com.android.systemui.qs.dagger.QSFragmentComponent; import com.android.systemui.qs.external.TileServiceRequestController; import com.android.systemui.qs.footer.ui.binder.FooterActionsViewBinder; import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; @@ -494,7 +495,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { @Override protected Fragment instantiate(Context context, String className, Bundle arguments) { MockitoAnnotations.initMocks(this); - CommandQueue commandQueue = new CommandQueue(context); + CommandQueue commandQueue = new CommandQueue(context, new FakeDisplayTracker(context)); setupQsComponent(); setUpViews(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt index 2bd068a674ae..8644b5ea18ae 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt @@ -35,12 +35,14 @@ import android.view.View import com.android.internal.logging.MetricsLogger import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ActivityLaunchAnimator +import com.android.systemui.animation.LaunchableFrameLayout import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.qs.QSTile import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.QSHost import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.nullable @@ -90,6 +92,7 @@ class CustomTileTest : SysuiTestCase() { private lateinit var customTile: CustomTile private lateinit var testableLooper: TestableLooper private lateinit var customTileBuilder: CustomTile.Builder + private val displayTracker = FakeDisplayTracker(mContext) @Before fun setUp() { @@ -119,7 +122,8 @@ class CustomTileTest : SysuiTestCase() { activityStarter, qsLogger, customTileStatePersister, - tileServices + tileServices, + displayTracker ) customTile = CustomTile.create(customTileBuilder, TILE_SPEC, mContext) @@ -339,7 +343,7 @@ class CustomTileTest : SysuiTestCase() { val tile = CustomTile.create(customTileBuilder, TILE_SPEC, mContext) tile.qsTile.activityLaunchForClick = pi - tile.handleClick(mock(View::class.java)) + tile.handleClick(mock(LaunchableFrameLayout::class.java)) testableLooper.processAllMessages() diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java index 80c39cf9e4cd..addca9d28d1a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java @@ -37,10 +37,12 @@ import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.logging.QSLogger; +import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.qs.tiles.dialog.InternetDialogFactory; import com.android.systemui.statusbar.connectivity.AccessPointController; import com.android.systemui.statusbar.connectivity.IconState; import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.WifiIndicators; import org.junit.Before; import org.junit.Test; @@ -135,4 +137,24 @@ public class InternetTileTest extends SysuiTestCase { assertThat(mTile.getState().secondaryLabel) .isNotEqualTo(mContext.getString(R.string.status_bar_airplane)); } + + @Test + public void setIsAirplaneMode_APM_enabled_after_wifi_disconnected() { + WifiIndicators wifiIndicators = new WifiIndicators( + /* enabled= */ true, + /* statusIcon= */ null, + /* qsIcon= */ null, + /* activityIn= */ false, + /* activityOut= */ false, + /* description= */ null, + /* isTransient= */ false, + /* statusLabel= */ null + ); + mTile.mSignalCallback.setWifiIndicators(wifiIndicators); + IconState state = new IconState(true, 0, ""); + mTile.mSignalCallback.setIsAirplaneMode(state); + mTestableLooper.processAllMessages(); + assertThat(mTile.getState().icon).isEqualTo( + QSTileImpl.ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable)); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionProxyReceiverTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionProxyReceiverTest.java index e1eda117177d..d5014fa366f1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionProxyReceiverTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionProxyReceiverTest.java @@ -39,6 +39,7 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.statusbar.phone.CentralSurfaces; @@ -67,6 +68,7 @@ public class ActionProxyReceiverTest extends SysuiTestCase { private PendingIntent mMockPendingIntent; private Intent mIntent; + private final FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Before public void setup() throws InterruptedException, ExecutionException, TimeoutException { @@ -135,10 +137,11 @@ public class ActionProxyReceiverTest extends SysuiTestCase { if (withStatusBar) { return new ActionProxyReceiver( Optional.of(mMockCentralSurfaces), mMockActivityManagerWrapper, - mMockScreenshotSmartActions); + mMockScreenshotSmartActions, mDisplayTracker); } else { return new ActionProxyReceiver( - Optional.empty(), mMockActivityManagerWrapper, mMockScreenshotSmartActions); + Optional.empty(), mMockActivityManagerWrapper, mMockScreenshotSmartActions, + mDisplayTracker); } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt new file mode 100644 index 000000000000..9f0a803fac40 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt @@ -0,0 +1,143 @@ +package com.android.systemui.screenshot + +import android.graphics.drawable.Drawable +import android.os.UserHandle +import android.testing.AndroidTestingRunner +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.constraintlayout.widget.Guideline +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever +import junit.framework.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class MessageContainerControllerTest : SysuiTestCase() { + lateinit var messageContainer: MessageContainerController + + @Mock lateinit var workProfileMessageController: WorkProfileMessageController + + @Mock lateinit var screenshotDetectionController: ScreenshotDetectionController + + @Mock lateinit var icon: Drawable + + lateinit var workProfileFirstRunView: ViewGroup + lateinit var detectionNoticeView: ViewGroup + lateinit var container: FrameLayout + + var featureFlags = FakeFeatureFlags() + lateinit var screenshotView: ViewGroup + + val userHandle = UserHandle.of(5) + val screenshotData = ScreenshotData.forTesting() + + val appName = "app name" + lateinit var workProfileData: WorkProfileMessageController.WorkProfileFirstRunData + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + messageContainer = + MessageContainerController( + workProfileMessageController, + screenshotDetectionController, + featureFlags + ) + screenshotView = ConstraintLayout(mContext) + workProfileData = WorkProfileMessageController.WorkProfileFirstRunData(appName, icon) + + val guideline = Guideline(mContext) + guideline.id = com.android.systemui.R.id.guideline + screenshotView.addView(guideline) + + container = FrameLayout(mContext) + container.id = com.android.systemui.R.id.screenshot_message_container + screenshotView.addView(container) + + workProfileFirstRunView = FrameLayout(mContext) + workProfileFirstRunView.id = com.android.systemui.R.id.work_profile_first_run + container.addView(workProfileFirstRunView) + + detectionNoticeView = FrameLayout(mContext) + detectionNoticeView.id = com.android.systemui.R.id.screenshot_detection_notice + container.addView(detectionNoticeView) + + messageContainer.setView(screenshotView) + + screenshotData.userHandle = userHandle + } + + @Test + fun testOnScreenshotTakenUserHandle_noWorkProfileFirstRun() { + featureFlags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, true) + // (just being explicit here) + whenever(workProfileMessageController.onScreenshotTaken(eq(userHandle))).thenReturn(null) + + messageContainer.onScreenshotTaken(userHandle) + + verify(workProfileMessageController, never()).populateView(any(), any(), any()) + } + + @Test + fun testOnScreenshotTakenUserHandle_noWorkProfileFlag() { + featureFlags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) + + messageContainer.onScreenshotTaken(userHandle) + + verify(workProfileMessageController, never()).onScreenshotTaken(any()) + verify(workProfileMessageController, never()).populateView(any(), any(), any()) + } + + @Test + fun testOnScreenshotTakenUserHandle_withWorkProfileFirstRun() { + featureFlags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, true) + whenever(workProfileMessageController.onScreenshotTaken(eq(userHandle))) + .thenReturn(workProfileData) + messageContainer.onScreenshotTaken(userHandle) + + verify(workProfileMessageController) + .populateView(eq(workProfileFirstRunView), eq(workProfileData), any()) + assertEquals(View.VISIBLE, workProfileFirstRunView.visibility) + assertEquals(View.GONE, detectionNoticeView.visibility) + } + + @Test + fun testOnScreenshotTakenScreenshotData_flagsOff() { + featureFlags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) + featureFlags.set(Flags.SCREENSHOT_DETECTION, false) + + messageContainer.onScreenshotTaken(screenshotData) + + verify(workProfileMessageController, never()).onScreenshotTaken(any()) + verify(screenshotDetectionController, never()).maybeNotifyOfScreenshot(any()) + + assertEquals(View.GONE, container.visibility) + } + + @Test + fun testOnScreenshotTakenScreenshotData_nothingToShow() { + featureFlags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, true) + featureFlags.set(Flags.SCREENSHOT_DETECTION, true) + + messageContainer.onScreenshotTaken(screenshotData) + + verify(workProfileMessageController, never()).populateView(any(), any(), any()) + verify(screenshotDetectionController, never()).populateView(any(), any()) + + assertEquals(View.GONE, container.visibility) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt index 541d6c25192f..2e73c0b5d0e3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt @@ -23,7 +23,7 @@ import android.graphics.Insets import android.graphics.Rect import android.hardware.HardwareBuffer import android.os.UserHandle -import android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD +import android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_OTHER import android.view.WindowManager.ScreenshotSource.SCREENSHOT_OTHER import android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN import android.view.WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE @@ -35,6 +35,7 @@ import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking +import org.junit.Assert import org.junit.Test private const val USER_ID = 1 @@ -55,7 +56,7 @@ class RequestProcessorTest { flags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) val request = - ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD).build() + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER).build() val processor = RequestProcessor(imageCapture, policy, flags, scope) var result: ScreenshotRequest? = null @@ -78,8 +79,10 @@ class RequestProcessorTest { fun testProcessAsync_ScreenshotData() { flags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) - val request = ScreenshotData.fromRequest( - ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD).build()) + val request = + ScreenshotData.fromRequest( + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER).build() + ) val processor = RequestProcessor(imageCapture, policy, flags, scope) var result: ScreenshotData? = null @@ -102,7 +105,7 @@ class RequestProcessorTest { flags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) val request = - ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD).build() + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER).build() val processor = RequestProcessor(imageCapture, policy, flags, scope) val processedRequest = processor.process(request) @@ -162,7 +165,7 @@ class RequestProcessorTest { ) val request = - ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD).build() + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER).build() val processor = RequestProcessor(imageCapture, policy, flags, scope) val processedRequest = processor.process(request) @@ -191,6 +194,32 @@ class RequestProcessorTest { } @Test + fun testFullScreenshot_managedProfile_nullBitmap() { + flags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, true) + + // Provide a null task bitmap when asked + imageCapture.image = null + + // Indicate that the primary content belongs to a manged profile + policy.setManagedProfile(USER_ID, true) + policy.setDisplayContentInfo( + policy.getDefaultDisplayId(), + DisplayContentInfo(component, bounds, UserHandle.of(USER_ID), TASK_ID) + ) + + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER).build() + val processor = RequestProcessor(imageCapture, policy, flags, scope) + + Assert.assertThrows(IllegalStateException::class.java) { + runBlocking { processor.process(request) } + } + Assert.assertThrows(IllegalStateException::class.java) { + runBlocking { processor.process(ScreenshotData.fromRequest(request)) } + } + } + + @Test fun testProvidedImageScreenshot_workProfilePolicyDisabled() = runBlocking { flags.set(Flags.SCREENSHOT_WORK_PROFILE_POLICY, false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotPolicyImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotPolicyImplTest.kt index 17396b13036c..e70fa2f915bd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotPolicyImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotPolicyImplTest.kt @@ -31,6 +31,7 @@ import android.os.UserManager import android.testing.AndroidTestingRunner import com.android.systemui.SysuiTestCase import com.android.systemui.screenshot.ScreenshotPolicy.DisplayContentInfo +import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.util.mockito.mock import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.Dispatchers @@ -126,8 +127,10 @@ class ScreenshotPolicyImplTest : SysuiTestCase() { val userManager = mock<UserManager>() val atmService = mock<IActivityTaskManager>() val dispatcher = Dispatchers.Unconfined + val displayTracker = FakeDisplayTracker(mContext) - return object : ScreenshotPolicyImpl(context, userManager, atmService, dispatcher) { + return object : ScreenshotPolicyImpl(context, userManager, atmService, dispatcher, + displayTracker) { override suspend fun isManagedProfile(userId: Int) = (userId == MANAGED_PROFILE_USER) override suspend fun getAllRootTaskInfosOnDisplay(displayId: Int) = tasks override suspend fun isNotificationShadeExpanded() = shadeExpanded diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt index 74969d0e4737..1fa2ace955b0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt @@ -38,8 +38,9 @@ import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.util.ScreenshotRequest import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY import com.android.systemui.flags.Flags.SCREENSHOT_METADATA +import com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY +import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_CAPTURE_FAILED import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_KEY_OTHER import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_OVERVIEW import com.android.systemui.screenshot.TakeScreenshotService.RequestCallback @@ -47,6 +48,7 @@ import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argThat import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever import java.util.function.Consumer import org.junit.Assert.assertEquals import org.junit.Before @@ -55,10 +57,10 @@ import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.isNull import org.mockito.Mockito.doAnswer +import org.mockito.Mockito.doThrow import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.verifyZeroInteractions -import org.mockito.Mockito.`when` as whenever private const val USER_ID = 1 private const val TASK_ID = 11 @@ -107,18 +109,20 @@ class TakeScreenshotServiceTest : SysuiTestCase() { // Stub request processor as a synchronous no-op for tests with the flag enabled doAnswer { - val request: ScreenshotRequest = it.getArgument(0) as ScreenshotRequest - val consumer: Consumer<ScreenshotRequest> = it.getArgument(1) - consumer.accept(request) - }.`when`(requestProcessor).processAsync( - /* request= */ any(ScreenshotRequest::class.java), /* callback= */ any()) + val request: ScreenshotRequest = it.getArgument(0) as ScreenshotRequest + val consumer: Consumer<ScreenshotRequest> = it.getArgument(1) + consumer.accept(request) + } + .whenever(requestProcessor) + .processAsync(/* request= */ any(ScreenshotRequest::class.java), /* callback= */ any()) doAnswer { - val request: ScreenshotData = it.getArgument(0) as ScreenshotData - val consumer: Consumer<ScreenshotData> = it.getArgument(1) - consumer.accept(request) - }.`when`(requestProcessor).processAsync( - /* screenshot= */ any(ScreenshotData::class.java), /* callback= */ any()) + val request: ScreenshotData = it.getArgument(0) as ScreenshotData + val consumer: Consumer<ScreenshotData> = it.getArgument(1) + consumer.accept(request) + } + .whenever(requestProcessor) + .processAsync(/* screenshot= */ any(ScreenshotData::class.java), /* callback= */ any()) // Flipped in selected test cases flags.set(SCREENSHOT_WORK_PROFILE_POLICY, false) @@ -162,37 +166,52 @@ class TakeScreenshotServiceTest : SysuiTestCase() { /* requestCallback = */ any() ) - assertEquals("Expected one UiEvent", eventLogger.numLogs(), 1) + assertEquals("Expected one UiEvent", 1, eventLogger.numLogs()) val logEvent = eventLogger.get(0) - assertEquals("Expected SCREENSHOT_REQUESTED UiEvent", - logEvent.eventId, SCREENSHOT_REQUESTED_KEY_OTHER.id) - assertEquals("Expected supplied package name", - topComponent.packageName, eventLogger.get(0).packageName) + assertEquals( + "Expected SCREENSHOT_REQUESTED UiEvent", + logEvent.eventId, + SCREENSHOT_REQUESTED_KEY_OTHER.id + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + eventLogger.get(0).packageName + ) } @Test fun takeScreenshotFullscreen_screenshotDataEnabled() { flags.set(SCREENSHOT_METADATA, true) - val request = ScreenshotRequest.Builder( - TAKE_SCREENSHOT_FULLSCREEN, - SCREENSHOT_KEY_OTHER).setTopComponent(topComponent).build() + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER) + .setTopComponent(topComponent) + .build() - service.handleRequest(request, { /* onSaved */ }, callback) + service.handleRequest(request, { /* onSaved */}, callback) - verify(controller, times(1)).handleScreenshot( - eq(ScreenshotData.fromRequest(request)), - /* onSavedListener = */ any(), - /* requestCallback = */ any()) + verify(controller, times(1)) + .handleScreenshot( + eq(ScreenshotData.fromRequest(request)), + /* onSavedListener = */ any(), + /* requestCallback = */ any() + ) assertEquals("Expected one UiEvent", eventLogger.numLogs(), 1) val logEvent = eventLogger.get(0) - assertEquals("Expected SCREENSHOT_REQUESTED UiEvent", - logEvent.eventId, SCREENSHOT_REQUESTED_KEY_OTHER.id) - assertEquals("Expected supplied package name", - topComponent.packageName, eventLogger.get(0).packageName) + assertEquals( + "Expected SCREENSHOT_REQUESTED UiEvent", + logEvent.eventId, + SCREENSHOT_REQUESTED_KEY_OTHER.id + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + eventLogger.get(0).packageName + ) } @Test @@ -224,7 +243,7 @@ class TakeScreenshotServiceTest : SysuiTestCase() { /* requestCallback = */ any() ) - assertEquals("Expected one UiEvent", eventLogger.numLogs(), 1) + assertEquals("Expected one UiEvent", 1, eventLogger.numLogs()) val logEvent = eventLogger.get(0) assertEquals( @@ -241,6 +260,8 @@ class TakeScreenshotServiceTest : SysuiTestCase() { @Test fun takeScreenshotFullscreen_userLocked() { + flags.set(SCREENSHOT_METADATA, true) + whenever(userManager.isUserUnlocked).thenReturn(false) val request = @@ -253,10 +274,36 @@ class TakeScreenshotServiceTest : SysuiTestCase() { verify(notificationsController, times(1)).notifyScreenshotError(anyInt()) verify(callback, times(1)).reportError() verifyZeroInteractions(controller) + + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) } @Test fun takeScreenshotFullscreen_screenCaptureDisabled_allUsers() { + flags.set(SCREENSHOT_METADATA, true) + whenever(devicePolicyManager.getScreenCaptureDisabled(isNull(), eq(UserHandle.USER_ALL))) .thenReturn(true) @@ -279,6 +326,206 @@ class TakeScreenshotServiceTest : SysuiTestCase() { // error shown: Toast.makeText(...).show(), untestable verify(callback, times(1)).reportError() verifyZeroInteractions(controller) + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) + } + + @Test + fun takeScreenshotFullscreen_userLocked_metadataDisabled() { + flags.set(SCREENSHOT_METADATA, false) + whenever(userManager.isUserUnlocked).thenReturn(false) + + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER) + .setTopComponent(topComponent) + .build() + + service.handleRequest(request, { /* onSaved */}, callback) + + verify(notificationsController, times(1)).notifyScreenshotError(anyInt()) + verify(callback, times(1)).reportError() + verifyZeroInteractions(controller) + + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) + } + + @Test + fun takeScreenshotFullscreen_screenCaptureDisabled_allUsers_metadataDisabled() { + flags.set(SCREENSHOT_METADATA, false) + + whenever(devicePolicyManager.getScreenCaptureDisabled(isNull(), eq(UserHandle.USER_ALL))) + .thenReturn(true) + + whenever( + devicePolicyResourcesManager.getString( + eq(SCREENSHOT_BLOCKED_BY_ADMIN), + /* Supplier<String> */ + any(), + ) + ) + .thenReturn("SCREENSHOT_BLOCKED_BY_ADMIN") + + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER) + .setTopComponent(topComponent) + .build() + + service.handleRequest(request, { /* onSaved */}, callback) + + // error shown: Toast.makeText(...).show(), untestable + verify(callback, times(1)).reportError() + verifyZeroInteractions(controller) + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) + } + + @Test + fun takeScreenshot_workProfile_nullBitmap_metadataDisabled() { + flags.set(SCREENSHOT_METADATA, false) + + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER) + .setTopComponent(topComponent) + .build() + + doThrow(IllegalStateException::class.java) + .whenever(requestProcessor) + .processAsync(any(ScreenshotRequest::class.java), any()) + + service.handleRequest(request, { /* onSaved */}, callback) + + verify(callback, times(1)).reportError() + verify(notificationsController, times(1)).notifyScreenshotError(anyInt()) + verifyZeroInteractions(controller) + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) + } + @Test + fun takeScreenshot_workProfile_nullBitmap() { + flags.set(SCREENSHOT_METADATA, true) + + val request = + ScreenshotRequest.Builder(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_OTHER) + .setTopComponent(topComponent) + .build() + + doThrow(IllegalStateException::class.java) + .whenever(requestProcessor) + .processAsync(any(ScreenshotData::class.java), any()) + + service.handleRequest(request, { /* onSaved */}, callback) + + verify(callback, times(1)).reportError() + verify(notificationsController, times(1)).notifyScreenshotError(anyInt()) + verifyZeroInteractions(controller) + assertEquals("Expected two UiEvents", 2, eventLogger.numLogs()) + val requestEvent = eventLogger.get(0) + assertEquals( + "Expected SCREENSHOT_REQUESTED_* UiEvent", + SCREENSHOT_REQUESTED_KEY_OTHER.id, + requestEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + requestEvent.packageName + ) + val failureEvent = eventLogger.get(1) + assertEquals( + "Expected SCREENSHOT_CAPTURE_FAILED UiEvent", + SCREENSHOT_CAPTURE_FAILED.id, + failureEvent.eventId + ) + assertEquals( + "Expected supplied package name", + topComponent.packageName, + failureEvent.packageName + ) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/WorkProfileMessageControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/WorkProfileMessageControllerTest.java index bd04b3ccc039..3440f91c1237 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/WorkProfileMessageControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/WorkProfileMessageControllerTest.java @@ -16,13 +16,11 @@ package com.android.systemui.screenshot; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ComponentName; @@ -33,28 +31,35 @@ import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; import android.testing.AndroidTestingRunner; +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; import androidx.test.filters.SmallTest; +import com.android.systemui.R; +import com.android.systemui.SysuiTestCase; import com.android.systemui.util.FakeSharedPreferences; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; -import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import kotlin.Unit; + @SmallTest @RunWith(AndroidTestingRunner.class) -public class WorkProfileMessageControllerTest { +public class WorkProfileMessageControllerTest extends SysuiTestCase { private static final String DEFAULT_LABEL = "default label"; - private static final String BADGED_DEFAULT_LABEL = "badged default label"; private static final String APP_LABEL = "app label"; - private static final String BADGED_APP_LABEL = "badged app label"; private static final UserHandle NON_WORK_USER = UserHandle.of(0); private static final UserHandle WORK_USER = UserHandle.of(10); @@ -63,17 +68,13 @@ public class WorkProfileMessageControllerTest { @Mock private PackageManager mPackageManager; @Mock - private Context mContext; - @Mock - private WorkProfileMessageController.WorkProfileMessageDisplay mMessageDisplay; + private Context mMockContext; @Mock private Drawable mActivityIcon; @Mock private Drawable mBadgedActivityIcon; @Mock private ActivityInfo mActivityInfo; - @Captor - private ArgumentCaptor<Runnable> mRunnableArgumentCaptor; private FakeSharedPreferences mSharedPreferences = new FakeSharedPreferences(); @@ -84,14 +85,10 @@ public class WorkProfileMessageControllerTest { MockitoAnnotations.initMocks(this); when(mUserManager.isManagedProfile(eq(WORK_USER.getIdentifier()))).thenReturn(true); - when(mContext.getSharedPreferences( + when(mMockContext.getSharedPreferences( eq(WorkProfileMessageController.SHARED_PREFERENCES_NAME), eq(Context.MODE_PRIVATE))).thenReturn(mSharedPreferences); - when(mContext.getString(ArgumentMatchers.anyInt())).thenReturn(DEFAULT_LABEL); - when(mPackageManager.getUserBadgedLabel(eq(DEFAULT_LABEL), any())) - .thenReturn(BADGED_DEFAULT_LABEL); - when(mPackageManager.getUserBadgedLabel(eq(APP_LABEL), any())) - .thenReturn(BADGED_APP_LABEL); + when(mMockContext.getString(ArgumentMatchers.anyInt())).thenReturn(DEFAULT_LABEL); when(mPackageManager.getActivityIcon(any(ComponentName.class))) .thenReturn(mActivityIcon); when(mPackageManager.getUserBadgedIcon( @@ -103,16 +100,13 @@ public class WorkProfileMessageControllerTest { mSharedPreferences.edit().putBoolean( WorkProfileMessageController.PREFERENCE_KEY, false).apply(); - mMessageController = new WorkProfileMessageController(mContext, mUserManager, + mMessageController = new WorkProfileMessageController(mMockContext, mUserManager, mPackageManager); } @Test public void testOnScreenshotTaken_notManaged() { - mMessageController.onScreenshotTaken(NON_WORK_USER, mMessageDisplay); - - verify(mMessageDisplay, never()) - .showWorkProfileMessage(any(), nullable(Drawable.class), any()); + assertNull(mMessageController.onScreenshotTaken(NON_WORK_USER)); } @Test @@ -120,10 +114,7 @@ public class WorkProfileMessageControllerTest { mSharedPreferences.edit().putBoolean( WorkProfileMessageController.PREFERENCE_KEY, true).apply(); - mMessageController.onScreenshotTaken(WORK_USER, mMessageDisplay); - - verify(mMessageDisplay, never()) - .showWorkProfileMessage(any(), nullable(Drawable.class), any()); + assertNull(mMessageController.onScreenshotTaken(WORK_USER)); } @Test @@ -133,28 +124,45 @@ public class WorkProfileMessageControllerTest { any(PackageManager.ComponentInfoFlags.class))).thenThrow( new PackageManager.NameNotFoundException()); - mMessageController.onScreenshotTaken(WORK_USER, mMessageDisplay); + WorkProfileMessageController.WorkProfileFirstRunData data = + mMessageController.onScreenshotTaken(WORK_USER); - verify(mMessageDisplay).showWorkProfileMessage( - eq(BADGED_DEFAULT_LABEL), eq(null), any()); + assertEquals(DEFAULT_LABEL, data.getAppName()); + assertNull(data.getIcon()); } @Test public void testOnScreenshotTaken() { - mMessageController.onScreenshotTaken(WORK_USER, mMessageDisplay); + WorkProfileMessageController.WorkProfileFirstRunData data = + mMessageController.onScreenshotTaken(WORK_USER); - verify(mMessageDisplay).showWorkProfileMessage( - eq(BADGED_APP_LABEL), eq(mBadgedActivityIcon), mRunnableArgumentCaptor.capture()); - - // Dismiss hasn't been tapped, preference untouched. - assertFalse( - mSharedPreferences.getBoolean(WorkProfileMessageController.PREFERENCE_KEY, false)); - - mRunnableArgumentCaptor.getValue().run(); + assertEquals(APP_LABEL, data.getAppName()); + assertEquals(mBadgedActivityIcon, data.getIcon()); + } - // After dismiss has been tapped, the setting should be updated. - assertTrue( - mSharedPreferences.getBoolean(WorkProfileMessageController.PREFERENCE_KEY, false)); + @Test + public void testPopulateView() throws InterruptedException { + ViewGroup layout = (ViewGroup) LayoutInflater.from(mContext).inflate( + R.layout.screenshot_work_profile_first_run, null); + WorkProfileMessageController.WorkProfileFirstRunData data = + new WorkProfileMessageController.WorkProfileFirstRunData(APP_LABEL, + mBadgedActivityIcon); + final CountDownLatch countdown = new CountDownLatch(1); + mMessageController.populateView(layout, data, () -> { + countdown.countDown(); + return Unit.INSTANCE; + }); + + ImageView image = layout.findViewById(R.id.screenshot_message_icon); + assertEquals(mBadgedActivityIcon, image.getDrawable()); + TextView text = layout.findViewById(R.id.screenshot_message_content); + // The app name is used in a template, but at least validate that it was inserted. + assertTrue(text.getText().toString().contains(APP_LABEL)); + + // Validate that clicking the dismiss button calls back properly. + assertEquals(1, countdown.getCount()); + layout.findViewById(R.id.message_dismiss_button).callOnClick(); + countdown.await(1000, TimeUnit.MILLISECONDS); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/settings/DisplayTrackerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/settings/DisplayTrackerImplTest.kt new file mode 100644 index 000000000000..ae976a0ea703 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/settings/DisplayTrackerImplTest.kt @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.settings + +import android.hardware.display.DisplayManager +import android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS +import android.hardware.display.DisplayManagerGlobal +import android.os.Handler +import android.testing.AndroidTestingRunner +import android.view.Display +import android.view.DisplayAdjustments +import android.view.DisplayInfo +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import java.util.concurrent.Executor +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.never +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class DisplayTrackerImplTest : SysuiTestCase() { + @Mock private lateinit var displayManager: DisplayManager + @Mock private lateinit var handler: Handler + + private val executor = Executor(Runnable::run) + private lateinit var mDefaultDisplay: Display + private lateinit var mSecondaryDisplay: Display + private lateinit var tracker: DisplayTrackerImpl + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + + mDefaultDisplay = + Display( + DisplayManagerGlobal.getInstance(), + Display.DEFAULT_DISPLAY, + DisplayInfo(), + DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS + ) + mSecondaryDisplay = + Display( + DisplayManagerGlobal.getInstance(), + Display.DEFAULT_DISPLAY + 1, + DisplayInfo(), + DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS + ) + + `when`(displayManager.displays).thenReturn(arrayOf(mDefaultDisplay, mSecondaryDisplay)) + + tracker = DisplayTrackerImpl(displayManager, handler) + } + + @Test + fun testGetDefaultDisplay() { + assertThat(tracker.defaultDisplayId).isEqualTo(Display.DEFAULT_DISPLAY) + } + + @Test + fun testGetAllDisplays() { + assertThat(tracker.allDisplays).isEqualTo(arrayOf(mDefaultDisplay, mSecondaryDisplay)) + } + + @Test + fun registerCallback_registersDisplayListener() { + tracker.addDisplayChangeCallback(TestCallback(), executor) + verify(displayManager).registerDisplayListener(any(), any()) + } + + @Test + fun registerBrightnessCallback_registersDisplayListener() { + tracker.addBrightnessChangeCallback(TestCallback(), executor) + verify(displayManager) + .registerDisplayListener(any(), any(), eq(EVENT_FLAG_DISPLAY_BRIGHTNESS)) + } + + @Test + fun unregisterCallback_displayListenerStillRegistered() { + val callback1 = TestCallback() + tracker.addDisplayChangeCallback(callback1, executor) + tracker.addDisplayChangeCallback(TestCallback(), executor) + tracker.removeCallback(callback1) + + verify(displayManager, never()).unregisterDisplayListener(any()) + } + + @Test + fun unregisterLastCallback_unregistersDisplayListener() { + val callback = TestCallback() + tracker.addDisplayChangeCallback(callback, executor) + tracker.removeCallback(callback) + + verify(displayManager).unregisterDisplayListener(any()) + } + + @Test + fun callbackCalledOnDisplayAdd() { + val testDisplay = 2 + val callback = TestCallback() + tracker.addDisplayChangeCallback(callback, executor) + tracker.displayChangedListener.onDisplayAdded(testDisplay) + + assertThat(callback.lastDisplayAdded).isEqualTo(testDisplay) + } + + @Test + fun callbackCalledOnDisplayRemoved() { + val testDisplay = 2 + val callback = TestCallback() + tracker.addDisplayChangeCallback(callback, executor) + tracker.displayChangedListener.onDisplayRemoved(testDisplay) + + assertThat(callback.lastDisplayRemoved).isEqualTo(testDisplay) + } + + @Test + fun callbackCalledOnDisplayChanged() { + val testDisplay = 2 + val callback = TestCallback() + tracker.addDisplayChangeCallback(callback, executor) + tracker.displayChangedListener.onDisplayChanged(testDisplay) + + assertThat(callback.lastDisplayChanged).isEqualTo(testDisplay) + } + + @Test + fun callbackCalledOnBrightnessChanged() { + val testDisplay = 2 + val callback = TestCallback() + tracker.addBrightnessChangeCallback(callback, executor) + tracker.displayBrightnessChangedListener.onDisplayChanged(testDisplay) + + assertThat(callback.lastDisplayChanged).isEqualTo(testDisplay) + } + + private class TestCallback : DisplayTracker.Callback { + var lastDisplayAdded = -1 + var lastDisplayRemoved = -1 + var lastDisplayChanged = -1 + + override fun onDisplayAdded(displayId: Int) { + lastDisplayAdded = displayId + } + + override fun onDisplayRemoved(displayId: Int) { + lastDisplayRemoved = displayId + } + + override fun onDisplayChanged(displayId: Int) { + lastDisplayChanged = displayId + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt index 9d1802a686fa..58ade49648d6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt @@ -28,6 +28,7 @@ import androidx.test.rule.ActivityTestRule import androidx.test.runner.intercepting.SingleActivityFactory import com.android.systemui.R import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.settings.UserTracker import com.android.systemui.util.mockito.any import com.google.common.truth.Truth.assertThat @@ -51,6 +52,7 @@ class BrightnessDialogTest : SysuiTestCase() { @Mock private lateinit var mainExecutor: Executor @Mock private lateinit var backgroundHandler: Handler @Mock private lateinit var brightnessSliderController: BrightnessSliderController + private val displayTracker = FakeDisplayTracker(mContext) @Rule @JvmField @@ -60,6 +62,7 @@ class BrightnessDialogTest : SysuiTestCase() { override fun create(intent: Intent?): TestDialog { return TestDialog( userTracker, + displayTracker, brightnessSliderControllerFactory, mainExecutor, backgroundHandler @@ -105,12 +108,14 @@ class BrightnessDialogTest : SysuiTestCase() { class TestDialog( userTracker: UserTracker, + displayTracker: FakeDisplayTracker, brightnessSliderControllerFactory: BrightnessSliderController.Factory, mainExecutor: Executor, backgroundHandler: Handler ) : BrightnessDialog( userTracker, + displayTracker, brightnessSliderControllerFactory, mainExecutor, backgroundHandler diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt index bdafc7df33bc..c915502ad42e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt @@ -13,8 +13,11 @@ import androidx.test.filters.SmallTest import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FeatureFlags +import com.android.systemui.fragments.FragmentHostManager +import com.android.systemui.fragments.FragmentService import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener +import com.android.systemui.plugins.qs.QS import com.android.systemui.recents.OverviewProxyService import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener import com.android.systemui.util.concurrency.FakeExecutor @@ -29,6 +32,7 @@ import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.RETURNS_DEEP_STUBS +import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.doNothing import org.mockito.Mockito.eq @@ -69,6 +73,10 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { private lateinit var shadeExpansionStateManager: ShadeExpansionStateManager @Mock private lateinit var featureFlags: FeatureFlags + @Mock + private lateinit var fragmentService: FragmentService + @Mock + private lateinit var fragmentHostManager: FragmentHostManager @Captor lateinit var navigationModeCaptor: ArgumentCaptor<ModeChangedListener> @Captor @@ -77,6 +85,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { lateinit var windowInsetsCallbackCaptor: ArgumentCaptor<Consumer<WindowInsets>> @Captor lateinit var constraintSetCaptor: ArgumentCaptor<ConstraintSet> + @Captor + lateinit var attachStateListenerCaptor: ArgumentCaptor<View.OnAttachStateChangeListener> private lateinit var controller: NotificationsQSContainerController private lateinit var navigationModeCallback: ModeChangedListener @@ -91,8 +101,10 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { mContext.ensureTestableResources() whenever(notificationsQSContainer.context).thenReturn(mContext) whenever(notificationsQSContainer.resources).thenReturn(mContext.resources) + whenever(fragmentService.getFragmentHostManager(any())).thenReturn(fragmentHostManager) fakeSystemClock = FakeSystemClock() delayableExecutor = FakeExecutor(fakeSystemClock) + controller = NotificationsQSContainerController( notificationsQSContainer, navigationModeController, @@ -100,6 +112,7 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { largeScreenShadeHeaderController, shadeExpansionStateManager, featureFlags, + fragmentService, delayableExecutor ) @@ -114,9 +127,10 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { doNothing().`when`(notificationsQSContainer) .setInsetsChangedListener(windowInsetsCallbackCaptor.capture()) doNothing().`when`(notificationsQSContainer).applyConstraints(constraintSetCaptor.capture()) - + doNothing().`when`(notificationsQSContainer) + .addOnAttachStateChangeListener(attachStateListenerCaptor.capture()) controller.init() - controller.onViewAttached() + attachStateListenerCaptor.value.onViewAttachedToWindow(notificationsQSContainer) navigationModeCallback = navigationModeCaptor.value taskbarVisibilityCallback = taskbarVisibilityCaptor.value @@ -385,6 +399,7 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { largeScreenShadeHeaderController, shadeExpansionStateManager, featureFlags, + fragmentService, delayableExecutor ) controller.updateConstraints() @@ -426,6 +441,17 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { verify(largeScreenShadeHeaderController).startCustomizingAnimation(false, 100L) } + @Test + fun testTagListenerAdded() { + verify(fragmentHostManager).addTagListener(eq(QS.TAG), eq(notificationsQSContainer)) + } + + @Test + fun testTagListenerRemoved() { + attachStateListenerCaptor.value.onViewDetachedFromWindow(notificationsQSContainer) + verify(fragmentHostManager).removeTagListener(eq(QS.TAG), eq(notificationsQSContainer)) + } + private fun disableSplitShade() { setSplitShadeEnabled(false) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 4c768253202a..e5d5e3b8433a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -45,13 +45,16 @@ import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.statusbar.phone.PhoneStatusBarViewController import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager import com.android.systemui.statusbar.window.StatusBarWindowStateController +import com.android.systemui.util.mockito.any import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mock +import org.mockito.Mockito import org.mockito.Mockito.anyFloat +import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever @@ -102,7 +105,6 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock private lateinit var alternateBouncerInteractor: AlternateBouncerInteractor @Mock lateinit var keyguardBouncerComponentFactory: KeyguardBouncerComponent.Factory - @Mock lateinit var keyguardBouncerContainer: ViewGroup @Mock lateinit var keyguardBouncerComponent: KeyguardBouncerComponent @Mock lateinit var keyguardHostViewController: KeyguardHostViewController @Mock lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor @@ -116,6 +118,12 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) whenever(view.bottom).thenReturn(VIEW_BOTTOM) + whenever(view.findViewById<ViewGroup>(R.id.keyguard_bouncer_container)) + .thenReturn(mock(ViewGroup::class.java)) + whenever(keyguardBouncerComponentFactory.create(any(ViewGroup::class.java))) + .thenReturn(keyguardBouncerComponent) + whenever(keyguardBouncerComponent.keyguardHostViewController) + .thenReturn(keyguardHostViewController) underTest = NotificationShadeWindowViewController( lockscreenShadeTransitionController, FalsingCollectorFake(), @@ -275,6 +283,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Test fun testGetBouncerContainer() { + Mockito.clearInvocations(view) underTest.bouncerContainer verify(view).findViewById<ViewGroup>(R.id.keyguard_bouncer_container) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.java index d43562443d6e..5cc3ef1def9e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.java @@ -29,9 +29,11 @@ import android.os.SystemClock; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.view.MotionEvent; +import android.view.ViewGroup; import androidx.test.filters.SmallTest; +import com.android.keyguard.KeyguardHostViewController; import com.android.keyguard.LockIconViewController; import com.android.keyguard.dagger.KeyguardBouncerComponent; import com.android.systemui.R; @@ -94,6 +96,8 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { @Mock private FeatureFlags mFeatureFlags; @Mock private KeyguardBouncerViewModel mKeyguardBouncerViewModel; @Mock private KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory; + @Mock private KeyguardBouncerComponent mKeyguardBouncerComponent; + @Mock private KeyguardHostViewController mKeyguardHostViewController; @Mock private NotificationInsetsController mNotificationInsetsController; @Mock private AlternateBouncerInteractor mAlternateBouncerInteractor; @Mock private KeyguardTransitionInteractor mKeyguardTransitionInteractor; @@ -110,6 +114,12 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { when(mView.findViewById(R.id.notification_stack_scroller)) .thenReturn(mNotificationStackScrollLayout); + when(mView.findViewById(R.id.keyguard_bouncer_container)).thenReturn(mock(ViewGroup.class)); + when(mKeyguardBouncerComponentFactory.create(any(ViewGroup.class))).thenReturn( + mKeyguardBouncerComponent); + when(mKeyguardBouncerComponent.getKeyguardHostViewController()).thenReturn( + mKeyguardHostViewController); + when(mStatusBarStateController.isDozing()).thenReturn(false); mDependency.injectTestDependency(ShadeController.class, mShadeController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt index a7588ddcaeef..cd2efc061b72 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt @@ -114,7 +114,8 @@ class DefaultClockProviderTest : SysuiTestCase() { @Test fun defaultClock_events_onTimeTick() { val clock = provider.createClock(DEFAULT_CLOCK_ID) - clock.events.onTimeTick() + clock.smallClock.events.onTimeTick() + clock.largeClock.events.onTimeTick() verify(mockSmallClockView).refreshTime() verify(mockLargeClockView).refreshTime() diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java index 8aaa18129834..e68d3b465a07 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -45,6 +45,7 @@ import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.view.AppearanceRegion; import com.android.systemui.SysuiTestCase; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue.Callbacks; import org.junit.After; @@ -62,12 +63,14 @@ public class CommandQueueTest extends SysuiTestCase { }; private CommandQueue mCommandQueue; + + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); private Callbacks mCallbacks; private static final int SECONDARY_DISPLAY = 1; @Before public void setup() { - mCommandQueue = new CommandQueue(mContext); + mCommandQueue = new CommandQueue(mContext, mDisplayTracker); mCallbacks = mock(Callbacks.class); mCommandQueue.addCallback(mCallbacks); verify(mCallbacks).disable(anyInt(), eq(0), eq(0), eq(false)); @@ -415,7 +418,7 @@ public class CommandQueueTest extends SysuiTestCase { @Test public void testOnDisplayRemoved() { - mCommandQueue.onDisplayRemoved(SECONDARY_DISPLAY); + mDisplayTracker.triggerOnDisplayRemoved(SECONDARY_DISPLAY); waitForIdleSync(); verify(mCallbacks).onDisplayRemoved(eq(SECONDARY_DISPLAY)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index 610bb13c6016..dffa566c97c0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -58,6 +58,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.app.AlarmManager; import android.app.Instrumentation; import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyResourcesManager; @@ -183,6 +184,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { private ScreenLifecycle mScreenLifecycle; @Mock private AuthController mAuthController; + @Mock + private AlarmManager mAlarmManager; @Captor private ArgumentCaptor<DockManager.AlignmentStateListener> mAlignmentListener; @Captor @@ -277,7 +280,9 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { mAuthController, mLockPatternUtils, mScreenLifecycle, mKeyguardBypassController, mAccessibilityManager, mFaceHelpMessageDeferral, mock(KeyguardLogger.class), - mAlternateBouncerInteractor); + mAlternateBouncerInteractor, + mAlarmManager + ); mController.init(); mController.setIndicationArea(mIndicationArea); verify(mStatusBarStateController).addCallback(mStatusBarStateListenerCaptor.capture()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt index 5124eb992dc0..e6f272b3ad70 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt @@ -37,6 +37,7 @@ import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.eq import org.mockito.Mock +import org.mockito.Mockito import org.mockito.Mockito.mock import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever @@ -152,4 +153,18 @@ class StatusBarStateControllerImplTest : SysuiTestCase() { // and cause us to drop a frame during the LOCKSCREEN_TRANSITION_FROM_AOD CUJ. assertEquals(0.99f, controller.dozeAmount, 0.009f) } + + @Test + fun testSetDreamState_invokesCallback() { + val listener = mock(StatusBarStateController.StateListener::class.java) + controller.addCallback(listener) + + controller.setIsDreaming(true) + verify(listener).onDreamingChanged(true) + + Mockito.clearInvocations(listener) + + controller.setIsDreaming(false) + verify(listener).onDreamingChanged(false) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt index ea066471a802..a9c3d5d5eeb4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt @@ -6,6 +6,7 @@ import android.view.InputEvent import android.view.MotionEvent import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.FakeDisplayTracker import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test @@ -17,6 +18,7 @@ import org.junit.runner.RunWith class GenericGestureDetectorTest : SysuiTestCase() { private lateinit var gestureDetector: TestGestureDetector + private val displayTracker = FakeDisplayTracker(mContext) @Before fun setUp() { @@ -101,12 +103,21 @@ class GenericGestureDetectorTest : SysuiTestCase() { gestureDetector.addOnGestureDetectedCallback("tag2"){} gestureDetector.removeOnGestureDetectedCallback("tag") - gestureDetector.onInputEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, CORRECT_X, 0f, 0)) + gestureDetector.onInputEvent( + MotionEvent.obtain( + 0, + 0, + MotionEvent.ACTION_DOWN, + CORRECT_X, + 0f, + 0 + ) + ) assertThat(oldCallbackNotified).isFalse() } - inner class TestGestureDetector : GenericGestureDetector("fakeTag") { + inner class TestGestureDetector : GenericGestureDetector("fakeTag", displayTracker) { var isGestureListening = false override fun onInputEvent(ev: InputEvent) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt index 43b6e4144a2e..0a576de4c3a9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt @@ -34,6 +34,7 @@ import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.BcSmartspaceConfigPlugin import com.android.systemui.plugins.BcSmartspaceDataPlugin @@ -112,6 +113,12 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { private lateinit var handler: Handler @Mock + private lateinit var datePlugin: BcSmartspaceDataPlugin + + @Mock + private lateinit var weatherPlugin: BcSmartspaceDataPlugin + + @Mock private lateinit var plugin: BcSmartspaceDataPlugin @Mock @@ -151,6 +158,8 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { KeyguardBypassController.OnBypassStateChangedListener private lateinit var deviceProvisionedListener: DeviceProvisionedListener + private lateinit var dateSmartspaceView: SmartspaceView + private lateinit var weatherSmartspaceView: SmartspaceView private lateinit var smartspaceView: SmartspaceView private val clock = FakeSystemClock() @@ -176,16 +185,24 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) + // Todo(b/261760571): flip the flag value here when feature is launched, and update relevant + // tests. + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(false) + `when`(secureSettings.getUriFor(PRIVATE_LOCKSCREEN_SETTING)) .thenReturn(fakePrivateLockscreenSettingUri) `when`(secureSettings.getUriFor(NOTIF_ON_LOCKSCREEN_SETTING)) .thenReturn(fakeNotifOnLockscreenSettingUri) `when`(smartspaceManager.createSmartspaceSession(any())).thenReturn(smartspaceSession) + `when`(datePlugin.getView(any())).thenReturn( + createDateSmartspaceView(), createDateSmartspaceView()) + `when`(weatherPlugin.getView(any())).thenReturn( + createWeatherSmartspaceView(), createWeatherSmartspaceView()) `when`(plugin.getView(any())).thenReturn(createSmartspaceView(), createSmartspaceView()) `when`(userTracker.userProfiles).thenReturn(userList) `when`(statusBarStateController.dozeAmount).thenReturn(0.5f) - `when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true) - `when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(true) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) setActiveUser(userHandlePrimary) setAllowPrivateNotifications(userHandlePrimary, true) @@ -210,6 +227,8 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { executor, bgExecutor, handler, + Optional.of(datePlugin), + Optional.of(weatherPlugin), Optional.of(plugin), Optional.of(configPlugin), ) @@ -218,11 +237,22 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { deviceProvisionedListener = deviceProvisionedCaptor.value } + @Test(expected = RuntimeException::class) + fun testBuildAndConnectWeatherView_throwsIfDecouplingDisabled() { + // GIVEN the feature flag is disabled + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(false) + + // WHEN we try to build the view + controller.buildAndConnectWeatherView(fakeParent) + + // THEN an exception is thrown + } + @Test - fun connectOnlyAfterDeviceIsProvisioned() { + fun testBuildAndConnectView_connectsOnlyAfterDeviceIsProvisioned() { // GIVEN an unprovisioned device and an attempt to connect - `when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(false) - `when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(false) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(false) + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(false) // WHEN a connection attempt is made and view is attached val view = controller.buildAndConnectView(fakeParent) @@ -232,8 +262,8 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { verify(smartspaceManager, never()).createSmartspaceSession(any()) // WHEN it does become provisioned - `when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true) - `when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(true) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) deviceProvisionedListener.onUserSetupChanged() // THEN the session is created @@ -243,7 +273,7 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test - fun testListenersAreRegistered() { + fun testAddListener_registersListenersForPlugin() { // GIVEN a listener is added after a session is created connectSession() @@ -252,10 +282,13 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { // THEN the listener is registered to the underlying plugin verify(plugin).registerListener(controllerListener) + // The listener is registered only for the plugin, not the date, or weather plugin. + verify(datePlugin, never()).registerListener(any()) + verify(weatherPlugin, never()).registerListener(any()) } @Test - fun testEarlyRegisteredListenersAreAttachedAfterConnected() { + fun testAddListener_earlyRegisteredListenersAreAttachedAfterConnected() { // GIVEN a listener that is registered before the session is created controller.addListener(controllerListener) @@ -264,10 +297,13 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { // THEN the listener is subsequently registered verify(plugin).registerListener(controllerListener) + // The listener is registered only for the plugin, not the date, or the weather plugin. + verify(datePlugin, never()).registerListener(any()) + verify(weatherPlugin, never()).registerListener(any()) } @Test - fun testEmptyListIsEmittedAndNotifierRemovedAfterDisconnect() { + fun testDisconnect_emitsEmptyListAndRemovesNotifier() { // GIVEN a registered listener on an active session connectSession() clearInvocations(plugin) @@ -279,10 +315,13 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { // THEN the listener receives an empty list of targets and unregisters the notifier verify(plugin).onTargetsAvailable(emptyList()) verify(plugin).registerSmartspaceEventNotifier(null) + verify(weatherPlugin).onTargetsAvailable(emptyList()) + verify(weatherPlugin).registerSmartspaceEventNotifier(null) + verify(datePlugin).registerSmartspaceEventNotifier(null) } @Test - fun testUserChangeReloadsSmartspace() { + fun testUserChange_reloadsSmartspace() { // GIVEN a connected smartspace session connectSession() @@ -294,7 +333,7 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test - fun testSettingsChangeReloadsSmartspace() { + fun testSettingsChange_reloadsSmartspace() { // GIVEN a connected smartspace session connectSession() @@ -306,7 +345,21 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test - fun testThemeChangeUpdatesTextColor() { + fun testThemeChange_updatesTextColor() { + // GIVEN a connected smartspace session + connectSession() + + // WHEN the theme changes + configChangeListener.onThemeChanged() + + // We update the new text color to match the wallpaper color + verify(smartspaceView).setPrimaryTextColor(anyInt()) + } + + @Test + fun testThemeChange_ifDecouplingEnabled_updatesTextColor() { + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(true) + // GIVEN a connected smartspace session connectSession() @@ -314,11 +367,13 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { configChangeListener.onThemeChanged() // We update the new text color to match the wallpaper color + verify(dateSmartspaceView).setPrimaryTextColor(anyInt()) + verify(weatherSmartspaceView).setPrimaryTextColor(anyInt()) verify(smartspaceView).setPrimaryTextColor(anyInt()) } @Test - fun testDozeAmountChangeUpdatesView() { + fun testDozeAmountChange_updatesView() { // GIVEN a connected smartspace session connectSession() @@ -330,7 +385,23 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test - fun testKeyguardBypassEnabledUpdatesView() { + fun testDozeAmountChange_ifDecouplingEnabled_updatesViews() { + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(true) + + // GIVEN a connected smartspace session + connectSession() + + // WHEN the doze amount changes + statusBarStateListener.onDozeAmountChanged(0.1f, 0.7f) + + // We pass that along to the view + verify(dateSmartspaceView).setDozeAmount(0.7f) + verify(weatherSmartspaceView).setDozeAmount(0.7f) + verify(smartspaceView).setDozeAmount(0.7f) + } + + @Test + fun testKeyguardBypassEnabled_updatesView() { // GIVEN a connected smartspace session connectSession() `when`(keyguardBypassController.bypassEnabled).thenReturn(true) @@ -425,6 +496,29 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test + fun testSessionListener_ifDecouplingEnabled_weatherTargetIsFilteredOut() { + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(true) + connectSession() + + // WHEN we receive a list of targets + val targets = listOf( + makeTarget(1, userHandlePrimary, isSensitive = true), + makeTarget(2, userHandlePrimary), + makeTarget(3, userHandleManaged), + makeTarget(4, userHandlePrimary, featureType = SmartspaceTarget.FEATURE_WEATHER) + ) + + sessionListener.onTargetsAvailable(targets) + + // THEN all non-sensitive content is still shown + verify(plugin).onTargetsAvailable(eq(listOf(targets[0], targets[1], targets[2]))) + // No filtering is applied for the weather plugin + verify(weatherPlugin).onTargetsAvailable(eq(targets)) + // No targets needed for the date plugin + verify(datePlugin, never()).onTargetsAvailable(any()) + } + + @Test fun testSettingsAreReloaded() { // GIVEN a connected session where the privacy settings later flip to false connectSession() @@ -515,6 +609,16 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } @Test + fun testWeatherViewUsesSameSession() { + `when`(featureFlags.isEnabled(Flags.SMARTSPACE_DATE_WEATHER_DECOUPLED)).thenReturn(true) + // GIVEN a connected session + connectSession() + + // No checks is needed here, since connectSession() already checks internally that + // createSmartspaceSession is invoked only once. + } + + @Test fun testViewGetInitializedWithBypassEnabledState() { // GIVEN keyguard bypass is enabled. `when`(keyguardBypassController.bypassEnabled).thenReturn(true) @@ -531,8 +635,8 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { fun testConnectAttemptBeforeInitializationShouldNotCreateSession() { // GIVEN an uninitalized smartspaceView // WHEN the device is provisioned - `when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true) - `when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(true) + `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) + `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) deviceProvisionedListener.onDeviceProvisionedChanged() // THEN no calls to createSmartspaceSession should occur @@ -542,9 +646,35 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { } private fun connectSession() { + if (controller.isDateWeatherDecoupled()) { + val dateView = controller.buildAndConnectDateView(fakeParent) + dateSmartspaceView = dateView as SmartspaceView + fakeParent.addView(dateView) + controller.stateChangeListener.onViewAttachedToWindow(dateView) + + verify(dateSmartspaceView).setUiSurface( + BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD) + verify(dateSmartspaceView).registerDataProvider(datePlugin) + + verify(dateSmartspaceView).setPrimaryTextColor(anyInt()) + verify(dateSmartspaceView).setDozeAmount(0.5f) + + val weatherView = controller.buildAndConnectWeatherView(fakeParent) + weatherSmartspaceView = weatherView as SmartspaceView + fakeParent.addView(weatherView) + controller.stateChangeListener.onViewAttachedToWindow(weatherView) + + verify(weatherSmartspaceView).setUiSurface( + BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD) + verify(weatherSmartspaceView).registerDataProvider(weatherPlugin) + + verify(weatherSmartspaceView).setPrimaryTextColor(anyInt()) + verify(weatherSmartspaceView).setDozeAmount(0.5f) + } + val view = controller.buildAndConnectView(fakeParent) smartspaceView = view as SmartspaceView - + fakeParent.addView(view) controller.stateChangeListener.onViewAttachedToWindow(view) verify(smartspaceView).setUiSurface(BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD) @@ -554,6 +684,8 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { .addOnTargetsAvailableListener(any(), capture(sessionListenerCaptor)) sessionListener = sessionListenerCaptor.value + verify(smartspaceManager).createSmartspaceSession(any()) + verify(userTracker).addCallback(capture(userTrackerCaptor), any()) userListener = userTrackerCaptor.value @@ -578,9 +710,12 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { verify(smartspaceView).setPrimaryTextColor(anyInt()) verify(smartspaceView).setDozeAmount(0.5f) - clearInvocations(view) - fakeParent.addView(view) + if (controller.isDateWeatherDecoupled()) { + clearInvocations(dateSmartspaceView) + clearInvocations(weatherSmartspaceView) + } + clearInvocations(smartspaceView) } private fun setActiveUser(userHandle: UserHandle) { @@ -626,6 +761,62 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { ).thenReturn(if (value) 1 else 0) } + // Separate function for the date view, which implements a specific subset of all functions. + private fun createDateSmartspaceView(): SmartspaceView { + return spy(object : View(context), SmartspaceView { + override fun registerDataProvider(plugin: BcSmartspaceDataPlugin?) { + } + + override fun setPrimaryTextColor(color: Int) { + } + + override fun setIsDreaming(isDreaming: Boolean) { + } + + override fun setUiSurface(uiSurface: String) { + } + + override fun setDozeAmount(amount: Float) { + } + + override fun setIntentStarter(intentStarter: BcSmartspaceDataPlugin.IntentStarter?) { + } + + override fun setFalsingManager(falsingManager: FalsingManager?) { + } + + override fun setDnd(image: Drawable?, description: String?) { + } + + override fun setNextAlarm(image: Drawable?, description: String?) { + } + }) + } + // Separate function for the weather view, which implements a specific subset of all functions. + private fun createWeatherSmartspaceView(): SmartspaceView { + return spy(object : View(context), SmartspaceView { + override fun registerDataProvider(plugin: BcSmartspaceDataPlugin?) { + } + + override fun setPrimaryTextColor(color: Int) { + } + + override fun setIsDreaming(isDreaming: Boolean) { + } + + override fun setUiSurface(uiSurface: String) { + } + + override fun setDozeAmount(amount: Float) { + } + + override fun setIntentStarter(intentStarter: BcSmartspaceDataPlugin.IntentStarter?) { + } + + override fun setFalsingManager(falsingManager: FalsingManager?) { + } + }) + } private fun createSmartspaceView(): SmartspaceView { return spy(object : View(context), SmartspaceView { override fun registerDataProvider(plugin: BcSmartspaceDataPlugin?) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java index 4559a23a4f5c..9e23d548e5b5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java @@ -82,19 +82,14 @@ import org.mockito.junit.MockitoRule; import java.util.Arrays; import java.util.List; +import java.util.function.Consumer; @SmallTest @RunWith(AndroidTestingRunner.class) @RunWithLooper public class ExpandableNotificationRowTest extends SysuiTestCase { - private ExpandableNotificationRow mGroupRow; - private ExpandableNotificationRow mNotifRow; - private ExpandableNotificationRow mPublicRow; - private NotificationTestHelper mNotificationTestHelper; - boolean mHeadsUpAnimatingAway = false; - @Rule public MockitoRule mockito = MockitoJUnit.rule(); @Before @@ -105,112 +100,108 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { mDependency, TestableLooper.get(this)); mNotificationTestHelper.setDefaultInflationFlags(FLAG_CONTENT_VIEW_ALL); + FakeFeatureFlags fakeFeatureFlags = new FakeFeatureFlags(); fakeFeatureFlags.set(Flags.NOTIFICATION_ANIMATE_BIG_PICTURE, true); mNotificationTestHelper.setFeatureFlags(fakeFeatureFlags); - // create a standard private notification row - Notification normalNotif = mNotificationTestHelper.createNotification(); - normalNotif.publicVersion = null; - mNotifRow = mNotificationTestHelper.createRow(normalNotif); - // create a notification row whose public version is identical - Notification publicNotif = mNotificationTestHelper.createNotification(); - publicNotif.publicVersion = mNotificationTestHelper.createNotification(); - mPublicRow = mNotificationTestHelper.createRow(publicNotif); - // create a group row - mGroupRow = mNotificationTestHelper.createGroup(); - mGroupRow.setHeadsUpAnimatingAwayListener( - animatingAway -> mHeadsUpAnimatingAway = animatingAway); - } @Test - public void testUpdateBackgroundColors_isRecursive() { - mGroupRow.setTintColor(Color.RED); - mGroupRow.getChildNotificationAt(0).setTintColor(Color.GREEN); - mGroupRow.getChildNotificationAt(1).setTintColor(Color.BLUE); + public void testUpdateBackgroundColors_isRecursive() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + group.setTintColor(Color.RED); + group.getChildNotificationAt(0).setTintColor(Color.GREEN); + group.getChildNotificationAt(1).setTintColor(Color.BLUE); - assertThat(mGroupRow.getCurrentBackgroundTint()).isEqualTo(Color.RED); - assertThat(mGroupRow.getChildNotificationAt(0).getCurrentBackgroundTint()) + assertThat(group.getCurrentBackgroundTint()).isEqualTo(Color.RED); + assertThat(group.getChildNotificationAt(0).getCurrentBackgroundTint()) .isEqualTo(Color.GREEN); - assertThat(mGroupRow.getChildNotificationAt(1).getCurrentBackgroundTint()) + assertThat(group.getChildNotificationAt(1).getCurrentBackgroundTint()) .isEqualTo(Color.BLUE); - mGroupRow.updateBackgroundColors(); + group.updateBackgroundColors(); - int resetTint = mGroupRow.getCurrentBackgroundTint(); + int resetTint = group.getCurrentBackgroundTint(); assertThat(resetTint).isNotEqualTo(Color.RED); - assertThat(mGroupRow.getChildNotificationAt(0).getCurrentBackgroundTint()) + assertThat(group.getChildNotificationAt(0).getCurrentBackgroundTint()) .isEqualTo(resetTint); - assertThat(mGroupRow.getChildNotificationAt(1).getCurrentBackgroundTint()) + assertThat(group.getChildNotificationAt(1).getCurrentBackgroundTint()) .isEqualTo(resetTint); } @Test - public void testSetSensitiveOnNotifRowNotifiesOfHeightChange() throws InterruptedException { + public void testSetSensitiveOnNotifRowNotifiesOfHeightChange() throws Exception { // GIVEN a sensitive notification row that's currently redacted - measureAndLayout(mNotifRow); - mNotifRow.setHideSensitiveForIntrinsicHeight(true); - mNotifRow.setSensitive(true, true); - assertThat(mNotifRow.getShowingLayout()).isSameInstanceAs(mNotifRow.getPublicLayout()); - assertThat(mNotifRow.getIntrinsicHeight()).isGreaterThan(0); + ExpandableNotificationRow row = mNotificationTestHelper.createRow(); + measureAndLayout(row); + row.setHideSensitiveForIntrinsicHeight(true); + row.setSensitive(true, true); + assertThat(row.getShowingLayout()).isSameInstanceAs(row.getPublicLayout()); + assertThat(row.getIntrinsicHeight()).isGreaterThan(0); // GIVEN that the row has a height change listener OnHeightChangedListener listener = mock(OnHeightChangedListener.class); - mNotifRow.setOnHeightChangedListener(listener); + row.setOnHeightChangedListener(listener); // WHEN the row is set to no longer be sensitive - mNotifRow.setSensitive(false, true); + row.setSensitive(false, true); // VERIFY that the height change listener is invoked - assertThat(mNotifRow.getShowingLayout()).isSameInstanceAs(mNotifRow.getPrivateLayout()); - assertThat(mNotifRow.getIntrinsicHeight()).isGreaterThan(0); - verify(listener).onHeightChanged(eq(mNotifRow), eq(false)); + assertThat(row.getShowingLayout()).isSameInstanceAs(row.getPrivateLayout()); + assertThat(row.getIntrinsicHeight()).isGreaterThan(0); + verify(listener).onHeightChanged(eq(row), eq(false)); } @Test - public void testSetSensitiveOnGroupRowNotifiesOfHeightChange() { + public void testSetSensitiveOnGroupRowNotifiesOfHeightChange() throws Exception { // GIVEN a sensitive group row that's currently redacted - measureAndLayout(mGroupRow); - mGroupRow.setHideSensitiveForIntrinsicHeight(true); - mGroupRow.setSensitive(true, true); - assertThat(mGroupRow.getShowingLayout()).isSameInstanceAs(mGroupRow.getPublicLayout()); - assertThat(mGroupRow.getIntrinsicHeight()).isGreaterThan(0); + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + measureAndLayout(group); + group.setHideSensitiveForIntrinsicHeight(true); + group.setSensitive(true, true); + assertThat(group.getShowingLayout()).isSameInstanceAs(group.getPublicLayout()); + assertThat(group.getIntrinsicHeight()).isGreaterThan(0); // GIVEN that the row has a height change listener OnHeightChangedListener listener = mock(OnHeightChangedListener.class); - mGroupRow.setOnHeightChangedListener(listener); + group.setOnHeightChangedListener(listener); // WHEN the row is set to no longer be sensitive - mGroupRow.setSensitive(false, true); + group.setSensitive(false, true); // VERIFY that the height change listener is invoked - assertThat(mGroupRow.getShowingLayout()).isSameInstanceAs(mGroupRow.getPrivateLayout()); - assertThat(mGroupRow.getIntrinsicHeight()).isGreaterThan(0); - verify(listener).onHeightChanged(eq(mGroupRow), eq(false)); + assertThat(group.getShowingLayout()).isSameInstanceAs(group.getPrivateLayout()); + assertThat(group.getIntrinsicHeight()).isGreaterThan(0); + verify(listener).onHeightChanged(eq(group), eq(false)); } @Test - public void testSetSensitiveOnPublicRowDoesNotNotifyOfHeightChange() { + public void testSetSensitiveOnPublicRowDoesNotNotifyOfHeightChange() throws Exception { + // create a notification row whose public version is identical + Notification publicNotif = mNotificationTestHelper.createNotification(); + publicNotif.publicVersion = mNotificationTestHelper.createNotification(); + ExpandableNotificationRow publicRow = mNotificationTestHelper.createRow(publicNotif); + // GIVEN a sensitive public row that's currently redacted - measureAndLayout(mPublicRow); - mPublicRow.setHideSensitiveForIntrinsicHeight(true); - mPublicRow.setSensitive(true, true); - assertThat(mPublicRow.getShowingLayout()).isSameInstanceAs(mPublicRow.getPublicLayout()); - assertThat(mPublicRow.getIntrinsicHeight()).isGreaterThan(0); + measureAndLayout(publicRow); + publicRow.setHideSensitiveForIntrinsicHeight(true); + publicRow.setSensitive(true, true); + assertThat(publicRow.getShowingLayout()).isSameInstanceAs(publicRow.getPublicLayout()); + assertThat(publicRow.getIntrinsicHeight()).isGreaterThan(0); // GIVEN that the row has a height change listener OnHeightChangedListener listener = mock(OnHeightChangedListener.class); - mPublicRow.setOnHeightChangedListener(listener); + publicRow.setOnHeightChangedListener(listener); // WHEN the row is set to no longer be sensitive - mPublicRow.setSensitive(false, true); + publicRow.setSensitive(false, true); // VERIFY that the height change listener is not invoked, because the height didn't change - assertThat(mPublicRow.getShowingLayout()).isSameInstanceAs(mPublicRow.getPrivateLayout()); - assertThat(mPublicRow.getIntrinsicHeight()).isGreaterThan(0); - assertThat(mPublicRow.getPrivateLayout().getMinHeight()) - .isEqualTo(mPublicRow.getPublicLayout().getMinHeight()); - verify(listener, never()).onHeightChanged(eq(mPublicRow), eq(false)); + assertThat(publicRow.getShowingLayout()).isSameInstanceAs(publicRow.getPrivateLayout()); + assertThat(publicRow.getIntrinsicHeight()).isGreaterThan(0); + assertThat(publicRow.getPrivateLayout().getMinHeight()) + .isEqualTo(publicRow.getPublicLayout().getMinHeight()); + verify(listener, never()).onHeightChanged(eq(publicRow), eq(false)); } private void measureAndLayout(ExpandableNotificationRow row) { @@ -227,36 +218,43 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { } @Test - public void testGroupSummaryNotShowingIconWhenPublic() { - mGroupRow.setSensitive(true, true); - mGroupRow.setHideSensitiveForIntrinsicHeight(true); - assertTrue(mGroupRow.isSummaryWithChildren()); - assertFalse(mGroupRow.isShowingIcon()); + public void testGroupSummaryNotShowingIconWhenPublic() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + group.setSensitive(true, true); + group.setHideSensitiveForIntrinsicHeight(true); + assertTrue(group.isSummaryWithChildren()); + assertFalse(group.isShowingIcon()); } @Test - public void testNotificationHeaderVisibleWhenAnimating() { - mGroupRow.setSensitive(true, true); - mGroupRow.setHideSensitive(true, false, 0, 0); - mGroupRow.setHideSensitive(false, true, 0, 0); - assertEquals(View.VISIBLE, mGroupRow.getChildrenContainer().getVisibleWrapper() + public void testNotificationHeaderVisibleWhenAnimating() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + group.setSensitive(true, true); + group.setHideSensitive(true, false, 0, 0); + group.setHideSensitive(false, true, 0, 0); + assertEquals(View.VISIBLE, group.getChildrenContainer().getVisibleWrapper() .getNotificationHeader().getVisibility()); } @Test - public void testUserLockedResetEvenWhenNoChildren() { - mGroupRow.setUserLocked(true); - mGroupRow.setUserLocked(false); + public void testUserLockedResetEvenWhenNoChildren() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + group.setUserLocked(true); + group.setUserLocked(false); assertFalse("The childrencontainer should not be userlocked but is, the state " - + "seems out of sync.", mGroupRow.getChildrenContainer().isUserLocked()); + + "seems out of sync.", group.getChildrenContainer().isUserLocked()); } @Test - public void testReinflatedOnDensityChange() { + public void testReinflatedOnDensityChange() throws Exception { + ExpandableNotificationRow row = mNotificationTestHelper.createRow(); NotificationChildrenContainer mockContainer = mock(NotificationChildrenContainer.class); - mNotifRow.setChildrenContainer(mockContainer); + row.setChildrenContainer(mockContainer); - mNotifRow.onDensityOrFontScaleChanged(); + row.onDensityOrFontScaleChanged(); verify(mockContainer).reInflateViews(any(), any()); } @@ -299,64 +297,73 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { @Test public void testAboveShelfChangedListenerCalledWhenGoingBelow() throws Exception { ExpandableNotificationRow row = mNotificationTestHelper.createRow(); - row.setHeadsUp(true); AboveShelfChangedListener listener = mock(AboveShelfChangedListener.class); row.setAboveShelfChangedListener(listener); + Mockito.reset(listener); + row.setHeadsUp(true); row.setAboveShelf(false); verify(listener).onAboveShelfStateChanged(false); } @Test public void testClickSound() throws Exception { - assertTrue("Should play sounds by default.", mGroupRow.isSoundEffectsEnabled()); + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + assertTrue("Should play sounds by default.", group.isSoundEffectsEnabled()); StatusBarStateController mock = mNotificationTestHelper.getStatusBarStateController(); when(mock.isDozing()).thenReturn(true); - mGroupRow.setSecureStateProvider(()-> false); + group.setSecureStateProvider(()-> false); assertFalse("Shouldn't play sounds when dark and trusted.", - mGroupRow.isSoundEffectsEnabled()); - mGroupRow.setSecureStateProvider(()-> true); + group.isSoundEffectsEnabled()); + group.setSecureStateProvider(()-> true); assertTrue("Should always play sounds when not trusted.", - mGroupRow.isSoundEffectsEnabled()); + group.isSoundEffectsEnabled()); } @Test - public void testSetDismissed_longPressListenerRemoved() { + public void testSetDismissed_longPressListenerRemoved() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + ExpandableNotificationRow.LongPressListener listener = mock(ExpandableNotificationRow.LongPressListener.class); - mGroupRow.setLongPressListener(listener); - mGroupRow.doLongClickCallback(0,0); - verify(listener, times(1)).onLongPress(eq(mGroupRow), eq(0), eq(0), + group.setLongPressListener(listener); + group.doLongClickCallback(0, 0); + verify(listener, times(1)).onLongPress(eq(group), eq(0), eq(0), any(NotificationMenuRowPlugin.MenuItem.class)); reset(listener); - mGroupRow.dismiss(true); - mGroupRow.doLongClickCallback(0,0); - verify(listener, times(0)).onLongPress(eq(mGroupRow), eq(0), eq(0), + group.dismiss(true); + group.doLongClickCallback(0, 0); + verify(listener, times(0)).onLongPress(eq(group), eq(0), eq(0), any(NotificationMenuRowPlugin.MenuItem.class)); } @Test - public void testFeedback_noHeader() { + public void testFeedback_noHeader() throws Exception { + ExpandableNotificationRow groupRow = mNotificationTestHelper.createGroup(); + // public notification is custom layout - no header - mGroupRow.setSensitive(true, true); - mGroupRow.setOnFeedbackClickListener(null); - mGroupRow.setFeedbackIcon(null); + groupRow.setSensitive(true, true); + groupRow.setOnFeedbackClickListener(null); + groupRow.setFeedbackIcon(null); } @Test - public void testFeedback_header() { + public void testFeedback_header() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + NotificationContentView publicLayout = mock(NotificationContentView.class); - mGroupRow.setPublicLayout(publicLayout); + group.setPublicLayout(publicLayout); NotificationContentView privateLayout = mock(NotificationContentView.class); - mGroupRow.setPrivateLayout(privateLayout); + group.setPrivateLayout(privateLayout); NotificationChildrenContainer mockContainer = mock(NotificationChildrenContainer.class); when(mockContainer.getNotificationChildCount()).thenReturn(1); - mGroupRow.setChildrenContainer(mockContainer); + group.setChildrenContainer(mockContainer); final boolean show = true; final FeedbackIcon icon = new FeedbackIcon( R.drawable.ic_feedback_alerted, R.string.notification_feedback_indicator_alerted); - mGroupRow.setFeedbackIcon(icon); + group.setFeedbackIcon(icon); verify(mockContainer, times(1)).setFeedbackIcon(icon); verify(privateLayout, times(1)).setFeedbackIcon(icon); @@ -364,43 +371,60 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { } @Test - public void testFeedbackOnClick() { + public void testFeedbackOnClick() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + ExpandableNotificationRow.CoordinateOnClickListener l = mock( ExpandableNotificationRow.CoordinateOnClickListener.class); View view = mock(View.class); - mGroupRow.setOnFeedbackClickListener(l); + group.setOnFeedbackClickListener(l); - mGroupRow.getFeedbackOnClickListener().onClick(view); + group.getFeedbackOnClickListener().onClick(view); verify(l, times(1)).onClick(any(), anyInt(), anyInt(), any()); } @Test - public void testHeadsUpAnimatingAwayListener() { - mGroupRow.setHeadsUpAnimatingAway(true); - Assert.assertEquals(true, mHeadsUpAnimatingAway); - mGroupRow.setHeadsUpAnimatingAway(false); - Assert.assertEquals(false, mHeadsUpAnimatingAway); + public void testHeadsUpAnimatingAwayListener() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + Consumer<Boolean> headsUpListener = mock(Consumer.class); + AboveShelfChangedListener aboveShelfChangedListener = mock(AboveShelfChangedListener.class); + group.setHeadsUpAnimatingAwayListener(headsUpListener); + group.setAboveShelfChangedListener(aboveShelfChangedListener); + + group.setHeadsUpAnimatingAway(true); + verify(headsUpListener).accept(true); + verify(aboveShelfChangedListener).onAboveShelfStateChanged(true); + + group.setHeadsUpAnimatingAway(false); + verify(headsUpListener).accept(false); + verify(aboveShelfChangedListener).onAboveShelfStateChanged(false); } @Test - public void testIsBlockingHelperShowing_isCorrectlyUpdated() { - mGroupRow.setBlockingHelperShowing(true); - assertTrue(mGroupRow.isBlockingHelperShowing()); + public void testIsBlockingHelperShowing_isCorrectlyUpdated() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); - mGroupRow.setBlockingHelperShowing(false); - assertFalse(mGroupRow.isBlockingHelperShowing()); + group.setBlockingHelperShowing(true); + assertTrue(group.isBlockingHelperShowing()); + + group.setBlockingHelperShowing(false); + assertFalse(group.isBlockingHelperShowing()); } @Test - public void testGetNumUniqueChildren_defaultChannel() { - assertEquals(1, mGroupRow.getNumUniqueChannels()); + public void testGetNumUniqueChildren_defaultChannel() throws Exception { + ExpandableNotificationRow groupRow = mNotificationTestHelper.createGroup(); + + assertEquals(1, groupRow.getNumUniqueChannels()); } @Test - public void testGetNumUniqueChildren_multiChannel() { + public void testGetNumUniqueChildren_multiChannel() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + List<ExpandableNotificationRow> childRows = - mGroupRow.getChildrenContainer().getAttachedChildren(); + group.getChildrenContainer().getAttachedChildren(); // Give each child a unique channel id/name. int i = 0; for (ExpandableNotificationRow childRow : childRows) { @@ -412,25 +436,29 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { i++; } - assertEquals(3, mGroupRow.getNumUniqueChannels()); + assertEquals(3, group.getNumUniqueChannels()); } @Test public void testIconScrollXAfterTranslationAndReset() throws Exception { - mGroupRow.setDismissUsingRowTranslationX(false); - mGroupRow.setTranslation(50); - assertEquals(50, -mGroupRow.getEntry().getIcons().getShelfIcon().getScrollX()); + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + group.setDismissUsingRowTranslationX(false); + group.setTranslation(50); + assertEquals(50, -group.getEntry().getIcons().getShelfIcon().getScrollX()); - mGroupRow.resetTranslation(); - assertEquals(0, mGroupRow.getEntry().getIcons().getShelfIcon().getScrollX()); + group.resetTranslation(); + assertEquals(0, group.getEntry().getIcons().getShelfIcon().getScrollX()); } @Test - public void testIsExpanded_userExpanded() { - mGroupRow.setExpandable(true); - Assert.assertFalse(mGroupRow.isExpanded()); - mGroupRow.setUserExpanded(true); - Assert.assertTrue(mGroupRow.isExpanded()); + public void testIsExpanded_userExpanded() throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + + group.setExpandable(true); + Assert.assertFalse(group.isExpanded()); + group.setUserExpanded(true); + Assert.assertTrue(group.isExpanded()); } @Test @@ -549,72 +577,80 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { } @Test - public void applyRoundnessAndInv_should_be_immediately_applied_on_childrenContainer_legacy() { - mGroupRow.useRoundnessSourceTypes(false); - Assert.assertEquals(0f, mGroupRow.getBottomRoundness(), 0.001f); - Assert.assertEquals(0f, mGroupRow.getChildrenContainer().getBottomRoundness(), 0.001f); + public void applyRoundnessAndInv_should_be_immediately_applied_on_childrenContainer_legacy() + throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + group.useRoundnessSourceTypes(false); + Assert.assertEquals(0f, group.getBottomRoundness(), 0.001f); + Assert.assertEquals(0f, group.getChildrenContainer().getBottomRoundness(), 0.001f); - mGroupRow.requestBottomRoundness(1f, SourceType.from(""), false); + group.requestBottomRoundness(1f, SourceType.from(""), false); - Assert.assertEquals(1f, mGroupRow.getBottomRoundness(), 0.001f); - Assert.assertEquals(1f, mGroupRow.getChildrenContainer().getBottomRoundness(), 0.001f); + Assert.assertEquals(1f, group.getBottomRoundness(), 0.001f); + Assert.assertEquals(1f, group.getChildrenContainer().getBottomRoundness(), 0.001f); } @Test - public void applyRoundnessAndInvalidate_should_be_immediately_applied_on_childrenContainer() { - mGroupRow.useRoundnessSourceTypes(true); - Assert.assertEquals(0f, mGroupRow.getBottomRoundness(), 0.001f); - Assert.assertEquals(0f, mGroupRow.getChildrenContainer().getBottomRoundness(), 0.001f); + public void applyRoundnessAndInvalidate_should_be_immediately_applied_on_childrenContainer() + throws Exception { + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + group.useRoundnessSourceTypes(true); + Assert.assertEquals(0f, group.getBottomRoundness(), 0.001f); + Assert.assertEquals(0f, group.getChildrenContainer().getBottomRoundness(), 0.001f); - mGroupRow.requestBottomRoundness(1f, SourceType.from(""), false); + group.requestBottomRoundness(1f, SourceType.from(""), false); - Assert.assertEquals(1f, mGroupRow.getBottomRoundness(), 0.001f); - Assert.assertEquals(1f, mGroupRow.getChildrenContainer().getBottomRoundness(), 0.001f); + Assert.assertEquals(1f, group.getBottomRoundness(), 0.001f); + Assert.assertEquals(1f, group.getChildrenContainer().getBottomRoundness(), 0.001f); } @Test public void testSetContentAnimationRunning_Run() throws Exception { // Create views for the notification row. + ExpandableNotificationRow row = mNotificationTestHelper.createRow(); NotificationContentView publicLayout = mock(NotificationContentView.class); - mNotifRow.setPublicLayout(publicLayout); + row.setPublicLayout(publicLayout); NotificationContentView privateLayout = mock(NotificationContentView.class); - mNotifRow.setPrivateLayout(privateLayout); + row.setPrivateLayout(privateLayout); - mNotifRow.setAnimationRunning(true); + row.setAnimationRunning(true); verify(publicLayout, times(1)).setContentAnimationRunning(true); verify(privateLayout, times(1)).setContentAnimationRunning(true); } @Test - public void testSetContentAnimationRunning_Stop() { + public void testSetContentAnimationRunning_Stop() throws Exception { // Create views for the notification row. + ExpandableNotificationRow row = mNotificationTestHelper.createRow(); NotificationContentView publicLayout = mock(NotificationContentView.class); - mNotifRow.setPublicLayout(publicLayout); + row.setPublicLayout(publicLayout); NotificationContentView privateLayout = mock(NotificationContentView.class); - mNotifRow.setPrivateLayout(privateLayout); + row.setPrivateLayout(privateLayout); - mNotifRow.setAnimationRunning(false); + row.setAnimationRunning(false); verify(publicLayout, times(1)).setContentAnimationRunning(false); verify(privateLayout, times(1)).setContentAnimationRunning(false); } @Test - public void testSetContentAnimationRunningInGroupChild_Run() { - // Creates parent views on mGroupRow. + public void testSetContentAnimationRunningInGroupChild_Run() throws Exception { + // Creates parent views on groupRow. + ExpandableNotificationRow groupRow = mNotificationTestHelper.createGroup(); NotificationContentView publicParentLayout = mock(NotificationContentView.class); - mGroupRow.setPublicLayout(publicParentLayout); + groupRow.setPublicLayout(publicParentLayout); NotificationContentView privateParentLayout = mock(NotificationContentView.class); - mGroupRow.setPrivateLayout(privateParentLayout); + groupRow.setPrivateLayout(privateParentLayout); - // Create child views on mNotifRow. + // Create child views on row. + ExpandableNotificationRow row = mNotificationTestHelper.createRow(); NotificationContentView publicChildLayout = mock(NotificationContentView.class); - mNotifRow.setPublicLayout(publicChildLayout); + row.setPublicLayout(publicChildLayout); NotificationContentView privateChildLayout = mock(NotificationContentView.class); - mNotifRow.setPrivateLayout(privateChildLayout); - when(mNotifRow.isGroupExpanded()).thenReturn(true); - setMockChildrenContainer(mGroupRow, mNotifRow); + row.setPrivateLayout(privateChildLayout); + when(row.isGroupExpanded()).thenReturn(true); + setMockChildrenContainer(groupRow, row); - mGroupRow.setAnimationRunning(true); + groupRow.setAnimationRunning(true); verify(publicParentLayout, times(1)).setContentAnimationRunning(true); verify(privateParentLayout, times(1)).setContentAnimationRunning(true); // The child layouts should be started too. @@ -624,23 +660,25 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { @Test - public void testSetIconAnimationRunningGroup_Run() { + public void testSetIconAnimationRunningGroup_Run() throws Exception { // Create views for a group row. + ExpandableNotificationRow group = mNotificationTestHelper.createGroup(); + ExpandableNotificationRow child = mNotificationTestHelper.createRow(); NotificationContentView publicParentLayout = mock(NotificationContentView.class); - mGroupRow.setPublicLayout(publicParentLayout); + group.setPublicLayout(publicParentLayout); NotificationContentView privateParentLayout = mock(NotificationContentView.class); - mGroupRow.setPrivateLayout(privateParentLayout); - when(mGroupRow.isGroupExpanded()).thenReturn(true); + group.setPrivateLayout(privateParentLayout); + when(group.isGroupExpanded()).thenReturn(true); - // Sets up mNotifRow as a child ExpandableNotificationRow. + // Add the child to the group. NotificationContentView publicChildLayout = mock(NotificationContentView.class); - mNotifRow.setPublicLayout(publicChildLayout); + child.setPublicLayout(publicChildLayout); NotificationContentView privateChildLayout = mock(NotificationContentView.class); - mNotifRow.setPrivateLayout(privateChildLayout); - when(mNotifRow.isGroupExpanded()).thenReturn(true); + child.setPrivateLayout(privateChildLayout); + when(child.isGroupExpanded()).thenReturn(true); NotificationChildrenContainer mockContainer = - setMockChildrenContainer(mGroupRow, mNotifRow); + setMockChildrenContainer(group, child); // Mock the children view wrappers, and give them each an icon. NotificationViewWrapper mockViewWrapper = mock(NotificationViewWrapper.class); @@ -663,7 +701,7 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { AnimatedVectorDrawable lowPriVectorDrawable = mock(AnimatedVectorDrawable.class); setDrawableIconsInImageView(mockLowPriorityIcon, lowPriDrawable, lowPriVectorDrawable); - mGroupRow.setAnimationRunning(true); + group.setAnimationRunning(true); verify(drawable, times(1)).start(); verify(vectorDrawable, times(1)).start(); verify(lowPriDrawable, times(1)).start(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java index e4fc4d5d54ba..aca9c563de04 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java @@ -40,7 +40,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.LauncherApps; import android.graphics.drawable.Icon; -import android.os.Handler; import android.os.UserHandle; import android.service.notification.StatusBarNotification; import android.testing.TestableLooper; @@ -49,7 +48,6 @@ import android.view.LayoutInflater; import android.widget.RemoteViews; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.UiEventLogger; import com.android.systemui.TestableDependency; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; @@ -57,7 +55,6 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.controls.util.MediaFeatureFlag; import com.android.systemui.media.dialog.MediaOutputDialogFactory; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.shade.ShadeExpansionStateManager; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationShadeWindowController; @@ -68,7 +65,6 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; -import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.icon.IconBuilder; @@ -77,11 +73,8 @@ import com.android.systemui.statusbar.notification.people.PeopleNotificationIden import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow.ExpandableNotificationRowLogger; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow.OnExpandClickListener; import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag; -import com.android.systemui.statusbar.phone.ConfigurationControllerImpl; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; -import com.android.systemui.statusbar.policy.HeadsUpManagerLogger; import com.android.systemui.statusbar.policy.InflatedSmartReplyState; import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder; import com.android.systemui.statusbar.policy.SmartReplyConstants; @@ -121,12 +114,12 @@ public class NotificationTestHelper { private final GroupMembershipManager mGroupMembershipManager; private final GroupExpansionManager mGroupExpansionManager; private ExpandableNotificationRow mRow; - private HeadsUpManagerPhone mHeadsUpManager; + private final HeadsUpManagerPhone mHeadsUpManager; private final NotifBindPipeline mBindPipeline; private final NotifCollectionListener mBindPipelineEntryListener; private final RowContentBindStage mBindStage; private final IconManager mIconManager; - private StatusBarStateController mStatusBarStateController; + private final StatusBarStateController mStatusBarStateController; private final PeopleNotificationIdentifier mPeopleNotificationIdentifier; public final OnUserInteractionCallback mOnUserInteractionCallback; public final Runnable mFutureDismissalRunnable; @@ -146,21 +139,7 @@ public class NotificationTestHelper { mStatusBarStateController = mock(StatusBarStateController.class); mGroupMembershipManager = mock(GroupMembershipManager.class); mGroupExpansionManager = mock(GroupExpansionManager.class); - mHeadsUpManager = new HeadsUpManagerPhone( - mContext, - mock(HeadsUpManagerLogger.class), - mStatusBarStateController, - mock(KeyguardBypassController.class), - mock(GroupMembershipManager.class), - mock(VisualStabilityProvider.class), - mock(ConfigurationControllerImpl.class), - new Handler(mTestLooper.getLooper()), - mock(AccessibilityManagerWrapper.class), - mock(UiEventLogger.class), - mock(ShadeExpansionStateManager.class) - ); - mHeadsUpManager.mHandler.removeCallbacksAndMessages(null); - mHeadsUpManager.mHandler = new Handler(mTestLooper.getLooper()); + mHeadsUpManager = mock(HeadsUpManagerPhone.class); mIconManager = new IconManager( mock(CommonNotifCollection.class), mock(LauncherApps.class), diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index b1363a047307..06053987202c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -1010,6 +1010,18 @@ public class CentralSurfacesImplTest extends SysuiTestCase { } @Test + public void testSetDozingNotUnlocking_transitionToAOD_cancelKeyguardFadingAway() { + setDozing(true); + when(mKeyguardStateController.isShowing()).thenReturn(false); + when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(true); + + mCentralSurfaces.updateScrimController(); + + verify(mScrimController, times(2)).transitionTo(eq(ScrimState.AOD)); + verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway(); + } + + @Test public void testShowKeyguardImplementation_setsState() { when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java deleted file mode 100644 index 2f495355df40..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java +++ /dev/null @@ -1,526 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.systemui.statusbar.phone; - -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyFloat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; - -import android.content.res.ColorStateList; -import android.graphics.Color; -import android.hardware.biometrics.BiometricSourceType; -import android.os.Handler; -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper; -import android.view.View; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import androidx.test.filters.SmallTest; - -import com.android.keyguard.KeyguardHostViewController; -import com.android.keyguard.KeyguardSecurityModel; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.ViewMediatorCallback; -import com.android.keyguard.dagger.KeyguardBouncerComponent; -import com.android.systemui.DejankUtils; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.classifier.FalsingCollector; -import com.android.systemui.keyguard.DismissCallbackRegistry; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; -import com.android.systemui.plugins.ActivityStarter.OnDismissAction; -import com.android.systemui.statusbar.policy.KeyguardStateController; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper -public class KeyguardBouncerTest extends SysuiTestCase { - - @Mock - private FalsingCollector mFalsingCollector; - @Mock - private ViewMediatorCallback mViewMediatorCallback; - @Mock - private DismissCallbackRegistry mDismissCallbackRegistry; - @Mock - private KeyguardHostViewController mKeyguardHostViewController; - @Mock - private PrimaryBouncerExpansionCallback mExpansionCallback; - @Mock - private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - @Mock - private KeyguardStateController mKeyguardStateController; - @Mock - private KeyguardBypassController mKeyguardBypassController; - @Mock - private Handler mHandler; - @Mock - private KeyguardSecurityModel mKeyguardSecurityModel; - @Mock - private KeyguardBouncerComponent.Factory mKeyguardBouncerComponentFactory; - @Mock - private KeyguardBouncerComponent mKeyguardBouncerComponent; - private ViewGroup mContainer; - @Rule - public MockitoRule mRule = MockitoJUnit.rule(); - private Integer mRootVisibility = View.INVISIBLE; - private KeyguardBouncer mBouncer; - - @Before - public void setup() { - allowTestableLooperAsMainThread(); - when(mKeyguardSecurityModel.getSecurityMode(anyInt())) - .thenReturn(KeyguardSecurityModel.SecurityMode.None); - DejankUtils.setImmediate(true); - - mContainer = spy(new FrameLayout(getContext())); - when(mKeyguardBouncerComponentFactory.create(mContainer)).thenReturn( - mKeyguardBouncerComponent); - when(mKeyguardBouncerComponent.getKeyguardHostViewController()) - .thenReturn(mKeyguardHostViewController); - - mBouncer = new KeyguardBouncer.Factory(getContext(), mViewMediatorCallback, - mDismissCallbackRegistry, mFalsingCollector, - mKeyguardStateController, mKeyguardUpdateMonitor, - mKeyguardBypassController, mHandler, mKeyguardSecurityModel, - mKeyguardBouncerComponentFactory) - .create(mContainer, mExpansionCallback); - } - - @Test - public void testInflateView_doesntCrash() { - mBouncer.inflateView(); - } - - @Test - public void testShow_notifiesFalsingManager() { - mBouncer.show(true); - verify(mFalsingCollector).onBouncerShown(); - - mBouncer.show(true, false); - verifyNoMoreInteractions(mFalsingCollector); - } - - /** - * Regression test: Invisible bouncer when occluded. - */ - @Test - public void testShow_bouncerIsVisible() { - // Expand notification panel as if we were in the keyguard. - mBouncer.ensureView(); - mBouncer.setExpansion(1); - - reset(mKeyguardHostViewController); - - mBouncer.show(true); - verify(mKeyguardHostViewController).setExpansion(0); - } - - @Test - public void testShow_notifiesVisibility() { - mBouncer.show(true); - verify(mKeyguardStateController).notifyBouncerShowing(eq(true)); - verify(mExpansionCallback).onStartingToShow(); - - // Not called again when visible - reset(mViewMediatorCallback); - mBouncer.show(true); - verifyNoMoreInteractions(mViewMediatorCallback); - } - - @Test - public void testShow_triesToDismissKeyguard() { - mBouncer.show(true); - verify(mKeyguardHostViewController).dismiss(anyInt()); - } - - @Test - public void testShow_resetsSecuritySelection() { - mBouncer.show(false); - verify(mKeyguardHostViewController, never()).showPrimarySecurityScreen(); - - mBouncer.hide(false); - mBouncer.show(true); - verify(mKeyguardHostViewController).showPrimarySecurityScreen(); - } - - @Test - public void testShow_animatesKeyguardView() { - mBouncer.show(true); - verify(mKeyguardHostViewController).appear(anyInt()); - } - - @Test - public void testShow_showsErrorMessage() { - final String errorMessage = "an error message"; - when(mViewMediatorCallback.consumeCustomMessage()).thenReturn(errorMessage); - mBouncer.show(true); - verify(mKeyguardHostViewController).showErrorMessage(eq(errorMessage)); - } - - @Test - public void testSetExpansion_notifiesFalsingManager() { - mBouncer.ensureView(); - mBouncer.setExpansion(0.5f); - - mBouncer.setExpansion(EXPANSION_HIDDEN); - verify(mFalsingCollector).onBouncerHidden(); - verify(mExpansionCallback).onFullyHidden(); - - mBouncer.setExpansion(EXPANSION_VISIBLE); - verify(mFalsingCollector).onBouncerShown(); - verify(mExpansionCallback).onFullyShown(); - - verify(mExpansionCallback, never()).onStartingToHide(); - verify(mKeyguardHostViewController, never()).onStartingToHide(); - mBouncer.setExpansion(0.9f); - verify(mExpansionCallback).onStartingToHide(); - verify(mKeyguardHostViewController).onStartingToHide(); - } - - @Test - public void testSetExpansion_notifiesKeyguardView() { - mBouncer.ensureView(); - mBouncer.setExpansion(0.1f); - - mBouncer.setExpansion(0); - verify(mKeyguardHostViewController).onResume(); - verify(mContainer).announceForAccessibility(any()); - } - - @Test - public void show_notifiesKeyguardViewController() { - mBouncer.ensureView(); - - mBouncer.show(/* resetSecuritySelection= */ false); - - verify(mKeyguardHostViewController).onBouncerVisibilityChanged(View.VISIBLE); - } - - @Test - public void testHide_notifiesFalsingManager() { - mBouncer.hide(false); - verify(mFalsingCollector).onBouncerHidden(); - } - - @Test - public void testHide_notifiesVisibility() { - mBouncer.hide(false); - verify(mKeyguardStateController).notifyBouncerShowing(eq(false)); - } - - @Test - public void testHide_notifiesDismissCallbackIfVisible() { - mBouncer.hide(false); - verifyZeroInteractions(mDismissCallbackRegistry); - mBouncer.show(false); - mBouncer.hide(false); - verify(mDismissCallbackRegistry).notifyDismissCancelled(); - } - - @Test - public void testHide_notShowingAnymore() { - mBouncer.ensureView(); - mBouncer.show(false /* resetSecuritySelection */); - mBouncer.hide(false /* destroyViews */); - Assert.assertFalse("Not showing", mBouncer.isShowing()); - } - - @Test - public void testShowPromptReason_propagates() { - mBouncer.ensureView(); - mBouncer.showPromptReason(1); - verify(mKeyguardHostViewController).showPromptReason(eq(1)); - } - - @Test - public void testShowMessage_propagates() { - final String message = "a message"; - mBouncer.ensureView(); - mBouncer.showMessage(message, ColorStateList.valueOf(Color.GREEN)); - verify(mKeyguardHostViewController).showMessage( - eq(message), eq(ColorStateList.valueOf(Color.GREEN))); - } - - @Test - public void testShowOnDismissAction_showsBouncer() { - final OnDismissAction dismissAction = () -> false; - final Runnable cancelAction = () -> {}; - mBouncer.showWithDismissAction(dismissAction, cancelAction); - verify(mKeyguardHostViewController).setOnDismissAction(dismissAction, cancelAction); - Assert.assertTrue("Should be showing", mBouncer.isShowing()); - } - - @Test - public void testStartPreHideAnimation_notifiesView() { - final boolean[] ran = {false}; - final Runnable r = () -> ran[0] = true; - mBouncer.startPreHideAnimation(r); - Assert.assertTrue("Callback should have been invoked", ran[0]); - - ran[0] = false; - mBouncer.ensureView(); - mBouncer.startPreHideAnimation(r); - verify(mKeyguardHostViewController).startDisappearAnimation(r); - Assert.assertFalse("Callback should have been deferred", ran[0]); - } - - @Test - public void testIsShowing_animated() { - Assert.assertFalse("Show wasn't invoked yet", mBouncer.isShowing()); - mBouncer.show(true /* reset */); - Assert.assertTrue("Should be showing", mBouncer.isShowing()); - } - - @Test - public void testIsShowing_forSwipeUp() { - mBouncer.setExpansion(1f); - mBouncer.show(true /* reset */, false /* animated */); - Assert.assertFalse("Should only be showing after collapsing notification panel", - mBouncer.isShowing()); - mBouncer.setExpansion(0f); - Assert.assertTrue("Should be showing", mBouncer.isShowing()); - } - - @Test - public void testSetExpansion() { - mBouncer.ensureView(); - mBouncer.setExpansion(0.5f); - verify(mKeyguardHostViewController).setExpansion(0.5f); - } - - @Test - public void testIsFullscreenBouncer_asksKeyguardView() { - mBouncer.ensureView(); - mBouncer.isFullscreenBouncer(); - verify(mKeyguardHostViewController).getCurrentSecurityMode(); - } - - @Test - public void testIsHiding_preHideOrHide() { - Assert.assertFalse("Should not be hiding on initial state", mBouncer.isAnimatingAway()); - mBouncer.startPreHideAnimation(null /* runnable */); - Assert.assertTrue("Should be hiding during pre-hide", mBouncer.isAnimatingAway()); - mBouncer.hide(false /* destroyView */); - Assert.assertFalse("Should be hidden after hide()", mBouncer.isAnimatingAway()); - } - - @Test - public void testIsHiding_skipsTranslation() { - mBouncer.show(false /* reset */); - reset(mKeyguardHostViewController); - mBouncer.startPreHideAnimation(null /* runnable */); - mBouncer.setExpansion(0.5f); - verify(mKeyguardHostViewController, never()).setExpansion(anyFloat()); - } - - @Test - public void testIsSecure() { - mBouncer.ensureView(); - for (KeyguardSecurityModel.SecurityMode mode : KeyguardSecurityModel.SecurityMode.values()){ - reset(mKeyguardSecurityModel); - when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(mode); - Assert.assertEquals("Security doesn't match for mode: " + mode, - mBouncer.isSecure(), mode != KeyguardSecurityModel.SecurityMode.None); - } - } - - @Test - public void testIsShowingScrimmed_true() { - doAnswer(invocation -> { - assertThat(mBouncer.isScrimmed()).isTrue(); - return null; - }).when(mExpansionCallback).onFullyShown(); - mBouncer.show(false /* resetSecuritySelection */, true /* animate */); - assertThat(mBouncer.isScrimmed()).isTrue(); - mBouncer.hide(false /* destroyView */); - assertThat(mBouncer.isScrimmed()).isFalse(); - } - - @Test - public void testIsShowingScrimmed_false() { - doAnswer(invocation -> { - assertThat(mBouncer.isScrimmed()).isFalse(); - return null; - }).when(mExpansionCallback).onFullyShown(); - mBouncer.show(false /* resetSecuritySelection */, false /* animate */); - assertThat(mBouncer.isScrimmed()).isFalse(); - } - - @Test - public void testWillDismissWithAction() { - mBouncer.ensureView(); - Assert.assertFalse("Action not set yet", mBouncer.willDismissWithAction()); - when(mKeyguardHostViewController.hasDismissActions()).thenReturn(true); - Assert.assertTrue("Action should exist", mBouncer.willDismissWithAction()); - } - - @Test - public void testShow_delaysIfFaceAuthIsRunning() { - when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE)) - .thenReturn(true); - when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true); - mBouncer.show(true /* reset */); - - ArgumentCaptor<Runnable> showRunnable = ArgumentCaptor.forClass(Runnable.class); - verify(mHandler).postDelayed(showRunnable.capture(), - eq(KeyguardBouncer.BOUNCER_FACE_DELAY)); - - mBouncer.hide(false /* destroyView */); - verify(mHandler).removeCallbacks(eq(showRunnable.getValue())); - } - - @Test - public void testShow_doesNotDelaysIfFaceAuthIsNotAllowed() { - when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true); - when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(BiometricSourceType.FACE)) - .thenReturn(false); - mBouncer.show(true /* reset */); - - verify(mHandler, never()).postDelayed(any(), anyLong()); - } - - @Test - public void testShow_delaysIfFaceAuthIsRunning_unlessBypassEnabled() { - when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true); - when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true); - mBouncer.show(true /* reset */); - - verify(mHandler, never()).postDelayed(any(), anyLong()); - } - - @Test - public void testShow_delaysIfFaceAuthIsRunning_unlessFingerprintEnrolled() { - when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true); - when(mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(0)) - .thenReturn(true); - mBouncer.show(true /* reset */); - - verify(mHandler, never()).postDelayed(any(), anyLong()); - } - - @Test - public void testRegisterUpdateMonitorCallback() { - verify(mKeyguardUpdateMonitor).registerCallback(any()); - } - - @Test - public void testInTransit_whenTranslation() { - mBouncer.show(true); - mBouncer.setExpansion(EXPANSION_HIDDEN); - assertThat(mBouncer.inTransit()).isFalse(); - mBouncer.setExpansion(0.5f); - assertThat(mBouncer.inTransit()).isTrue(); - mBouncer.setExpansion(EXPANSION_VISIBLE); - assertThat(mBouncer.inTransit()).isFalse(); - } - - @Test - public void testUpdateResources_delegatesToRootView() { - mBouncer.ensureView(); - mBouncer.updateResources(); - - // This is mocked, so won't pick up on the call to updateResources via - // mKeyguardViewController.init(), only updateResources above. - verify(mKeyguardHostViewController).updateResources(); - } - - @Test - public void testUpdateKeyguardPosition_delegatesToRootView() { - mBouncer.ensureView(); - mBouncer.updateKeyguardPosition(1.0f); - - verify(mKeyguardHostViewController).updateKeyguardPosition(1.0f); - } - - @Test - public void testExpansion_notifiesCallback() { - mBouncer.ensureView(); - mBouncer.setExpansion(0.5f); - - final PrimaryBouncerExpansionCallback callback = - mock(PrimaryBouncerExpansionCallback.class); - mBouncer.addBouncerExpansionCallback(callback); - - mBouncer.setExpansion(EXPANSION_HIDDEN); - verify(callback).onFullyHidden(); - verify(callback).onExpansionChanged(EXPANSION_HIDDEN); - - Mockito.clearInvocations(callback); - mBouncer.setExpansion(EXPANSION_VISIBLE); - verify(callback).onFullyShown(); - verify(callback).onExpansionChanged(EXPANSION_VISIBLE); - - Mockito.clearInvocations(callback); - float bouncerHideAmount = 0.9f; - // Ensure the callback only triggers once despite multiple calls to setExpansion - // with the same value. - mBouncer.setExpansion(bouncerHideAmount); - mBouncer.setExpansion(bouncerHideAmount); - verify(callback, times(1)).onStartingToHide(); - verify(callback, times(1)).onExpansionChanged(bouncerHideAmount); - - Mockito.clearInvocations(callback); - mBouncer.removeBouncerExpansionCallback(callback); - bouncerHideAmount = 0.5f; - mBouncer.setExpansion(bouncerHideAmount); - verify(callback, never()).onExpansionChanged(bouncerHideAmount); - } - - @Test - public void testOnResumeCalledForFullscreenBouncerOnSecondShow() { - // GIVEN a security mode which requires fullscreen bouncer - when(mKeyguardSecurityModel.getSecurityMode(anyInt())) - .thenReturn(KeyguardSecurityModel.SecurityMode.SimPin); - mBouncer.show(true); - - // WHEN a second call to show occurs, the bouncer will already by visible - reset(mKeyguardHostViewController); - mBouncer.show(true); - - // THEN ensure the ViewController is told to resume - verify(mKeyguardHostViewController).onResume(); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java index cc4abfcaa42f..529519a6246e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java @@ -38,6 +38,7 @@ import com.android.internal.view.AppearanceRegion; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; import com.android.systemui.navigationbar.NavigationModeController; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.policy.BatteryController; import org.junit.Before; @@ -67,7 +68,8 @@ public class LightBarControllerTest extends SysuiTestCase { mStatusBarIconController, mock(BatteryController.class), mock(NavigationModeController.class), - mock(DumpManager.class)); + mock(DumpManager.class), + new FakeDisplayTracker(mContext)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarTransitionsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarTransitionsControllerTest.java index 189aa0f99b0f..0a68406882d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarTransitionsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightBarTransitionsControllerTest.java @@ -28,6 +28,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.LightBarTransitionsController.DarkIntensityApplier; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -56,7 +57,8 @@ public class LightBarTransitionsControllerTest extends SysuiTestCase { public void setup() { MockitoAnnotations.initMocks(this); mLightBarTransitionsController = new LightBarTransitionsController(mContext, mApplier, - new CommandQueue(mContext), mKeyguardStateController, mStatusBarStateController); + new CommandQueue(mContext, new FakeDisplayTracker(mContext)), + mKeyguardStateController, mStatusBarStateController); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 1ba0a36fb05d..d8446f4721b3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.flags.Flags.MODERN_BOUNCER; import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; @@ -109,7 +108,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Mock private View mNotificationContainer; @Mock private KeyguardBypassController mBypassController; - @Mock private KeyguardBouncer.Factory mKeyguardBouncerFactory; @Mock private KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory; @Mock private KeyguardMessageAreaController mKeyguardMessageAreaController; @Mock private KeyguardMessageArea mKeyguardMessageArea; @@ -153,8 +151,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { .isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_BOUNCER_ANIM)) .thenReturn(true); - when(mFeatureFlags.isEnabled(MODERN_BOUNCER)).thenReturn(true); - mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager( getContext(), @@ -169,7 +165,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mock(NotificationShadeWindowController.class), mKeyguardStateController, mock(NotificationMediaManager.class), - mKeyguardBouncerFactory, mKeyguardMessageAreaFactory, Optional.of(mSysUiUnfoldComponent), () -> mShadeController, @@ -660,7 +655,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mock(NotificationShadeWindowController.class), mKeyguardStateController, mock(NotificationMediaManager.class), - mKeyguardBouncerFactory, mKeyguardMessageAreaFactory, Optional.of(mSysUiUnfoldComponent), () -> mShadeController, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest_Old.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest_Old.java deleted file mode 100644 index 55ab6812da91..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest_Old.java +++ /dev/null @@ -1,581 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar.phone; - -import static com.android.systemui.flags.Flags.MODERN_BOUNCER; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN; -import static com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_VISIBLE; - -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyFloat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewRootImpl; -import android.window.OnBackInvokedCallback; -import android.window.OnBackInvokedDispatcher; -import android.window.WindowOnBackInvokedDispatcher; - -import androidx.test.filters.SmallTest; - -import com.android.internal.util.LatencyTracker; -import com.android.internal.widget.LockPatternUtils; -import com.android.keyguard.KeyguardMessageArea; -import com.android.keyguard.KeyguardMessageAreaController; -import com.android.keyguard.KeyguardSecurityModel; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.ViewMediatorCallback; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.dock.DockManager; -import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.keyguard.data.BouncerView; -import com.android.systemui.keyguard.data.BouncerViewDelegate; -import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; -import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor; -import com.android.systemui.navigationbar.NavigationModeController; -import com.android.systemui.plugins.ActivityStarter.OnDismissAction; -import com.android.systemui.shade.NotificationPanelViewController; -import com.android.systemui.shade.ShadeController; -import com.android.systemui.shade.ShadeExpansionChangeEvent; -import com.android.systemui.shade.ShadeExpansionStateManager; -import com.android.systemui.statusbar.NotificationMediaManager; -import com.android.systemui.statusbar.NotificationShadeWindowController; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.SysuiStatusBarStateController; -import com.android.systemui.statusbar.policy.ConfigurationController; -import com.android.systemui.unfold.SysUIUnfoldComponent; - -import com.google.common.truth.Truth; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import java.util.Optional; - -/** - * StatusBarKeyguardViewManager Test with deprecated KeyguardBouncer.java. - * TODO: Delete when deleting {@link KeyguardBouncer} - */ -@SmallTest -@RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper -public class StatusBarKeyguardViewManagerTest_Old extends SysuiTestCase { - private static final ShadeExpansionChangeEvent EXPANSION_EVENT = - expansionEvent(/* fraction= */ 0.5f, /* expanded= */ false, /* tracking= */ true); - - @Mock private ViewMediatorCallback mViewMediatorCallback; - @Mock private LockPatternUtils mLockPatternUtils; - @Mock private CentralSurfaces mCentralSurfaces; - @Mock private ViewGroup mContainer; - @Mock private NotificationPanelViewController mNotificationPanelView; - @Mock private BiometricUnlockController mBiometricUnlockController; - @Mock private SysuiStatusBarStateController mStatusBarStateController; - @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - @Mock private View mNotificationContainer; - @Mock private KeyguardBypassController mBypassController; - @Mock private KeyguardBouncer.Factory mKeyguardBouncerFactory; - @Mock private KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory; - @Mock private KeyguardMessageAreaController mKeyguardMessageAreaController; - @Mock private KeyguardBouncer mPrimaryBouncer; - @Mock private KeyguardMessageArea mKeyguardMessageArea; - @Mock private ShadeController mShadeController; - @Mock private SysUIUnfoldComponent mSysUiUnfoldComponent; - @Mock private DreamOverlayStateController mDreamOverlayStateController; - @Mock private LatencyTracker mLatencyTracker; - @Mock private FeatureFlags mFeatureFlags; - @Mock private KeyguardSecurityModel mKeyguardSecurityModel; - @Mock private PrimaryBouncerCallbackInteractor mPrimaryBouncerCallbackInteractor; - @Mock private PrimaryBouncerInteractor mPrimaryBouncerInteractor; - @Mock private AlternateBouncerInteractor mAlternateBouncerInteractor; - @Mock private BouncerView mBouncerView; - @Mock private BouncerViewDelegate mBouncerViewDelegate; - - private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; - private PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback - mBouncerExpansionCallback; - private FakeKeyguardStateController mKeyguardStateController = - spy(new FakeKeyguardStateController()); - - @Mock private ViewRootImpl mViewRootImpl; - @Mock private WindowOnBackInvokedDispatcher mOnBackInvokedDispatcher; - @Captor - private ArgumentCaptor<OnBackInvokedCallback> mOnBackInvokedCallback; - - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - when(mKeyguardBouncerFactory.create( - any(ViewGroup.class), - any(PrimaryBouncerExpansionCallback.class))) - .thenReturn(mPrimaryBouncer); - when(mCentralSurfaces.getBouncerContainer()).thenReturn(mContainer); - when(mContainer.findViewById(anyInt())).thenReturn(mKeyguardMessageArea); - when(mKeyguardMessageAreaFactory.create(any(KeyguardMessageArea.class))) - .thenReturn(mKeyguardMessageAreaController); - when(mBouncerView.getDelegate()).thenReturn(mBouncerViewDelegate); - - mStatusBarKeyguardViewManager = - new StatusBarKeyguardViewManager( - getContext(), - mViewMediatorCallback, - mLockPatternUtils, - mStatusBarStateController, - mock(ConfigurationController.class), - mKeyguardUpdateMonitor, - mDreamOverlayStateController, - mock(NavigationModeController.class), - mock(DockManager.class), - mock(NotificationShadeWindowController.class), - mKeyguardStateController, - mock(NotificationMediaManager.class), - mKeyguardBouncerFactory, - mKeyguardMessageAreaFactory, - Optional.of(mSysUiUnfoldComponent), - () -> mShadeController, - mLatencyTracker, - mKeyguardSecurityModel, - mFeatureFlags, - mPrimaryBouncerCallbackInteractor, - mPrimaryBouncerInteractor, - mBouncerView, - mAlternateBouncerInteractor) { - @Override - public ViewRootImpl getViewRootImpl() { - return mViewRootImpl; - } - }; - when(mViewRootImpl.getOnBackInvokedDispatcher()) - .thenReturn(mOnBackInvokedDispatcher); - mStatusBarKeyguardViewManager.registerCentralSurfaces( - mCentralSurfaces, - mNotificationPanelView, - new ShadeExpansionStateManager(), - mBiometricUnlockController, - mNotificationContainer, - mBypassController); - mStatusBarKeyguardViewManager.show(null); - ArgumentCaptor<PrimaryBouncerExpansionCallback> callbackArgumentCaptor = - ArgumentCaptor.forClass(PrimaryBouncerExpansionCallback.class); - verify(mKeyguardBouncerFactory).create(any(ViewGroup.class), - callbackArgumentCaptor.capture()); - mBouncerExpansionCallback = callbackArgumentCaptor.getValue(); - } - - @Test - public void dismissWithAction_AfterKeyguardGoneSetToFalse() { - OnDismissAction action = () -> false; - Runnable cancelAction = () -> {}; - mStatusBarKeyguardViewManager.dismissWithAction( - action, cancelAction, false /* afterKeyguardGone */); - verify(mPrimaryBouncer).showWithDismissAction(eq(action), eq(cancelAction)); - } - - @Test - public void showBouncer_onlyWhenShowing() { - mStatusBarKeyguardViewManager.hide(0 /* startTime */, 0 /* fadeoutDuration */); - mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */); - verify(mPrimaryBouncer, never()).show(anyBoolean(), anyBoolean()); - verify(mPrimaryBouncer, never()).show(anyBoolean()); - } - - @Test - public void showBouncer_notWhenBouncerAlreadyShowing() { - mStatusBarKeyguardViewManager.hide(0 /* startTime */, 0 /* fadeoutDuration */); - when(mPrimaryBouncer.isSecure()).thenReturn(true); - mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */); - verify(mPrimaryBouncer, never()).show(anyBoolean(), anyBoolean()); - verify(mPrimaryBouncer, never()).show(anyBoolean()); - } - - @Test - public void showBouncer_showsTheBouncer() { - mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */); - verify(mPrimaryBouncer).show(anyBoolean(), eq(true)); - } - - @Test - public void onPanelExpansionChanged_neverShowsDuringHintAnimation() { - when(mNotificationPanelView.isUnlockHintRunning()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void onPanelExpansionChanged_propagatesToBouncerOnlyIfShowing() { - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer, never()).setExpansion(eq(0.5f)); - - when(mPrimaryBouncer.isShowing()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent(/* fraction= */ 0.6f, /* expanded= */ false, /* tracking= */ true)); - verify(mPrimaryBouncer).setExpansion(eq(0.6f)); - } - - @Test - public void onPanelExpansionChanged_duplicateEventsAreIgnored() { - when(mPrimaryBouncer.isShowing()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer).setExpansion(eq(0.5f)); - - reset(mPrimaryBouncer); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer, never()).setExpansion(eq(0.5f)); - } - - @Test - public void onPanelExpansionChanged_hideBouncer_afterKeyguardHidden() { - mStatusBarKeyguardViewManager.hide(0, 0); - when(mPrimaryBouncer.inTransit()).thenReturn(true); - - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer).setExpansion(eq(EXPANSION_HIDDEN)); - } - - @Test - public void onPanelExpansionChanged_showsBouncerWhenSwiping() { - mKeyguardStateController.setCanDismissLockScreen(false); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer).show(eq(false), eq(false)); - - // But not when it's already visible - reset(mPrimaryBouncer); - when(mPrimaryBouncer.isShowing()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer, never()).show(eq(false), eq(false)); - - // Or animating away - reset(mPrimaryBouncer); - when(mPrimaryBouncer.isAnimatingAway()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); - verify(mPrimaryBouncer, never()).show(eq(false), eq(false)); - } - - @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenWakeAndUnlock() { - when(mBiometricUnlockController.getMode()) - .thenReturn(BiometricUnlockController.MODE_WAKE_AND_UNLOCK); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenDismissBouncer() { - // Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing - // the bouncer, there may be an onPanelExpansionChanged(0) call to collapse the panel - // which would mistakenly cause the bouncer to show briefly before its visibility - // is set to hide. Therefore, we don't want to propagate panelExpansionChanged to the - // bouncer if the bouncer is dismissing as a result of a biometric unlock. - when(mBiometricUnlockController.getMode()) - .thenReturn(BiometricUnlockController.MODE_DISMISS_BOUNCER); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenOccluded() { - when(mKeyguardStateController.isOccluded()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() { - // Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing - // the bouncer, there may be an onPanelExpansionChanged(0) call to collapse the panel - // which would mistakenly cause the bouncer to show briefly before its visibility - // is set to hide. Therefore, we don't want to propagate panelExpansionChanged to the - // bouncer if the bouncer is dismissing as a result of a biometric unlock. - when(mBiometricUnlockController.getMode()) - .thenReturn(BiometricUnlockController.MODE_SHOW_BOUNCER); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenShadeLocked() { - when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE_LOCKED); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); - } - - @Test - public void setOccluded_animatesPanelExpansion_onlyIfBouncerHidden() { - mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, true /* animated */); - verify(mCentralSurfaces).animateKeyguardUnoccluding(); - - when(mPrimaryBouncer.isShowing()).thenReturn(true); - clearInvocations(mCentralSurfaces); - mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, true /* animated */); - verify(mCentralSurfaces, never()).animateKeyguardUnoccluding(); - } - - @Test - public void setOccluded_onKeyguardOccludedChangedCalled() { - clearInvocations(mKeyguardStateController); - clearInvocations(mKeyguardUpdateMonitor); - - mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, false /* animated */); - verify(mKeyguardStateController).notifyKeyguardState(true, false); - - clearInvocations(mKeyguardUpdateMonitor); - clearInvocations(mKeyguardStateController); - - mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animated */); - verify(mKeyguardStateController).notifyKeyguardState(true, true); - - clearInvocations(mKeyguardUpdateMonitor); - clearInvocations(mKeyguardStateController); - - mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, false /* animated */); - verify(mKeyguardStateController).notifyKeyguardState(true, false); - } - - @Test - public void setOccluded_isInLaunchTransition_onKeyguardOccludedChangedCalled() { - mStatusBarKeyguardViewManager.show(null); - - mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animated */); - verify(mKeyguardStateController).notifyKeyguardState(true, true); - } - - @Test - public void setOccluded_isLaunchingActivityOverLockscreen_onKeyguardOccludedChangedCalled() { - when(mCentralSurfaces.isLaunchingActivityOverLockscreen()).thenReturn(true); - mStatusBarKeyguardViewManager.show(null); - - mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animated */); - verify(mKeyguardStateController).notifyKeyguardState(true, true); - } - - @Test - public void testHiding_cancelsGoneRunnable() { - OnDismissAction action = mock(OnDismissAction.class); - Runnable cancelAction = mock(Runnable.class); - mStatusBarKeyguardViewManager.dismissWithAction( - action, cancelAction, true /* afterKeyguardGone */); - - when(mPrimaryBouncer.isShowing()).thenReturn(false); - mStatusBarKeyguardViewManager.hideBouncer(true); - mStatusBarKeyguardViewManager.hide(0, 30); - verify(action, never()).onDismiss(); - verify(cancelAction).run(); - } - - @Test - public void testHidingBouncer_cancelsGoneRunnable() { - OnDismissAction action = mock(OnDismissAction.class); - Runnable cancelAction = mock(Runnable.class); - mStatusBarKeyguardViewManager.dismissWithAction( - action, cancelAction, true /* afterKeyguardGone */); - - when(mPrimaryBouncer.isShowing()).thenReturn(false); - mStatusBarKeyguardViewManager.hideBouncer(true); - - verify(action, never()).onDismiss(); - verify(cancelAction).run(); - } - - @Test - public void testHiding_doesntCancelWhenShowing() { - OnDismissAction action = mock(OnDismissAction.class); - Runnable cancelAction = mock(Runnable.class); - mStatusBarKeyguardViewManager.dismissWithAction( - action, cancelAction, true /* afterKeyguardGone */); - - mStatusBarKeyguardViewManager.hide(0, 30); - verify(action).onDismiss(); - verify(cancelAction, never()).run(); - } - - @Test - public void testBouncerIsOrWillBeShowing_whenBouncerIsInTransit() { - when(mPrimaryBouncer.isShowing()).thenReturn(false); - when(mPrimaryBouncer.inTransit()).thenReturn(true); - - assertTrue( - "Is or will be showing should be true when bouncer is in transit", - mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()); - } - - @Test - public void testUpdateResources_delegatesToBouncer() { - mStatusBarKeyguardViewManager.updateResources(); - - verify(mPrimaryBouncer).updateResources(); - } - - @Test - public void updateKeyguardPosition_delegatesToBouncer() { - mStatusBarKeyguardViewManager.updateKeyguardPosition(1.0f); - - verify(mPrimaryBouncer).updateKeyguardPosition(1.0f); - } - - @Test - public void testIsBouncerInTransit() { - when(mPrimaryBouncer.inTransit()).thenReturn(true); - Truth.assertThat(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit()).isTrue(); - when(mPrimaryBouncer.inTransit()).thenReturn(false); - Truth.assertThat(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit()).isFalse(); - mPrimaryBouncer = null; - Truth.assertThat(mStatusBarKeyguardViewManager.isPrimaryBouncerInTransit()).isFalse(); - } - - private static ShadeExpansionChangeEvent expansionEvent( - float fraction, boolean expanded, boolean tracking) { - return new ShadeExpansionChangeEvent( - fraction, expanded, tracking, /* dragDownPxAmount= */ 0f); - } - - @Test - public void testPredictiveBackCallback_registration() { - /* verify that a predictive back callback is registered when the bouncer becomes visible */ - mBouncerExpansionCallback.onVisibilityChanged(true); - verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), - mOnBackInvokedCallback.capture()); - - /* verify that the same callback is unregistered when the bouncer becomes invisible */ - mBouncerExpansionCallback.onVisibilityChanged(false); - verify(mOnBackInvokedDispatcher).unregisterOnBackInvokedCallback( - eq(mOnBackInvokedCallback.getValue())); - } - - @Test - public void testPredictiveBackCallback_invocationHidesBouncer() { - mBouncerExpansionCallback.onVisibilityChanged(true); - /* capture the predictive back callback during registration */ - verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback( - eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY), - mOnBackInvokedCallback.capture()); - - when(mPrimaryBouncer.isShowing()).thenReturn(true); - when(mCentralSurfaces.shouldKeyguardHideImmediately()).thenReturn(true); - /* invoke the back callback directly */ - mOnBackInvokedCallback.getValue().onBackInvoked(); - - /* verify that the bouncer will be hidden as a result of the invocation */ - verify(mCentralSurfaces).setBouncerShowing(eq(false)); - } - - @Test - public void testReportBouncerOnDreamWhenVisible() { - mBouncerExpansionCallback.onVisibilityChanged(true); - verify(mCentralSurfaces).setBouncerShowingOverDream(false); - Mockito.clearInvocations(mCentralSurfaces); - when(mDreamOverlayStateController.isOverlayActive()).thenReturn(true); - mBouncerExpansionCallback.onVisibilityChanged(true); - verify(mCentralSurfaces).setBouncerShowingOverDream(true); - } - - @Test - public void testReportBouncerOnDreamWhenNotVisible() { - mBouncerExpansionCallback.onVisibilityChanged(false); - verify(mCentralSurfaces).setBouncerShowingOverDream(false); - Mockito.clearInvocations(mCentralSurfaces); - when(mDreamOverlayStateController.isOverlayActive()).thenReturn(true); - mBouncerExpansionCallback.onVisibilityChanged(false); - verify(mCentralSurfaces).setBouncerShowingOverDream(false); - } - - @Test - public void flag_off_DoesNotCallBouncerInteractor() { - when(mFeatureFlags.isEnabled(MODERN_BOUNCER)).thenReturn(false); - mStatusBarKeyguardViewManager.hideBouncer(false); - verify(mPrimaryBouncerInteractor, never()).hide(); - } - - @Test - public void hideAlternateBouncer_beforeCentralSurfacesRegistered() { - mStatusBarKeyguardViewManager = - new StatusBarKeyguardViewManager( - getContext(), - mViewMediatorCallback, - mLockPatternUtils, - mStatusBarStateController, - mock(ConfigurationController.class), - mKeyguardUpdateMonitor, - mDreamOverlayStateController, - mock(NavigationModeController.class), - mock(DockManager.class), - mock(NotificationShadeWindowController.class), - mKeyguardStateController, - mock(NotificationMediaManager.class), - mKeyguardBouncerFactory, - mKeyguardMessageAreaFactory, - Optional.of(mSysUiUnfoldComponent), - () -> mShadeController, - mLatencyTracker, - mKeyguardSecurityModel, - mFeatureFlags, - mPrimaryBouncerCallbackInteractor, - mPrimaryBouncerInteractor, - mBouncerView, - mAlternateBouncerInteractor) { - @Override - public ViewRootImpl getViewRootImpl() { - return mViewRootImpl; - } - }; - - // the following call before registering centralSurfaces should NOT throw a NPE: - mStatusBarKeyguardViewManager.hideAlternateBouncer(true); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java index eef43bde1a23..8841521c19f5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java @@ -40,6 +40,7 @@ import com.android.systemui.InitController; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shade.NotificationPanelViewController; import com.android.systemui.shade.NotificationShadeWindowView; import com.android.systemui.shade.ShadeController; @@ -92,7 +93,7 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { mMetricsLogger = new FakeMetricsLogger(); LockscreenGestureLogger lockscreenGestureLogger = new LockscreenGestureLogger( mMetricsLogger); - mCommandQueue = new CommandQueue(mContext); + mCommandQueue = new CommandQueue(mContext, new FakeDisplayTracker(mContext)); mDependency.injectTestDependency(StatusBarStateController.class, mock(SysuiStatusBarStateController.class)); mDependency.injectTestDependency(ShadeController.class, mShadeController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java index 613238f7752e..929099a8f1f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java @@ -32,6 +32,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.shade.ShadeController; import com.android.systemui.statusbar.ActionClickLogger; import com.android.systemui.statusbar.CommandQueue; @@ -78,7 +79,8 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { mRemoteInputCallback = spy(new StatusBarRemoteInputCallback(mContext, mock(GroupExpansionManager.class), mNotificationLockscreenUserManager, mKeyguardStateController, mStatusBarStateController, mStatusBarKeyguardViewManager, - mActivityStarter, mShadeController, new CommandQueue(mContext), + mActivityStarter, mShadeController, + new CommandQueue(mContext, new FakeDisplayTracker(mContext)), mock(ActionClickLogger.class), mFakeExecutor)); mRemoteInputCallback.mChallengeReceiver = mRemoteInputCallback.new ChallengeReceiver(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index f230b876f05e..07e8d3c19518 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -23,10 +23,12 @@ import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedul import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -45,6 +47,7 @@ import android.widget.FrameLayout; import androidx.test.filters.SmallTest; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.R; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.dump.DumpManager; @@ -67,6 +70,8 @@ import com.android.systemui.statusbar.phone.StatusBarLocationPublisher; import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateController; +import com.android.systemui.statusbar.window.StatusBarWindowStateListener; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.settings.SecureSettings; @@ -79,6 +84,9 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.List; + @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) @SmallTest @@ -118,6 +126,12 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { private StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager; @Mock private DumpManager mDumpManager; + @Mock + private StatusBarWindowStateController mStatusBarWindowStateController; + @Mock + private KeyguardUpdateMonitor mKeyguardUpdateMonitor; + + private List<StatusBarWindowStateListener> mStatusBarWindowStateListeners = new ArrayList<>(); public CollapsedStatusBarFragmentTest() { super(CollapsedStatusBarFragment.class); @@ -127,6 +141,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { public void setup() { injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES); mDependency.injectMockDependency(DarkIconDispatcher.class); + + // Keep the window state listeners so we can dispatch to them to test the status bar + // fragment's response. + doAnswer(invocation -> { + mStatusBarWindowStateListeners.add(invocation.getArgument(0)); + return null; + }).when(mStatusBarWindowStateController).addListener( + any(StatusBarWindowStateListener.class)); } @Test @@ -414,6 +436,27 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertFalse(contains); } + @Test + public void testStatusBarIcons_hiddenThroughoutCameraLaunch() { + final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); + + mockSecureCameraLaunch(fragment, true /* launched */); + + // Status icons should be invisible or gone, but certainly not VISIBLE. + assertNotEquals(View.VISIBLE, getEndSideContentView().getVisibility()); + assertNotEquals(View.VISIBLE, getClockView().getVisibility()); + + mockSecureCameraLaunchFinished(); + + assertNotEquals(View.VISIBLE, getEndSideContentView().getVisibility()); + assertNotEquals(View.VISIBLE, getClockView().getVisibility()); + + mockSecureCameraLaunch(fragment, false /* launched */); + + assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); + assertEquals(View.VISIBLE, getClockView().getVisibility()); + } + @Override protected Fragment instantiate(Context context, String className, Bundle arguments) { MockitoAnnotations.initMocks(this); @@ -455,7 +498,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mOperatorNameViewControllerFactory, mSecureSettings, mExecutor, - mDumpManager); + mDumpManager, + mStatusBarWindowStateController, + mKeyguardUpdateMonitor); } private void setUpDaggerComponent() { @@ -478,6 +523,35 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mNotificationAreaInner); } + /** + * Configure mocks to return values consistent with the secure camera animating itself launched + * over the keyguard. + */ + private void mockSecureCameraLaunch(CollapsedStatusBarFragment fragment, boolean launched) { + when(mKeyguardUpdateMonitor.isSecureCameraLaunchedOverKeyguard()).thenReturn(launched); + when(mKeyguardStateController.isOccluded()).thenReturn(launched); + + if (launched) { + fragment.onCameraLaunchGestureDetected(0 /* source */); + } else { + for (StatusBarWindowStateListener listener : mStatusBarWindowStateListeners) { + listener.onStatusBarWindowStateChanged(StatusBarManager.WINDOW_STATE_SHOWING); + } + } + + fragment.disable(DEFAULT_DISPLAY, 0, 0, false); + } + + /** + * Configure mocks to return values consistent with the secure camera showing over the keyguard + * with its launch animation finished. + */ + private void mockSecureCameraLaunchFinished() { + for (StatusBarWindowStateListener listener : mStatusBarWindowStateListeners) { + listener.onStatusBarWindowStateChanged(StatusBarManager.WINDOW_STATE_HIDDEN); + } + } + private CollapsedStatusBarFragment resumeAndGetFragment() { mFragments.dispatchResume(); processAllMessages(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt index 1b62d5cc15b5..bd249221b6ca 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt @@ -28,6 +28,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobile import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeUserSetupRepository import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy import com.android.systemui.util.CarrierConfigTracker +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 @@ -77,6 +78,7 @@ class MobileIconsInteractorTest : SysuiTestCase() { MobileIconsInteractorImpl( connectionsRepository, carrierConfigTracker, + logger = mock(), userSetupRepository, testScope.backgroundScope, ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt index b32058fca109..3dccbbf26575 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt @@ -45,7 +45,7 @@ class ConnectivityPipelineLoggerTest : SysuiTestCase() { @Test fun testLogNetworkCapsChange_bufferHasInfo() { - logger.logOnCapabilitiesChanged(NET_1, NET_1_CAPS) + logger.logOnCapabilitiesChanged(NET_1, NET_1_CAPS, isDefaultNetworkCallback = true) val stringWriter = StringWriter() buffer.dump(PrintWriter(stringWriter), tailLength = 0) @@ -54,6 +54,7 @@ class ConnectivityPipelineLoggerTest : SysuiTestCase() { val expectedNetId = NET_1_ID.toString() val expectedCaps = NET_1_CAPS.toString() + assertThat(actualString).contains("true") assertThat(actualString).contains(expectedNetId) assertThat(actualString).contains(expectedCaps) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt index 3fe69837a761..e4c8fd0cd8a1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.pipeline.shared.ui.view +import android.graphics.Rect import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import androidx.test.filters.SmallTest @@ -118,6 +119,22 @@ class ModernStatusBarViewTest : SysuiTestCase() { assertThat(view.isIconVisible).isEqualTo(false) } + @Test + fun getDrawingRect_takesTranslationIntoAccount() { + val view = createAndInitView() + + view.translationX = 50f + view.translationY = 60f + + val drawingRect = Rect() + view.getDrawingRect(drawingRect) + + assertThat(drawingRect.left).isEqualTo(view.left + 50) + assertThat(drawingRect.right).isEqualTo(view.right + 50) + assertThat(drawingRect.top).isEqualTo(view.top + 60) + assertThat(drawingRect.bottom).isEqualTo(view.bottom + 60) + } + private fun createAndInitView(): ModernStatusBarView { val view = ModernStatusBarView(context, null) binding = TestBinding() diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt index 87ce8faff5a5..7099f1f0af2d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt @@ -21,7 +21,10 @@ import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED import android.net.NetworkCapabilities.TRANSPORT_CELLULAR +import android.net.NetworkCapabilities.TRANSPORT_VPN import android.net.NetworkCapabilities.TRANSPORT_WIFI +import android.net.TransportInfo +import android.net.VpnTransportInfo import android.net.vcn.VcnTransportInfo import android.net.wifi.WifiInfo import android.net.wifi.WifiManager @@ -243,6 +246,54 @@ class WifiRepositoryImplTest : SysuiTestCase() { job.cancel() } + /** Regression test for b/266628069. */ + @Test + fun isWifiDefault_transportInfoIsNotWifi_andNoWifiTransport_false() = + runBlocking(IMMEDIATE) { + val job = underTest.isWifiDefault.launchIn(this) + + val transportInfo = VpnTransportInfo( + /* type= */ 0, + /* sessionId= */ "sessionId", + ) + val networkCapabilities = mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_VPN)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(false) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(false) + whenever(it.transportInfo).thenReturn(transportInfo) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, networkCapabilities) + + assertThat(underTest.isWifiDefault.value).isFalse() + + job.cancel() + } + + /** Regression test for b/266628069. */ + @Test + fun isWifiDefault_transportInfoIsNotWifi_butHasWifiTransport_true() = + runBlocking(IMMEDIATE) { + val job = underTest.isWifiDefault.launchIn(this) + + val transportInfo = VpnTransportInfo( + /* type= */ 0, + /* sessionId= */ "sessionId", + ) + val networkCapabilities = mock<NetworkCapabilities>().also { + whenever(it.hasTransport(TRANSPORT_VPN)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(it.hasTransport(TRANSPORT_CELLULAR)).thenReturn(false) + whenever(it.transportInfo).thenReturn(transportInfo) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, networkCapabilities) + + assertThat(underTest.isWifiDefault.value).isTrue() + + job.cancel() + } + @Test fun isWifiDefault_cellularVcnNetwork_isTrue() = runBlocking(IMMEDIATE) { val job = underTest.isWifiDefault.launchIn(this) @@ -260,6 +311,24 @@ class WifiRepositoryImplTest : SysuiTestCase() { } @Test + fun wifiNetwork_cellularAndWifiTransports_usesCellular_isTrue() = + runBlocking(IMMEDIATE) { + val job = underTest.isWifiDefault.launchIn(this) + + val capabilities = mock<NetworkCapabilities>().apply { + whenever(this.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(this.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(this.transportInfo).thenReturn(VcnTransportInfo(PRIMARY_WIFI_INFO)) + } + + getDefaultNetworkCallback().onCapabilitiesChanged(NETWORK, capabilities) + + assertThat(underTest.isWifiDefault.value).isTrue() + + job.cancel() + } + + @Test fun isWifiDefault_cellularNotVcnNetwork_isFalse() = runBlocking(IMMEDIATE) { val job = underTest.isWifiDefault.launchIn(this) @@ -467,6 +536,28 @@ class WifiRepositoryImplTest : SysuiTestCase() { job.cancel() } + /** Regression test for b/266628069. */ + @Test + fun wifiNetwork_transportInfoIsNotWifi_flowHasNoNetwork() = + runBlocking(IMMEDIATE) { + var latest: WifiNetworkModel? = null + val job = underTest + .wifiNetwork + .onEach { latest = it } + .launchIn(this) + + val transportInfo = VpnTransportInfo( + /* type= */ 0, + /* sessionId= */ "sessionId", + ) + getNetworkCallback() + .onCapabilitiesChanged(NETWORK, createWifiNetworkCapabilities(transportInfo)) + + assertThat(latest is WifiNetworkModel.Inactive).isTrue() + + job.cancel() + } + @Test fun wifiNetwork_cellularVcnNetworkAdded_flowHasNetwork() = runBlocking(IMMEDIATE) { var latest: WifiNetworkModel? = null @@ -535,6 +626,31 @@ class WifiRepositoryImplTest : SysuiTestCase() { } @Test + fun wifiNetwork_cellularAndWifiTransports_usesCellular() = + runBlocking(IMMEDIATE) { + var latest: WifiNetworkModel? = null + val job = underTest + .wifiNetwork + .onEach { latest = it } + .launchIn(this) + + val capabilities = mock<NetworkCapabilities>().apply { + whenever(this.hasTransport(TRANSPORT_CELLULAR)).thenReturn(true) + whenever(this.hasTransport(TRANSPORT_WIFI)).thenReturn(true) + whenever(this.transportInfo).thenReturn(VcnTransportInfo(PRIMARY_WIFI_INFO)) + } + + getNetworkCallback().onCapabilitiesChanged(NETWORK, capabilities) + + assertThat(latest is WifiNetworkModel.Active).isTrue() + val latestActive = latest as WifiNetworkModel.Active + assertThat(latestActive.networkId).isEqualTo(NETWORK_ID) + assertThat(latestActive.ssid).isEqualTo(SSID) + + job.cancel() + } + + @Test fun wifiNetwork_newPrimaryWifiNetwork_flowHasNewNetwork() = runBlocking(IMMEDIATE) { var latest: WifiNetworkModel? = null val job = underTest @@ -870,12 +986,12 @@ class WifiRepositoryImplTest : SysuiTestCase() { } private fun createWifiNetworkCapabilities( - wifiInfo: WifiInfo, + transportInfo: TransportInfo, isValidated: Boolean = true, ): NetworkCapabilities { return mock<NetworkCapabilities>().also { whenever(it.hasTransport(TRANSPORT_WIFI)).thenReturn(true) - whenever(it.transportInfo).thenReturn(wifiInfo) + whenever(it.transportInfo).thenReturn(transportInfo) whenever(it.hasCapability(NET_CAPABILITY_VALIDATED)).thenReturn(isValidated) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt index dd04ac4d79f6..fc7436a6b273 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt @@ -79,6 +79,7 @@ class ChipbarCoordinatorTest : SysuiTestCase() { @Mock private lateinit var viewUtil: ViewUtil @Mock private lateinit var vibratorHelper: VibratorHelper @Mock private lateinit var swipeGestureHandler: SwipeChipbarAwayGestureHandler + private lateinit var chipbarAnimator: TestChipbarAnimator private lateinit var fakeWakeLockBuilder: WakeLockFake.Builder private lateinit var fakeWakeLock: WakeLockFake private lateinit var fakeClock: FakeSystemClock @@ -98,6 +99,7 @@ class ChipbarCoordinatorTest : SysuiTestCase() { fakeWakeLockBuilder.setWakeLock(fakeWakeLock) uiEventLoggerFake = UiEventLoggerFake() + chipbarAnimator = TestChipbarAnimator() underTest = ChipbarCoordinator( @@ -109,6 +111,7 @@ class ChipbarCoordinatorTest : SysuiTestCase() { configurationController, dumpManager, powerManager, + chipbarAnimator, falsingManager, falsingCollector, swipeGestureHandler, @@ -371,6 +374,26 @@ class ChipbarCoordinatorTest : SysuiTestCase() { verify(vibratorHelper).vibrate(VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK)) } + /** Regression test for b/266119467. */ + @Test + fun displayView_animationFailure_viewsStillBecomeVisible() { + chipbarAnimator.allowAnimation = false + + underTest.displayView( + createChipbarInfo( + Icon.Resource(R.id.check_box, null), + Text.Loaded("text"), + endItem = ChipbarEndItem.Loading, + ) + ) + + val view = getChipbarView() + assertThat(view.getInnerView().alpha).isEqualTo(1f) + assertThat(view.getStartIconView().alpha).isEqualTo(1f) + assertThat(view.getLoadingIcon().alpha).isEqualTo(1f) + assertThat(view.getChipTextView().alpha).isEqualTo(1f) + } + @Test fun updateView_viewUpdated() { // First, display a view @@ -453,6 +476,25 @@ class ChipbarCoordinatorTest : SysuiTestCase() { verify(windowManager).removeView(chipbarView) } + /** Regression test for b/266209420. */ + @Test + fun removeView_animationFailure_viewStillRemoved() { + chipbarAnimator.allowAnimation = false + + underTest.displayView( + createChipbarInfo( + Icon.Resource(R.drawable.ic_cake, contentDescription = null), + Text.Loaded("title text"), + endItem = ChipbarEndItem.Error, + ), + ) + val chipbarView = getChipbarView() + + underTest.removeView(DEVICE_ID, "test reason") + + verify(windowManager).removeView(chipbarView) + } + @Test fun swipeToDismiss_false_neverListensForGesture() { underTest.displayView( @@ -560,8 +602,9 @@ class ChipbarCoordinatorTest : SysuiTestCase() { private fun ViewGroup.getStartIconView() = this.requireViewById<ImageView>(R.id.start_icon) - private fun ViewGroup.getChipText(): String = - (this.requireViewById<TextView>(R.id.text)).text as String + private fun ViewGroup.getChipTextView() = this.requireViewById<TextView>(R.id.text) + + private fun ViewGroup.getChipText(): String = this.getChipTextView().text as String private fun ViewGroup.getLoadingIcon(): View = this.requireViewById(R.id.loading) @@ -574,6 +617,25 @@ class ChipbarCoordinatorTest : SysuiTestCase() { verify(windowManager).addView(viewCaptor.capture(), any()) return viewCaptor.value as ViewGroup } + + /** Test class that lets us disallow animations. */ + inner class TestChipbarAnimator : ChipbarAnimator() { + var allowAnimation: Boolean = true + + override fun animateViewIn(innerView: ViewGroup, onAnimationEnd: Runnable): Boolean { + if (!allowAnimation) { + return false + } + return super.animateViewIn(innerView, onAnimationEnd) + } + + override fun animateViewOut(innerView: ViewGroup, onAnimationEnd: Runnable): Boolean { + if (!allowAnimation) { + return false + } + return super.animateViewOut(innerView, onAnimationEnd) + } + } } private const val TIMEOUT = 10000 diff --git a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt index a87a95060a7e..c539246d4902 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt @@ -22,6 +22,7 @@ import android.view.View import androidx.test.filters.SmallTest import com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer import com.android.systemui.SysuiTestCase +import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever @@ -36,7 +37,7 @@ class SwipeChipbarAwayGestureHandlerTest : SysuiTestCase() { @Before fun setUp() { - underTest = SwipeChipbarAwayGestureHandler(context, mock()) + underTest = SwipeChipbarAwayGestureHandler(context, FakeDisplayTracker(mContext), mock()) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt index 034c618e55d4..ccf378a71abd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt @@ -17,12 +17,17 @@ package com.android.systemui.user.data.repository +import android.app.IActivityManager +import android.app.UserSwitchObserver import android.content.pm.UserInfo +import android.os.IRemoteCallback import android.os.UserHandle import android.os.UserManager import android.provider.Settings import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.Flags.FACE_AUTH_REFACTOR import com.android.systemui.settings.FakeUserTracker import com.android.systemui.user.data.model.UserSwitcherSettingsModel import com.android.systemui.util.settings.FakeSettings @@ -39,7 +44,14 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import org.mockito.ArgumentCaptor +import org.mockito.Captor import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.anyString +import org.mockito.Mockito.mock +import org.mockito.Mockito.times +import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations @@ -48,6 +60,8 @@ import org.mockito.MockitoAnnotations class UserRepositoryImplTest : SysuiTestCase() { @Mock private lateinit var manager: UserManager + @Mock private lateinit var activityManager: IActivityManager + @Captor private lateinit var userSwitchObserver: ArgumentCaptor<UserSwitchObserver> private lateinit var underTest: UserRepositoryImpl @@ -214,6 +228,34 @@ class UserRepositoryImplTest : SysuiTestCase() { assertThat(selectedUserInfo?.id).isEqualTo(1) } + @Test + fun userSwitchingInProgress_registersOnlyOneUserSwitchObserver() = runSelfCancelingTest { + underTest = create(this) + + underTest.userSwitchingInProgress.launchIn(this) + underTest.userSwitchingInProgress.launchIn(this) + underTest.userSwitchingInProgress.launchIn(this) + + verify(activityManager, times(1)).registerUserSwitchObserver(any(), anyString()) + } + + @Test + fun userSwitchingInProgress_propagatesStateFromActivityManager() = runSelfCancelingTest { + underTest = create(this) + verify(activityManager) + .registerUserSwitchObserver(userSwitchObserver.capture(), anyString()) + + userSwitchObserver.value.onUserSwitching(0, mock(IRemoteCallback::class.java)) + + var mostRecentSwitchingValue = false + underTest.userSwitchingInProgress.onEach { mostRecentSwitchingValue = it }.launchIn(this) + + assertThat(mostRecentSwitchingValue).isTrue() + + userSwitchObserver.value.onUserSwitchComplete(0) + assertThat(mostRecentSwitchingValue).isFalse() + } + private fun createUserInfo( id: Int, isGuest: Boolean, @@ -280,6 +322,8 @@ class UserRepositoryImplTest : SysuiTestCase() { } private fun create(scope: CoroutineScope = TestCoroutineScope()): UserRepositoryImpl { + val featureFlags = FakeFeatureFlags() + featureFlags.set(FACE_AUTH_REFACTOR, true) return UserRepositoryImpl( appContext = context, manager = manager, @@ -288,6 +332,8 @@ class UserRepositoryImplTest : SysuiTestCase() { backgroundDispatcher = IMMEDIATE, globalSettings = globalSettings, tracker = tracker, + activityManager = activityManager, + featureFlags = featureFlags, ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index 68ccc301755d..bc3343993737 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -91,6 +91,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.model.SysUiState; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.NotificationShadeWindowControllerImpl; import com.android.systemui.shade.NotificationShadeWindowView; @@ -287,6 +288,8 @@ public class BubblesTest extends SysuiTestCase { private TestableLooper mTestableLooper; + private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -333,7 +336,7 @@ public class BubblesTest extends SysuiTestCase { mZenModeConfig.suppressedVisualEffects = 0; when(mZenModeController.getConfig()).thenReturn(mZenModeConfig); - mSysUiState = new SysUiState(); + mSysUiState = new SysUiState(mDisplayTracker); mSysUiState.addCallback(sysUiFlags -> { mSysUiStateBubblesManageMenuExpanded = (sysUiFlags diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java index 7ae47b41d5ae..45489d974195 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/WMShellTest.java @@ -29,6 +29,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.model.SysUiState; import com.android.systemui.notetask.NoteTaskInitializer; +import com.android.systemui.settings.FakeDisplayTracker; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -63,6 +64,7 @@ import java.util.concurrent.Executor; @RunWith(AndroidJUnit4.class) public class WMShellTest extends SysuiTestCase { WMShell mWMShell; + FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); @Mock ShellInterface mShellInterface; @Mock CommandQueue mCommandQueue; @@ -100,6 +102,7 @@ public class WMShellTest extends SysuiTestCase { mProtoTracer, mWakefulnessLifecycle, mUserTracker, + mDisplayTracker, mNoteTaskInitializer, mSysUiMainExecutor ); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/FakeFeatureFlags.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/FakeFeatureFlags.kt index 6c82cef22ddb..b94f816e1ca4 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/FakeFeatureFlags.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/FakeFeatureFlags.kt @@ -38,12 +38,6 @@ class FakeFeatureFlags : FeatureFlags { } } - fun set(flag: DeviceConfigBooleanFlag, value: Boolean) { - if (booleanFlags.put(flag.id, value)?.let { value != it } != false) { - notifyFlagChanged(flag) - } - } - fun set(flag: ResourceBooleanFlag, value: Boolean) { if (booleanFlags.put(flag.id, value)?.let { value != it } != false) { notifyFlagChanged(flag) @@ -73,7 +67,7 @@ class FakeFeatureFlags : FeatureFlags { listeners.forEach { listener -> listener.onFlagChanged( object : FlagListenable.FlagEvent { - override val flagId = flag.id + override val flagName = flag.name override fun requestNoRestart() {} } ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBiometricRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBiometricSettingsRepository.kt index f3e52de0d7a0..044679d6e9a8 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBiometricRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeBiometricSettingsRepository.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -class FakeBiometricRepository : BiometricRepository { +class FakeBiometricSettingsRepository : BiometricSettingsRepository { private val _isFingerprintEnrolled = MutableStateFlow<Boolean>(false) override val isFingerprintEnrolled: StateFlow<Boolean> = _isFingerprintEnrolled.asStateFlow() diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeDeviceEntryFingerprintAuthRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeDeviceEntryFingerprintAuthRepository.kt new file mode 100644 index 000000000000..5641832b6ae2 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeDeviceEntryFingerprintAuthRepository.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.keyguard.data.repository + +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +class FakeDeviceEntryFingerprintAuthRepository : DeviceEntryFingerprintAuthRepository { + private val _isLockedOut = MutableStateFlow<Boolean>(false) + override val isLockedOut: StateFlow<Boolean> = _isLockedOut.asStateFlow() + + fun setLockedOut(lockedOut: Boolean) { + _isLockedOut.value = lockedOut + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardBouncerRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardBouncerRepository.kt new file mode 100644 index 000000000000..d0383e996121 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardBouncerRepository.kt @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.systemui.keyguard.data.repository + +import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN +import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel +import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow + +/** Fake implementation of [KeyguardRepository] */ +class FakeKeyguardBouncerRepository : KeyguardBouncerRepository { + private val _primaryBouncerVisible = MutableStateFlow(false) + override val primaryBouncerVisible = _primaryBouncerVisible.asStateFlow() + private val _primaryBouncerShow = MutableStateFlow<KeyguardBouncerModel?>(null) + override val primaryBouncerShow = _primaryBouncerShow.asStateFlow() + private val _primaryBouncerShowingSoon = MutableStateFlow(false) + override val primaryBouncerShowingSoon = _primaryBouncerShowingSoon.asStateFlow() + private val _primaryBouncerHide = MutableStateFlow(false) + override val primaryBouncerHide = _primaryBouncerHide.asStateFlow() + private val _primaryBouncerStartingToHide = MutableStateFlow(false) + override val primaryBouncerStartingToHide = _primaryBouncerStartingToHide.asStateFlow() + private val _primaryBouncerDisappearAnimation = MutableStateFlow<Runnable?>(null) + override val primaryBouncerStartingDisappearAnimation = + _primaryBouncerDisappearAnimation.asStateFlow() + private val _primaryBouncerScrimmed = MutableStateFlow(false) + override val primaryBouncerScrimmed = _primaryBouncerScrimmed.asStateFlow() + private val _panelExpansionAmount = MutableStateFlow(EXPANSION_HIDDEN) + override val panelExpansionAmount = _panelExpansionAmount.asStateFlow() + private val _keyguardPosition = MutableStateFlow(0f) + override val keyguardPosition = _keyguardPosition.asStateFlow() + private val _onScreenTurnedOff = MutableStateFlow(false) + override val onScreenTurnedOff = _onScreenTurnedOff.asStateFlow() + private val _isBackButtonEnabled = MutableStateFlow<Boolean?>(null) + override val isBackButtonEnabled = _isBackButtonEnabled.asStateFlow() + private val _keyguardAuthenticated = MutableStateFlow<Boolean?>(null) + override val keyguardAuthenticated = _keyguardAuthenticated.asStateFlow() + private val _showMessage = MutableStateFlow<BouncerShowMessageModel?>(null) + override val showMessage = _showMessage.asStateFlow() + private val _resourceUpdateRequests = MutableStateFlow(false) + override val resourceUpdateRequests = _resourceUpdateRequests.asStateFlow() + override val bouncerPromptReason = 0 + override val bouncerErrorMessage: CharSequence? = null + private val _isAlternateBouncerVisible = MutableStateFlow(false) + override val isAlternateBouncerVisible = _isAlternateBouncerVisible.asStateFlow() + override var lastAlternateBouncerVisibleTime: Long = 0L + private val _isAlternateBouncerUIAvailable = MutableStateFlow<Boolean>(false) + override val isAlternateBouncerUIAvailable = _isAlternateBouncerUIAvailable.asStateFlow() + + override fun setPrimaryScrimmed(isScrimmed: Boolean) { + _primaryBouncerScrimmed.value = isScrimmed + } + + override fun setPrimaryVisible(isVisible: Boolean) { + _primaryBouncerVisible.value = isVisible + } + + override fun setAlternateVisible(isVisible: Boolean) { + _isAlternateBouncerVisible.value = isVisible + } + + override fun setAlternateBouncerUIAvailable(isAvailable: Boolean) { + _isAlternateBouncerUIAvailable.value = isAvailable + } + + override fun setPrimaryShow(keyguardBouncerModel: KeyguardBouncerModel?) { + _primaryBouncerShow.value = keyguardBouncerModel + } + + override fun setPrimaryShowingSoon(showingSoon: Boolean) { + _primaryBouncerShowingSoon.value = showingSoon + } + + override fun setPrimaryHide(hide: Boolean) { + _primaryBouncerHide.value = hide + } + + override fun setPrimaryStartingToHide(startingToHide: Boolean) { + _primaryBouncerStartingToHide.value = startingToHide + } + + override fun setPrimaryStartDisappearAnimation(runnable: Runnable?) { + _primaryBouncerDisappearAnimation.value = runnable + } + + override fun setPanelExpansion(panelExpansion: Float) { + _panelExpansionAmount.value = panelExpansion + } + + override fun setKeyguardPosition(keyguardPosition: Float) { + _keyguardPosition.value = keyguardPosition + } + + override fun setResourceUpdateRequests(willUpdateResources: Boolean) { + _resourceUpdateRequests.value = willUpdateResources + } + + override fun setShowMessage(bouncerShowMessageModel: BouncerShowMessageModel?) { + _showMessage.value = bouncerShowMessageModel + } + + override fun setKeyguardAuthenticated(keyguardAuthenticated: Boolean?) { + _keyguardAuthenticated.value = keyguardAuthenticated + } + + override fun setIsBackButtonEnabled(isBackButtonEnabled: Boolean) { + _isBackButtonEnabled.value = isBackButtonEnabled + } + + override fun setOnScreenTurnedOff(onScreenTurnedOff: Boolean) { + _onScreenTurnedOff.value = onScreenTurnedOff + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeDisplayTracker.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeDisplayTracker.kt new file mode 100644 index 000000000000..6ae7c34e13f2 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeDisplayTracker.kt @@ -0,0 +1,76 @@ +/* + * 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.settings + +import android.content.Context +import android.hardware.display.DisplayManager +import android.view.Display +import java.util.concurrent.Executor + +class FakeDisplayTracker internal constructor(val context: Context) : DisplayTracker { + val displayManager: DisplayManager = context.getSystemService(DisplayManager::class.java)!! + override var defaultDisplayId: Int = Display.DEFAULT_DISPLAY + override var allDisplays: Array<Display> = displayManager.displays + + private val displayCallbacks: MutableList<DisplayTracker.Callback> = ArrayList() + private val brightnessCallbacks: MutableList<DisplayTracker.Callback> = ArrayList() + override fun addDisplayChangeCallback(callback: DisplayTracker.Callback, executor: Executor) { + displayCallbacks.add(callback) + } + override fun addBrightnessChangeCallback( + callback: DisplayTracker.Callback, + executor: Executor + ) { + brightnessCallbacks.add(callback) + } + + override fun removeCallback(callback: DisplayTracker.Callback) { + displayCallbacks.remove(callback) + brightnessCallbacks.remove(callback) + } + + fun setDefaultDisplay(displayId: Int) { + defaultDisplayId = displayId + } + + fun setDisplays(displays: Array<Display>) { + allDisplays = displays + } + + fun triggerOnDisplayAdded(displayId: Int) { + notifyCallbacks({ onDisplayAdded(displayId) }, displayCallbacks) + } + + fun triggerOnDisplayRemoved(displayId: Int) { + notifyCallbacks({ onDisplayRemoved(displayId) }, displayCallbacks) + } + + fun triggerOnDisplayChanged(displayId: Int) { + notifyCallbacks({ onDisplayChanged(displayId) }, displayCallbacks) + } + + fun triggerOnDisplayBrightnessChanged(displayId: Int) { + notifyCallbacks({ onDisplayChanged(displayId) }, brightnessCallbacks) + } + + private inline fun notifyCallbacks( + crossinline action: DisplayTracker.Callback.() -> Unit, + list: List<DisplayTracker.Callback> + ) { + list.forEach { it.action() } + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/user/data/repository/FakeUserRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/user/data/repository/FakeUserRepository.kt index ea5a302ce05a..1a8e244bf54f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/user/data/repository/FakeUserRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/user/data/repository/FakeUserRepository.kt @@ -39,6 +39,10 @@ class FakeUserRepository : UserRepository { private val _selectedUserInfo = MutableStateFlow<UserInfo?>(null) override val selectedUserInfo: Flow<UserInfo> = _selectedUserInfo.filterNotNull() + private val _userSwitchingInProgress = MutableStateFlow(false) + override val userSwitchingInProgress: Flow<Boolean> + get() = _userSwitchingInProgress + override var lastSelectedNonGuestUserId: Int = UserHandle.USER_SYSTEM private var _isGuestUserAutoCreated: Boolean = false diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 3584f16c6de1..ac782289606a 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -51,6 +51,7 @@ import android.app.GameManager.GameMode; import android.app.GameModeInfo; import android.app.GameState; import android.app.IGameManagerService; +import android.app.IUidObserver; import android.app.compat.PackageOverride; import android.content.BroadcastReceiver; import android.content.Context; @@ -118,6 +119,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; /** * Service to manage game related features. @@ -171,40 +173,19 @@ public final class GameManagerService extends IGameManagerService.Stub { private final ArrayMap<String, GamePackageConfiguration> mOverrideConfigs = new ArrayMap<>(); @Nullable private final GameServiceController mGameServiceController; + private final Object mUidObserverLock = new Object(); + @VisibleForTesting + @Nullable + final UidObserver mUidObserver; + @GuardedBy("mUidObserverLock") + private final Set<Integer> mForegroundGameUids = new HashSet<>(); public GameManagerService(Context context) { this(context, createServiceThread().getLooper()); } GameManagerService(Context context, Looper looper) { - mContext = context; - mHandler = new SettingsHandler(looper); - mPackageManager = mContext.getPackageManager(); - mUserManager = mContext.getSystemService(UserManager.class); - mPlatformCompat = IPlatformCompat.Stub.asInterface( - ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); - mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class); - mSystemDir = new File(Environment.getDataDirectory(), "system"); - mSystemDir.mkdirs(); - FileUtils.setPermissions(mSystemDir.toString(), - FileUtils.S_IRWXU | FileUtils.S_IRWXG | FileUtils.S_IROTH | FileUtils.S_IXOTH, - -1, -1); - mGameModeInterventionListFile = new AtomicFile(new File(mSystemDir, - GAME_MODE_INTERVENTION_LIST_FILE_NAME)); - FileUtils.setPermissions(mGameModeInterventionListFile.getBaseFile().getAbsolutePath(), - FileUtils.S_IRUSR | FileUtils.S_IWUSR - | FileUtils.S_IRGRP | FileUtils.S_IWGRP, - -1, -1); - if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_GAME_SERVICE)) { - mGameServiceController = new GameServiceController( - context, BackgroundThread.getExecutor(), - new GameServiceProviderSelectorImpl( - context.getResources(), - context.getPackageManager()), - new GameServiceProviderInstanceFactoryImpl(context)); - } else { - mGameServiceController = null; - } + this(context, looper, Environment.getDataDirectory()); } @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) @@ -237,6 +218,14 @@ public final class GameManagerService extends IGameManagerService.Stub { } else { mGameServiceController = null; } + mUidObserver = new UidObserver(); + try { + ActivityManager.getService().registerUidObserver(mUidObserver, + ActivityManager.UID_OBSERVER_PROCSTATE | ActivityManager.UID_OBSERVER_GONE, + ActivityManager.PROCESS_STATE_UNKNOWN, null); + } catch (RemoteException e) { + Slog.w(TAG, "Could not register UidObserver"); + } } @Override @@ -1874,4 +1863,66 @@ public final class GameManagerService extends IGameManagerService.Stub { * load dynamic library for frame rate overriding JNI calls */ private static native void nativeSetOverrideFrameRate(int uid, float frameRate); + + final class UidObserver extends IUidObserver.Stub { + @Override + public void onUidIdle(int uid, boolean disabled) {} + + @Override + public void onUidGone(int uid, boolean disabled) { + synchronized (mUidObserverLock) { + disableGameMode(uid); + } + } + + @Override + public void onUidActive(int uid) {} + + @Override + public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { + synchronized (mUidObserverLock) { + if (ActivityManager.isProcStateBackground(procState)) { + disableGameMode(uid); + return; + } + + final String[] packages = mContext.getPackageManager().getPackagesForUid(uid); + if (packages == null || packages.length == 0) { + return; + } + + final int userId = mContext.getUserId(); + if (!Arrays.stream(packages).anyMatch(p -> isPackageGame(p, userId))) { + return; + } + + if (mForegroundGameUids.isEmpty()) { + Slog.v(TAG, "Game power mode ON (process state was changed to foreground)"); + mPowerManagerInternal.setPowerMode(Mode.GAME, true); + } + mForegroundGameUids.add(uid); + } + } + + private void disableGameMode(int uid) { + synchronized (mUidObserverLock) { + if (!mForegroundGameUids.contains(uid)) { + return; + } + mForegroundGameUids.remove(uid); + if (!mForegroundGameUids.isEmpty()) { + return; + } + Slog.v(TAG, + "Game power mode OFF (process remomved or state changed to background)"); + mPowerManagerInternal.setPowerMode(Mode.GAME, false); + } + } + + @Override + public void onUidCachedChanged(int uid, boolean cached) {} + + @Override + public void onUidProcAdjChanged(int uid) {} + } } diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 278c98f45c44..0589cfc0967b 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -56,6 +56,7 @@ import android.util.PrintWriterPrinter; import com.android.internal.annotations.GuardedBy; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; @@ -434,6 +435,48 @@ import java.util.concurrent.atomic.AtomicBoolean; return device; } + private static final int[] VALID_COMMUNICATION_DEVICE_TYPES = { + AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, + AudioDeviceInfo.TYPE_BLUETOOTH_SCO, + AudioDeviceInfo.TYPE_WIRED_HEADSET, + AudioDeviceInfo.TYPE_USB_HEADSET, + AudioDeviceInfo.TYPE_BUILTIN_EARPIECE, + AudioDeviceInfo.TYPE_WIRED_HEADPHONES, + AudioDeviceInfo.TYPE_HEARING_AID, + AudioDeviceInfo.TYPE_BLE_HEADSET, + AudioDeviceInfo.TYPE_USB_DEVICE, + AudioDeviceInfo.TYPE_BLE_SPEAKER, + AudioDeviceInfo.TYPE_LINE_ANALOG, + AudioDeviceInfo.TYPE_HDMI, + AudioDeviceInfo.TYPE_AUX_LINE + }; + + /*package */ static boolean isValidCommunicationDevice(AudioDeviceInfo device) { + for (int type : VALID_COMMUNICATION_DEVICE_TYPES) { + if (device.getType() == type) { + return true; + } + } + return false; + } + + /* package */ static List<AudioDeviceInfo> getAvailableCommunicationDevices() { + ArrayList<AudioDeviceInfo> commDevices = new ArrayList<>(); + AudioDeviceInfo[] allDevices = + AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_OUTPUTS); + for (AudioDeviceInfo device : allDevices) { + if (isValidCommunicationDevice(device)) { + commDevices.add(device); + } + } + return commDevices; + } + + private @Nullable AudioDeviceInfo getCommunicationDeviceOfType(int type) { + return getAvailableCommunicationDevices().stream().filter(d -> d.getType() == type) + .findFirst().orElse(null); + } + /** * Returns the device currently requested for communication use case. * @return AudioDeviceInfo the requested device for communication. @@ -441,7 +484,29 @@ import java.util.concurrent.atomic.AtomicBoolean; /* package */ AudioDeviceInfo getCommunicationDevice() { synchronized (mDeviceStateLock) { updateActiveCommunicationDevice(); - return mActiveCommunicationDevice; + AudioDeviceInfo device = mActiveCommunicationDevice; + // make sure we return a valid communication device (i.e. a device that is allowed by + // setCommunicationDevice()) for consistency. + if (device != null) { + // a digital dock is used instead of the speaker in speakerphone mode and should + // be reflected as such + if (device.getType() == AudioDeviceInfo.TYPE_DOCK) { + device = getCommunicationDeviceOfType(AudioDeviceInfo.TYPE_BUILTIN_SPEAKER); + } + } + // Try to default to earpiece when current communication device is not valid. This can + // happen for instance if no call is active. If no earpiece device is available take the + // first valid communication device + if (device == null || !AudioDeviceBroker.isValidCommunicationDevice(device)) { + device = getCommunicationDeviceOfType(AudioDeviceInfo.TYPE_BUILTIN_EARPIECE); + if (device == null) { + List<AudioDeviceInfo> commDevices = getAvailableCommunicationDevices(); + if (!commDevices.isEmpty()) { + device = commDevices.get(0); + } + } + } + return device; } } @@ -918,8 +983,8 @@ import java.util.concurrent.atomic.AtomicBoolean; @GuardedBy("mDeviceStateLock") private void dispatchCommunicationDevice() { - int portId = (mActiveCommunicationDevice == null) ? 0 - : mActiveCommunicationDevice.getId(); + AudioDeviceInfo device = getCommunicationDevice(); + int portId = device != null ? device.getId() : 0; if (portId == mCurCommunicationPortId) { return; } @@ -936,6 +1001,7 @@ import java.util.concurrent.atomic.AtomicBoolean; mCommDevDispatchers.finishBroadcast(); } + //--------------------------------------------------------------------- // Communication with (to) AudioService //TODO check whether the AudioService methods are candidates to move here diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 8931ddee74fd..fa3a3bf85184 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1253,6 +1253,20 @@ public class AudioService extends IAudioService.Stub 0 /* arg1 */, 0 /* arg2 */, null /* obj */, 0 /* delay */); } + private void initVolumeStreamStates() { + int numStreamTypes = AudioSystem.getNumStreamTypes(); + synchronized (VolumeStreamState.class) { + for (int streamType = numStreamTypes - 1; streamType >= 0; streamType--) { + VolumeStreamState streamState = mStreamStates[streamType]; + int groupId = getVolumeGroupForStreamType(streamType); + if (groupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP + && sVolumeGroupStates.indexOfKey(groupId) >= 0) { + streamState.setVolumeGroupState(sVolumeGroupStates.get(groupId)); + } + } + } + } + /** * Separating notification volume from ring is NOT of aliasing the corresponding streams * @param properties @@ -1282,6 +1296,8 @@ public class AudioService extends IAudioService.Stub // mSafeUsbMediaVolumeIndex must be initialized after createStreamStates() because it // relies on audio policy having correct ranges for volume indexes. mSafeUsbMediaVolumeIndex = getSafeUsbMediaVolumeIndex(); + // Link VGS on VSS + initVolumeStreamStates(); // Call setRingerModeInt() to apply correct mute // state on streams affected by ringer mode. @@ -2178,19 +2194,19 @@ public class AudioService extends IAudioService.Stub AudioSystem.STREAM_ASSISTANT : AudioSystem.STREAM_MUSIC; if (mIsSingleVolume) { - mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION; + mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION.clone(); dtmfStreamAlias = AudioSystem.STREAM_MUSIC; } else if (mUseVolumeGroupAliases) { - mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE; + mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE.clone(); dtmfStreamAlias = AudioSystem.STREAM_DTMF; } else { switch (mPlatformType) { case AudioSystem.PLATFORM_VOICE: - mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE; + mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE.clone(); dtmfStreamAlias = AudioSystem.STREAM_RING; break; default: - mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT; + mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT.clone(); dtmfStreamAlias = AudioSystem.STREAM_MUSIC; } if (!mNotifAliasRing) { @@ -3340,15 +3356,7 @@ public class AudioService extends IAudioService.Stub } else { state = direction == AudioManager.ADJUST_MUTE; } - for (int stream = 0; stream < mStreamStates.length; stream++) { - if (streamTypeAlias == mStreamVolumeAlias[stream]) { - if (!(readCameraSoundForced() - && (mStreamStates[stream].getStreamType() - == AudioSystem.STREAM_SYSTEM_ENFORCED))) { - mStreamStates[stream].mute(state); - } - } - } + muteAliasStreams(streamTypeAlias, state); } else if ((direction == AudioManager.ADJUST_RAISE) && !checkSafeMediaVolume(streamTypeAlias, aliasIndex + step, device)) { Log.e(TAG, "adjustStreamVolume() safe volume index = " + oldIndex); @@ -3363,7 +3371,7 @@ public class AudioService extends IAudioService.Stub // Unmute the stream if it was previously muted if (direction == AudioManager.ADJUST_RAISE) { // unmute immediately for volume up - streamState.mute(false); + muteAliasStreams(streamTypeAlias, false); } else if (direction == AudioManager.ADJUST_LOWER) { if (mIsSingleVolume) { sendMsg(mAudioHandler, MSG_UNMUTE_STREAM, SENDMSG_QUEUE, @@ -3489,6 +3497,42 @@ public class AudioService extends IAudioService.Stub sendVolumeUpdate(streamType, oldIndex, newIndex, flags, device); } + /** + * Loops on aliasted stream, update the mute cache attribute of each + * {@see AudioService#VolumeStreamState}, and then apply the change. + * It prevents to unnecessary {@see AudioSystem#setStreamVolume} done for each stream + * and aliases before mute change changed and after. + */ + private void muteAliasStreams(int streamAlias, boolean state) { + synchronized (VolumeStreamState.class) { + List<Integer> streamsToMute = new ArrayList<>(); + for (int stream = 0; stream < mStreamStates.length; stream++) { + if (streamAlias == mStreamVolumeAlias[stream]) { + if (!(readCameraSoundForced() + && (mStreamStates[stream].getStreamType() + == AudioSystem.STREAM_SYSTEM_ENFORCED))) { + boolean changed = mStreamStates[stream].mute(state, /* apply= */ false); + if (changed) { + streamsToMute.add(stream); + } + } + } + } + streamsToMute.forEach(streamToMute -> { + mStreamStates[streamToMute].doMute(); + broadcastMuteSetting(streamToMute, state); + }); + } + } + + private void broadcastMuteSetting(int streamType, boolean isMuted) { + // Stream mute changed, fire the intent. + Intent intent = new Intent(AudioManager.STREAM_MUTE_CHANGED_ACTION); + intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, streamType); + intent.putExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, isMuted); + sendBroadcastToAll(intent); + } + // Called after a delay when volume down is pressed while muted private void onUnmuteStream(int stream, int flags) { boolean wasMuted; @@ -3593,8 +3637,19 @@ public class AudioService extends IAudioService.Stub return false; } + /** + * Update stream volume, ringer mode and mute status after a volume index change + * @param streamType + * @param index + * @param flags + * @param device the device for which the volume is changed + * @param caller + * @param hasModifyAudioSettings + * @param canChangeMute true if the origin of this event is one where the mute state should be + * updated following the change in volume index + */ private void onSetStreamVolume(int streamType, int index, int flags, int device, - String caller, boolean hasModifyAudioSettings) { + String caller, boolean hasModifyAudioSettings, boolean canChangeMute) { final int stream = mStreamVolumeAlias[streamType]; setStreamVolumeInt(stream, index, device, false, caller, hasModifyAudioSettings); // setting volume on ui sounds stream type also controls silent mode @@ -3604,11 +3659,10 @@ public class AudioService extends IAudioService.Stub TAG + ".onSetStreamVolume", false /*external*/); } // setting non-zero volume for a muted stream unmutes the stream and vice versa - // (only when changing volume for the current device), // except for BT SCO stream where only explicit mute is allowed to comply to BT requirements - if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO) - && (getDeviceForStream(stream) == device)) { - mStreamStates[stream].mute(index == 0); + if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO) && canChangeMute) { + // As adjustStreamVolume with muteAdjust flags mute/unmutes stream and aliased streams. + muteAliasStreams(stream, index == 0); } } @@ -3664,29 +3718,27 @@ public class AudioService extends IAudioService.Stub } - /** @see AudioManager#setVolumeIndexForAttributes(attr, int, int) */ - public void setVolumeIndexForAttributes(@NonNull AudioAttributes attr, int index, int flags, + /** @see AudioManager#setVolumeGroupVolumeIndex(int, int, int) */ + public void setVolumeGroupVolumeIndex(int groupId, int index, int flags, String callingPackage, String attributionTag) { enforceModifyAudioRoutingPermission(); - Objects.requireNonNull(attr, "attr must not be null"); - final int volumeGroup = getVolumeGroupIdForAttributes(attr); - if (sVolumeGroupStates.indexOfKey(volumeGroup) < 0) { - Log.e(TAG, ": no volume group found for attributes " + attr.toString()); + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + Log.e(TAG, ": no volume group found for id " + groupId); return; } - final VolumeGroupState vgs = sVolumeGroupStates.get(volumeGroup); + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); - sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_SET_GROUP_VOL, attr, vgs.name(), - index/*val1*/, flags/*val2*/, callingPackage)); + sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_SET_GROUP_VOL, vgs.name(), + index, flags, callingPackage + ", user " + getCurrentUserId())); vgs.setVolumeIndex(index, flags); // For legacy reason, propagate to all streams associated to this volume group - for (final int groupedStream : vgs.getLegacyStreamTypes()) { + for (int groupedStream : vgs.getLegacyStreamTypes()) { try { ensureValidStreamType(groupedStream); } catch (IllegalArgumentException e) { - Log.d(TAG, "volume group " + volumeGroup + " has internal streams (" + groupedStream + Log.d(TAG, "volume group " + groupId + " has internal streams (" + groupedStream + "), do not change associated stream volume"); continue; } @@ -3698,7 +3750,7 @@ public class AudioService extends IAudioService.Stub @Nullable private AudioVolumeGroup getAudioVolumeGroupById(int volumeGroupId) { - for (final AudioVolumeGroup avg : AudioVolumeGroup.getAudioVolumeGroups()) { + for (AudioVolumeGroup avg : AudioVolumeGroup.getAudioVolumeGroups()) { if (avg.getId() == volumeGroupId) { return avg; } @@ -3708,30 +3760,42 @@ public class AudioService extends IAudioService.Stub return null; } - /** @see AudioManager#getVolumeIndexForAttributes(attr) */ - public int getVolumeIndexForAttributes(@NonNull AudioAttributes attr) { + /** @see AudioManager#getVolumeGroupVolumeIndex(int) */ + public int getVolumeGroupVolumeIndex(int groupId) { enforceModifyAudioRoutingPermission(); - Objects.requireNonNull(attr, "attr must not be null"); - final int volumeGroup = getVolumeGroupIdForAttributes(attr); - if (sVolumeGroupStates.indexOfKey(volumeGroup) < 0) { - throw new IllegalArgumentException("No volume group for attributes " + attr); + synchronized (VolumeStreamState.class) { + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + throw new IllegalArgumentException("No volume group for id " + groupId); + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + // Return 0 when muted, not min index since for e.g. Voice Call, it has a non zero + // min but it mutable on permission condition. + return vgs.isMuted() ? 0 : vgs.getVolumeIndex(); } - final VolumeGroupState vgs = sVolumeGroupStates.get(volumeGroup); - return vgs.getVolumeIndex(); } - /** @see AudioManager#getMaxVolumeIndexForAttributes(attr) */ - public int getMaxVolumeIndexForAttributes(@NonNull AudioAttributes attr) { + /** @see AudioManager#getVolumeGroupMaxVolumeIndex(int) */ + public int getVolumeGroupMaxVolumeIndex(int groupId) { enforceModifyAudioRoutingPermission(); - Objects.requireNonNull(attr, "attr must not be null"); - return AudioSystem.getMaxVolumeIndexForAttributes(attr); + synchronized (VolumeStreamState.class) { + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + throw new IllegalArgumentException("No volume group for id " + groupId); + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + return vgs.getMaxIndex(); + } } - /** @see AudioManager#getMinVolumeIndexForAttributes(attr) */ - public int getMinVolumeIndexForAttributes(@NonNull AudioAttributes attr) { + /** @see AudioManager#getVolumeGroupMinVolumeIndex(int) */ + public int getVolumeGroupMinVolumeIndex(int groupId) { enforceModifyAudioRoutingPermission(); - Objects.requireNonNull(attr, "attr must not be null"); - return AudioSystem.getMinVolumeIndexForAttributes(attr); + synchronized (VolumeStreamState.class) { + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + throw new IllegalArgumentException("No volume group for id " + groupId); + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + return vgs.getMinIndex(); + } } /** @see AudioDeviceVolumeManager#setDeviceVolume(VolumeInfo, AudioDeviceAttributes) @@ -3808,6 +3872,70 @@ public class AudioService extends IAudioService.Stub callingPackage, /*attributionTag*/ null); } + /** @see AudioManager#adjustVolumeGroupVolume(int, int, int) */ + public void adjustVolumeGroupVolume(int groupId, int direction, int flags, + String callingPackage) { + ensureValidDirection(direction); + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + Log.e(TAG, ": no volume group found for id " + groupId); + return; + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + // For compatibility reason, use stream API if group linked to a valid stream + boolean fallbackOnStream = false; + for (int stream : vgs.getLegacyStreamTypes()) { + try { + ensureValidStreamType(stream); + } catch (IllegalArgumentException e) { + Log.d(TAG, "volume group " + groupId + " has internal streams (" + stream + + "), do not change associated stream volume"); + continue; + } + // Note: Group and Stream does not share same convention, 0 is mute for stream, + // min index is acting as mute for Groups + if (vgs.isVssMuteBijective(stream)) { + adjustStreamVolume(stream, direction, flags, callingPackage); + if (isMuteAdjust(direction)) { + // will be propagated to all aliased streams + return; + } + fallbackOnStream = true; + } + } + if (fallbackOnStream) { + // Handled by at least one stream, will be propagated to group, bailing out. + return; + } + sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_ADJUST_GROUP_VOL, vgs.name(), + direction, flags, callingPackage)); + vgs.adjustVolume(direction, flags); + } + + /** @see AudioManager#getLastAudibleVolumeGroupVolume(int) */ + public int getLastAudibleVolumeGroupVolume(int groupId) { + enforceQueryStatePermission(); + synchronized (VolumeStreamState.class) { + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + Log.e(TAG, ": no volume group found for id " + groupId); + return 0; + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + return vgs.getVolumeIndex(); + } + } + + /** @see AudioManager#isVolumeGroupMuted(int) */ + public boolean isVolumeGroupMuted(int groupId) { + synchronized (VolumeStreamState.class) { + if (sVolumeGroupStates.indexOfKey(groupId) < 0) { + Log.e(TAG, ": no volume group found for id " + groupId); + return false; + } + VolumeGroupState vgs = sVolumeGroupStates.get(groupId); + return vgs.isMuted(); + } + } + /** @see AudioManager#setStreamVolume(int, int, int) * Part of service interface, check permissions here */ public void setStreamVolumeWithAttribution(int streamType, int index, int flags, @@ -4247,7 +4375,10 @@ public class AudioService extends IAudioService.Stub mPendingVolumeCommand = new StreamVolumeCommand( streamType, index, flags, device); } else { - onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings); + onSetStreamVolume(streamType, index, flags, device, caller, hasModifyAudioSettings, + // ada is non-null when called from setDeviceVolume, + // which shouldn't update the mute state + ada == null /*canChangeMute*/); index = mStreamStates[streamType].getIndex(device); } } @@ -4264,31 +4395,6 @@ public class AudioService extends IAudioService.Stub } } - - - private int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) { - Objects.requireNonNull(attributes, "attributes must not be null"); - int volumeGroupId = getVolumeGroupIdForAttributesInt(attributes); - if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) { - return volumeGroupId; - } - // The default volume group is the one hosted by default product strategy, i.e. - // supporting Default Attributes - return getVolumeGroupIdForAttributesInt(AudioProductStrategy.getDefaultAttributes()); - } - - private int getVolumeGroupIdForAttributesInt(@NonNull AudioAttributes attributes) { - Objects.requireNonNull(attributes, "attributes must not be null"); - for (final AudioProductStrategy productStrategy : - AudioProductStrategy.getAudioProductStrategies()) { - int volumeGroupId = productStrategy.getVolumeGroupIdForAudioAttributes(attributes); - if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) { - return volumeGroupId; - } - } - return AudioVolumeGroup.DEFAULT_VOLUME_GROUP; - } - private void dispatchAbsoluteVolumeChanged(int streamType, AbsoluteVolumeDeviceInfo deviceInfo, int index) { VolumeInfo volumeInfo = deviceInfo.getMatchingVolumeInfoForStream(streamType); @@ -4321,7 +4427,6 @@ public class AudioService extends IAudioService.Stub } } - // No ringer or zen muted stream volumes can be changed unless it'll exit dnd private boolean volumeAdjustmentAllowedByDnd(int streamTypeAlias, int flags) { switch (mNm.getZenMode()) { @@ -5013,7 +5118,7 @@ public class AudioService extends IAudioService.Stub } private void setRingerMode(int ringerMode, String caller, boolean external) { - if (mUseFixedVolume || mIsSingleVolume) { + if (mUseFixedVolume || mIsSingleVolume || mUseVolumeGroupAliases) { return; } if (caller == null || caller.length() == 0) { @@ -5838,7 +5943,7 @@ public class AudioService extends IAudioService.Stub } } - readVolumeGroupsSettings(); + readVolumeGroupsSettings(userSwitch); if (DEBUG_VOL) { Log.d(TAG, "Restoring device volume behavior"); @@ -5846,46 +5951,16 @@ public class AudioService extends IAudioService.Stub restoreDeviceVolumeBehavior(); } - private static final int[] VALID_COMMUNICATION_DEVICE_TYPES = { - AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, - AudioDeviceInfo.TYPE_BLUETOOTH_SCO, - AudioDeviceInfo.TYPE_WIRED_HEADSET, - AudioDeviceInfo.TYPE_USB_HEADSET, - AudioDeviceInfo.TYPE_BUILTIN_EARPIECE, - AudioDeviceInfo.TYPE_WIRED_HEADPHONES, - AudioDeviceInfo.TYPE_HEARING_AID, - AudioDeviceInfo.TYPE_BLE_HEADSET, - AudioDeviceInfo.TYPE_USB_DEVICE, - AudioDeviceInfo.TYPE_BLE_SPEAKER, - AudioDeviceInfo.TYPE_LINE_ANALOG, - AudioDeviceInfo.TYPE_HDMI, - AudioDeviceInfo.TYPE_AUX_LINE - }; - - private boolean isValidCommunicationDevice(AudioDeviceInfo device) { - for (int type : VALID_COMMUNICATION_DEVICE_TYPES) { - if (device.getType() == type) { - return true; - } - } - return false; - } - /** @see AudioManager#getAvailableCommunicationDevices(int) */ public int[] getAvailableCommunicationDeviceIds() { - ArrayList<Integer> deviceIds = new ArrayList<>(); - AudioDeviceInfo[] devices = AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_OUTPUTS); - for (AudioDeviceInfo device : devices) { - if (isValidCommunicationDevice(device)) { - deviceIds.add(device.getId()); - } - } - return deviceIds.stream().mapToInt(Integer::intValue).toArray(); + List<AudioDeviceInfo> commDevices = AudioDeviceBroker.getAvailableCommunicationDevices(); + return commDevices.stream().mapToInt(AudioDeviceInfo::getId).toArray(); } - /** - * @see AudioManager#setCommunicationDevice(int) - * @see AudioManager#clearCommunicationDevice() - */ + + /** + * @see AudioManager#setCommunicationDevice(int) + * @see AudioManager#clearCommunicationDevice() + */ public boolean setCommunicationDevice(IBinder cb, int portId) { final int uid = Binder.getCallingUid(); final int pid = Binder.getCallingPid(); @@ -5897,7 +5972,7 @@ public class AudioService extends IAudioService.Stub Log.w(TAG, "setCommunicationDevice: invalid portID " + portId); return false; } - if (!isValidCommunicationDevice(device)) { + if (!AudioDeviceBroker.isValidCommunicationDevice(device)) { throw new IllegalArgumentException("invalid device type " + device.getType()); } } @@ -5940,13 +6015,15 @@ public class AudioService extends IAudioService.Stub /** @see AudioManager#getCommunicationDevice() */ public int getCommunicationDevice() { + int deviceId = 0; final long ident = Binder.clearCallingIdentity(); - AudioDeviceInfo device = mDeviceBroker.getCommunicationDevice(); - Binder.restoreCallingIdentity(ident); - if (device == null) { - return 0; + try { + AudioDeviceInfo device = mDeviceBroker.getCommunicationDevice(); + deviceId = device != null ? device.getId() : 0; + } finally { + Binder.restoreCallingIdentity(ident); } - return device.getId(); + return deviceId; } /** @see AudioManager#addOnCommunicationDeviceChangedListener( @@ -7314,6 +7391,7 @@ public class AudioService extends IAudioService.Stub try { // if no valid attributes, this volume group is not controllable, throw exception ensureValidAttributes(avg); + sVolumeGroupStates.append(avg.getId(), new VolumeGroupState(avg)); } catch (IllegalArgumentException e) { // Volume Groups without attributes are not controllable through set/get volume // using attributes. Do not append them. @@ -7322,11 +7400,10 @@ public class AudioService extends IAudioService.Stub } continue; } - sVolumeGroupStates.append(avg.getId(), new VolumeGroupState(avg)); } for (int i = 0; i < sVolumeGroupStates.size(); i++) { final VolumeGroupState vgs = sVolumeGroupStates.valueAt(i); - vgs.applyAllVolumes(); + vgs.applyAllVolumes(/* userSwitch= */ false); } } @@ -7339,14 +7416,22 @@ public class AudioService extends IAudioService.Stub } } - private void readVolumeGroupsSettings() { - if (DEBUG_VOL) { - Log.v(TAG, "readVolumeGroupsSettings"); - } - for (int i = 0; i < sVolumeGroupStates.size(); i++) { - final VolumeGroupState vgs = sVolumeGroupStates.valueAt(i); - vgs.readSettings(); - vgs.applyAllVolumes(); + private void readVolumeGroupsSettings(boolean userSwitch) { + synchronized (mSettingsLock) { + synchronized (VolumeStreamState.class) { + if (DEBUG_VOL) { + Log.d(TAG, "readVolumeGroupsSettings userSwitch=" + userSwitch); + } + for (int i = 0; i < sVolumeGroupStates.size(); i++) { + VolumeGroupState vgs = sVolumeGroupStates.valueAt(i); + // as for STREAM_MUSIC, preserve volume from one user to the next. + if (!(userSwitch && vgs.isMusic())) { + vgs.clearIndexCache(); + vgs.readSettings(); + } + vgs.applyAllVolumes(userSwitch); + } + } } } @@ -7357,7 +7442,7 @@ public class AudioService extends IAudioService.Stub } for (int i = 0; i < sVolumeGroupStates.size(); i++) { final VolumeGroupState vgs = sVolumeGroupStates.valueAt(i); - vgs.applyAllVolumes(); + vgs.applyAllVolumes(false/*userSwitch*/); } } @@ -7370,17 +7455,34 @@ public class AudioService extends IAudioService.Stub } } + private static boolean isCallStream(int stream) { + return stream == AudioSystem.STREAM_VOICE_CALL + || stream == AudioSystem.STREAM_BLUETOOTH_SCO; + } + + private static int getVolumeGroupForStreamType(int stream) { + AudioAttributes attributes = + AudioProductStrategy.getAudioAttributesForStrategyWithLegacyStreamType(stream); + if (attributes.equals(new AudioAttributes.Builder().build())) { + return AudioVolumeGroup.DEFAULT_VOLUME_GROUP; + } + return AudioProductStrategy.getVolumeGroupIdForAudioAttributes( + attributes, /* fallbackOnDefault= */ false); + } + // NOTE: Locking order for synchronized objects related to volume management: // 1 mSettingsLock - // 2 VolumeGroupState.class + // 2 VolumeStreamState.class private class VolumeGroupState { private final AudioVolumeGroup mAudioVolumeGroup; private final SparseIntArray mIndexMap = new SparseIntArray(8); private int mIndexMin; private int mIndexMax; - private int mLegacyStreamType = AudioSystem.STREAM_DEFAULT; + private boolean mHasValidStreamType = false; private int mPublicStreamType = AudioSystem.STREAM_MUSIC; private AudioAttributes mAudioAttributes = AudioProductStrategy.getDefaultAttributes(); + private boolean mIsMuted = false; + private final String mSettingName; // No API in AudioSystem to get a device from strategy or from attributes. // Need a valid public stream type to use current API getDeviceForStream @@ -7394,20 +7496,22 @@ public class AudioService extends IAudioService.Stub Log.v(TAG, "VolumeGroupState for " + avg.toString()); } // mAudioAttributes is the default at this point - for (final AudioAttributes aa : avg.getAudioAttributes()) { + for (AudioAttributes aa : avg.getAudioAttributes()) { if (!aa.equals(mAudioAttributes)) { mAudioAttributes = aa; break; } } - final int[] streamTypes = mAudioVolumeGroup.getLegacyStreamTypes(); + int[] streamTypes = mAudioVolumeGroup.getLegacyStreamTypes(); + String streamSettingName = ""; if (streamTypes.length != 0) { // Uses already initialized MIN / MAX if a stream type is attached to group - mLegacyStreamType = streamTypes[0]; - for (final int streamType : streamTypes) { + for (int streamType : streamTypes) { if (streamType != AudioSystem.STREAM_DEFAULT && streamType < AudioSystem.getNumStreamTypes()) { mPublicStreamType = streamType; + mHasValidStreamType = true; + streamSettingName = System.VOLUME_SETTINGS_INT[mPublicStreamType]; break; } } @@ -7417,10 +7521,10 @@ public class AudioService extends IAudioService.Stub mIndexMin = AudioSystem.getMinVolumeIndexForAttributes(mAudioAttributes); mIndexMax = AudioSystem.getMaxVolumeIndexForAttributes(mAudioAttributes); } else { - Log.e(TAG, "volume group: " + mAudioVolumeGroup.name() + throw new IllegalArgumentException("volume group: " + mAudioVolumeGroup.name() + " has neither valid attributes nor valid stream types assigned"); - return; } + mSettingName = !streamSettingName.isEmpty() ? streamSettingName : ("volume_" + name()); // Load volume indexes from data base readSettings(); } @@ -7433,40 +7537,149 @@ public class AudioService extends IAudioService.Stub return mAudioVolumeGroup.name(); } + /** + * Volume group with non null minimum index are considered as non mutable, thus + * bijectivity is broken with potential associated stream type. + * VOICE_CALL stream has minVolumeIndex > 0 but can be muted directly by an + * app that has MODIFY_PHONE_STATE permission. + */ + private boolean isVssMuteBijective(int stream) { + return isStreamAffectedByMute(stream) + && (getMinIndex() == (mStreamStates[stream].mIndexMin + 5) / 10) + && (getMinIndex() == 0 || isCallStream(stream)); + } + + private boolean isMutable() { + return mIndexMin == 0 || (mHasValidStreamType && isVssMuteBijective(mPublicStreamType)); + } + /** + * Mute/unmute the volume group + * @param muted the new mute state + */ + @GuardedBy("AudioService.VolumeStreamState.class") + public boolean mute(boolean muted) { + if (!isMutable()) { + // Non mutable volume group + if (DEBUG_VOL) { + Log.d(TAG, "invalid mute on unmutable volume group " + name()); + } + return false; + } + boolean changed = (mIsMuted != muted); + // As for VSS, mute shall apply minIndex to all devices found in IndexMap and default. + if (changed) { + mIsMuted = muted; + applyAllVolumes(false /*userSwitch*/); + } + return changed; + } + + public boolean isMuted() { + return mIsMuted; + } + + public void adjustVolume(int direction, int flags) { + synchronized (VolumeStreamState.class) { + int device = getDeviceForVolume(); + int previousIndex = getIndex(device); + if (isMuteAdjust(direction) && !isMutable()) { + // Non mutable volume group + if (DEBUG_VOL) { + Log.d(TAG, "invalid mute on unmutable volume group " + name()); + } + return; + } + switch (direction) { + case AudioManager.ADJUST_TOGGLE_MUTE: { + // Note: If muted by volume 0, unmute will restore volume 0. + mute(!mIsMuted); + break; + } + case AudioManager.ADJUST_UNMUTE: + // Note: If muted by volume 0, unmute will restore volume 0. + mute(false); + break; + case AudioManager.ADJUST_MUTE: + // May be already muted by setvolume 0, prevent from setting same value + if (previousIndex != 0) { + // bypass persist + mute(true); + } + mIsMuted = true; + break; + case AudioManager.ADJUST_RAISE: + // As for stream, RAISE during mute will increment the index + setVolumeIndex(Math.min(previousIndex + 1, mIndexMax), device, flags); + break; + case AudioManager.ADJUST_LOWER: + // For stream, ADJUST_LOWER on a muted VSS is a no-op + // If we decide to unmute on ADJUST_LOWER, cannot fallback on + // adjustStreamVolume for group associated to legacy stream type + if (isMuted() && previousIndex != 0) { + mute(false); + } else { + int newIndex = Math.max(previousIndex - 1, mIndexMin); + setVolumeIndex(newIndex, device, flags); + } + break; + } + } + } + public int getVolumeIndex() { - return getIndex(getDeviceForVolume()); + synchronized (VolumeStreamState.class) { + return getIndex(getDeviceForVolume()); + } } public void setVolumeIndex(int index, int flags) { - if (mUseFixedVolume) { - return; + synchronized (VolumeStreamState.class) { + if (mUseFixedVolume) { + return; + } + setVolumeIndex(index, getDeviceForVolume(), flags); } - setVolumeIndex(index, getDeviceForVolume(), flags); } + @GuardedBy("AudioService.VolumeStreamState.class") private void setVolumeIndex(int index, int device, int flags) { - // Set the volume index - setVolumeIndexInt(index, device, flags); + // Update cache & persist (muted by volume 0 shall be persisted) + updateVolumeIndex(index, device); + // setting non-zero volume for a muted stream unmutes the stream and vice versa, + boolean changed = mute(index == 0); + if (!changed) { + // Set the volume index only if mute operation is a no-op + index = getValidIndex(index); + setVolumeIndexInt(index, device, flags); + } + } - // Update local cache - mIndexMap.put(device, index); + @GuardedBy("AudioService.VolumeStreamState.class") + public void updateVolumeIndex(int index, int device) { + // Filter persistency if already exist and the index has not changed + if (mIndexMap.indexOfKey(device) < 0 || mIndexMap.get(device) != index) { + // Update local cache + mIndexMap.put(device, getValidIndex(index)); - // update data base - post a persist volume group msg - sendMsg(mAudioHandler, - MSG_PERSIST_VOLUME_GROUP, - SENDMSG_QUEUE, - device, - 0, - this, - PERSIST_DELAY); + // update data base - post a persist volume group msg + sendMsg(mAudioHandler, + MSG_PERSIST_VOLUME_GROUP, + SENDMSG_QUEUE, + device, + 0, + this, + PERSIST_DELAY); + } } + @GuardedBy("AudioService.VolumeStreamState.class") private void setVolumeIndexInt(int index, int device, int flags) { // Reflect mute state of corresponding stream by forcing index to 0 if muted // Only set audio policy BT SCO stream volume to 0 when the stream is actually muted. // This allows RX path muting by the audio HAL only when explicitly muted but not when // index is just set to 0 to repect BT requirements - if (mStreamStates[mPublicStreamType].isFullyMuted()) { + if (mHasValidStreamType && isVssMuteBijective(mPublicStreamType) + && mStreamStates[mPublicStreamType].isFullyMuted()) { index = 0; } else if (mPublicStreamType == AudioSystem.STREAM_BLUETOOTH_SCO && index == 0) { index = 1; @@ -7475,18 +7688,16 @@ public class AudioService extends IAudioService.Stub AudioSystem.setVolumeIndexForAttributes(mAudioAttributes, index, device); } - public int getIndex(int device) { - synchronized (VolumeGroupState.class) { - int index = mIndexMap.get(device, -1); - // there is always an entry for AudioSystem.DEVICE_OUT_DEFAULT - return (index != -1) ? index : mIndexMap.get(AudioSystem.DEVICE_OUT_DEFAULT); - } + @GuardedBy("AudioService.VolumeStreamState.class") + private int getIndex(int device) { + int index = mIndexMap.get(device, -1); + // there is always an entry for AudioSystem.DEVICE_OUT_DEFAULT + return (index != -1) ? index : mIndexMap.get(AudioSystem.DEVICE_OUT_DEFAULT); } - public boolean hasIndexForDevice(int device) { - synchronized (VolumeGroupState.class) { - return (mIndexMap.get(device, -1) != -1); - } + @GuardedBy("AudioService.VolumeStreamState.class") + private boolean hasIndexForDevice(int device) { + return (mIndexMap.get(device, -1) != -1); } public int getMaxIndex() { @@ -7497,55 +7708,108 @@ public class AudioService extends IAudioService.Stub return mIndexMin; } - private boolean isValidLegacyStreamType() { - return (mLegacyStreamType != AudioSystem.STREAM_DEFAULT) - && (mLegacyStreamType < mStreamStates.length); + private boolean isValidStream(int stream) { + return (stream != AudioSystem.STREAM_DEFAULT) && (stream < mStreamStates.length); } - public void applyAllVolumes() { - synchronized (VolumeGroupState.class) { - int deviceForStream = AudioSystem.DEVICE_NONE; - int volumeIndexForStream = 0; - if (isValidLegacyStreamType()) { - // Prevent to apply settings twice when group is associated to public stream - deviceForStream = getDeviceForStream(mLegacyStreamType); - volumeIndexForStream = getStreamVolume(mLegacyStreamType); - } + public boolean isMusic() { + return mHasValidStreamType && mPublicStreamType == AudioSystem.STREAM_MUSIC; + } + + public void applyAllVolumes(boolean userSwitch) { + String caller = "from vgs"; + synchronized (VolumeStreamState.class) { // apply device specific volumes first - int index; for (int i = 0; i < mIndexMap.size(); i++) { - final int device = mIndexMap.keyAt(i); + int device = mIndexMap.keyAt(i); + int index = mIndexMap.valueAt(i); + boolean synced = false; if (device != AudioSystem.DEVICE_OUT_DEFAULT) { - index = mIndexMap.valueAt(i); - if (device == deviceForStream && volumeIndexForStream == index) { - continue; + for (int stream : getLegacyStreamTypes()) { + if (isValidStream(stream)) { + boolean streamMuted = mStreamStates[stream].mIsMuted; + int deviceForStream = getDeviceForStream(stream); + int indexForStream = + (mStreamStates[stream].getIndex(deviceForStream) + 5) / 10; + if (device == deviceForStream) { + if (indexForStream == index && (isMuted() == streamMuted) + && isVssMuteBijective(stream)) { + synced = true; + continue; + } + if (indexForStream != index) { + mStreamStates[stream].setIndex(index * 10, device, caller, + true /*hasModifyAudioSettings*/); + } + if ((isMuted() != streamMuted) && isVssMuteBijective(stream)) { + mStreamStates[stream].mute(isMuted()); + } + } + } } - if (DEBUG_VOL) { - Log.v(TAG, "applyAllVolumes: restore index " + index + " for group " - + mAudioVolumeGroup.name() + " and device " - + AudioSystem.getOutputDeviceName(device)); + if (!synced) { + if (DEBUG_VOL) { + Log.d(TAG, "applyAllVolumes: apply index " + index + ", group " + + mAudioVolumeGroup.name() + " and device " + + AudioSystem.getOutputDeviceName(device)); + } + setVolumeIndexInt(isMuted() ? 0 : index, device, 0 /*flags*/); } - setVolumeIndexInt(index, device, 0 /*flags*/); } } // apply default volume last: by convention , default device volume will be used // by audio policy manager if no explicit volume is present for a given device type - index = getIndex(AudioSystem.DEVICE_OUT_DEFAULT); - if (DEBUG_VOL) { - Log.v(TAG, "applyAllVolumes: restore default device index " + index - + " for group " + mAudioVolumeGroup.name()); + int index = getIndex(AudioSystem.DEVICE_OUT_DEFAULT); + boolean synced = false; + int deviceForVolume = getDeviceForVolume(); + boolean forceDeviceSync = userSwitch && (mIndexMap.indexOfKey(deviceForVolume) < 0); + for (int stream : getLegacyStreamTypes()) { + if (isValidStream(stream)) { + boolean streamMuted = mStreamStates[stream].mIsMuted; + int defaultStreamIndex = (mStreamStates[stream].getIndex( + AudioSystem.DEVICE_OUT_DEFAULT) + 5) / 10; + if (forceDeviceSync) { + mStreamStates[stream].setIndex(index * 10, deviceForVolume, caller, + true /*hasModifyAudioSettings*/); + } + if (defaultStreamIndex == index && (isMuted() == streamMuted) + && isVssMuteBijective(stream)) { + synced = true; + continue; + } + if (defaultStreamIndex != index) { + mStreamStates[stream].setIndex( + index * 10, AudioSystem.DEVICE_OUT_DEFAULT, caller, + true /*hasModifyAudioSettings*/); + } + if ((isMuted() != streamMuted) && isVssMuteBijective(stream)) { + mStreamStates[stream].mute(isMuted()); + } + } } - if (isValidLegacyStreamType()) { - int defaultStreamIndex = (mStreamStates[mLegacyStreamType] - .getIndex(AudioSystem.DEVICE_OUT_DEFAULT) + 5) / 10; - if (defaultStreamIndex == index) { - return; + if (!synced) { + if (DEBUG_VOL) { + Log.d(TAG, "applyAllVolumes: apply default device index " + index + + ", group " + mAudioVolumeGroup.name()); + } + setVolumeIndexInt( + isMuted() ? 0 : index, AudioSystem.DEVICE_OUT_DEFAULT, 0 /*flags*/); + } + if (forceDeviceSync) { + if (DEBUG_VOL) { + Log.d(TAG, "applyAllVolumes: forceDeviceSync index " + index + + ", device " + AudioSystem.getOutputDeviceName(deviceForVolume) + + ", group " + mAudioVolumeGroup.name()); } + setVolumeIndexInt(isMuted() ? 0 : index, deviceForVolume, 0); } - setVolumeIndexInt(index, AudioSystem.DEVICE_OUT_DEFAULT, 0 /*flags*/); } } + public void clearIndexCache() { + mIndexMap.clear(); + } + private void persistVolumeGroup(int device) { if (mUseFixedVolume) { return; @@ -7554,21 +7818,19 @@ public class AudioService extends IAudioService.Stub Log.v(TAG, "persistVolumeGroup: storing index " + getIndex(device) + " for group " + mAudioVolumeGroup.name() + ", device " + AudioSystem.getOutputDeviceName(device) - + " and User=" + ActivityManager.getCurrentUser()); + + " and User=" + getCurrentUserId()); } boolean success = mSettings.putSystemIntForUser(mContentResolver, getSettingNameForDevice(device), getIndex(device), - UserHandle.USER_CURRENT); + isMusic() ? UserHandle.USER_SYSTEM : UserHandle.USER_CURRENT); if (!success) { Log.e(TAG, "persistVolumeGroup failed for group " + mAudioVolumeGroup.name()); } } public void readSettings() { - synchronized (VolumeGroupState.class) { - // First clear previously loaded (previous user?) settings - mIndexMap.clear(); + synchronized (VolumeStreamState.class) { // force maximum volume on all streams if fixed volume property is set if (mUseFixedVolume) { mIndexMap.put(AudioSystem.DEVICE_OUT_DEFAULT, mIndexMax); @@ -7583,7 +7845,8 @@ public class AudioService extends IAudioService.Stub int index; String name = getSettingNameForDevice(device); index = mSettings.getSystemIntForUser( - mContentResolver, name, defaultIndex, UserHandle.USER_CURRENT); + mContentResolver, name, defaultIndex, + isMusic() ? UserHandle.USER_SYSTEM : UserHandle.USER_CURRENT); if (index == -1) { continue; } @@ -7594,13 +7857,14 @@ public class AudioService extends IAudioService.Stub if (DEBUG_VOL) { Log.v(TAG, "readSettings: found stored index " + getValidIndex(index) + " for group " + mAudioVolumeGroup.name() + ", device: " + name - + ", User=" + ActivityManager.getCurrentUser()); + + ", User=" + getCurrentUserId()); } mIndexMap.put(device, getValidIndex(index)); } } } + @GuardedBy("AudioService.VolumeStreamState.class") private int getValidIndex(int index) { if (index < mIndexMin) { return mIndexMin; @@ -7611,15 +7875,17 @@ public class AudioService extends IAudioService.Stub } public @NonNull String getSettingNameForDevice(int device) { - final String suffix = AudioSystem.getOutputDeviceName(device); + String suffix = AudioSystem.getOutputDeviceName(device); if (suffix.isEmpty()) { - return mAudioVolumeGroup.name(); + return mSettingName; } - return mAudioVolumeGroup.name() + "_" + AudioSystem.getOutputDeviceName(device); + return mSettingName + "_" + AudioSystem.getOutputDeviceName(device); } private void dump(PrintWriter pw) { pw.println("- VOLUME GROUP " + mAudioVolumeGroup.name() + ":"); + pw.print(" Muted: "); + pw.println(mIsMuted); pw.print(" Min: "); pw.println(mIndexMin); pw.print(" Max: "); @@ -7629,9 +7895,9 @@ public class AudioService extends IAudioService.Stub if (i > 0) { pw.print(", "); } - final int device = mIndexMap.keyAt(i); + int device = mIndexMap.keyAt(i); pw.print(Integer.toHexString(device)); - final String deviceName = device == AudioSystem.DEVICE_OUT_DEFAULT ? "default" + String deviceName = device == AudioSystem.DEVICE_OUT_DEFAULT ? "default" : AudioSystem.getOutputDeviceName(device); if (!deviceName.isEmpty()) { pw.print(" ("); @@ -7644,7 +7910,7 @@ public class AudioService extends IAudioService.Stub pw.println(); pw.print(" Devices: "); int n = 0; - final int devices = getDeviceForVolume(); + int devices = getDeviceForVolume(); for (int device : AudioSystem.DEVICE_OUT_ALL_SET) { if ((devices & device) == device) { if (n++ > 0) { @@ -7653,6 +7919,10 @@ public class AudioService extends IAudioService.Stub pw.print(AudioSystem.getOutputDeviceName(device)); } } + pw.println(); + pw.print(" Streams: "); + Arrays.stream(getLegacyStreamTypes()) + .forEach(stream -> pw.print(AudioSystem.streamToString(stream) + " ")); } } @@ -7664,13 +7934,14 @@ public class AudioService extends IAudioService.Stub // 4 VolumeStreamState.class private class VolumeStreamState { private final int mStreamType; + private VolumeGroupState mVolumeGroupState = null; private int mIndexMin; // min index when user doesn't have permission to change audio settings private int mIndexMinNoPerm; private int mIndexMax; - private boolean mIsMuted; - private boolean mIsMutedInternally; + private boolean mIsMuted = false; + private boolean mIsMutedInternally = false; private String mVolumeIndexSettingName; @NonNull private Set<Integer> mObservedDeviceSet = new TreeSet<>(); @@ -7728,6 +7999,15 @@ public class AudioService extends IAudioService.Stub } /** + * Associate a {@link volumeGroupState} on the {@link VolumeStreamState}. + * <p> It helps to synchronize the index, mute attributes on the maching + * {@link volumeGroupState} + * @param volumeGroupState matching the {@link VolumeStreamState} + */ + public void setVolumeGroupState(VolumeGroupState volumeGroupState) { + mVolumeGroupState = volumeGroupState; + } + /** * Update the minimum index that can be used without MODIFY_AUDIO_SETTINGS permission * @param index minimum index expressed in "UI units", i.e. no 10x factor */ @@ -7985,6 +8265,9 @@ public class AudioService extends IAudioService.Stub } } if (changed) { + // If associated to volume group, update group cache + updateVolumeGroupIndex(device, /* forceMuteState= */ false); + oldIndex = (oldIndex + 5) / 10; index = (index + 5) / 10; // log base stream changes to the event log @@ -8087,6 +8370,28 @@ public class AudioService extends IAudioService.Stub } } + // If associated to volume group, update group cache + private void updateVolumeGroupIndex(int device, boolean forceMuteState) { + synchronized (VolumeStreamState.class) { + if (mVolumeGroupState != null) { + int groupIndex = (getIndex(device) + 5) / 10; + if (DEBUG_VOL) { + Log.d(TAG, "updateVolumeGroupIndex for stream " + mStreamType + + ", muted=" + mIsMuted + ", device=" + device + ", index=" + + getIndex(device) + ", group " + mVolumeGroupState.name() + + " Muted=" + mVolumeGroupState.isMuted() + ", Index=" + groupIndex + + ", forceMuteState=" + forceMuteState); + } + mVolumeGroupState.updateVolumeIndex(groupIndex, device); + // Only propage mute of stream when applicable + if (mIndexMin == 0 || isCallStream(mStreamType)) { + // For call stream, align mute only when muted, not when index is set to 0 + mVolumeGroupState.mute(forceMuteState ? mIsMuted : groupIndex == 0); + } + } + } + } + /** * Mute/unmute the stream * @param state the new mute state @@ -8095,27 +8400,10 @@ public class AudioService extends IAudioService.Stub public boolean mute(boolean state) { boolean changed = false; synchronized (VolumeStreamState.class) { - if (state != mIsMuted) { - changed = true; - mIsMuted = state; - - // Set the new mute volume. This propagates the values to - // the audio system, otherwise the volume won't be changed - // at the lower level. - sendMsg(mAudioHandler, - MSG_SET_ALL_VOLUMES, - SENDMSG_QUEUE, - 0, - 0, - this, 0); - } + changed = mute(state, true); } if (changed) { - // Stream mute changed, fire the intent. - Intent intent = new Intent(AudioManager.STREAM_MUTE_CHANGED_ACTION); - intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, mStreamType); - intent.putExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, state); - sendBroadcastToAll(intent); + broadcastMuteSetting(mStreamType, state); } return changed; } @@ -8147,6 +8435,44 @@ public class AudioService extends IAudioService.Stub return mIsMuted || mIsMutedInternally; } + /** + * Mute/unmute the stream + * @param state the new mute state + * @param apply true to propagate to HW, or false just to update the cache. May be needed + * to mute a stream and its aliases as applyAllVolume will force settings to aliases. + * It prevents unnecessary calls to {@see AudioSystem#setStreamVolume} + * @return true if the mute state was changed + */ + public boolean mute(boolean state, boolean apply) { + synchronized (VolumeStreamState.class) { + boolean changed = state != mIsMuted; + if (changed) { + mIsMuted = state; + if (apply) { + doMute(); + } + } + return changed; + } + } + + public void doMute() { + synchronized (VolumeStreamState.class) { + // If associated to volume group, update group cache + updateVolumeGroupIndex(getDeviceForStream(mStreamType), /* forceMuteState= */ true); + + // Set the new mute volume. This propagates the values to + // the audio system, otherwise the volume won't be changed + // at the lower level. + sendMsg(mAudioHandler, + MSG_SET_ALL_VOLUMES, + SENDMSG_QUEUE, + 0, + 0, + this, 0); + } + } + public int getStreamType() { return mStreamType; } @@ -8216,6 +8542,9 @@ public class AudioService extends IAudioService.Stub pw.println(); pw.print(" Devices: "); pw.print(AudioSystem.deviceSetToString(getDeviceSetForStream(mStreamType))); + pw.println(); + pw.print(" Volume Group: "); + pw.println(mVolumeGroupState != null ? mVolumeGroupState.name() : "n/a"); } } @@ -9882,7 +10211,7 @@ public class AudioService extends IAudioService.Stub private static final int CHECK_MODE_FOR_UID_PERIOD_MS = 6000; private static final String ACTION_CHECK_MUSIC_ACTIVE = - AudioService.class.getSimpleName() + ".CHECK_MUSIC_ACTIVE"; + "com.android.server.audio.action.CHECK_MUSIC_ACTIVE"; private static final int REQUEST_CODE_CHECK_MUSIC_ACTIVE = 1; private int safeMediaVolumeIndex(int device) { @@ -9958,7 +10287,8 @@ public class AudioService extends IAudioService.Stub mPendingVolumeCommand.mIndex, mPendingVolumeCommand.mFlags, mPendingVolumeCommand.mDevice, - callingPackage, true /*hasModifyAudioSettings*/); + callingPackage, true /*hasModifyAudioSettings*/, + true /*canChangeMute*/); mPendingVolumeCommand = null; } } diff --git a/services/core/java/com/android/server/audio/AudioServiceEvents.java b/services/core/java/com/android/server/audio/AudioServiceEvents.java index c2c3f028abdb..6cbe03ed87d3 100644 --- a/services/core/java/com/android/server/audio/AudioServiceEvents.java +++ b/services/core/java/com/android/server/audio/AudioServiceEvents.java @@ -17,7 +17,6 @@ package com.android.server.audio; import android.annotation.NonNull; -import android.media.AudioAttributes; import android.media.AudioDeviceAttributes; import android.media.AudioManager; import android.media.AudioSystem; @@ -221,6 +220,7 @@ public class AudioServiceEvents { static final int VOL_SET_GROUP_VOL = 8; static final int VOL_MUTE_STREAM_INT = 9; static final int VOL_SET_LE_AUDIO_VOL = 10; + static final int VOL_ADJUST_GROUP_VOL = 11; final int mOp; final int mStream; @@ -228,7 +228,6 @@ public class AudioServiceEvents { final int mVal2; final String mCaller; final String mGroupName; - final AudioAttributes mAudioAttributes; /** used for VOL_ADJUST_VOL_UID, * VOL_ADJUST_SUGG_VOL, @@ -241,7 +240,6 @@ public class AudioServiceEvents { mVal2 = val2; mCaller = caller; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } @@ -254,7 +252,6 @@ public class AudioServiceEvents { mStream = -1; mCaller = null; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } @@ -267,7 +264,6 @@ public class AudioServiceEvents { mStream = -1; mCaller = null; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } @@ -280,7 +276,6 @@ public class AudioServiceEvents { // unused mCaller = null; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } @@ -293,19 +288,18 @@ public class AudioServiceEvents { // unused mCaller = null; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } - /** used for VOL_SET_GROUP_VOL */ - VolumeEvent(int op, AudioAttributes aa, String group, int index, int flags, String caller) { + /** used for VOL_SET_GROUP_VOL, + * VOL_ADJUST_GROUP_VOL */ + VolumeEvent(int op, String group, int index, int flags, String caller) { mOp = op; mStream = -1; mVal1 = index; mVal2 = flags; mCaller = caller; mGroupName = group; - mAudioAttributes = aa; logMetricEvent(); } @@ -317,7 +311,6 @@ public class AudioServiceEvents { mVal2 = 0; mCaller = null; mGroupName = null; - mAudioAttributes = null; logMetricEvent(); } @@ -359,6 +352,15 @@ public class AudioServiceEvents { .record(); return; } + case VOL_ADJUST_GROUP_VOL: + new MediaMetrics.Item(mMetricsId) + .set(MediaMetrics.Property.CALLING_PACKAGE, mCaller) + .set(MediaMetrics.Property.DIRECTION, mVal1 > 0 ? "up" : "down") + .set(MediaMetrics.Property.EVENT, "adjustVolumeGroupVolume") + .set(MediaMetrics.Property.FLAGS, mVal2) + .set(MediaMetrics.Property.GROUP, mGroupName) + .record(); + return; case VOL_SET_STREAM_VOL: new MediaMetrics.Item(mMetricsId) .set(MediaMetrics.Property.CALLING_PACKAGE, mCaller) @@ -410,7 +412,6 @@ public class AudioServiceEvents { return; case VOL_SET_GROUP_VOL: new MediaMetrics.Item(mMetricsId) - .set(MediaMetrics.Property.ATTRIBUTES, mAudioAttributes.toString()) .set(MediaMetrics.Property.CALLING_PACKAGE, mCaller) .set(MediaMetrics.Property.EVENT, "setVolumeIndexForAttributes") .set(MediaMetrics.Property.FLAGS, mVal2) @@ -436,6 +437,13 @@ public class AudioServiceEvents { .append(" flags:0x").append(Integer.toHexString(mVal2)) .append(") from ").append(mCaller) .toString(); + case VOL_ADJUST_GROUP_VOL: + return new StringBuilder("adjustVolumeGroupVolume(group:") + .append(mGroupName) + .append(" dir:").append(AudioManager.adjustToString(mVal1)) + .append(" flags:0x").append(Integer.toHexString(mVal2)) + .append(") from ").append(mCaller) + .toString(); case VOL_ADJUST_STREAM_VOL: return new StringBuilder("adjustStreamVolume(stream:") .append(AudioSystem.streamToString(mStream)) @@ -484,8 +492,7 @@ public class AudioServiceEvents { .append(" stream:").append(AudioSystem.streamToString(mStream)) .toString(); case VOL_SET_GROUP_VOL: - return new StringBuilder("setVolumeIndexForAttributes(attr:") - .append(mAudioAttributes.toString()) + return new StringBuilder("setVolumeIndexForAttributes(group:") .append(" group: ").append(mGroupName) .append(" index:").append(mVal1) .append(" flags:0x").append(Integer.toHexString(mVal2)) diff --git a/services/core/java/com/android/server/audio/AudioSystemAdapter.java b/services/core/java/com/android/server/audio/AudioSystemAdapter.java index 258837116cd6..a17b4bfceaca 100644 --- a/services/core/java/com/android/server/audio/AudioSystemAdapter.java +++ b/services/core/java/com/android/server/audio/AudioSystemAdapter.java @@ -29,8 +29,12 @@ import android.util.Pair; import com.android.internal.annotations.GuardedBy; import java.io.PrintWriter; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -60,8 +64,12 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback, private String[] mMethodNames = {"getDevicesForAttributes"}; private static final boolean USE_CACHE_FOR_GETDEVICES = true; + private static final Object sDeviceCacheLock = new Object(); + @GuardedBy("sDeviceCacheLock") private ConcurrentHashMap<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>> mDevicesForAttrCache; + @GuardedBy("sDeviceCacheLock") + private long mDevicesForAttributesCacheClearTimeMs = System.currentTimeMillis(); private int[] mMethodCacheHit; private static final Object sRoutingListenerLock = new Object(); @GuardedBy("sRoutingListenerLock") @@ -147,9 +155,11 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback, AudioSystem.setRoutingCallback(sSingletonDefaultAdapter); AudioSystem.setVolumeRangeInitRequestCallback(sSingletonDefaultAdapter); if (USE_CACHE_FOR_GETDEVICES) { - sSingletonDefaultAdapter.mDevicesForAttrCache = - new ConcurrentHashMap<>(AudioSystem.getNumStreamTypes()); - sSingletonDefaultAdapter.mMethodCacheHit = new int[NB_MEASUREMENTS]; + synchronized (sDeviceCacheLock) { + sSingletonDefaultAdapter.mDevicesForAttrCache = + new ConcurrentHashMap<>(AudioSystem.getNumStreamTypes()); + sSingletonDefaultAdapter.mMethodCacheHit = new int[NB_MEASUREMENTS]; + } } if (ENABLE_GETDEVICES_STATS) { sSingletonDefaultAdapter.mMethodCallCounter = new int[NB_MEASUREMENTS]; @@ -163,8 +173,9 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback, if (DEBUG_CACHE) { Log.d(TAG, "---- clearing cache ----------"); } - if (mDevicesForAttrCache != null) { - synchronized (mDevicesForAttrCache) { + synchronized (sDeviceCacheLock) { + if (mDevicesForAttrCache != null) { + mDevicesForAttributesCacheClearTimeMs = System.currentTimeMillis(); mDevicesForAttrCache.clear(); } } @@ -193,7 +204,7 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback, if (USE_CACHE_FOR_GETDEVICES) { ArrayList<AudioDeviceAttributes> res; final Pair<AudioAttributes, Boolean> key = new Pair(attributes, forVolume); - synchronized (mDevicesForAttrCache) { + synchronized (sDeviceCacheLock) { res = mDevicesForAttrCache.get(key); if (res == null) { // result from AudioSystem guaranteed non-null, but could be invalid @@ -508,23 +519,31 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback, */ public void dump(PrintWriter pw) { pw.println("\nAudioSystemAdapter:"); - pw.println(" mDevicesForAttrCache:"); - if (mDevicesForAttrCache != null) { - for (Map.Entry<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>> - entry : mDevicesForAttrCache.entrySet()) { - final AudioAttributes attributes = entry.getKey().first; - try { - final int stream = attributes.getVolumeControlStream(); - pw.println("\t" + attributes + " forVolume: " + entry.getKey().second - + " stream: " - + AudioSystem.STREAM_NAMES[stream] + "(" + stream + ")"); - for (AudioDeviceAttributes devAttr : entry.getValue()) { - pw.println("\t\t" + devAttr); + final DateTimeFormatter formatter = DateTimeFormatter + .ofPattern("MM-dd HH:mm:ss:SSS") + .withLocale(Locale.US) + .withZone(ZoneId.systemDefault()); + synchronized (sDeviceCacheLock) { + pw.println(" last cache clear time: " + formatter.format( + Instant.ofEpochMilli(mDevicesForAttributesCacheClearTimeMs))); + pw.println(" mDevicesForAttrCache:"); + if (mDevicesForAttrCache != null) { + for (Map.Entry<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>> + entry : mDevicesForAttrCache.entrySet()) { + final AudioAttributes attributes = entry.getKey().first; + try { + final int stream = attributes.getVolumeControlStream(); + pw.println("\t" + attributes + " forVolume: " + entry.getKey().second + + " stream: " + + AudioSystem.STREAM_NAMES[stream] + "(" + stream + ")"); + for (AudioDeviceAttributes devAttr : entry.getValue()) { + pw.println("\t\t" + devAttr); + } + } catch (IllegalArgumentException e) { + // dump could fail if attributes do not map to a stream. + pw.println("\t dump failed for attributes: " + attributes); + Log.e(TAG, "dump failed", e); } - } catch (IllegalArgumentException e) { - // dump could fail if attributes do not map to a stream. - pw.println("\t dump failed for attributes: " + attributes); - Log.e(TAG, "dump failed", e); } } } diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java index 017b96cc5f67..22767157d1d9 100644 --- a/services/core/java/com/android/server/display/color/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java @@ -107,11 +107,6 @@ public final class ColorDisplayService extends SystemService { Matrix.setIdentityM(MATRIX_IDENTITY, 0); } - /** - * The transition time, in milliseconds, for Night Display to turn on/off. - */ - private static final long TRANSITION_DURATION = 3000L; - private static final int MSG_USER_CHANGED = 0; private static final int MSG_SET_UP = 1; private static final int MSG_APPLY_NIGHT_DISPLAY_IMMEDIATE = 2; @@ -661,7 +656,7 @@ public final class ColorDisplayService extends SystemService { TintValueAnimator valueAnimator = TintValueAnimator.ofMatrix(COLOR_MATRIX_EVALUATOR, from == null ? MATRIX_IDENTITY : from, to); tintController.setAnimator(valueAnimator); - valueAnimator.setDuration(TRANSITION_DURATION); + valueAnimator.setDuration(tintController.getTransitionDurationMilliseconds()); valueAnimator.setInterpolator(AnimationUtils.loadInterpolator( getContext(), android.R.interpolator.fast_out_slow_in)); valueAnimator.addUpdateListener((ValueAnimator animator) -> { diff --git a/services/core/java/com/android/server/display/color/DisplayWhiteBalanceTintController.java b/services/core/java/com/android/server/display/color/DisplayWhiteBalanceTintController.java index 93a78c1507ad..f27ccc723596 100644 --- a/services/core/java/com/android/server/display/color/DisplayWhiteBalanceTintController.java +++ b/services/core/java/com/android/server/display/color/DisplayWhiteBalanceTintController.java @@ -59,7 +59,8 @@ final class DisplayWhiteBalanceTintController extends TintController { private float[] mCurrentColorTemperatureXYZ; @VisibleForTesting boolean mSetUp = false; - private float[] mMatrixDisplayWhiteBalance = new float[16]; + private final float[] mMatrixDisplayWhiteBalance = new float[16]; + private long mTransitionDuration; private Boolean mIsAvailable; // This feature becomes disallowed if the device is in an unsupported strong/light state. private boolean mIsAllowed = true; @@ -119,6 +120,9 @@ final class DisplayWhiteBalanceTintController extends TintController { final int colorTemperature = res.getInteger( R.integer.config_displayWhiteBalanceColorTemperatureDefault); + mTransitionDuration = res.getInteger( + R.integer.config_displayWhiteBalanceTransitionTime); + synchronized (mLock) { mDisplayColorSpaceRGB = displayColorSpaceRGB; mDisplayNominalWhiteXYZ = displayNominalWhiteXYZ; @@ -232,6 +236,11 @@ final class DisplayWhiteBalanceTintController extends TintController { } @Override + public long getTransitionDurationMilliseconds() { + return mTransitionDuration; + } + + @Override public void dump(PrintWriter pw) { synchronized (mLock) { pw.println(" mSetUp = " + mSetUp); diff --git a/services/core/java/com/android/server/display/color/TintController.java b/services/core/java/com/android/server/display/color/TintController.java index 422dd328d2b6..c53ac06c66e1 100644 --- a/services/core/java/com/android/server/display/color/TintController.java +++ b/services/core/java/com/android/server/display/color/TintController.java @@ -16,7 +16,6 @@ package com.android.server.display.color; -import android.animation.ValueAnimator; import android.content.Context; import android.util.Slog; @@ -24,6 +23,11 @@ import java.io.PrintWriter; abstract class TintController { + /** + * The default transition time, in milliseconds, for color transforms to turn on/off. + */ + private static final long TRANSITION_DURATION = 3000L; + private ColorDisplayService.TintValueAnimator mAnimator; private Boolean mIsActivated; @@ -66,6 +70,10 @@ abstract class TintController { return mIsActivated == null; } + public long getTransitionDurationMilliseconds() { + return TRANSITION_DURATION; + } + /** * Dump debug information. */ diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java index db9deb1ceb69..f87a1461f9d2 100644 --- a/services/core/java/com/android/server/dreams/DreamController.java +++ b/services/core/java/com/android/server/dreams/DreamController.java @@ -244,7 +244,10 @@ final class DreamController { } mListener.onDreamStopped(dream.mToken); + } else if (dream.mCanDoze && !mCurrentDream.mCanDoze) { + mListener.stopDozing(dream.mToken); } + } finally { Trace.traceEnd(Trace.TRACE_TAG_POWER); } @@ -289,6 +292,7 @@ final class DreamController { */ public interface Listener { void onDreamStopped(Binder token); + void stopDozing(Binder token); } private final class DreamRecord implements DeathRecipient, ServiceConnection { diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index bb1e3931c02e..148b80ea0447 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -499,7 +499,12 @@ public final class DreamManagerService extends SystemService { } synchronized (mLock) { - if (mCurrentDream != null && mCurrentDream.token == token && mCurrentDream.isDozing) { + if (mCurrentDream == null) { + return; + } + + final boolean sameDream = mCurrentDream.token == token; + if ((sameDream && mCurrentDream.isDozing) || (!sameDream && !mCurrentDream.isDozing)) { mCurrentDream.isDozing = false; mDozeWakeLock.release(); mPowerManagerInternal.setDozeOverrideFromDreamManager( @@ -765,6 +770,11 @@ public final class DreamManagerService extends SystemService { } } } + + @Override + public void stopDozing(Binder token) { + stopDozingInternal(token); + } }; private final ContentObserver mDozeEnabledObserver = new ContentObserver(null) { diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 39acaeec8926..25fefad8042f 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -132,6 +132,7 @@ abstract public class ManagedServices { // contains connections to all connected services, including app services // and system services + @GuardedBy("mMutex") private final ArrayList<ManagedServiceInfo> mServices = new ArrayList<>(); /** * The services that have been bound by us. If the service is also connected, it will also @@ -157,7 +158,8 @@ abstract public class ManagedServices { // List of approved packages or components (by user, then by primary/secondary) that are // allowed to be bound as managed services. A package or component appearing in this list does // not mean that we are currently bound to said package/component. - protected ArrayMap<Integer, ArrayMap<Boolean, ArraySet<String>>> mApproved = new ArrayMap<>(); + protected final ArrayMap<Integer, ArrayMap<Boolean, ArraySet<String>>> mApproved = + new ArrayMap<>(); // List of packages or components (by user) that are configured to be enabled/disabled // explicitly by the user @@ -316,6 +318,7 @@ abstract public class ManagedServices { return changes; } + @GuardedBy("mApproved") private boolean clearUserSetFlagLocked(ComponentName component, int userId) { String approvedValue = getApprovedValue(component.flattenToString()); ArraySet<String> userSet = mUserSetServices.get(userId); @@ -376,8 +379,8 @@ abstract public class ManagedServices { pw.println(" " + cmpt); } - pw.println(" Live " + getCaption() + "s (" + mServices.size() + "):"); synchronized (mMutex) { + pw.println(" Live " + getCaption() + "s (" + mServices.size() + "):"); for (ManagedServiceInfo info : mServices) { if (filter != null && !filter.matches(info.component)) continue; pw.println(" " + info.component @@ -1011,10 +1014,12 @@ abstract public class ManagedServices { return null; } final IBinder token = service.asBinder(); - final int N = mServices.size(); - for (int i = 0; i < N; i++) { - final ManagedServiceInfo info = mServices.get(i); - if (info.service.asBinder() == token) return info; + synchronized (mMutex) { + final int nServices = mServices.size(); + for (int i = 0; i < nServices; i++) { + final ManagedServiceInfo info = mServices.get(i); + if (info.service.asBinder() == token) return info; + } } return null; } @@ -1488,10 +1493,12 @@ abstract public class ManagedServices { } } + @GuardedBy("mMutex") private void registerServiceLocked(final ComponentName name, final int userid) { registerServiceLocked(name, userid, false /* isSystem */); } + @GuardedBy("mMutex") private void registerServiceLocked(final ComponentName name, final int userid, final boolean isSystem) { if (DEBUG) Slog.v(TAG, "registerService: " + name + " u=" + userid); @@ -1622,6 +1629,7 @@ abstract public class ManagedServices { } } + @GuardedBy("mMutex") private void unregisterServiceLocked(ComponentName name, int userid) { final int N = mServices.size(); for (int i = N - 1; i >= 0; i--) { @@ -1656,6 +1664,7 @@ abstract public class ManagedServices { return serviceInfo; } + @GuardedBy("mMutex") private ManagedServiceInfo removeServiceLocked(int i) { final ManagedServiceInfo info = mServices.remove(i); onServiceRemovedLocked(info); diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index 890c89152a7c..632a34e4470d 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -885,7 +885,12 @@ class ShortcutPackage extends ShortcutPackageItem { * available ShareTarget definitions in this package. */ public List<ShortcutManager.ShareShortcutInfo> getMatchingShareTargets( - @NonNull IntentFilter filter) { + @NonNull final IntentFilter filter) { + return getMatchingShareTargets(filter, null); + } + + List<ShortcutManager.ShareShortcutInfo> getMatchingShareTargets( + @NonNull final IntentFilter filter, @Nullable final String pkgName) { synchronized (mLock) { final List<ShareTargetInfo> matchedTargets = new ArrayList<>(); for (int i = 0; i < mShareTargets.size(); i++) { @@ -909,8 +914,7 @@ class ShortcutPackage extends ShortcutPackageItem { // included in the result findAll(shortcuts, ShortcutInfo::isNonManifestVisible, ShortcutInfo.CLONE_REMOVE_FOR_APP_PREDICTION, - mShortcutUser.mService.mContext.getPackageName(), - 0, /*getPinnedByAnyLauncher=*/ false); + pkgName, 0, /*getPinnedByAnyLauncher=*/ false); final List<ShortcutManager.ShareShortcutInfo> result = new ArrayList<>(); for (int i = 0; i < shortcuts.size(); i++) { @@ -1108,7 +1112,7 @@ class ShortcutPackage extends ShortcutPackageItem { // Now prepare to publish manifest shortcuts. List<ShortcutInfo> newManifestShortcutList = null; - final int shareTargetSize; + int shareTargetSize = 0; synchronized (mLock) { try { shareTargetSize = mShareTargets.size(); diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 0b20683185f0..49831d75db49 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -2512,11 +2512,17 @@ public class ShortcutService extends IShortcutService.Stub { } enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS, "getShareTargets"); + final ComponentName chooser = injectChooserActivity(); + final String pkg = (chooser != null + && mPackageManagerInternal.getComponentEnabledSetting(chooser, + injectBinderCallingUid(), userId) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) + ? chooser.getPackageName() : mContext.getPackageName(); synchronized (mLock) { throwIfUserLockedL(userId); final List<ShortcutManager.ShareShortcutInfo> shortcutInfoList = new ArrayList<>(); final ShortcutUser user = getUserShortcutsLocked(userId); - user.forAllPackages(p -> shortcutInfoList.addAll(p.getMatchingShareTargets(filter))); + user.forAllPackages(p -> shortcutInfoList.addAll( + p.getMatchingShareTargets(filter, pkg))); return new ParceledListSlice<>(shortcutInfoList); } } diff --git a/services/core/java/com/android/server/wm/ActivityClientController.java b/services/core/java/com/android/server/wm/ActivityClientController.java index 725254513519..7489f80946eb 100644 --- a/services/core/java/com/android/server/wm/ActivityClientController.java +++ b/services/core/java/com/android/server/wm/ActivityClientController.java @@ -709,7 +709,8 @@ class ActivityClientController extends IActivityClientController.Stub { synchronized (mGlobalLock) { final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token); return r != null - ? r.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; + ? r.getOverrideOrientation() + : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 6b01a7726a43..f7b9d8b2d856 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -439,6 +439,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // finished destroying itself. private static final int DESTROY_TIMEOUT = 10 * 1000; + // Rounding tolerance to be used in aspect ratio computations + private static final float ASPECT_RATIO_ROUNDING_TOLERANCE = 0.005f; + final ActivityTaskManagerService mAtmService; @NonNull final ActivityInfo info; // activity info provided by developer in AndroidManifest @@ -1165,8 +1168,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A pw.println(prefix + "mVoiceInteraction=true"); } pw.print(prefix); pw.print("mOccludesParent="); pw.println(mOccludesParent); - pw.print(prefix); pw.print("mOrientation="); - pw.println(ActivityInfo.screenOrientationToString(mOrientation)); + pw.print(prefix); pw.print("overrideOrientation="); + pw.println(ActivityInfo.screenOrientationToString(getOverrideOrientation())); + pw.print(prefix); pw.print("requestedOrientation="); + pw.println(ActivityInfo.screenOrientationToString(super.getOverrideOrientation())); pw.println(prefix + "mVisibleRequested=" + mVisibleRequested + " mVisible=" + mVisible + " mClientVisible=" + isClientVisible() + ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "") @@ -1964,6 +1969,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A new ComponentName(info.packageName, info.targetActivity); } + // Don't move below setActivityType since it triggers onConfigurationChange -> + // resolveOverrideConfiguration that requires having mLetterboxUiController initialised. + // Don't move below setOrientation(info.screenOrientation) since it triggers + // getOverrideOrientation that requires having mLetterboxUiController + // initialised. + mLetterboxUiController = new LetterboxUiController(mWmService, this); + mCameraCompatControlEnabled = mWmService.mContext.getResources() + .getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled); + mTargetSdk = info.applicationInfo.targetSdkVersion; mShowForAllUsers = (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0; setOrientation(info.screenOrientation); @@ -2084,12 +2098,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A launchMode = aInfo.launchMode; - // Don't move below setActivityType since it triggers onConfigurationChange -> - // resolveOverrideConfiguration that requires having mLetterboxUiController initialised. - mLetterboxUiController = new LetterboxUiController(mWmService, this); - mCameraCompatControlEnabled = mWmService.mContext.getResources() - .getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled); - setActivityType(_componentSpecified, _launchedFromUid, _intent, options, sourceRecord); immersive = (aInfo.flags & FLAG_IMMERSIVE) != 0; @@ -2486,7 +2494,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (topAttached != null) { if (topAttached.isSnapshotCompatible(snapshot) // This trampoline must be the same rotation. - && mDisplayContent.getDisplayRotation().rotationForOrientation(mOrientation, + && mDisplayContent.getDisplayRotation().rotationForOrientation( + getOverrideOrientation(), mDisplayContent.getRotation()) == snapshot.getRotation()) { return STARTING_WINDOW_TYPE_SNAPSHOT; } @@ -7704,13 +7713,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return mLetterboxUiController.getInheritedOrientation(); } } - if (mOrientation == SCREEN_ORIENTATION_BEHIND && task != null) { + if (task != null && getOverrideOrientation() == SCREEN_ORIENTATION_BEHIND) { // We use Task here because we want to be consistent with what happens in // multi-window mode where other tasks orientations are ignored. final ActivityRecord belowCandidate = task.getActivity( - a -> a.mOrientation != SCREEN_ORIENTATION_UNSET && !a.finishing - && a.mOrientation != ActivityInfo.SCREEN_ORIENTATION_BEHIND, this, - false /* includeBoundary */, true /* traverseTopToBottom */); + a -> a.canDefineOrientationForActivitiesAbove() /* callback */, + this /* boundary */, false /* includeBoundary */, + true /* traverseTopToBottom */); if (belowCandidate != null) { return belowCandidate.getRequestedConfigurationOrientation(forDisplay); } @@ -7718,6 +7727,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return super.getRequestedConfigurationOrientation(forDisplay); } + /** + * Whether this activity can be used as an orientation source for activities above with + * {@link SCREEN_ORIENTATION_BEHIND}. + */ + boolean canDefineOrientationForActivitiesAbove() { + if (finishing) { + return false; + } + final int overrideOrientation = getOverrideOrientation(); + return overrideOrientation != SCREEN_ORIENTATION_UNSET + && overrideOrientation != SCREEN_ORIENTATION_BEHIND; + } + @Override void onCancelFixedRotationTransform(int originalDisplayRotation) { if (this != mDisplayContent.getLastOrientationSource()) { @@ -7744,7 +7766,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } } - void setRequestedOrientation(int requestedOrientation) { + void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) { if (mLetterboxUiController.shouldIgnoreRequestedOrientation(requestedOrientation)) { return; } @@ -7789,7 +7811,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Allow app to specify orientation regardless of its visibility state if the current // candidate want us to use orientation behind. I.e. the visible app on-top of this one // wants us to use the orientation of the app behind it. - return mOrientation; + return getOverrideOrientation(); } // The {@link ActivityRecord} should only specify an orientation when it is not closing. @@ -7797,15 +7819,31 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // task being started in the wrong orientation during the transition. if (!getDisplayContent().mClosingApps.contains(this) && (isVisibleRequested() || getDisplayContent().mOpeningApps.contains(this))) { - return mOrientation; + return getOverrideOrientation(); } return SCREEN_ORIENTATION_UNSET; } - /** Returns the app's preferred orientation regardless of its currently visibility state. */ + /** + * Returns the app's preferred orientation regardless of its current visibility state taking + * into account orientation per-app overrides applied by the device manufacturers. + */ + @Override + protected int getOverrideOrientation() { + return mLetterboxUiController.overrideOrientationIfNeeded(super.getOverrideOrientation()); + } + + /** + * Returns the app's preferred orientation regardless of its currently visibility state. This + * is used to return a requested value to an app if they call {@link + * android.app.Activity#getRequestedOrientation} since {@link #getOverrideOrientation} value + * with override can confuse an app if it's different from what they requested with {@link + * android.app.Activity#setRequestedOrientation}. + */ + @ActivityInfo.ScreenOrientation int getRequestedOrientation() { - return mOrientation; + return super.getOverrideOrientation(); } /** @@ -8204,8 +8242,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (screenResolvedBounds.width() <= parentAppBounds.width()) { float positionMultiplier = mLetterboxUiController.getHorizontalPositionMultiplier( newParentConfiguration); - offsetX = (int) Math.ceil((parentAppBounds.width() - screenResolvedBounds.width()) - * positionMultiplier); + offsetX = Math.max(0, (int) Math.ceil((parentAppBounds.width() + - screenResolvedBounds.width()) * positionMultiplier) + // This is added to make sure that insets added inside + // CompatDisplayInsets#getContainerBounds() do not break the alignment + // provided by the positionMultiplier + - screenResolvedBounds.left + parentAppBounds.left); } } @@ -8215,8 +8257,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (screenResolvedBounds.height() <= parentAppBounds.height()) { float positionMultiplier = mLetterboxUiController.getVerticalPositionMultiplier( newParentConfiguration); - offsetY = (int) Math.ceil((parentAppBounds.height() - screenResolvedBounds.height()) - * positionMultiplier); + offsetY = Math.max(0, (int) Math.ceil((parentAppBounds.height() + - screenResolvedBounds.height()) * positionMultiplier) + // This is added to make sure that insets added inside + // CompatDisplayInsets#getContainerBounds() do not break the alignment + // provided by the positionMultiplier + - screenResolvedBounds.top + parentAppBounds.top); } } @@ -8357,8 +8403,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // If orientation is respected when insets are applied, then stableBounds will be empty. boolean orientationRespectedWithInsets = orientationRespectedWithInsets(parentBounds, stableBounds); - if (orientationRespectedWithInsets - && handlesOrientationChangeFromDescendant(mOrientation)) { + if (orientationRespectedWithInsets && handlesOrientationChangeFromDescendant( + getOverrideOrientation())) { // No need to letterbox because of fixed orientation. Display will handle // fixed-orientation requests and a display rotation is enough to respect requested // orientation with insets applied. @@ -8915,7 +8961,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A int activityWidth = containingAppWidth; int activityHeight = containingAppHeight; - if (containingRatio > desiredAspectRatio) { + if (containingRatio - desiredAspectRatio > ASPECT_RATIO_ROUNDING_TOLERANCE) { if (containingAppWidth < containingAppHeight) { // Width is the shorter side, so we use that to figure-out what the max. height // should be given the aspect ratio. @@ -8925,7 +8971,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // should be given the aspect ratio. activityWidth = (int) ((activityHeight * desiredAspectRatio) + 0.5f); } - } else if (containingRatio < desiredAspectRatio) { + } else if (desiredAspectRatio - containingRatio > ASPECT_RATIO_ROUNDING_TOLERANCE) { boolean adjustWidth; switch (getRequestedConfigurationOrientation()) { case ORIENTATION_LANDSCAPE: @@ -9003,7 +9049,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } if (info.isChangeEnabled(OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY) - && !ActivityInfo.isFixedOrientationPortrait(getRequestedOrientation())) { + && !ActivityInfo.isFixedOrientationPortrait( + getOverrideOrientation())) { return info.getMinAspectRatio(); } @@ -9998,6 +10045,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A isLandscape ? shortSide : longSide); } + // TODO(b/267151420): Explore removing getContainerBounds() from CompatDisplayInsets. /** Gets the horizontal centered container bounds for size compatibility mode. */ void getContainerBounds(Rect outAppBounds, Rect outBounds, int rotation, int orientation, boolean orientationRequested, boolean isFixedToUserRotation) { @@ -10166,8 +10214,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // TODO(b/263592337): Explore enabling compat fake focus for fullscreen, e.g. for when // covered with bubbles. boolean shouldSendCompatFakeFocus() { - return mWmService.mLetterboxConfiguration.isCompatFakeFocusEnabled(info) - && inMultiWindowMode() && !inPinnedWindowingMode() && !inFreeformWindowingMode(); + return mLetterboxUiController.shouldSendFakeFocus() && inMultiWindowMode() + && !inPinnedWindowingMode() && !inFreeformWindowingMode(); } static class Builder { diff --git a/services/core/java/com/android/server/wm/DeviceStateController.java b/services/core/java/com/android/server/wm/DeviceStateController.java index 2e67399321a0..7d9a4ec4b5c3 100644 --- a/services/core/java/com/android/server/wm/DeviceStateController.java +++ b/services/core/java/com/android/server/wm/DeviceStateController.java @@ -47,10 +47,13 @@ final class DeviceStateController implements DeviceStateManager.DeviceStateCallb @NonNull private final int[] mRearDisplayDeviceStates; @NonNull + private final int[] mReverseRotationAroundZAxisStates; + @NonNull private final List<Consumer<DeviceState>> mDeviceStateCallbacks = new ArrayList<>(); @Nullable private DeviceState mLastDeviceState; + private int mCurrentState; public enum DeviceState { UNKNOWN, OPEN, FOLDED, HALF_FOLDED, REAR, @@ -58,6 +61,7 @@ final class DeviceStateController implements DeviceStateManager.DeviceStateCallb DeviceStateController(@NonNull Context context, @NonNull Handler handler) { mDeviceStateManager = context.getSystemService(DeviceStateManager.class); + mOpenDeviceStates = context.getResources() .getIntArray(R.array.config_openDeviceStates); mHalfFoldedDeviceStates = context.getResources() @@ -66,6 +70,8 @@ final class DeviceStateController implements DeviceStateManager.DeviceStateCallb .getIntArray(R.array.config_foldedDeviceStates); mRearDisplayDeviceStates = context.getResources() .getIntArray(R.array.config_rearDisplayDeviceStates); + mReverseRotationAroundZAxisStates = context.getResources() + .getIntArray(R.array.config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis); if (mDeviceStateManager != null) { mDeviceStateManager.registerCallback(new HandlerExecutor(handler), this); @@ -82,8 +88,17 @@ final class DeviceStateController implements DeviceStateManager.DeviceStateCallb mDeviceStateCallbacks.add(callback); } + /** + * @return true if the rotation direction on the Z axis should be reversed. + */ + boolean shouldReverseRotationDirectionAroundZAxis() { + return ArrayUtils.contains(mReverseRotationAroundZAxisStates, mCurrentState); + } + @Override public void onStateChanged(int state) { + mCurrentState = state; + final DeviceState deviceState; if (ArrayUtils.contains(mHalfFoldedDeviceStates, state)) { deviceState = DeviceState.HALF_FOLDED; diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index af5bd14baf31..fad2ddadc88f 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -93,7 +93,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { DisplayArea(WindowManagerService wms, Type type, String name, int featureId) { super(wms); // TODO(display-area): move this up to ConfigurationContainer - mOrientation = SCREEN_ORIENTATION_UNSET; + setOverrideOrientation(SCREEN_ORIENTATION_UNSET); mType = type; mName = name; mFeatureId = featureId; @@ -165,7 +165,8 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { // If this is set to ignore the orientation request, we don't propagate descendant // orientation request. final int orientation = requestingContainer != null - ? requestingContainer.mOrientation : SCREEN_ORIENTATION_UNSET; + ? requestingContainer.getOverrideOrientation() + : SCREEN_ORIENTATION_UNSET; return !getIgnoreOrientationRequest(orientation) && super.onDescendantOrientationChanged(requestingContainer); } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 740fd584839f..aede04bf504b 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -27,6 +27,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; @@ -1128,7 +1129,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mDeviceStateController = new DeviceStateController(mWmService.mContext, mWmService.mH); mDisplayPolicy = new DisplayPolicy(mWmService, this); - mDisplayRotation = new DisplayRotation(mWmService, this, mDisplayInfo.address); + mDisplayRotation = new DisplayRotation(mWmService, this, mDisplayInfo.address, + mDeviceStateController); final Consumer<DeviceStateController.DeviceState> deviceStateConsumer = (@NonNull DeviceStateController.DeviceState newFoldState) -> { @@ -1575,7 +1577,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp // If display rotation class tells us that it doesn't consider app requested orientation, // this display won't rotate just because of an app changes its requested orientation. Thus // it indicates that this display chooses not to handle this request. - final int orientation = requestingContainer != null ? requestingContainer.mOrientation + final int orientation = requestingContainer != null + ? requestingContainer.getOverrideOrientation() : SCREEN_ORIENTATION_UNSET; final boolean handled = handlesOrientationChangeFromDescendant(orientation); if (config == null) { @@ -1701,15 +1704,15 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp if (mTransitionController.useShellTransitionsRotation()) { return ROTATION_UNDEFINED; } + final int activityOrientation = r.getOverrideOrientation(); if (!WindowManagerService.ENABLE_FIXED_ROTATION_TRANSFORM - || getIgnoreOrientationRequest(r.mOrientation)) { + || getIgnoreOrientationRequest(activityOrientation)) { return ROTATION_UNDEFINED; } - if (r.mOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) { + if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) { final ActivityRecord nextCandidate = getActivity( - a -> a.mOrientation != SCREEN_ORIENTATION_UNSET - && a.mOrientation != ActivityInfo.SCREEN_ORIENTATION_BEHIND, - r, false /* includeBoundary */, true /* traverseTopToBottom */); + a -> a.canDefineOrientationForActivitiesAbove() /* callback */, + r /* boundary */, false /* includeBoundary */, true /* traverseTopToBottom */); if (nextCandidate != null) { r = nextCandidate; } @@ -2726,6 +2729,15 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final int orientation = super.getOrientation(); if (!handlesOrientationChangeFromDescendant(orientation)) { + ActivityRecord topActivity = topRunningActivity(/* considerKeyguardState= */ true); + if (topActivity != null && topActivity.mLetterboxUiController + .shouldUseDisplayLandscapeNaturalOrientation()) { + ProtoLog.v(WM_DEBUG_ORIENTATION, + "Display id=%d is ignoring orientation request for %d, return %d" + + " following a per-app override for %s", + mDisplayId, orientation, SCREEN_ORIENTATION_LANDSCAPE, topActivity); + return SCREEN_ORIENTATION_LANDSCAPE; + } mLastOrientationSource = null; // Return SCREEN_ORIENTATION_UNSPECIFIED so that Display respect sensor rotation ProtoLog.v(WM_DEBUG_ORIENTATION, diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index f8fd2b953c20..cf7d5d9548fd 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -2007,7 +2007,8 @@ public class DisplayPolicy { dc.getDisplayPolicy().simulateLayoutDisplay(df); final InsetsState insetsState = df.mInsetsState; final Rect displayFrame = insetsState.getDisplayFrame(); - final Insets decor = calculateDecorInsetsWithInternalTypes(insetsState); + final Insets decor = insetsState.calculateInsets(displayFrame, DECOR_TYPES, + true /* ignoreVisibility */); final Insets statusBar = insetsState.calculateInsets(displayFrame, Type.statusBars(), true /* ignoreVisibility */); mNonDecorInsets.set(decor.left, decor.top, decor.right, decor.bottom); @@ -2039,17 +2040,8 @@ public class DisplayPolicy { } } - // TODO (b/235842600): Use public type once we can treat task bar as navigation bar. - static final int[] INTERNAL_DECOR_TYPES; - static { - final ArraySet<Integer> decorTypes = InsetsState.toInternalType( - Type.displayCutout() | Type.navigationBars()); - decorTypes.remove(ITYPE_EXTRA_NAVIGATION_BAR); - INTERNAL_DECOR_TYPES = new int[decorTypes.size()]; - for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) { - INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i); - } - } + + static final int DECOR_TYPES = Type.displayCutout() | Type.navigationBars(); private final DisplayContent mDisplayContent; private final Info[] mInfoForRotation = new Info[4]; @@ -2076,20 +2068,6 @@ public class DisplayPolicy { info.mNeedUpdate = true; } } - - // TODO (b/235842600): Remove this method once we can treat task bar as navigation bar. - private static Insets calculateDecorInsetsWithInternalTypes(InsetsState state) { - final Rect frame = state.getDisplayFrame(); - Insets insets = Insets.NONE; - for (int i = INTERNAL_DECOR_TYPES.length - 1; i >= 0; i--) { - final InsetsSource source = state.peekSource(INTERNAL_DECOR_TYPES[i]); - if (source != null) { - insets = Insets.max(source.calculateInsets(frame, true /* ignoreVisibility */), - insets); - } - } - return insets; - } } /** diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index a1e18cf75ae6..3404279d2c59 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -41,6 +41,7 @@ import static com.android.server.wm.WindowManagerService.WINDOW_FREEZE_TIMEOUT_D import android.annotation.AnimRes; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.content.ContentResolver; @@ -117,6 +118,8 @@ public class DisplayRotation { private SettingsObserver mSettingsObserver; @Nullable private FoldController mFoldController; + @NonNull + private final DeviceStateController mDeviceStateController; @ScreenOrientation private int mCurrentAppOrientation = SCREEN_ORIENTATION_UNSPECIFIED; @@ -218,21 +221,24 @@ public class DisplayRotation { private boolean mDemoRotationLock; DisplayRotation(WindowManagerService service, DisplayContent displayContent, - DisplayAddress displayAddress) { + DisplayAddress displayAddress, @NonNull DeviceStateController deviceStateController) { this(service, displayContent, displayAddress, displayContent.getDisplayPolicy(), - service.mDisplayWindowSettings, service.mContext, service.getWindowManagerLock()); + service.mDisplayWindowSettings, service.mContext, service.getWindowManagerLock(), + deviceStateController); } @VisibleForTesting DisplayRotation(WindowManagerService service, DisplayContent displayContent, DisplayAddress displayAddress, DisplayPolicy displayPolicy, - DisplayWindowSettings displayWindowSettings, Context context, Object lock) { + DisplayWindowSettings displayWindowSettings, Context context, Object lock, + @NonNull DeviceStateController deviceStateController) { mService = service; mDisplayContent = displayContent; mDisplayPolicy = displayPolicy; mDisplayWindowSettings = displayWindowSettings; mContext = context; mLock = lock; + mDeviceStateController = deviceStateController; isDefaultDisplay = displayContent.isDefaultDisplay; mCompatPolicyForImmersiveApps = initImmersiveAppCompatPolicy(service, displayContent); @@ -243,11 +249,13 @@ public class DisplayRotation { mDeskDockRotation = readRotation(R.integer.config_deskDockRotation); mUndockedHdmiRotation = readRotation(R.integer.config_undockedHdmiRotation); - mRotation = readDefaultDisplayRotation(displayAddress); + int defaultRotation = readDefaultDisplayRotation(displayAddress); + mRotation = defaultRotation; if (isDefaultDisplay) { final Handler uiHandler = UiThread.getHandler(); - mOrientationListener = new OrientationListener(mContext, uiHandler); + mOrientationListener = + new OrientationListener(mContext, uiHandler, defaultRotation); mOrientationListener.setCurrentRotation(mRotation); mSettingsObserver = new SettingsObserver(uiHandler); mSettingsObserver.observe(); @@ -1137,6 +1145,15 @@ public class DisplayRotation { int sensorRotation = mOrientationListener != null ? mOrientationListener.getProposedRotation() // may be -1 : -1; + if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) { + // Flipping 270 and 90 has the same effect as changing the direction which rotation is + // applied. + if (sensorRotation == Surface.ROTATION_90) { + sensorRotation = Surface.ROTATION_270; + } else if (sensorRotation == Surface.ROTATION_270) { + sensorRotation = Surface.ROTATION_90; + } + } mLastSensorRotation = sensorRotation; if (sensorRotation < 0) { sensorRotation = lastRotation; @@ -1720,8 +1737,9 @@ public class DisplayRotation { private class OrientationListener extends WindowOrientationListener implements Runnable { transient boolean mEnabled; - OrientationListener(Context context, Handler handler) { - super(context, handler); + OrientationListener(Context context, Handler handler, + @Surface.Rotation int defaultRotation) { + super(context, handler, defaultRotation); } @Override @@ -1844,8 +1862,9 @@ public class DisplayRotation { if (source != null) { mLastOrientationSource = source.toString(); final WindowState w = source.asWindowState(); - mSourceOrientation = - w != null ? w.mAttrs.screenOrientation : source.mOrientation; + mSourceOrientation = w != null + ? w.mAttrs.screenOrientation + : source.getOverrideOrientation(); } else { mLastOrientationSource = null; mSourceOrientation = SCREEN_ORIENTATION_UNSET; diff --git a/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java b/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java index c6037dab6568..3ffb2fa7eaad 100644 --- a/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java @@ -296,8 +296,8 @@ final class DisplayRotationCompatPolicy { && activity.getRequestedConfigurationOrientation() != ORIENTATION_UNDEFINED // "locked" and "nosensor" values are often used by camera apps that can't // handle dynamic changes so we shouldn't force rotate them. - && activity.getRequestedOrientation() != SCREEN_ORIENTATION_NOSENSOR - && activity.getRequestedOrientation() != SCREEN_ORIENTATION_LOCKED + && activity.getOverrideOrientation() != SCREEN_ORIENTATION_NOSENSOR + && activity.getOverrideOrientation() != SCREEN_ORIENTATION_LOCKED && mCameraIdPackageBiMap.containsPackageName(activity.packageName) && activity.mLetterboxUiController.shouldForceRotateForCameraCompat(); } diff --git a/services/core/java/com/android/server/wm/LetterboxConfiguration.java b/services/core/java/com/android/server/wm/LetterboxConfiguration.java index 800fe090b457..22db37034153 100644 --- a/services/core/java/com/android/server/wm/LetterboxConfiguration.java +++ b/services/core/java/com/android/server/wm/LetterboxConfiguration.java @@ -18,14 +18,13 @@ package com.android.server.wm; 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.LetterboxConfigurationDeviceConfig.KEY_ALLOW_IGNORE_ORIENTATION_REQUEST; import static com.android.server.wm.LetterboxConfigurationDeviceConfig.KEY_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; import android.graphics.Color; import android.provider.DeviceConfig; import android.util.Slog; @@ -311,12 +310,23 @@ final class LetterboxConfiguration { mDeviceConfig.updateFlagActiveStatus( /* isActive */ mIsDisplayRotationImmersiveAppCompatPolicyEnabled, /* key */ KEY_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY); + mDeviceConfig.updateFlagActiveStatus( + /* isActive */ true, + /* key */ KEY_ALLOW_IGNORE_ORIENTATION_REQUEST); mLetterboxConfigurationPersister = letterboxConfigurationPersister; mLetterboxConfigurationPersister.start(); } /** + * Whether enabling ignoreOrientationRequest is allowed on the device. This value is controlled + * via {@link android.provider.DeviceConfig}. + */ + boolean isIgnoreOrientationRequestAllowed() { + return mDeviceConfig.getFlag(KEY_ALLOW_IGNORE_ORIENTATION_REQUEST); + } + + /** * Overrides the aspect ratio of letterbox for fixed orientation. If given value is <= {@link * #MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO}, both it and a value of {@link * com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio} will be ignored and @@ -1050,38 +1060,8 @@ final class LetterboxConfiguration { "enable_translucent_activity_letterbox", false); } - @VisibleForTesting - boolean getPackageManagerProperty(PackageManager pm, String property) { - boolean enabled = false; - try { - final PackageManager.Property p = pm.getProperty(property, mContext.getPackageName()); - enabled = p.getBoolean(); - } catch (PackageManager.NameNotFoundException e) { - // Property not found - } - return enabled; - } - - @VisibleForTesting - boolean isCompatFakeFocusEnabled(ActivityInfo info) { - if (!isCompatFakeFocusEnabledOnDevice()) { - return false; - } - // See if the developer has chosen to opt in / out of treatment - PackageManager pm = mContext.getPackageManager(); - if (getPackageManagerProperty(pm, PROPERTY_COMPAT_FAKE_FOCUS_OPT_OUT)) { - return false; - } else if (getPackageManagerProperty(pm, PROPERTY_COMPAT_FAKE_FOCUS_OPT_IN)) { - return true; - } - if (info.isChangeEnabled(ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS)) { - return true; - } - return false; - } - /** Whether fake sending focus is enabled for unfocused apps in splitscreen */ - boolean isCompatFakeFocusEnabledOnDevice() { + boolean isCompatFakeFocusEnabled() { return mIsCompatFakeFocusEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_WINDOW_MANAGER, DEVICE_CONFIG_KEY_ENABLE_COMPAT_FAKE_FOCUS, true); diff --git a/services/core/java/com/android/server/wm/LetterboxConfigurationDeviceConfig.java b/services/core/java/com/android/server/wm/LetterboxConfigurationDeviceConfig.java index cf123a1f9ace..3f067e3a1556 100644 --- a/services/core/java/com/android/server/wm/LetterboxConfigurationDeviceConfig.java +++ b/services/core/java/com/android/server/wm/LetterboxConfigurationDeviceConfig.java @@ -38,10 +38,16 @@ final class LetterboxConfigurationDeviceConfig private static final boolean DEFAULT_VALUE_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY = true; + static final String KEY_ALLOW_IGNORE_ORIENTATION_REQUEST = + "allow_ignore_orientation_request"; + private static final boolean DEFAULT_VALUE_ALLOW_IGNORE_ORIENTATION_REQUEST = true; + @VisibleForTesting static final Map<String, Boolean> sKeyToDefaultValueMap = Map.of( KEY_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY, - DEFAULT_VALUE_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY + DEFAULT_VALUE_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY, + KEY_ALLOW_IGNORE_ORIENTATION_REQUEST, + DEFAULT_VALUE_ALLOW_IGNORE_ORIENTATION_REQUEST ); // Whether enabling rotation compat policy for immersive apps that prevents auto rotation @@ -52,6 +58,10 @@ final class LetterboxConfigurationDeviceConfig private boolean mIsDisplayRotationImmersiveAppCompatPolicyEnabled = DEFAULT_VALUE_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY; + // Whether enabling ignoreOrientationRequest is allowed on the device. + private boolean mIsAllowIgnoreOrientationRequest = + DEFAULT_VALUE_ALLOW_IGNORE_ORIENTATION_REQUEST; + // Set of active device configs that need to be updated in // DeviceConfig.OnPropertiesChangedListener#onPropertiesChanged. private final ArraySet<String> mActiveDeviceConfigsSet = new ArraySet<>(); @@ -93,6 +103,8 @@ final class LetterboxConfigurationDeviceConfig switch (key) { case KEY_ENABLE_DISPLAY_ROTATION_IMMERSIVE_APP_COMPAT_POLICY: return mIsDisplayRotationImmersiveAppCompatPolicyEnabled; + case KEY_ALLOW_IGNORE_ORIENTATION_REQUEST: + return mIsAllowIgnoreOrientationRequest; default: throw new AssertionError("Unexpected flag name: " + key); } @@ -108,6 +120,10 @@ final class LetterboxConfigurationDeviceConfig mIsDisplayRotationImmersiveAppCompatPolicyEnabled = getDeviceConfig(key, defaultValue); break; + case KEY_ALLOW_IGNORE_ORIENTATION_REQUEST: + mIsAllowIgnoreOrientationRequest = + getDeviceConfig(key, defaultValue); + break; default: throw new AssertionError("Unexpected flag name: " + key); } diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index b67b74559e26..59e5ca4d1fbf 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -17,11 +17,22 @@ package com.android.server.wm; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE; +import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS; import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION; +import static android.content.pm.ActivityInfo.OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE; +import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR; +import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT; +import static android.content.pm.ActivityInfo.OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; +import static android.content.pm.ActivityInfo.isFixedOrientation; +import static android.content.pm.ActivityInfo.isFixedOrientationLandscape; import static android.content.pm.ActivityInfo.screenOrientationToString; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; @@ -29,6 +40,9 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE; +import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE; +import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE; +import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS; import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION; import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__BOTTOM; @@ -62,6 +76,9 @@ import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_VERTICAL_RE import static com.android.server.wm.LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO; import static com.android.server.wm.LetterboxConfiguration.letterboxBackgroundTypeToString; +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; + import android.annotation.Nullable; import android.app.ActivityManager.TaskDescription; import android.content.pm.ActivityInfo.ScreenOrientation; @@ -111,6 +128,37 @@ final class LetterboxUiController { */ private final float mExpandedTaskBarHeight; + // TODO(b/265576778): Cache other overrides as well. + + // Corresponds to OVERRIDE_ANY_ORIENTATION + private final boolean mIsOverrideAnyOrientationEnabled; + // Corresponds to OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT + private final boolean mIsOverrideToPortraitOrientationEnabled; + // Corresponds to OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR + private final boolean mIsOverrideToNosensorOrientationEnabled; + // Corresponds to OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE + private final boolean mIsOverrideToReverseLandscapeOrientationEnabled; + // Corresponds to OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION + private final boolean mIsOverrideUseDisplayLandscapeNaturalOrientationEnabled; + + // Corresponds to OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION + private final boolean mIsOverrideCameraCompatDisableForceRotationEnabled; + // Corresponds to OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH + private final boolean mIsOverrideCameraCompatDisableRefreshEnabled; + // Corresponds to OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE + private final boolean mIsOverrideCameraCompatEnableRefreshViaPauseEnabled; + + // Corresponds to OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION + private final boolean mIsOverrideEnableCompatIgnoreRequestedOrientationEnabled; + + // Corresponds to OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS + private final boolean mIsOverrideEnableCompatFakeFocusEnabled; + + @Nullable + private final Boolean mBooleanPropertyAllowOrientationOverride; + @Nullable + private final Boolean mBooleanPropertyAllowDisplayOrientationOverride; + /* * WindowContainerListener responsible to make translucent activities inherit * constraints from the first opaque activity beneath them. It's null for not @@ -161,6 +209,9 @@ final class LetterboxUiController { @Nullable private final Boolean mBooleanPropertyIgnoreRequestedOrientation; + @Nullable + private final Boolean mBooleanPropertyFakeFocus; + private boolean mIsRelauchingAfterRequestedOrientationChanged; LetterboxUiController(WindowManagerService wmService, ActivityRecord activityRecord) { @@ -175,6 +226,10 @@ final class LetterboxUiController { readComponentProperty(packageManager, mActivityRecord.packageName, mLetterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled, PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION); + mBooleanPropertyFakeFocus = + readComponentProperty(packageManager, mActivityRecord.packageName, + mLetterboxConfiguration::isCompatFakeFocusEnabled, + PROPERTY_COMPAT_ENABLE_FAKE_FOCUS); mBooleanPropertyCameraCompatAllowForceRotation = readComponentProperty(packageManager, mActivityRecord.packageName, () -> mLetterboxConfiguration.isCameraCompatTreatmentEnabled( @@ -193,6 +248,38 @@ final class LetterboxUiController { mExpandedTaskBarHeight = getResources().getDimensionPixelSize(R.dimen.taskbar_frame_height); + + mBooleanPropertyAllowOrientationOverride = + readComponentProperty(packageManager, mActivityRecord.packageName, + /* gatingCondition */ null, + PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE); + mBooleanPropertyAllowDisplayOrientationOverride = + readComponentProperty(packageManager, mActivityRecord.packageName, + /* gatingCondition */ null, + PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE); + + mIsOverrideAnyOrientationEnabled = isCompatChangeEnabled(OVERRIDE_ANY_ORIENTATION); + mIsOverrideToPortraitOrientationEnabled = + isCompatChangeEnabled(OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT); + mIsOverrideToReverseLandscapeOrientationEnabled = + isCompatChangeEnabled(OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE); + mIsOverrideToNosensorOrientationEnabled = + isCompatChangeEnabled(OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR); + mIsOverrideUseDisplayLandscapeNaturalOrientationEnabled = + isCompatChangeEnabled(OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION); + + mIsOverrideCameraCompatDisableForceRotationEnabled = + isCompatChangeEnabled(OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION); + mIsOverrideCameraCompatDisableRefreshEnabled = + isCompatChangeEnabled(OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH); + mIsOverrideCameraCompatEnableRefreshViaPauseEnabled = + isCompatChangeEnabled(OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE); + + mIsOverrideEnableCompatIgnoreRequestedOrientationEnabled = + isCompatChangeEnabled(OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION); + + mIsOverrideEnableCompatFakeFocusEnabled = + isCompatChangeEnabled(OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS); } /** @@ -207,8 +294,8 @@ final class LetterboxUiController { */ @Nullable private static Boolean readComponentProperty(PackageManager packageManager, String packageName, - BooleanSupplier gatingCondition, String propertyName) { - if (!gatingCondition.getAsBoolean()) { + @Nullable BooleanSupplier gatingCondition, String propertyName) { + if (gatingCondition != null && !gatingCondition.getAsBoolean()) { return null; } try { @@ -262,7 +349,7 @@ final class LetterboxUiController { if (!shouldEnableWithOverrideAndProperty( /* gatingCondition */ mLetterboxConfiguration ::isPolicyForIgnoringRequestedOrientationEnabled, - OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION, + mIsOverrideEnableCompatIgnoreRequestedOrientationEnabled, mBooleanPropertyIgnoreRequestedOrientation)) { return false; } @@ -288,6 +375,25 @@ final class LetterboxUiController { } /** + * Whether sending compat fake focus for split screen resumed activities is enabled. Needed + * because some game engines wait to get focus before drawing the content of the app which isn't + * guaranteed by default in multi-window modes. + * + * <p>This treatment is enabled when the following conditions are met: + * <ul> + * <li>Flag gating the treatment is enabled + * <li>Component property is NOT set to false + * <li>Component property is set to true or per-app override is enabled + * </ul> + */ + boolean shouldSendFakeFocus() { + return shouldEnableWithOverrideAndProperty( + /* gatingCondition */ mLetterboxConfiguration::isCompatFakeFocusEnabled, + mIsOverrideEnableCompatFakeFocusEnabled, + mBooleanPropertyFakeFocus); + } + + /** * Sets whether an activity is relaunching after the app has called {@link * android.app.Activity#setRequestedOrientation}. */ @@ -308,6 +414,66 @@ final class LetterboxUiController { } /** + * Whether should fix display orientation to landscape natural orientation when a task is + * fullscreen and the display is ignoring orientation requests. + * + * <p>This treatment is enabled when the following conditions are met: + * <ul> + * <li>Opt-out component property isn't enabled + * <li>Opt-in per-app override is enabled + * <li>Task is in fullscreen. + * <li>{@link DisplayContent#getIgnoreOrientationRequest} is enabled + * <li>Natural orientation of the display is landscape. + * </ul> + */ + boolean shouldUseDisplayLandscapeNaturalOrientation() { + return shouldEnableWithOptInOverrideAndOptOutProperty( + /* gatingCondition */ () -> mActivityRecord.mDisplayContent != null + && mActivityRecord.getTask() != null + && mActivityRecord.mDisplayContent.getIgnoreOrientationRequest() + && !mActivityRecord.getTask().inMultiWindowMode() + && mActivityRecord.mDisplayContent.getNaturalOrientation() + == ORIENTATION_LANDSCAPE, + mIsOverrideUseDisplayLandscapeNaturalOrientationEnabled, + mBooleanPropertyAllowDisplayOrientationOverride); + } + + @ScreenOrientation + int overrideOrientationIfNeeded(@ScreenOrientation int candidate) { + if (FALSE.equals(mBooleanPropertyAllowOrientationOverride)) { + return candidate; + } + + if (mIsOverrideToReverseLandscapeOrientationEnabled + && (isFixedOrientationLandscape(candidate) || mIsOverrideAnyOrientationEnabled)) { + Slog.w(TAG, "Requested orientation " + screenOrientationToString(candidate) + " for " + + mActivityRecord + " is overridden to " + + screenOrientationToString(SCREEN_ORIENTATION_REVERSE_LANDSCAPE)); + return SCREEN_ORIENTATION_REVERSE_LANDSCAPE; + } + + if (!mIsOverrideAnyOrientationEnabled && isFixedOrientation(candidate)) { + return candidate; + } + + if (mIsOverrideToPortraitOrientationEnabled) { + Slog.w(TAG, "Requested orientation " + screenOrientationToString(candidate) + " for " + + mActivityRecord + " is overridden to " + + screenOrientationToString(SCREEN_ORIENTATION_PORTRAIT)); + return SCREEN_ORIENTATION_PORTRAIT; + } + + if (mIsOverrideToNosensorOrientationEnabled) { + Slog.w(TAG, "Requested orientation " + screenOrientationToString(candidate) + " for " + + mActivityRecord + " is overridden to " + + screenOrientationToString(SCREEN_ORIENTATION_NOSENSOR)); + return SCREEN_ORIENTATION_NOSENSOR; + } + + return candidate; + } + + /** * Whether activity is eligible for activity "refresh" after camera compat force rotation * treatment. See {@link DisplayRotationCompatPolicy} for context. * @@ -322,7 +488,7 @@ final class LetterboxUiController { return shouldEnableWithOptOutOverrideAndProperty( /* gatingCondition */ () -> mLetterboxConfiguration .isCameraCompatTreatmentEnabled(/* checkDeviceConfig */ true), - OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH, + mIsOverrideCameraCompatDisableRefreshEnabled, mBooleanPropertyCameraCompatAllowRefresh); } @@ -344,7 +510,7 @@ final class LetterboxUiController { return shouldEnableWithOverrideAndProperty( /* gatingCondition */ () -> mLetterboxConfiguration .isCameraCompatTreatmentEnabled(/* checkDeviceConfig */ true), - OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE, + mIsOverrideCameraCompatEnableRefreshViaPauseEnabled, mBooleanPropertyCameraCompatEnableRefreshViaPause); } @@ -363,15 +529,19 @@ final class LetterboxUiController { return shouldEnableWithOptOutOverrideAndProperty( /* gatingCondition */ () -> mLetterboxConfiguration .isCameraCompatTreatmentEnabled(/* checkDeviceConfig */ true), - OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION, + mIsOverrideCameraCompatDisableForceRotationEnabled, mBooleanPropertyCameraCompatAllowForceRotation); } + private boolean isCompatChangeEnabled(long overrideChangeId) { + return mActivityRecord.info.isChangeEnabled(overrideChangeId); + } + /** * Returns {@code true} when the following conditions are met: * <ul> * <li>{@code gatingCondition} isn't {@code false} - * <li>OEM didn't opt out with a {@code overrideChangeId} override + * <li>OEM didn't opt out with a per-app override * <li>App developers didn't opt out with a component {@code property} * </ul> * @@ -379,12 +549,30 @@ final class LetterboxUiController { * disabled on per-app basis by OEMs or app developers. */ private boolean shouldEnableWithOptOutOverrideAndProperty(BooleanSupplier gatingCondition, - long overrideChangeId, Boolean property) { + boolean isOverrideChangeEnabled, Boolean property) { + if (!gatingCondition.getAsBoolean()) { + return false; + } + return !FALSE.equals(property) && !isOverrideChangeEnabled; + } + + /** + * Returns {@code true} when the following conditions are met: + * <ul> + * <li>{@code gatingCondition} isn't {@code false} + * <li>OEM did opt in with a per-app override + * <li>App developers didn't opt out with a component {@code property} + * </ul> + * + * <p>This is used for the treatments that are enabled based with the heuristic but can be + * disabled on per-app basis by OEMs or app developers. + */ + private boolean shouldEnableWithOptInOverrideAndOptOutProperty(BooleanSupplier gatingCondition, + boolean isOverrideChangeEnabled, Boolean property) { if (!gatingCondition.getAsBoolean()) { return false; } - return !Boolean.FALSE.equals(property) - && !mActivityRecord.info.isChangeEnabled(overrideChangeId); + return !FALSE.equals(property) && isOverrideChangeEnabled; } /** @@ -393,21 +581,20 @@ final class LetterboxUiController { * <li>{@code gatingCondition} isn't {@code false} * <li>App developers didn't opt out with a component {@code property} * <li>App developers opted in with a component {@code property} or an OEM opted in with a - * component {@code property} + * per-app override * </ul> * * <p>This is used for the treatments that are enabled only on per-app basis. */ private boolean shouldEnableWithOverrideAndProperty(BooleanSupplier gatingCondition, - long overrideChangeId, Boolean property) { + boolean isOverrideChangeEnabled, Boolean property) { if (!gatingCondition.getAsBoolean()) { return false; } - if (Boolean.FALSE.equals(property)) { + if (FALSE.equals(property)) { return false; } - return Boolean.TRUE.equals(property) - || mActivityRecord.info.isChangeEnabled(overrideChangeId); + return TRUE.equals(property) || isOverrideChangeEnabled; } boolean hasWallpaperBackgroundForLetterbox() { @@ -1224,7 +1411,8 @@ final class LetterboxUiController { // To avoid wrong behaviour, we're not forcing orientation for activities with not // fixed orientation (e.g. permission dialogs). return hasInheritedLetterboxBehavior() - && mActivityRecord.mOrientation != SCREEN_ORIENTATION_UNSPECIFIED; + && mActivityRecord.getOverrideOrientation() + != SCREEN_ORIENTATION_UNSPECIFIED; } float getInheritedMinAspectRatio() { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 8bdab9c22ab7..9a20354bcf81 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -73,6 +73,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.content.pm.ActivityInfo; +import android.content.pm.ActivityInfo.ScreenOrientation; import android.content.res.Configuration; import android.graphics.Color; import android.graphics.Point; @@ -178,8 +179,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< protected final WindowList<E> mChildren = new WindowList<E>(); // The specified orientation for this window container. - @ActivityInfo.ScreenOrientation - protected int mOrientation = SCREEN_ORIENTATION_UNSPECIFIED; + // Shouldn't be accessed directly since subclasses can override getOverrideOrientation. + @ScreenOrientation + private int mOverrideOrientation = SCREEN_ORIENTATION_UNSPECIFIED; /** * The window container which decides its orientation since the last time @@ -1427,19 +1429,20 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< /** * Gets the configuration orientation by the requested screen orientation - * ({@link ActivityInfo.ScreenOrientation}) of this activity. + * ({@link ScreenOrientation}) of this activity. * * @return orientation in ({@link Configuration#ORIENTATION_LANDSCAPE}, * {@link Configuration#ORIENTATION_PORTRAIT}, * {@link Configuration#ORIENTATION_UNDEFINED}). */ + @ScreenOrientation int getRequestedConfigurationOrientation() { return getRequestedConfigurationOrientation(false /* forDisplay */); } /** * Gets the configuration orientation by the requested screen orientation - * ({@link ActivityInfo.ScreenOrientation}) of this activity. + * ({@link ScreenOrientation}) of this activity. * * @param forDisplay whether it is the requested config orientation for display. * If {@code true}, we may reverse the requested orientation if the root is @@ -1450,8 +1453,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * {@link Configuration#ORIENTATION_PORTRAIT}, * {@link Configuration#ORIENTATION_UNDEFINED}). */ + @ScreenOrientation int getRequestedConfigurationOrientation(boolean forDisplay) { - int requestedOrientation = mOrientation; + int requestedOrientation = getOverrideOrientation(); final RootDisplayArea root = getRootDisplayArea(); if (forDisplay && root != null && root.isOrientationDifferentFromDisplay()) { // Reverse the requested orientation if the orientation of its root is different from @@ -1461,7 +1465,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< // (portrait). // When an app below the DAG is requesting landscape, it should actually request the // display to be portrait, so that the DAG and the app will be in landscape. - requestedOrientation = reverseOrientation(mOrientation); + requestedOrientation = reverseOrientation(getOverrideOrientation()); } if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_NOSENSOR) { @@ -1486,7 +1490,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * * @param orientation the specified orientation. */ - void setOrientation(int orientation) { + void setOrientation(@ScreenOrientation int orientation) { setOrientation(orientation, null /* requestingContainer */); } @@ -1494,17 +1498,17 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * Sets the specified orientation of this container. It percolates this change upward along the * hierarchy to let each level of the hierarchy a chance to respond to it. * - * @param orientation the specified orientation. Needs to be one of {@link - * android.content.pm.ActivityInfo.ScreenOrientation}. + * @param orientation the specified orientation. Needs to be one of {@link ScreenOrientation}. * @param requestingContainer the container which orientation request has changed. Mostly used * to ensure it gets correct configuration. */ - void setOrientation(int orientation, @Nullable WindowContainer requestingContainer) { - if (mOrientation == orientation) { + void setOrientation(@ScreenOrientation int orientation, + @Nullable WindowContainer requestingContainer) { + if (getOverrideOrientation() == orientation) { return; } - mOrientation = orientation; + setOverrideOrientation(orientation); final WindowContainer parent = getParent(); if (parent != null) { if (getConfiguration().orientation != getRequestedConfigurationOrientation() @@ -1523,9 +1527,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } - @ActivityInfo.ScreenOrientation + @ScreenOrientation int getOrientation() { - return getOrientation(mOrientation); + return getOrientation(getOverrideOrientation()); } /** @@ -1539,7 +1543,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * better match. * @return The orientation as specified by this branch or the window hierarchy. */ - int getOrientation(int candidate) { + @ScreenOrientation + int getOrientation(@ScreenOrientation int candidate) { mLastOrientationSource = null; if (!providesOrientation()) { return SCREEN_ORIENTATION_UNSET; @@ -1549,16 +1554,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< // specified; otherwise we prefer to use the orientation of its topmost child that has one // specified and fall back on this container's unset or unspecified value as a candidate // if none of the children have a better candidate for the orientation. - if (mOrientation != SCREEN_ORIENTATION_UNSET - && mOrientation != SCREEN_ORIENTATION_UNSPECIFIED) { + if (getOverrideOrientation() != SCREEN_ORIENTATION_UNSET + && getOverrideOrientation() != SCREEN_ORIENTATION_UNSPECIFIED) { mLastOrientationSource = this; - return mOrientation; + return getOverrideOrientation(); } for (int i = mChildren.size() - 1; i >= 0; --i) { final WindowContainer wc = mChildren.get(i); - // TODO: Maybe mOrientation should default to SCREEN_ORIENTATION_UNSET vs. + // TODO: Maybe mOverrideOrientation should default to SCREEN_ORIENTATION_UNSET vs. // SCREEN_ORIENTATION_UNSPECIFIED? final int orientation = wc.getOrientation(candidate == SCREEN_ORIENTATION_BEHIND ? SCREEN_ORIENTATION_BEHIND : SCREEN_ORIENTATION_UNSET); @@ -1590,6 +1595,20 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } /** + * Returns orientation specified on this level of hierarchy without taking children into + * account, like {@link #getOrientation} does, allowing subclasses to override. See {@link + * ActivityRecord#getOverrideOrientation} for an example. + */ + @ScreenOrientation + protected int getOverrideOrientation() { + return mOverrideOrientation; + } + + protected void setOverrideOrientation(@ScreenOrientation int orientation) { + mOverrideOrientation = orientation; + } + + /** * @return The deepest source which decides the orientation of this window container since the * last time {@link #getOrientation(int) was called. */ @@ -2635,7 +2654,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< final long token = proto.start(fieldId); super.dumpDebug(proto, CONFIGURATION_CONTAINER, logLevel); - proto.write(ORIENTATION, mOrientation); + proto.write(ORIENTATION, mOverrideOrientation); proto.write(VISIBLE, isVisible); writeIdentifierToProto(proto, IDENTIFIER); if (mSurfaceAnimator.isAnimating()) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5065014b9bee..2911890bf80e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -4170,7 +4170,8 @@ public class WindowManagerService extends IWindowManager.Stub * <p>Note: this assumes that {@link #mGlobalLock} is held by the caller. */ boolean isIgnoreOrientationRequestDisabled() { - return mIsIgnoreOrientationRequestDisabled; + return mIsIgnoreOrientationRequestDisabled + || !mLetterboxConfiguration.isIgnoreOrientationRequestAllowed(); } @Override diff --git a/services/core/java/com/android/server/wm/WindowOrientationListener.java b/services/core/java/com/android/server/wm/WindowOrientationListener.java index 3e165e442d79..14c816db0dbb 100644 --- a/services/core/java/com/android/server/wm/WindowOrientationListener.java +++ b/services/core/java/com/android/server/wm/WindowOrientationListener.java @@ -88,14 +88,19 @@ public abstract class WindowOrientationListener { private final Object mLock = new Object(); + @Surface.Rotation + private final int mDefaultRotation; + /** * Creates a new WindowOrientationListener. * * @param context for the WindowOrientationListener. * @param handler Provides the Looper for receiving sensor updates. + * @param defaultRotation Default rotation of the display. */ - public WindowOrientationListener(Context context, Handler handler) { - this(context, handler, SensorManager.SENSOR_DELAY_UI); + public WindowOrientationListener(Context context, Handler handler, + @Surface.Rotation int defaultRotation) { + this(context, handler, defaultRotation, SensorManager.SENSOR_DELAY_UI); } /** @@ -103,7 +108,7 @@ public abstract class WindowOrientationListener { * * @param context for the WindowOrientationListener. * @param handler Provides the Looper for receiving sensor updates. - * @param wmService WindowManagerService to read the device config from. + * @param defaultRotation Default rotation of the display. * @param rate at which sensor events are processed (see also * {@link android.hardware.SensorManager SensorManager}). Use the default * value of {@link android.hardware.SensorManager#SENSOR_DELAY_NORMAL @@ -111,10 +116,11 @@ public abstract class WindowOrientationListener { * * This constructor is private since no one uses it. */ - private WindowOrientationListener( - Context context, Handler handler, int rate) { + private WindowOrientationListener(Context context, Handler handler, + @Surface.Rotation int defaultRotation, int rate) { mContext = context; mHandler = handler; + mDefaultRotation = defaultRotation; mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); mRate = rate; List<Sensor> l = mSensorManager.getSensorList(Sensor.TYPE_DEVICE_ORIENTATION); @@ -1159,7 +1165,7 @@ public abstract class WindowOrientationListener { "Reusing the last rotation resolution: " + mLastRotationResolution); finalizeRotation(mLastRotationResolution); } else { - finalizeRotation(Surface.ROTATION_0); + finalizeRotation(mDefaultRotation); } return; } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index ae03fbbe1cff..45dacbbba75e 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2387,7 +2387,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // IME parent may failed to attach to the app during rotating the screen. // See DisplayContent#shouldImeAttachedToApp, DisplayContent#isImeControlledByApp if (windowConfigChanged) { - getDisplayContent().updateImeControlTarget(); + // If the window was the IME layering target, updates the IME surface parent in case + // the IME surface may be wrongly positioned when the window configuration affects the + // IME surface association. (e.g. Attach IME surface on the display instead of the + // app when the app bounds being letterboxed.) + mDisplayContent.updateImeControlTarget(isImeLayeringTarget() /* updateImeParent */); } } diff --git a/services/tests/mockingservicestests/AndroidManifest.xml b/services/tests/mockingservicestests/AndroidManifest.xml index 33ac73560968..ea0481e03b97 100644 --- a/services/tests/mockingservicestests/AndroidManifest.xml +++ b/services/tests/mockingservicestests/AndroidManifest.xml @@ -43,6 +43,9 @@ <!-- needed by TrustManagerServiceTest to access LockSettings' secure storage --> <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> + <!-- needed by GameManagerServiceTest because GameManager creates a UidObserver --> + <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" /> + <application android:testOnly="true" android:debuggable="true"> <uses-library android:name="android.test.runner" /> diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java index fa4a9de62a88..2d5f0b01ab4c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java @@ -29,13 +29,16 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.Manifest; +import android.app.ActivityManager; import android.app.GameManager; import android.app.GameModeInfo; import android.app.GameState; @@ -203,6 +206,23 @@ public class GameManagerServiceTests { LocalServices.addService(PowerManagerInternal.class, mMockPowerManager); } + private void mockAppCategory(String packageName, @ApplicationInfo.Category int category) + throws Exception { + reset(mMockPackageManager); + final ApplicationInfo gameApplicationInfo = new ApplicationInfo(); + gameApplicationInfo.category = category; + gameApplicationInfo.packageName = packageName; + final PackageInfo pi = new PackageInfo(); + pi.packageName = packageName; + pi.applicationInfo = gameApplicationInfo; + final List<PackageInfo> packages = new ArrayList<>(); + packages.add(pi); + when(mMockPackageManager.getInstalledPackagesAsUser(anyInt(), anyInt())) + .thenReturn(packages); + when(mMockPackageManager.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) + .thenReturn(gameApplicationInfo); + } + @After public void tearDown() throws Exception { LocalServices.removeServiceForTest(PowerManagerInternal.class); @@ -1597,4 +1617,113 @@ public class GameManagerServiceTests { ArgumentMatchers.eq(DEFAULT_PACKAGE_UID), ArgumentMatchers.eq(0.0f)); } + + private GameManagerService createServiceAndStartUser(int userId) { + GameManagerService gameManagerService = new GameManagerService(mMockContext, + mTestLooper.getLooper()); + startUser(gameManagerService, userId); + return gameManagerService; + } + + @Test + public void testGamePowerMode_gamePackage() throws Exception { + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages = {mPackageName}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, true); + } + + @Test + public void testGamePowerMode_twoGames() throws Exception { + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages1 = {mPackageName}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages1); + String someGamePkg = "some.game"; + String[] packages2 = {someGamePkg}; + int somePackageId = DEFAULT_PACKAGE_UID + 1; + when(mMockPackageManager.getPackagesForUid(somePackageId)).thenReturn(packages2); + HashMap<Integer, Boolean> powerState = new HashMap<>(); + doAnswer(inv -> powerState.put(inv.getArgument(0), inv.getArgument(1))) + .when(mMockPowerManager).setPowerMode(anyInt(), anyBoolean()); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + assertTrue(powerState.get(Mode.GAME)); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + somePackageId, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + assertTrue(powerState.get(Mode.GAME)); + gameManagerService.mUidObserver.onUidStateChanged( + somePackageId, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + assertFalse(powerState.get(Mode.GAME)); + } + + @Test + public void testGamePowerMode_twoGamesOverlap() throws Exception { + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages1 = {mPackageName}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages1); + String someGamePkg = "some.game"; + String[] packages2 = {someGamePkg}; + int somePackageId = DEFAULT_PACKAGE_UID + 1; + when(mMockPackageManager.getPackagesForUid(somePackageId)).thenReturn(packages2); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + somePackageId, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + somePackageId, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, true); + verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, false); + } + + @Test + public void testGamePowerMode_released() throws Exception { + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages = {mPackageName}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, false); + } + + @Test + public void testGamePowerMode_noPackage() throws Exception { + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages = {}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + verify(mMockPowerManager, times(0)).setPowerMode(Mode.GAME, true); + } + + @Test + public void testGamePowerMode_notAGamePackage() throws Exception { + mockAppCategory(mPackageName, ApplicationInfo.CATEGORY_IMAGE); + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages = {"someapp"}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + verify(mMockPowerManager, times(0)).setPowerMode(Mode.GAME, true); + } + + @Test + public void testGamePowerMode_notAGamePackageNotReleased() throws Exception { + mockAppCategory(mPackageName, ApplicationInfo.CATEGORY_IMAGE); + GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1); + String[] packages = {"someapp"}; + when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0); + gameManagerService.mUidObserver.onUidStateChanged( + DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); + verify(mMockPowerManager, times(0)).setPowerMode(Mode.GAME, false); + } } diff --git a/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java b/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java new file mode 100644 index 000000000000..6c73f716493c --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.dreams; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import android.content.ComponentName; +import android.content.Intent; +import android.os.IBinder; +import android.os.RemoteException; +import android.service.dreams.DreamOverlayService; +import android.service.dreams.IDreamOverlay; +import android.service.dreams.IDreamOverlayCallback; +import android.service.dreams.IDreamOverlayClient; +import android.service.dreams.IDreamOverlayClientCallback; +import android.view.WindowManager; + +import androidx.annotation.NonNull; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +/** + * A collection of tests to exercise {@link DreamOverlayService}. + */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class DreamOverlayServiceTest { + private static final ComponentName FIRST_DREAM_COMPONENT = + ComponentName.unflattenFromString("com.foo.bar/.DreamService"); + private static final ComponentName SECOND_DREAM_COMPONENT = + ComponentName.unflattenFromString("com.foo.baz/.DreamService"); + + @Mock + WindowManager.LayoutParams mLayoutParams; + + @Mock + IDreamOverlayCallback mOverlayCallback; + + /** + * {@link TestDreamOverlayService} is a simple {@link DreamOverlayService} implementation for + * tracking interactions across {@link IDreamOverlay} binder interface. The service reports + * interactions to a {@link Monitor} instance provided at construction. + */ + private static class TestDreamOverlayService extends DreamOverlayService { + /** + * An interface implemented to be informed when the corresponding methods in + * {@link TestDreamOverlayService} are invoked. + */ + interface Monitor { + void onStartDream(); + void onEndDream(); + void onWakeUp(); + } + + private final Monitor mMonitor; + + TestDreamOverlayService(Monitor monitor) { + super(); + mMonitor = monitor; + } + + @Override + public void onStartDream(@NonNull WindowManager.LayoutParams layoutParams) { + mMonitor.onStartDream(); + } + + @Override + public void onEndDream() { + mMonitor.onEndDream(); + super.onEndDream(); + } + + @Override + public void onWakeUp(@NonNull Runnable onCompleteCallback) { + mMonitor.onWakeUp(); + super.onWakeUp(onCompleteCallback); + } + } + + /** + * A {@link IDreamOverlayClientCallback} implementation that captures the requested client. + */ + private static class OverlayClientCallback extends IDreamOverlayClientCallback.Stub { + public IDreamOverlayClient retrievedClient; + @Override + public void onDreamOverlayClient(IDreamOverlayClient client) throws RemoteException { + retrievedClient = client; + } + } + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + /** + * Verifies that only the currently started dream is able to affect the overlay. + */ + @Test + public void testOverlayClientInteraction() throws RemoteException { + final TestDreamOverlayService.Monitor monitor = Mockito.mock( + TestDreamOverlayService.Monitor.class); + final TestDreamOverlayService service = new TestDreamOverlayService(monitor); + final IBinder binder = service.onBind(new Intent()); + final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(binder); + + // Create two overlay clients and ensure they are unique. + final IDreamOverlayClient firstClient = getClient(overlay); + assertThat(firstClient).isNotNull(); + + final IDreamOverlayClient secondClient = getClient(overlay); + assertThat(secondClient).isNotNull(); + + assertThat(firstClient).isNotEqualTo(secondClient); + + // Start a dream with the first client and ensure the dream is now active from the + // overlay's perspective. + firstClient.startDream(mLayoutParams, mOverlayCallback, + FIRST_DREAM_COMPONENT.flattenToString(), false); + + + verify(monitor).onStartDream(); + assertThat(service.getDreamComponent()).isEqualTo(FIRST_DREAM_COMPONENT); + + Mockito.clearInvocations(monitor); + + // Start a dream from the second client and verify that the overlay has both cycled to + // the new dream (ended/started). + secondClient.startDream(mLayoutParams, mOverlayCallback, + SECOND_DREAM_COMPONENT.flattenToString(), false); + + verify(monitor).onEndDream(); + verify(monitor).onStartDream(); + assertThat(service.getDreamComponent()).isEqualTo(SECOND_DREAM_COMPONENT); + + Mockito.clearInvocations(monitor); + + // Verify that interactions with the first, now inactive client don't affect the overlay. + firstClient.endDream(); + verify(monitor, never()).onEndDream(); + + firstClient.wakeUp(); + verify(monitor, never()).onWakeUp(); + } + + private static IDreamOverlayClient getClient(IDreamOverlay overlay) throws RemoteException { + final OverlayClientCallback callback = new OverlayClientCallback(); + overlay.getClient(callback); + return callback.retrievedClient; + } +} diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java b/services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java index 3de65c19a1a4..1b3a19954d7f 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java @@ -132,6 +132,19 @@ public class WindowOrientationListenerTest { assertThat(mFinalizedRotation).isEqualTo(DEFAULT_SENSOR_ROTATION); } + @Test + public void testOnSensorChanged_screenLocked_doNotCallRotationResolverReturnDefaultRotation() { + mWindowOrientationListener = new TestableWindowOrientationListener(mMockContext, + mHandler, /* defaultRotation */ Surface.ROTATION_180); + mWindowOrientationListener.mRotationResolverService = mFakeRotationResolverInternal; + mWindowOrientationListener.mIsScreenLocked = true; + + mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent); + + assertThat(mWindowOrientationListener.mIsOnProposedRotationChangedCalled).isFalse(); + assertThat(mFinalizedRotation).isEqualTo(Surface.ROTATION_180); + } + static final class TestableRotationResolver extends RotationResolverInternal { @Surface.Rotation RotationResolverCallbackInternal mCallback; @@ -166,21 +179,17 @@ public class WindowOrientationListenerTest { } } - @Test - public void testOnSensorChanged_inLockScreen_doNotCallRotationResolver() { - mWindowOrientationListener.mIsScreenLocked = true; - - mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent); - - assertThat(mWindowOrientationListener.mIsOnProposedRotationChangedCalled).isFalse(); - } - final class TestableWindowOrientationListener extends WindowOrientationListener { private boolean mIsOnProposedRotationChangedCalled = false; private boolean mIsScreenLocked; TestableWindowOrientationListener(Context context, Handler handler) { - super(context, handler); + this(context, handler, Surface.ROTATION_0); + } + + TestableWindowOrientationListener(Context context, Handler handler, + @Surface.Rotation int defaultRotation) { + super(context, handler, defaultRotation); this.mOrientationJudge = new OrientationSensorJudge(); } 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 b0639bffe694..dc12469960ff 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1736,7 +1736,7 @@ public class DisplayContentTests extends WindowTestsBase { // No need to apply rotation if the display ignores orientation request. doCallRealMethod().when(displayContent).rotationForActivityInDifferentOrientation(any()); - pinnedActivity.mOrientation = SCREEN_ORIENTATION_LANDSCAPE; + pinnedActivity.setOverrideOrientation(SCREEN_ORIENTATION_LANDSCAPE); displayContent.setIgnoreOrientationRequest(true); assertEquals(WindowConfiguration.ROTATION_UNDEFINED, displayContent.rotationForActivityInDifferentOrientation(pinnedActivity)); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java index f814608ed87a..ed2b0a36cd5c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java @@ -56,6 +56,7 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.hardware.devicestate.DeviceStateManager; import android.os.PowerManagerInternal; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; @@ -111,6 +112,7 @@ public class DisplayRotationTests { private ContentResolver mMockResolver; private FakeSettingsProvider mFakeSettingsProvider; private StatusBarManagerInternal mMockStatusBarManagerInternal; + private DeviceStateManager mMockDeviceStateManager; // Fields below are callbacks captured from test target. private ContentObserver mShowRotationSuggestionsObserver; @@ -120,6 +122,7 @@ public class DisplayRotationTests { private DisplayRotationBuilder mBuilder; + private DeviceStateController mDeviceStateController; private DisplayRotation mTarget; @BeforeClass @@ -484,6 +487,34 @@ public class DisplayRotationTests { SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); } + @Test + public void testReverseRotation() throws Exception { + mBuilder.build(); + configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false); + + when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(true); + + thawRotation(); + + enableOrientationSensor(); + + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_90)); + assertEquals(Surface.ROTATION_270, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_270)); + assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_0)); + assertEquals(Surface.ROTATION_0, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0)); + + mOrientationSensorListener.onSensorChanged(createSensorEvent(Surface.ROTATION_180)); + assertEquals(Surface.ROTATION_180, mTarget.rotationForOrientation( + SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_180)); + } + private boolean waitForUiHandler() { final CountDownLatch latch = new CountDownLatch(1); UiThread.getHandler().post(latch::countDown); @@ -1097,8 +1128,14 @@ public class DisplayRotationTests { mMockDisplayWindowSettings = mock(DisplayWindowSettings.class); + mMockDeviceStateManager = mock(DeviceStateManager.class); + when(mMockContext.getSystemService(eq(DeviceStateManager.class))) + .thenReturn(mMockDeviceStateManager); + + mDeviceStateController = mock(DeviceStateController.class); mTarget = new DisplayRotation(sMockWm, mMockDisplayContent, mMockDisplayAddress, - mMockDisplayPolicy, mMockDisplayWindowSettings, mMockContext, new Object()) { + mMockDisplayPolicy, mMockDisplayWindowSettings, mMockContext, new Object(), + mDeviceStateController) { @Override DisplayRotationImmersiveAppCompatPolicy initImmersiveAppCompatPolicy( WindowManagerService service, DisplayContent displayContent) { diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxConfigurationTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxConfigurationTest.java index ead1a8675775..12b7c9d5e535 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxConfigurationTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxConfigurationTest.java @@ -51,7 +51,7 @@ import java.util.function.BiConsumer; * Tests for the {@link LetterboxConfiguration} class. * * Build/Install/Run: - * atest WmTests:LetterboxConfigurationTests + * atest WmTests:LetterboxConfigurationTest */ @SmallTest @Presubmit @@ -243,18 +243,18 @@ public class LetterboxConfigurationTest { DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, DEVICE_CONFIG_KEY_ENABLE_COMPAT_FAKE_FOCUS, "true", false); mLetterboxConfiguration.setIsCompatFakeFocusEnabled(false); - assertFalse(mLetterboxConfiguration.isCompatFakeFocusEnabledOnDevice()); + assertFalse(mLetterboxConfiguration.isCompatFakeFocusEnabled()); // Set runtime flag to false and build time flag to true DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, DEVICE_CONFIG_KEY_ENABLE_COMPAT_FAKE_FOCUS, "false", false); mLetterboxConfiguration.setIsCompatFakeFocusEnabled(true); - assertFalse(mLetterboxConfiguration.isCompatFakeFocusEnabledOnDevice()); + assertFalse(mLetterboxConfiguration.isCompatFakeFocusEnabled()); // Set runtime flag to true so that both are enabled DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, DEVICE_CONFIG_KEY_ENABLE_COMPAT_FAKE_FOCUS, "true", false); - assertTrue(mLetterboxConfiguration.isCompatFakeFocusEnabledOnDevice()); + assertTrue(mLetterboxConfiguration.isCompatFakeFocusEnabled()); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, DEVICE_CONFIG_KEY_ENABLE_COMPAT_FAKE_FOCUS, Boolean.toString(wasFakeFocusEnabled), diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java index 478bd855902a..f6f7dca57e08 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java @@ -16,14 +16,29 @@ package com.android.server.wm; +import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH; import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE; +import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS; import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION; +import static android.content.pm.ActivityInfo.OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE; +import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR; +import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT; +import static android.content.pm.ActivityInfo.OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; +import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH; import static android.view.WindowManager.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE; +import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE; +import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE; +import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS; import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -58,6 +73,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.R; +import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges; import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; import org.junit.Before; @@ -89,6 +105,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { public TestRule compatChangeRule = new PlatformCompatChangeRule(); private ActivityRecord mActivity; + private Task mTask; private DisplayContent mDisplayContent; private LetterboxUiController mController; private LetterboxConfiguration mLetterboxConfiguration; @@ -488,6 +505,196 @@ public class LetterboxUiControllerTest extends WindowTestsBase { return mainWindow; } + // overrideOrientationIfNeeded + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT}) + public void testOverrideOrientationIfNeeded_portraitOverrideEnabled_returnsPortrait() + throws Exception { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_PORTRAIT); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR}) + public void testOverrideOrientationIfNeeded_portraitOverrideEnabled_returnsNosensor() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_NOSENSOR); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR}) + public void testOverrideOrientationIfNeeded_nosensorOverride_orientationFixed_returnsUnchanged() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_PORTRAIT), SCREEN_ORIENTATION_PORTRAIT); + } + + @Test + @EnableCompatChanges({OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE}) + public void testOverrideOrientationIfNeeded_reverseLandscapeOverride_orientationPortraitOrUndefined_returnsUnchanged() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_PORTRAIT), SCREEN_ORIENTATION_PORTRAIT); + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_UNSPECIFIED); + } + + @Test + @EnableCompatChanges({OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE}) + public void testOverrideOrientationIfNeeded_reverseLandscapeOverride_orientationLandscape_returnsReverseLandscape() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_LANDSCAPE), + SCREEN_ORIENTATION_REVERSE_LANDSCAPE); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT}) + public void testOverrideOrientationIfNeeded_portraitOverride_orientationFixed_returnsUnchanged() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_NOSENSOR), SCREEN_ORIENTATION_NOSENSOR); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT, OVERRIDE_ANY_ORIENTATION}) + public void testOverrideOrientationIfNeeded_portraitAndIgnoreFixedOverrides_returnsPortrait() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_NOSENSOR), SCREEN_ORIENTATION_PORTRAIT); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR, OVERRIDE_ANY_ORIENTATION}) + public void testOverrideOrientationIfNeeded_noSensorAndIgnoreFixedOverrides_returnsNosensor() { + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_PORTRAIT), SCREEN_ORIENTATION_NOSENSOR); + } + + @Test + @EnableCompatChanges({OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT}) + public void testOverrideOrientationIfNeeded_propertyIsFalse_returnsUnchanged() + throws Exception { + mockThatProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, /* value */ false); + + mController = new LetterboxUiController(mWm, mActivity); + + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_UNSPECIFIED); + } + + // shouldUseDisplayLandscapeNaturalOrientation + + @Test + @EnableCompatChanges({OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION}) + public void testShouldUseDisplayLandscapeNaturalOrientation_override_returnsTrue() { + prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation(); + assertTrue(mController.shouldUseDisplayLandscapeNaturalOrientation()); + } + + @Test + @EnableCompatChanges({OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION}) + public void testShouldUseDisplayLandscapeNaturalOrientation_overrideAndFalseProperty_returnsFalse() + throws Exception { + mockThatProperty(PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE, /* value */ false); + + mController = new LetterboxUiController(mWm, mActivity); + + prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation(); + assertFalse(mController.shouldUseDisplayLandscapeNaturalOrientation()); + } + + @Test + @EnableCompatChanges({OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION}) + public void testShouldUseDisplayLandscapeNaturalOrientation_portraitNaturalOrientation_returnsFalse() { + prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation(); + doReturn(ORIENTATION_PORTRAIT).when(mDisplayContent).getNaturalOrientation(); + + assertFalse(mController.shouldUseDisplayLandscapeNaturalOrientation()); + } + + @Test + @EnableCompatChanges({OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION}) + public void testShouldUseDisplayLandscapeNaturalOrientation_disabledIgnoreOrientationRequest_returnsFalse() { + prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation(); + mDisplayContent.setIgnoreOrientationRequest(false); + + assertFalse(mController.shouldUseDisplayLandscapeNaturalOrientation()); + } + + @Test + @EnableCompatChanges({OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION}) + public void testShouldUseDisplayLandscapeNaturalOrientation_inMultiWindowMode_returnsFalse() { + prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation(); + + spyOn(mTask); + doReturn(true).when(mTask).inMultiWindowMode(); + + assertFalse(mController.shouldUseDisplayLandscapeNaturalOrientation()); + } + + @Test + @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) + public void testShouldSendFakeFocus_overrideEnabled_returnsTrue() { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + + mController = new LetterboxUiController(mWm, mActivity); + + assertTrue(mController.shouldSendFakeFocus()); + } + + @Test + @DisableCompatChanges({OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) + public void testShouldSendFakeFocus_overrideDisabled_returnsFalse() { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + + mController = new LetterboxUiController(mWm, mActivity); + + assertFalse(mController.shouldSendFakeFocus()); + } + + @Test + @EnableCompatChanges({OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) + public void testIsCompatFakeFocusEnabled_propertyDisabledAndOverrideEnabled_fakeFocusDisabled() + throws Exception { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + mockThatProperty(PROPERTY_COMPAT_ENABLE_FAKE_FOCUS, /* value */ false); + + mController = new LetterboxUiController(mWm, mActivity); + + assertFalse(mController.shouldSendFakeFocus()); + } + + @Test + @DisableCompatChanges({OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) + public void testIsCompatFakeFocusEnabled_propertyEnabled_noOverride_fakeFocusEnabled() + throws Exception { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + mockThatProperty(PROPERTY_COMPAT_ENABLE_FAKE_FOCUS, /* value */ true); + + mController = new LetterboxUiController(mWm, mActivity); + + assertTrue(mController.shouldSendFakeFocus()); + } + + @Test + public void testIsCompatFakeFocusEnabled_propertyDisabled_fakeFocusDisabled() + throws Exception { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + mockThatProperty(PROPERTY_COMPAT_ENABLE_FAKE_FOCUS, /* value */ false); + + mController = new LetterboxUiController(mWm, mActivity); + + assertFalse(mController.shouldSendFakeFocus()); + } + + @Test + public void testIsCompatFakeFocusEnabled_propertyEnabled_fakeFocusEnabled() + throws Exception { + doReturn(true).when(mLetterboxConfiguration).isCompatFakeFocusEnabled(); + mockThatProperty(PROPERTY_COMPAT_ENABLE_FAKE_FOCUS, /* value */ true); + + mController = new LetterboxUiController(mWm, mActivity); + + assertTrue(mController.shouldSendFakeFocus()); + } + private void mockThatProperty(String propertyName, boolean value) throws Exception { Property property = new Property(propertyName, /* value */ value, /* packageName */ "", /* className */ ""); @@ -496,6 +703,12 @@ public class LetterboxUiControllerTest extends WindowTestsBase { doReturn(property).when(pm).getProperty(eq(propertyName), anyString()); } + private void prepareActivityThatShouldUseDisplayLandscapeNaturalOrientation() { + spyOn(mDisplayContent); + doReturn(ORIENTATION_LANDSCAPE).when(mDisplayContent).getNaturalOrientation(); + mDisplayContent.setIgnoreOrientationRequest(true); + } + private void prepareActivityThatShouldIgnoreRequestedOrientationDuringRelaunch() { doReturn(true).when(mLetterboxConfiguration) .isPolicyForIgnoringRequestedOrientationEnabled(); @@ -505,10 +718,10 @@ public class LetterboxUiControllerTest extends WindowTestsBase { private ActivityRecord setUpActivityWithComponent() { mDisplayContent = new TestDisplayContent .Builder(mAtm, /* dw */ 1000, /* dh */ 2000).build(); - Task task = new TaskBuilder(mSupervisor).setDisplay(mDisplayContent).build(); + mTask = new TaskBuilder(mSupervisor).setDisplay(mDisplayContent).build(); final ActivityRecord activity = new ActivityBuilder(mAtm) .setOnTop(true) - .setTask(task) + .setTask(mTask) // Set the component to be that of the test class in order to enable compat changes .setComponent(ComponentName.createRelative(mContext, com.android.server.wm.LetterboxUiControllerTest.class.getName())) diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java index 48084743afde..06e3854088e9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java @@ -468,7 +468,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { mWm.setRecentsAnimationController(mController); spyOn(mDisplayContent.mFixedRotationTransitionListener); final ActivityRecord recents = mock(ActivityRecord.class); - recents.mOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; + recents.setOverrideOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); doReturn(ORIENTATION_PORTRAIT).when(recents) .getRequestedConfigurationOrientation(anyBoolean()); mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recents); diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index a09bb337d56f..571dd690ab74 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -16,8 +16,10 @@ package com.android.server.wm; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; @@ -53,8 +55,6 @@ import static com.android.server.wm.ActivityRecord.State.RESTARTING_PROCESS; import static com.android.server.wm.ActivityRecord.State.RESUMED; import static com.android.server.wm.ActivityRecord.State.STOPPED; import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING; -import static com.android.server.wm.LetterboxConfiguration.PROPERTY_COMPAT_FAKE_FOCUS_OPT_IN; -import static com.android.server.wm.LetterboxConfiguration.PROPERTY_COMPAT_FAKE_FOCUS_OPT_OUT; import static com.android.server.wm.WindowContainer.POSITION_TOP; import static com.google.common.truth.Truth.assertThat; @@ -2313,6 +2313,29 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testDisplayIgnoreOrientationRequest_disabledViaDeviceConfig_orientationRespected() { + // Set up a display in landscape + setUpDisplaySizeWithApp(2800, 1400); + + final ActivityRecord activity = buildActivityRecord(/* supportsSizeChanges= */ false, + RESIZE_MODE_UNRESIZEABLE, SCREEN_ORIENTATION_PORTRAIT); + activity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + + spyOn(activity.mWmService.mLetterboxConfiguration); + doReturn(true).when(activity.mWmService.mLetterboxConfiguration) + .isIgnoreOrientationRequestAllowed(); + + // Display should not be rotated. + assertEquals(SCREEN_ORIENTATION_UNSPECIFIED, activity.mDisplayContent.getOrientation()); + + doReturn(false).when(activity.mWmService.mLetterboxConfiguration) + .isIgnoreOrientationRequestAllowed(); + + // Display should be rotated. + assertEquals(SCREEN_ORIENTATION_PORTRAIT, activity.mDisplayContent.getOrientation()); + } + + @Test public void testSandboxDisplayApis_unresizableAppNotSandboxed() { // Set up a display in landscape with an unresizable app. setUpDisplaySizeWithApp(2500, 1000); @@ -2910,6 +2933,39 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testUpdateResolvedBoundsHorizontalPosition_leftInsets_appCentered() { + // Set up folded display + final DisplayContent display = new TestDisplayContent.Builder(mAtm, 1100, 2100) + .setCanRotate(true) + .build(); + display.setIgnoreOrientationRequest(true); + final DisplayPolicy policy = display.getDisplayPolicy(); + DisplayPolicy.DecorInsets.Info decorInfo = policy.getDecorInsetsInfo(ROTATION_90, + display.mBaseDisplayHeight, display.mBaseDisplayWidth); + decorInfo.mNonDecorInsets.set(130, 0, 60, 0); + spyOn(policy); + doReturn(decorInfo).when(policy).getDecorInsetsInfo(ROTATION_90, + display.mBaseDisplayHeight, display.mBaseDisplayWidth); + mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f); + + setUpApp(display); + prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT); + + // Resize the display to simulate unfolding in portrait + resizeDisplay(mTask.mDisplayContent, 2200, 1800); + assertTrue(mActivity.inSizeCompatMode()); + + // Simulate real display not taking non-decor insets into consideration + display.getWindowConfiguration().setAppBounds(0, 0, 2200, 1800); + + // Rotate display to landscape + rotateDisplay(mActivity.mDisplayContent, ROTATION_90); + + // App is centered + assertEquals(mActivity.getBounds(), new Rect(350, 50, 1450, 2150)); + } + + @Test public void testUpdateResolvedBoundsHorizontalPosition_left() { // Display configured as (2800, 1400). assertHorizontalPositionForDifferentDisplayConfigsForPortraitActivity( @@ -3055,6 +3111,20 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testApplyAspectRatio_containingRatioAlmostEqualToMaxRatio_boundsUnchanged() { + setUpDisplaySizeWithApp(1981, 2576); + mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f); + + final Rect originalBounds = new Rect(mActivity.getBounds()); + prepareUnresizable(mActivity, 1.3f, SCREEN_ORIENTATION_UNSPECIFIED); + + // The containing aspect ratio is now 1.3003534, while the desired aspect ratio is 1.3. The + // bounds of the activity should not be changed as the difference is too small + assertEquals(mActivity.getBounds(), originalBounds); + } + + @Test public void testUpdateResolvedBoundsHorizontalPosition_activityFillParentWidth() { // When activity width equals parent width, multiplier shouldn't have any effect. assertHorizontalPositionForDifferentDisplayConfigsForLandscapeActivity( @@ -3066,6 +3136,39 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testUpdateResolvedBoundsVerticalPosition_topInsets_appCentered() { + // Set up folded display + final DisplayContent display = new TestDisplayContent.Builder(mAtm, 2100, 1100) + .setCanRotate(true) + .build(); + display.setIgnoreOrientationRequest(true); + final DisplayPolicy policy = display.getDisplayPolicy(); + DisplayPolicy.DecorInsets.Info decorInfo = policy.getDecorInsetsInfo(ROTATION_90, + display.mBaseDisplayHeight, display.mBaseDisplayWidth); + decorInfo.mNonDecorInsets.set(0, 130, 0, 60); + spyOn(policy); + doReturn(decorInfo).when(policy).getDecorInsetsInfo(ROTATION_90, + display.mBaseDisplayHeight, display.mBaseDisplayWidth); + mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f); + + setUpApp(display); + prepareUnresizable(mActivity, SCREEN_ORIENTATION_LANDSCAPE); + + // Resize the display to simulate unfolding in portrait + resizeDisplay(mTask.mDisplayContent, 1800, 2200); + assertTrue(mActivity.inSizeCompatMode()); + + // Simulate real display not taking non-decor insets into consideration + display.getWindowConfiguration().setAppBounds(0, 0, 1800, 2200); + + // Rotate display to landscape + rotateDisplay(mActivity.mDisplayContent, ROTATION_90); + + // App is centered + assertEquals(mActivity.getBounds(), new Rect(50, 350, 2150, 1450)); + } + + @Test public void testUpdateResolvedBoundsVerticalPosition_top() { // Display configured as (1400, 2800). assertVerticalPositionForDifferentDisplayConfigsForLandscapeActivity( @@ -3535,7 +3638,8 @@ public class SizeCompatTests extends WindowTestsBase { assertEquals(newDensity, mActivity.getConfiguration().densityDpi); } - private ActivityRecord setUpActivityForCompatFakeFocusTest() { + @Test + public void testShouldSendFakeFocus_compatFakeFocusEnabled() { final ActivityRecord activity = new ActivityBuilder(mAtm) .setCreateTask(true) .setOnTop(true) @@ -3544,69 +3648,40 @@ public class SizeCompatTests extends WindowTestsBase { com.android.server.wm.SizeCompatTests.class.getName())) .build(); final Task task = activity.getTask(); - task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); - spyOn(activity.mWmService.mLetterboxConfiguration); - doReturn(true).when(activity.mWmService.mLetterboxConfiguration) - .isCompatFakeFocusEnabledOnDevice(); - return activity; - } - - @Test - @EnableCompatChanges({ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) - public void testShouldSendFakeFocus_overrideEnabled_returnsTrue() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); + spyOn(activity.mLetterboxUiController); + doReturn(true).when(activity.mLetterboxUiController).shouldSendFakeFocus(); + task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); assertTrue(activity.shouldSendCompatFakeFocus()); - } - - @Test - @DisableCompatChanges({ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) - public void testShouldSendFakeFocus_overrideDisabled_returnsFalse() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); + task.setWindowingMode(WINDOWING_MODE_PINNED); assertFalse(activity.shouldSendCompatFakeFocus()); - } - - @Test - @EnableCompatChanges({ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) - public void testIsCompatFakeFocusEnabled_optOutPropertyAndOverrideEnabled_fakeFocusDisabled() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); - doReturn(true).when(activity.mWmService.mLetterboxConfiguration) - .getPackageManagerProperty(any(), eq(PROPERTY_COMPAT_FAKE_FOCUS_OPT_OUT)); - - assertFalse(activity.mWmService.mLetterboxConfiguration - .isCompatFakeFocusEnabled(activity.info)); - } - @Test - @DisableCompatChanges({ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS}) - public void testIsCompatFakeFocusEnabled_optInPropertyEnabled_noOverride_fakeFocusEnabled() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); - doReturn(true).when(activity.mWmService.mLetterboxConfiguration) - .getPackageManagerProperty(any(), eq(PROPERTY_COMPAT_FAKE_FOCUS_OPT_IN)); - - assertTrue(activity.mWmService.mLetterboxConfiguration - .isCompatFakeFocusEnabled(activity.info)); + task.setWindowingMode(WINDOWING_MODE_FREEFORM); + assertFalse(activity.shouldSendCompatFakeFocus()); } @Test - public void testIsCompatFakeFocusEnabled_optOutPropertyEnabled_fakeFocusDisabled() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); - doReturn(true).when(activity.mWmService.mLetterboxConfiguration) - .getPackageManagerProperty(any(), eq(PROPERTY_COMPAT_FAKE_FOCUS_OPT_OUT)); + public void testShouldSendFakeFocus_compatFakeFocusDisabled() { + final ActivityRecord activity = new ActivityBuilder(mAtm) + .setCreateTask(true) + .setOnTop(true) + // Set the component to be that of the test class in order to enable compat changes + .setComponent(ComponentName.createRelative(mContext, + com.android.server.wm.SizeCompatTests.class.getName())) + .build(); + final Task task = activity.getTask(); + spyOn(activity.mLetterboxUiController); + doReturn(false).when(activity.mLetterboxUiController).shouldSendFakeFocus(); - assertFalse(activity.mWmService.mLetterboxConfiguration - .isCompatFakeFocusEnabled(activity.info)); - } + task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); + assertFalse(activity.shouldSendCompatFakeFocus()); - @Test - public void testIsCompatFakeFocusEnabled_optInPropertyEnabled_fakeFocusEnabled() { - ActivityRecord activity = setUpActivityForCompatFakeFocusTest(); - doReturn(true).when(activity.mWmService.mLetterboxConfiguration) - .getPackageManagerProperty(any(), eq(PROPERTY_COMPAT_FAKE_FOCUS_OPT_IN)); + task.setWindowingMode(WINDOWING_MODE_PINNED); + assertFalse(activity.shouldSendCompatFakeFocus()); - assertTrue(activity.mWmService.mLetterboxConfiguration - .isCompatFakeFocusEnabled(activity.info)); + task.setWindowingMode(WINDOWING_MODE_FREEFORM); + assertFalse(activity.shouldSendCompatFakeFocus()); } private int getExpectedSplitSize(int dimensionToSplit) { diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java index ed7d12384662..2446fc497f04 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java @@ -1557,7 +1557,7 @@ public class WindowContainerTests extends WindowTestsBase { @Override int getOrientation() { - return getOrientation(super.mOrientation); + return getOrientation(super.getOverrideOrientation()); } @Override diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index fd3776f828e5..514aec1c6fc3 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -1138,7 +1138,9 @@ public class WindowStateTests extends WindowTestsBase { spyOn(app.getDisplayContent()); app.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_FULLSCREEN); - verify(app.getDisplayContent()).updateImeControlTarget(); + // Expect updateImeParent will be invoked when the configuration of the IME control + // target has changed. + verify(app.getDisplayContent()).updateImeControlTarget(eq(true) /* updateImeParent */); assertEquals(mAppWindow, mDisplayContent.getImeTarget(IME_TARGET_CONTROL).getWindow()); } diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java index 42a5af7fdce3..17c354a8a80e 100644 --- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java +++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java @@ -36,6 +36,7 @@ import libcore.io.IoUtils; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; /** @@ -106,6 +107,12 @@ public final class UsbAlsaManager { return false; } + /** + * List of connected MIDI devices + */ + private final HashMap<String, UsbMidiDevice> + mMidiDevices = new HashMap<String, UsbMidiDevice>(); + // UsbMidiDevice for USB peripheral mode (gadget) device private UsbMidiDevice mPeripheralMidiDevice = null; @@ -249,6 +256,8 @@ public final class UsbAlsaManager { } } + addMidiDevice(deviceAddress, usbDevice, parser, cardRec); + logDevices("deviceAdded()"); if (DEBUG) { @@ -256,6 +265,54 @@ public final class UsbAlsaManager { } } + private void addMidiDevice(String deviceAddress, UsbDevice usbDevice, + UsbDescriptorParser parser, AlsaCardsParser.AlsaCardRecord cardRec) { + boolean hasMidi = parser.hasMIDIInterface(); + // UsbHostManager will create UsbDirectMidiDevices instead if MIDI 2 is supported. + boolean hasMidi2 = parser.containsUniversalMidiDeviceEndpoint(); + if (DEBUG) { + Slog.d(TAG, "hasMidi: " + hasMidi + " mHasMidiFeature:" + mHasMidiFeature); + Slog.d(TAG, "hasMidi2: " + hasMidi2); + } + if (mHasMidiFeature && hasMidi && !hasMidi2) { + Bundle properties = new Bundle(); + String manufacturer = usbDevice.getManufacturerName(); + String product = usbDevice.getProductName(); + String version = usbDevice.getVersion(); + String name; + if (manufacturer == null || manufacturer.isEmpty()) { + name = product; + } else if (product == null || product.isEmpty()) { + name = manufacturer; + } else { + name = manufacturer + " " + product; + } + properties.putString(MidiDeviceInfo.PROPERTY_NAME, name); + properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, manufacturer); + properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, product); + properties.putString(MidiDeviceInfo.PROPERTY_VERSION, version); + properties.putString(MidiDeviceInfo.PROPERTY_SERIAL_NUMBER, + usbDevice.getSerialNumber()); + properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, cardRec.getCardNum()); + properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_DEVICE, 0 /*deviceNum*/); + properties.putParcelable(MidiDeviceInfo.PROPERTY_USB_DEVICE, usbDevice); + + int numLegacyMidiInputs = parser.calculateNumLegacyMidiInputs(); + int numLegacyMidiOutputs = parser.calculateNumLegacyMidiOutputs(); + if (DEBUG) { + Slog.d(TAG, "numLegacyMidiInputs: " + numLegacyMidiInputs); + Slog.d(TAG, "numLegacyMidiOutputs:" + numLegacyMidiOutputs); + } + + UsbMidiDevice usbMidiDevice = UsbMidiDevice.create(mContext, properties, + cardRec.getCardNum(), 0 /*device*/, numLegacyMidiInputs, + numLegacyMidiOutputs); + if (usbMidiDevice != null) { + mMidiDevices.put(deviceAddress, usbMidiDevice); + } + } + } + /* package */ synchronized void usbDeviceRemoved(String deviceAddress/*UsbDevice usbDevice*/) { if (DEBUG) { Slog.d(TAG, "deviceRemoved(" + deviceAddress + ")"); @@ -269,6 +326,13 @@ public final class UsbAlsaManager { selectDefaultDevice(); // if there any external devices left, select one of them } + // MIDI + UsbMidiDevice usbMidiDevice = mMidiDevices.remove(deviceAddress); + if (usbMidiDevice != null) { + Slog.i(TAG, "USB MIDI Device Removed: " + deviceAddress); + IoUtils.closeQuietly(usbMidiDevice); + } + logDevices("usbDeviceRemoved()"); } @@ -324,6 +388,12 @@ public final class UsbAlsaManager { usbAlsaDevice.dump(dump, "alsa_devices", UsbAlsaManagerProto.ALSA_DEVICES); } + for (String deviceAddr : mMidiDevices.keySet()) { + // A UsbMidiDevice does not have a handle to the UsbDevice anymore + mMidiDevices.get(deviceAddr).dump(deviceAddr, dump, "midi_devices", + UsbAlsaManagerProto.MIDI_DEVICES); + } + dump.end(token); } diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java index f3892768921c..b3eb28552796 100644 --- a/services/usb/java/com/android/server/usb/UsbHostManager.java +++ b/services/usb/java/com/android/server/usb/UsbHostManager.java @@ -444,14 +444,19 @@ public class UsbHostManager { } else { Slog.e(TAG, "Universal Midi Device is null."); } - } - if (parser.containsLegacyMidiDeviceEndpoint()) { - UsbDirectMidiDevice midiDevice = UsbDirectMidiDevice.create(mContext, - newDevice, parser, false, uniqueUsbDeviceIdentifier); - if (midiDevice != null) { - midiDevices.add(midiDevice); - } else { - Slog.e(TAG, "Legacy Midi Device is null."); + + // Use UsbDirectMidiDevice only if this supports MIDI 2.0 as well. + // ALSA removes the audio sound card if MIDI interfaces are removed. + // This means that as long as ALSA is used for audio, MIDI 1.0 USB + // devices should use the ALSA path for MIDI. + if (parser.containsLegacyMidiDeviceEndpoint()) { + midiDevice = UsbDirectMidiDevice.create(mContext, + newDevice, parser, false, uniqueUsbDeviceIdentifier); + if (midiDevice != null) { + midiDevices.add(midiDevice); + } else { + Slog.e(TAG, "Legacy Midi Device is null."); + } } } diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java index 3f2d8c8ef47c..c6ea22856dc7 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java @@ -79,6 +79,10 @@ public final class UsbConfigDescriptor extends UsbDescriptor { mInterfaceDescriptors.add(interfaceDesc); } + ArrayList<UsbInterfaceDescriptor> getInterfaceDescriptors() { + return mInterfaceDescriptors; + } + private boolean isAudioInterface(UsbInterfaceDescriptor descriptor) { return descriptor.getUsbClass() == UsbDescriptor.CLASSID_AUDIO && descriptor.getUsbSubclass() == UsbDescriptor.AUDIO_AUDIOSTREAMING; diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java index cd6ea681db07..626ce8927158 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java @@ -40,6 +40,7 @@ public final class UsbDescriptorParser { private UsbDeviceDescriptor mDeviceDescriptor; private UsbConfigDescriptor mCurConfigDescriptor; private UsbInterfaceDescriptor mCurInterfaceDescriptor; + private UsbEndpointDescriptor mCurEndpointDescriptor; // The AudioClass spec implemented by the AudioClass Interfaces // This may well be different than the overall USB Spec. @@ -165,7 +166,7 @@ public final class UsbDescriptorParser { break; case UsbDescriptor.DESCRIPTORTYPE_ENDPOINT: - descriptor = new UsbEndpointDescriptor(length, type); + descriptor = mCurEndpointDescriptor = new UsbEndpointDescriptor(length, type); if (mCurInterfaceDescriptor != null) { mCurInterfaceDescriptor.addEndpointDescriptor( (UsbEndpointDescriptor) descriptor); @@ -265,6 +266,9 @@ public final class UsbDescriptorParser { + Integer.toHexString(subClass)); break; } + if (mCurEndpointDescriptor != null && descriptor != null) { + mCurEndpointDescriptor.setClassSpecificEndpointDescriptor(descriptor); + } } break; @@ -798,6 +802,84 @@ public final class UsbDescriptorParser { /** * @hide */ + private int calculateNumLegacyMidiPorts(boolean isOutput) { + // Only look at the first config. + UsbConfigDescriptor configDescriptor = null; + for (UsbDescriptor descriptor : mDescriptors) { + if (descriptor.getType() == UsbDescriptor.DESCRIPTORTYPE_CONFIG) { + if (descriptor instanceof UsbConfigDescriptor) { + configDescriptor = (UsbConfigDescriptor) descriptor; + break; + } else { + Log.w(TAG, "Unrecognized Config l: " + descriptor.getLength() + + " t:0x" + Integer.toHexString(descriptor.getType())); + } + } + } + if (configDescriptor == null) { + Log.w(TAG, "Config not found"); + return 0; + } + + ArrayList<UsbInterfaceDescriptor> legacyMidiInterfaceDescriptors = + new ArrayList<UsbInterfaceDescriptor>(); + for (UsbInterfaceDescriptor interfaceDescriptor + : configDescriptor.getInterfaceDescriptors()) { + if (interfaceDescriptor.getUsbClass() == UsbDescriptor.CLASSID_AUDIO) { + if (interfaceDescriptor.getUsbSubclass() == UsbDescriptor.AUDIO_MIDISTREAMING) { + UsbDescriptor midiHeaderDescriptor = + interfaceDescriptor.getMidiHeaderInterfaceDescriptor(); + if (midiHeaderDescriptor != null) { + if (midiHeaderDescriptor instanceof UsbMSMidiHeader) { + UsbMSMidiHeader midiHeader = + (UsbMSMidiHeader) midiHeaderDescriptor; + if (midiHeader.getMidiStreamingClass() == MS_MIDI_1_0) { + legacyMidiInterfaceDescriptors.add(interfaceDescriptor); + } + } + } + } + } + } + + int count = 0; + for (UsbInterfaceDescriptor interfaceDescriptor : legacyMidiInterfaceDescriptors) { + for (int i = 0; i < interfaceDescriptor.getNumEndpoints(); i++) { + UsbEndpointDescriptor endpoint = + interfaceDescriptor.getEndpointDescriptor(i); + // 0 is output, 1 << 7 is input. + if ((endpoint.getDirection() == 0) == isOutput) { + UsbDescriptor classSpecificEndpointDescriptor = + endpoint.getClassSpecificEndpointDescriptor(); + if (classSpecificEndpointDescriptor != null + && (classSpecificEndpointDescriptor instanceof UsbACMidi10Endpoint)) { + UsbACMidi10Endpoint midiEndpoint = + (UsbACMidi10Endpoint) classSpecificEndpointDescriptor; + count += midiEndpoint.getNumJacks(); + } + } + } + } + return count; + } + + /** + * @hide + */ + public int calculateNumLegacyMidiInputs() { + return calculateNumLegacyMidiPorts(false /*isOutput*/); + } + + /** + * @hide + */ + public int calculateNumLegacyMidiOutputs() { + return calculateNumLegacyMidiPorts(true /*isOutput*/); + } + + /** + * @hide + */ public float getInputHeadsetProbability() { if (hasMIDIInterface()) { return 0.0f; diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java index ab07ce7fdb7a..1f448acac5e8 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java @@ -79,6 +79,8 @@ public class UsbEndpointDescriptor extends UsbDescriptor { private byte mRefresh; private byte mSyncAddress; + private UsbDescriptor mClassSpecificEndpointDescriptor; + public UsbEndpointDescriptor(int length, byte type) { super(length, type); mHierarchyLevel = 4; @@ -112,6 +114,14 @@ public class UsbEndpointDescriptor extends UsbDescriptor { return mEndpointAddress & UsbEndpointDescriptor.MASK_ENDPOINT_DIRECTION; } + void setClassSpecificEndpointDescriptor(UsbDescriptor descriptor) { + mClassSpecificEndpointDescriptor = descriptor; + } + + UsbDescriptor getClassSpecificEndpointDescriptor() { + return mClassSpecificEndpointDescriptor; + } + /** * Returns a UsbEndpoint that this UsbEndpointDescriptor is describing. */ diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt index aacc17a49a24..3361502f2ea0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt @@ -113,4 +113,18 @@ class ImeAppAutoFocusHelper @JvmOverloads constructor( } return false } + + fun toggleFixPortraitOrientation(wmHelper: WindowManagerStateHelper) { + val button = uiDevice.wait(Until.findObject(By.res(getPackage(), + "toggle_fixed_portrait_btn")), FIND_TIMEOUT) + require(button != null) { + "Button not found, this usually happens when the device " + + "was left in an unknown state (e.g. Screen turned off)" + } + button.click() + mInstrumentation.waitForIdleSync() + // Ensure app relaunching transition finish and the IME has shown + wmHelper.waitForAppTransitionIdle() + wmHelper.waitImeShown() + } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToFixedPortraitAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToFixedPortraitAppTest.kt new file mode 100644 index 000000000000..3b3bce6f39ba --- /dev/null +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToFixedPortraitAppTest.kt @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.wm.flicker.ime + +import android.app.Instrumentation +import android.platform.test.annotations.Postsubmit +import android.view.Surface +import android.view.WindowManagerPolicyConstants +import androidx.test.filters.RequiresDevice +import androidx.test.platform.app.InstrumentationRegistry +import com.android.server.wm.flicker.FlickerBuilderProvider +import com.android.server.wm.flicker.FlickerParametersRunnerFactory +import com.android.server.wm.flicker.FlickerTestParameter +import com.android.server.wm.flicker.FlickerTestParameterFactory +import com.android.server.wm.flicker.annotation.Group2 +import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper +import com.android.server.wm.flicker.helpers.WindowUtils +import com.android.server.wm.flicker.traces.region.RegionSubject +import com.android.server.wm.traces.common.FlickerComponentName +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Test IME window shown on the app with fixing portrait orientation. + * To run this test: `atest FlickerTests:OpenImeWindowToFixedPortraitAppTest` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Group2 +class OpenImeWindowToFixedPortraitAppTest (private val testSpec: FlickerTestParameter) { + private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation) + + @FlickerBuilderProvider + fun buildFlicker(): FlickerBuilder { + return FlickerBuilder(instrumentation).apply { + setup { + eachRun { + testApp.launchViaIntent(wmHelper) + testApp.openIME(device, wmHelper) + // Enable letterbox when the app calls setRequestedOrientation + device.executeShellCommand("cmd window set-ignore-orientation-request true") + } + } + transitions { + testApp.toggleFixPortraitOrientation(wmHelper) + } + teardown { + eachRun { + testApp.exit() + device.executeShellCommand("cmd window set-ignore-orientation-request false") + } + } + } + } + + @Postsubmit + @Test + fun imeLayerVisibleStart() { + testSpec.assertLayersStart { + this.isVisible(FlickerComponentName.IME) + } + } + + @Postsubmit + @Test + fun imeLayerExistsEnd() { + testSpec.assertLayersEnd { + this.isVisible(FlickerComponentName.IME) + } + } + + @Postsubmit + @Test + fun imeLayerVisibleRegionKeepsTheSame() { + var imeLayerVisibleRegionBeforeTransition: RegionSubject? = null + testSpec.assertLayersStart { + imeLayerVisibleRegionBeforeTransition = this.visibleRegion(FlickerComponentName.IME) + } + testSpec.assertLayersEnd { + this.visibleRegion(FlickerComponentName.IME) + .coversExactly(imeLayerVisibleRegionBeforeTransition!!.region) + } + } + + @Postsubmit + @Test + fun appWindowWithLetterboxCoversExactlyOnScreen() { + val displayBounds = WindowUtils.getDisplayBounds(testSpec.startRotation) + testSpec.assertLayersEnd { + this.visibleRegion(testApp.component, FlickerComponentName.LETTERBOX) + .coversExactly(displayBounds) + } + } + + companion object { + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams(): Collection<FlickerTestParameter> { + return FlickerTestParameterFactory.getInstance() + .getConfigNonRotationTests( + supportedRotations = listOf(Surface.ROTATION_90, Surface.ROTATION_270), + supportedNavigationModes = listOf( + WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY, + WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY + ) + ) + } + } +}
\ No newline at end of file diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml index b8ef1954d5fc..efd80f252e86 100644 --- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml +++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml @@ -45,7 +45,7 @@ android:theme="@style/CutoutShortEdges" android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivityAutoFocus" android:windowSoftInputMode="stateVisible" - android:configChanges="orientation|screenSize" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" android:label="ImeAppAutoFocus" android:exported="true"> <intent-filter> diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml index baaf7073b3a6..e71fe801e11a 100644 --- a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml +++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml @@ -26,14 +26,27 @@ android:layout_width="match_parent" android:imeOptions="flagNoExtractUi" android:inputType="text"/> - <Button - android:id="@+id/finish_activity_btn" + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Finish activity" /> - <Button - android:id="@+id/start_dialog_themed_activity_btn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Start dialog themed activity" /> + android:layout_height="match_parent" + android:orientation="horizontal"> + <Button + android:id="@+id/finish_activity_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Finish activity" /> + <Button + android:id="@+id/start_dialog_themed_activity_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Dialog activity" /> + <ToggleButton + android:id="@+id/toggle_fixed_portrait_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textOn="Portrait (On)" + android:textOff="Portrait (Off)" + /> + </LinearLayout> </LinearLayout> diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java index bb200f125507..7ee8debddcf1 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java @@ -16,21 +16,29 @@ package com.android.server.wm.flicker.testapp; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; + import android.content.Intent; import android.widget.Button; import android.widget.EditText; +import android.widget.ToggleButton; public class ImeActivityAutoFocus extends ImeActivity { - @Override protected void onStart() { super.onStart(); - EditText editTextField = findViewById(R.id.plain_text_input); - editTextField.requestFocus(); - Button startThemedActivityButton = findViewById(R.id.start_dialog_themed_activity_btn); startThemedActivityButton.setOnClickListener( button -> startActivity(new Intent(this, DialogThemedActivity.class))); + + ToggleButton toggleFixedPortraitButton = findViewById(R.id.toggle_fixed_portrait_btn); + toggleFixedPortraitButton.setOnCheckedChangeListener( + (button, isChecked) -> setRequestedOrientation( + isChecked ? SCREEN_ORIENTATION_PORTRAIT : SCREEN_ORIENTATION_UNSPECIFIED)); + + EditText editTextField = findViewById(R.id.plain_text_input); + editTextField.requestFocus(); } } |